SidDatabase.h   SidDatabase.h 
skipping to change at line 21 skipping to change at line 21
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by * * it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. * * (at your option) any later version. *
* * * *
************************************************************************** */ ************************************************************************** */
#ifndef _siddatabase_h_ #ifndef _siddatabase_h_
#define _siddatabase_h_ #define _siddatabase_h_
#include <exception>
#include "sidplayfp/sidconfig.h" #include "sidplayfp/sidconfig.h"
#include "SidTuneMod.h" #include "SidTuneMod.h"
class iniParser; class iniParser;
class SID_EXTERN SidDatabase class SID_EXTERN SidDatabase
{ {
private: private:
static const char *ERR_DATABASE_CORRUPT; static const char *ERR_DATABASE_CORRUPT;
static const char *ERR_NO_DATABASE_LOADED; static const char *ERR_NO_DATABASE_LOADED;
static const char *ERR_NO_SELECTED_SONG; static const char *ERR_NO_SELECTED_SONG;
static const char *ERR_MEM_ALLOC; static const char *ERR_MEM_ALLOC;
static const char *ERR_UNABLE_TO_LOAD_DATABASE; static const char *ERR_UNABLE_TO_LOAD_DATABASE;
iniParser *m_parser; iniParser *m_parser;
const char *errorString; const char *errorString;
class parseError : public std::exception {}; class parseError {};
static const char* parseTime(const char* str, long &result); static const char* parseTime(const char* str, long &result);
public: public:
SidDatabase (); SidDatabase ();
~SidDatabase (); ~SidDatabase ();
int open (const char *filename); int open (const char *filename);
void close (); void close ();
int_least32_t length (SidTuneMod &tune); int_least32_t length (SidTuneMod &tune);
 End of changes. 2 change blocks. 
3 lines changed or deleted 1 lines changed or added


 SidTune.h   SidTune.h 
skipping to change at line 99 skipping to change at line 99
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.
// //
uint_least16_t currentSong; // the one that has been initialized uint_least16_t currentSong; // the one that has been initialized
uint_least8_t songSpeed; // intended speed, see top uint_least8_t songSpeed; // intended speed, see top
uint_least8_t clockSpeed; // -"- uint_least8_t clockSpeed; // -"-
uint_least8_t relocStartPage; // First available page for relocation uint_least8_t relocStartPage; // First available page for relocation
uint_least8_t relocPages; // Number of pages available for relocat ion uint_least8_t relocPages; // Number of pages available for relocat ion
bool musPlayer; // whether Sidplayer routine has been in stalled bool musPlayer; // whether Sidplayer routine has been in stalled
int sidModel; // Sid Model required for this sid int sidModel1; // Sid Model required for first sid
int sidModel2; // Sid Model required for second sid
int compatibility; // compatibility requirements int compatibility; // compatibility requirements
bool fixLoad; // whether load address might be duplica te bool fixLoad; // whether load address might be duplica te
uint_least16_t songLength; // --- not yet supported --- uint_least16_t songLength; // --- not yet supported ---
// //
// 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 inf o lines uint_least8_t numberOfInfoStrings; // the number of available text inf o lines
char* infoString[SIDTUNE_MAX_CREDIT_STRINGS]; char* infoString[SIDTUNE_MAX_CREDIT_STRINGS];
// //
 End of changes. 1 change blocks. 
1 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/