SidDatabase.h   SidDatabase.h 
skipping to change at line 22 skipping to change at line 22
* 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 "sidplayfp/sidconfig.h" #include "sidplayfp/sidconfig.h"
#include "SidTuneMod.h" #include "sidplayfp/sidtypes.h"
class SidTuneMod;
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;
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added


 hardsid.h   hardsid.h 
/************************************************************************** * /************************************************************************** *
hardsid.h - Hardsid support interface. hardsid.h - Hardsid support interface.
Created from Jarno's original Created from Jarno's original
Sidplay2 patch Sidplay2 patch
------------------- -------------------
begin : Fri Dec 15 2000 begin : Fri Dec 15 2000
copyright : (C) 2000-2002 by Simon White copyright : (C) 2000-2002 by Simon White
email : s_a_white@email.com email : s_a_white@email.com
************************************************************************** */ ************************************************************************** */
/************************************************************************** * /************************************************************************** *
* * * *
* 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 *
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 resid.h   resid.h 
skipping to change at line 60 skipping to change at line 60
uint devices (bool used); uint devices (bool used);
uint create (uint sids); uint create (uint sids);
sidemu *lock (c64env *env, sid2_model_t model); sidemu *lock (c64env *env, sid2_model_t model);
void unlock (sidemu *device); void unlock (sidemu *device);
void remove (void); void remove (void);
const char *error (void) const { return m_error; } const char *error (void) const { return m_error; }
const char *credits (void); const char *credits (void);
// Settings that affect all SIDs // Settings that affect all SIDs
void filter (bool enable); void filter (bool enable);
void filter (const sid_filter_t *filter); SID_DEPRECATED void filter (const sid_filter_t *filter) {};
/* The bias is given in millivolts, and a maximum reasonable control ra
nge is
approximately -500 to 500. */
void bias (const double dac_bias);
}; };
#endif // _resid_h_ #endif // _resid_h_
 End of changes. 1 change blocks. 
1 lines changed or deleted 6 lines changed or added


 residfp.h   residfp.h 
skipping to change at line 60 skipping to change at line 60
uint devices (bool used); uint devices (bool used);
uint create (uint sids); uint create (uint sids);
sidemu *lock (c64env *env, sid2_model_t model); sidemu *lock (c64env *env, sid2_model_t model);
void unlock (sidemu *device); void unlock (sidemu *device);
void remove (void); void remove (void);
const char *error (void) const { return m_error; } const char *error (void) const { return m_error; }
const char *credits (void); const char *credits (void);
// Settings that affect all SIDs // Settings that affect all SIDs
void filter (bool enable); void filter (bool enable);
void filter (const sid_filterfp_t *filter); SID_DEPRECATED void filter (const sid_filterfp_t *filter) {};
void filter6581Curve (const double filterCurve);
void filter8580Curve (const double filterCurve);
}; };
#endif // _resid_h_ #endif // _resid_h_
 End of changes. 1 change blocks. 
1 lines changed or deleted 4 lines changed or added


 sidbuilder.h   sidbuilder.h 
skipping to change at line 38 skipping to change at line 38
{ {
private: private:
sidbuilder *m_builder; sidbuilder *m_builder;
protected: protected:
int m_bufferpos; int m_bufferpos;
short *m_buffer; short *m_buffer;
public: public:
sidemu (sidbuilder *builder) sidemu (sidbuilder *builder)
:m_builder (builder) {;} : m_builder (builder) {;}
virtual ~sidemu () {;} virtual ~sidemu () {;}
// Standard component functions // Standard component functions
void reset () { reset (0); } void reset () { reset (0); }
virtual void reset (uint8_t volume) = 0; virtual void reset (uint8_t volume) = 0;
virtual uint8_t read (uint_least8_t addr) = 0; virtual uint8_t read (uint_least8_t addr) = 0;
virtual void write (uint_least8_t addr, uint8_t data) = 0; virtual void write (uint_least8_t addr, uint8_t data) = 0;
virtual void clock() = 0; virtual void clock() = 0;
virtual const char *credits (void) = 0; virtual const char *credits (void) = 0;
// Standard SID functions // Standard SID functions
virtual void voice (uint_least8_t num, bool mute) = 0; virtual void voice (uint_least8_t num, bool mute) = 0;
sidbuilder *builder (void) const { return m_builder; } sidbuilder *builder (void) const { return m_builder; }
virtual int bufferpos() { return m_bufferpos; } virtual int bufferpos() { return m_bufferpos; }
virtual void bufferpos(int pos) { m_bufferpos = pos; } virtual void bufferpos(int pos) { m_bufferpos = pos; }
virtual short *buffer() { return m_buffer; } virtual short *buffer() { return m_buffer; }
virtual void sampling(float systemfreq, float outputfreq, virtual void sampling(float systemfreq, float outputfreq,
const sampling_method_t method, const bool fast) { return; } const sampling_method_t method, const bool fast) { return; }
}; };
class sidbuilder class sidbuilder
{ {
private: private:
const char * const m_name; const char * const m_name;
protected: protected:
bool m_status; bool m_status;
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 sidconfig.h   sidconfig.h 
skipping to change at line 22 skipping to change at line 22
# endif # endif
# ifndef SID_EXTERN /* static linking or !_WIN32 */ # ifndef SID_EXTERN /* static linking or !_WIN32 */
# if defined(__GNUC__) && (__GNUC__ >= 4) # if defined(__GNUC__) && (__GNUC__ >= 4)
# define SID_EXTERN __attribute__ ((visibility("default"))) # define SID_EXTERN __attribute__ ((visibility("default")))
# else # else
# define SID_EXTERN # define SID_EXTERN
# endif # endif
# endif # endif
#endif #endif
/* Deprecated attributes */
#if defined(_MSCVER)
# define SID_DEPRECATED __declspec(deprecated)
#elif defined(__GNUC__)
# define SID_DEPRECATED __attribute__ ((deprecated))
#else
# define SID_DEPRECATED
#endif
/* Namespace support */ /* Namespace support */
#define SIDPLAY2_NAMESPACE __sidplay2__ #define SIDPLAY2_NAMESPACE __sidplay2__
#ifdef SIDPLAY2_NAMESPACE #ifdef SIDPLAY2_NAMESPACE
# define SIDPLAY2_NAMESPACE_START \ # define SIDPLAY2_NAMESPACE_START \
namespace SIDPLAY2_NAMESPACE \ namespace SIDPLAY2_NAMESPACE \
{ {
# define SIDPLAY2_NAMESPACE_STOP \ # define SIDPLAY2_NAMESPACE_STOP \
} }
#else #else
# define SIDPLAY2_NAMESPACE_START # define SIDPLAY2_NAMESPACE_START
 End of changes. 1 change blocks. 
0 lines changed or deleted 9 lines changed or added


 sidplay2.h   sidplay2.h 
skipping to change at line 25 skipping to change at line 25
* * * *
************************************************************************** */ ************************************************************************** */
#ifndef _sidplay2_h_ #ifndef _sidplay2_h_
#define _sidplay2_h_ #define _sidplay2_h_
#include <stdio.h> #include <stdio.h>
#include "sidtypes.h" #include "sidtypes.h"
#include "sid2types.h" #include "sid2types.h"
#include "sidversion.h"
class SidTune; class SidTune;
// Private Sidplayer // Private Sidplayer
namespace SIDPLAY2_NAMESPACE namespace SIDPLAY2_NAMESPACE
{ {
class Player; class Player;
} }
class SID_EXTERN sidplay2 class SID_EXTERN sidplay2
 End of changes. 1 change blocks. 
0 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/