SidTune.h   SidTune.h 
skipping to change at line 94 skipping to change at line 94
/// error/status message of last operation /// error/status message of last operation
const char* statusString; const char* statusString;
/// describing the speed a song is running at /// describing the speed a song is running at
const char* speedString; const char* speedString;
uint_least16_t loadAddr; uint_least16_t loadAddr;
uint_least16_t initAddr; uint_least16_t initAddr;
uint_least16_t playAddr; uint_least16_t playAddr;
/// number of songs in the tune
uint_least16_t songs; uint_least16_t songs;
/// the default starting song
uint_least16_t startSong; uint_least16_t startSong;
/** /**
* @name Base addresses * @name Base addresses
* The SID chip base address(es) used by the sidtune. * The SID chip base address(es) used by the sidtune.
*/ */
//@{ //@{
uint_least16_t sidChipBase1; ///< 0xD400 (normal, 1st SID) uint_least16_t sidChipBase1; ///< 0xD400 (normal, 1st SID)
uint_least16_t sidChipBase2; ///< 0xD?00 (2nd SID) or 0 (no 2nd SID) uint_least16_t sidChipBase2; ///< 0xD?00 (2nd SID) or 0 (no 2nd SID)
//@} //@}
/// Available after song initialization. // Available after song initialization.
/// the one that has been initialized
/// the song that has been initialized
uint_least16_t currentSong; uint_least16_t currentSong;
/// intended speed, see top /**
* song speed: vertical blank interrupt (50Hz PAL, 60Hz NTSC)
* or CIA 1 timer interrupt (default 60Hz)
*/
uint_least8_t songSpeed; uint_least8_t songSpeed;
/// -"- /// specifies the video standard (clock)
uint_least8_t clockSpeed; uint_least8_t clockSpeed;
/// First available page for relocation /// First available page for relocation
uint_least8_t relocStartPage; uint_least8_t relocStartPage;
/// Number of pages available for relocation /// Number of pages available for relocation
uint_least8_t relocPages; uint_least8_t relocPages;
/// whether Sidplayer routine has been installed /// whether Sidplayer routine has been installed
bool musPlayer; bool musPlayer;
skipping to change at line 140 skipping to change at line 147
/// compatibility requirements /// compatibility requirements
int compatibility; int compatibility;
/// whether load address might be duplicate /// whether load address might be duplicate
bool fixLoad; bool fixLoad;
/// --- not yet supported --- /// --- not yet supported ---
uint_least16_t songLength; uint_least16_t songLength;
/// the number of available text info lines
uint_least8_t numberOfInfoStrings;
/** /**
* Song title, credits, ... * Song title, credits, ...
* 0 = Title, 1 = Author, 2 = Copyright/Publisher * 0 = Title, 1 = Author, 2 = Copyright/Publisher
*/ */
uint_least8_t numberOfInfoStrings;
/// the number of available text info lines
char* infoString[SIDTUNE_MAX_CREDIT_STRINGS]; char* infoString[SIDTUNE_MAX_CREDIT_STRINGS];
/// --- not yet supported --- /// --- not yet supported ---
uint_least16_t numberOfCommentStrings; uint_least16_t numberOfCommentStrings;
/// --- not yet supported --- /// --- not yet supported ---
char ** commentString; char ** commentString;
/// length of single-file sidtune file /// length of single-file sidtune file
uint_least32_t dataFileLen; uint_least32_t dataFileLen;
 End of changes. 7 change blocks. 
7 lines changed or deleted 14 lines changed or added


 sid2types.h   sid2types.h 
