SidTune.h   SidTune.h 
skipping to change at line 84 skipping to change at line 84
/** /**
* Load a single-file sidtune from a memory buffer. * Load a single-file sidtune from a memory buffer.
* Currently supported: PSID format. * Currently supported: PSID format.
* *
* @param oneFileFormatSidtune the buffer that contains song data * @param oneFileFormatSidtune the buffer that contains song data
* @param sidtuneLength length of the buffer * @param sidtuneLength length of the buffer
*/ */
SidTune(const uint_least8_t* oneFileFormatSidtune, uint_least32_t sidtu neLength); SidTune(const uint_least8_t* oneFileFormatSidtune, uint_least32_t sidtu neLength);
virtual ~SidTune() {} virtual ~SidTune();
/** /**
* The SidTune class does not copy the list of file name extensions, * The SidTune class does not copy the list of file name extensions,
* so make sure you keep it. If the provided pointer is 0, the * so make sure you keep it. If the provided pointer is 0, the
* default list will be activated. This is a static list which * default list will be activated. This is a static list which
* is used by all SidTune objects. * is used by all SidTune objects.
* *
* @param fileNameExt * @param fileNameExt
*/ */
void setFileNameExtensions(const char **fileNameExt); void setFileNameExtensions(const char **fileNameExt);
skipping to change at line 163 skipping to change at line 163
/** /**
* Calculates the MD5 hash of the tune. * Calculates the MD5 hash of the tune.
* Not providing an md5 buffer will cause the internal one to be used. * Not providing an md5 buffer will cause the internal one to be used.
* If provided, buffer must be MD5_LENGTH + 1 * If provided, buffer must be MD5_LENGTH + 1
* *
* @return a pointer to the buffer containing the md5 string, 0 if no t une is loaded. * @return a pointer to the buffer containing the md5 string, 0 if no t une is loaded.
*/ */
const char *createMD5(char *md5 = 0); const char *createMD5(char *md5 = 0);
const uint_least8_t* c64Data() const;
private: // prevent copying private: // prevent copying
SidTune(const SidTune&); SidTune(const SidTune&);
SidTune& operator=(SidTune&); SidTune& operator=(SidTune&);
}; };
#endif /* SIDTUNE_H */ #endif /* SIDTUNE_H */
 End of changes. 2 change blocks. 
1 lines changed or deleted 3 lines changed or added


 event.h   event.h 
skipping to change at line 125 skipping to change at line 125
/** /**
* Add event to pending queue. * Add event to pending queue.
* *
* At PHI2, specify cycles=0 and Phase=PHI1 to fire on the very next PH I1. * At PHI2, specify cycles=0 and Phase=PHI1 to fire on the very next PH I1.
* *
* @param event the event to add * @param event the event to add
* @param cycles how many cycles from now to fire * @param cycles how many cycles from now to fire
* @param phase the phase when to fire the event * @param phase the phase when to fire the event
*/ */
virtual void schedule(Event &event, event_clock_t cycles, virtual void schedule(Event &event, unsigned int cycles,
event_phase_t phase) = 0; event_phase_t phase) = 0;
/** /**
* Add event to pending queue in the same phase as current event. * Add event to pending queue in the same phase as current event.
* *
* @param event the event to add * @param event the event to add
* @param cycles how many cycles from now to fire * @param cycles how many cycles from now to fire
*/ */
virtual void schedule(Event &event, event_clock_t cycles) = 0; virtual void schedule(Event &event, unsigned int cycles) = 0;
/** /**
* Is the event pending in this scheduler? * Is the event pending in this scheduler?
* *
* @param event the event * @param event the event
* @return true when pending * @return true when pending
*/ */
virtual bool isPending(Event &event) const = 0; virtual bool isPending(Event &event) const = 0;
/** /**
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 sidversion.h   sidversion.h 
#ifndef LIBSIDPLAYFP_VERSION_H #ifndef LIBSIDPLAYFP_VERSION_H
#define LIBSIDPLAYFP_VERSION_H #define LIBSIDPLAYFP_VERSION_H
#ifndef SIDPLAYFP_H #ifndef SIDPLAYFP_H
# error Do not include directly. # error Do not include directly.
#endif #endif
#define LIBSIDPLAYFP_VERSION_MAJ 1 #define LIBSIDPLAYFP_VERSION_MAJ 1
#define LIBSIDPLAYFP_VERSION_MIN 5 #define LIBSIDPLAYFP_VERSION_MIN 7
#define LIBSIDPLAYFP_VERSION_LEV 3 #define LIBSIDPLAYFP_VERSION_LEV 0
#endif #endif
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/