skipping to change at line 66 skipping to change at line 66
/** /**
* Environment Modes * Environment Modes
* - sid2_envPS = Playsid * - sid2_envPS = Playsid
* - sid2_envTP = Sidplay - Transparent Rom * - sid2_envTP = Sidplay - Transparent Rom
* - sid2_envBS = Sidplay - Bankswitching * - sid2_envBS = Sidplay - Bankswitching
* - sid2_envR = Sidplay2 - Real C64 Environment * - sid2_envR = Sidplay2 - Real C64 Environment
*/ */
sid2_env_t environment; sid2_env_t environment;
bool forceDualSids; bool forceDualSids;
bool emulateStereo; bool emulateStereo;
/// Sampling frequency
uint_least32_t frequency; uint_least32_t frequency;
/** /**
* Playbak mode * Playbak mode
* - sid2_mono * - sid2_mono
* - sid2_stereo * - sid2_stereo
*/ */
sid2_playback_t playback; sid2_playback_t playback;
/** /**
* Intended sid model when unknown * Intended sid model when unknown
* - SID2_MODEL_CORRECT * - SID2_MODEL_CORRECT
* - SID2_MOS6581 * - SID2_MOS6581
* - SID2_MOS8580 * - SID2_MOS8580
*/ */
sid2_model_t sidDefault; sid2_model_t sidDefault;
sidbuilder *sidEmulation; sidbuilder *sidEmulation;
/// User requested sid model /// User requested sid model
sid2_model_t sidModel; sid2_model_t sidModel;
bool sidSamples; bool sidSamples;
uint_least32_t leftVolume; uint_least32_t leftVolume;
uint_least32_t rightVolume; uint_least32_t rightVolume;
uint_least16_t powerOnDelay; uint_least16_t powerOnDelay;
/// Max sid writes to form crc /// Max sid writes to form crc
uint_least32_t sid2crcCount; uint_least32_t sid2crcCount;
/** /**
* Sampling method * Sampling method
* - SID2_INTERPOLATE * - SID2_INTERPOLATE
* - SID2_RESAMPLE_INTERPOLATE * - SID2_RESAMPLE_INTERPOLATE
*/ */
sampling_method_t samplingMethod; sampling_method_t samplingMethod;
/** /**
* Faster low-quality emulation * Faster low-quality emulation
* available only for reSID * available only for reSID
*/ */
bool fastSampling; bool fastSampling;
}; };
/** /**
* sid2_info_t * sid2_info_t
*/ */
struct sid2_info_t struct sid2_info_t
{ {
const char **credits; const char **credits;
/// Number of output channels (1-mono, 2-stereo)
uint channels; uint channels;
uint_least16_t driverAddr; uint_least16_t driverAddr;
uint_least16_t driverLength; uint_least16_t driverLength;
const char *name; const char *name;
const SidTuneInfo *tuneInfo; // May not need this const SidTuneInfo *tuneInfo; // May not need this
const char *version; const char *version;
// load, config and stop calls will reset this // load, config and stop calls will reset this
// and remove all pending events! 10th sec resolution. // and remove all pending events! 10th sec resolution.
EventContext *eventContext; EventContext *eventContext;
/// Number of SIDs supported by this library
uint maxsids; uint maxsids;
sid2_env_t environment; sid2_env_t environment;
uint_least16_t powerOnDelay; uint_least16_t powerOnDelay;
uint_least32_t sid2crc; uint_least32_t sid2crc;
/// Number of sid writes forming crc /// Number of sid writes forming crc
uint_least32_t sid2crcCount; uint_least32_t sid2crcCount;
}; };
#endif // _sid2types_h_ #endif // _sid2types_h_
 End of changes. 9 change blocks. 
0 lines changed or deleted 12 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 _sidplay2_h_ #ifndef _sidplay2_h_
# error Do not include directly. # error Do not include directly.
#endif #endif
#define LIBSIDPLAYFP_VERSION_MAJ 0 #define LIBSIDPLAYFP_VERSION_MAJ 0
#define LIBSIDPLAYFP_VERSION_MIN 3 #define LIBSIDPLAYFP_VERSION_MIN 3
#define LIBSIDPLAYFP_VERSION_LEV 5 #define LIBSIDPLAYFP_VERSION_LEV 6
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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/