modplug.h   modplug.h 
skipping to change at line 84 skipping to change at line 84
{ {
int mFlags; /* One or more of the MODPLUG_ENABLE_* flags above, bit wise-OR'ed */ int mFlags; /* One or more of the MODPLUG_ENABLE_* flags above, bit wise-OR'ed */
/* Note that ModPlug always decodes sound at 44100kHz, 32 bit, stere o and then /* Note that ModPlug always decodes sound at 44100kHz, 32 bit, stere o and then
* down-mixes to the settings you choose. */ * down-mixes to the settings you choose. */
int mChannels; /* Number of channels - 1 for mono or 2 for ste reo */ int mChannels; /* Number of channels - 1 for mono or 2 for ste reo */
int mBits; /* Bits per sample - 8, 16, or 32 */ int mBits; /* Bits per sample - 8, 16, or 32 */
int mFrequency; /* Sampling rate - 11025, 22050, or 44100 */ int mFrequency; /* Sampling rate - 11025, 22050, or 44100 */
int mResamplingMode; /* One of MODPLUG_RESAMPLE_*, above */ int mResamplingMode; /* One of MODPLUG_RESAMPLE_*, above */
int mStereoSeparation; /* Stereo separation, 1 - 256 */
int mMaxMixChannels; /* Maximum number of mixing channels (polyphony
), 32 - 256 */
int mReverbDepth; /* Reverb level 0(quiet)-100(loud) */ int mReverbDepth; /* Reverb level 0(quiet)-100(loud) */
int mReverbDelay; /* Reverb delay in ms, usually 40-200ms */ int mReverbDelay; /* Reverb delay in ms, usually 40-200ms */
int mBassAmount; /* XBass level 0(quiet)-100(loud) */ int mBassAmount; /* XBass level 0(quiet)-100(loud) */
int mBassRange; /* XBass cutoff in Hz 10-100 */ int mBassRange; /* XBass cutoff in Hz 10-100 */
int mSurroundDepth; /* Surround level 0(quiet)-100(heavy) */ int mSurroundDepth; /* Surround level 0(quiet)-100(heavy) */
int mSurroundDelay; /* Surround delay in ms, usually 5-40ms */ int mSurroundDelay; /* Surround delay in ms, usually 5-40ms */
int mLoopCount; /* Number of times to loop. Zero prevents loop ing. int mLoopCount; /* Number of times to loop. Zero prevents loop ing.
-1 loops forever. */ -1 loops forever. */
} ModPlug_Settings; } ModPlug_Settings;
 End of changes. 1 change blocks. 
0 lines changed or deleted 4 lines changed or added


 sndfile.h   sndfile.h 
skipping to change at line 665 skipping to change at line 665
UINT Read(LPVOID lpBuffer, UINT cbBuffer); UINT Read(LPVOID lpBuffer, UINT cbBuffer);
UINT CreateStereoMix(int count); UINT CreateStereoMix(int count);
BOOL FadeSong(UINT msec); BOOL FadeSong(UINT msec);
BOOL GlobalFadeSong(UINT msec); BOOL GlobalFadeSong(UINT msec);
UINT GetTotalTickCount() const { return m_nTotalCount; } UINT GetTotalTickCount() const { return m_nTotalCount; }
VOID ResetTotalTickCount() { m_nTotalCount = 0; } VOID ResetTotalTickCount() { m_nTotalCount = 0; }
public: public:
// Mixer Config // Mixer Config
static BOOL InitPlayer(BOOL bReset=FALSE); static BOOL InitPlayer(BOOL bReset=FALSE);
static BOOL SetMixConfig(UINT nStereoSeparation, UINT nMaxMixChannel s);
static BOOL SetWaveConfig(UINT nRate,UINT nBits,UINT nChannels,BOOL bMMX=FALSE); static BOOL SetWaveConfig(UINT nRate,UINT nBits,UINT nChannels,BOOL bMMX=FALSE);
static BOOL SetResamplingMode(UINT nMode); // SRCMODE_XXXX static BOOL SetResamplingMode(UINT nMode); // SRCMODE_XXXX
static BOOL IsStereo() { return (gnChannels > 1) ? TRUE : FALSE; } static BOOL IsStereo() { return (gnChannels > 1) ? TRUE : FALSE; }
static DWORD GetSampleRate() { return gdwMixingFreq; } static DWORD GetSampleRate() { return gdwMixingFreq; }
static DWORD GetBitsPerSample() { return gnBitsPerSample; } static DWORD GetBitsPerSample() { return gnBitsPerSample; }
static DWORD InitSysInfo(); static DWORD InitSysInfo();
static DWORD GetSysInfo() { return gdwSysInfo; } static DWORD GetSysInfo() { return gdwSysInfo; }
// AGC // AGC
static BOOL GetAGC() { return (gdwSoundSetup & SNDMIX_AGC) ? TRUE : FALSE; } static BOOL GetAGC() { return (gdwSoundSetup & SNDMIX_AGC) ? TRUE : FALSE; }
static void SetAGC(BOOL b); static void SetAGC(BOOL b);
skipping to change at line 978 skipping to change at line 979
memcpy(&s,data,sizeof(s)); memcpy(&s,data,sizeof(s));
return s; return s;
} }
#define bswapLE16(X) ARM_get16(&X) #define bswapLE16(X) ARM_get16(&X)
#define bswapLE32(X) ARM_get32(&X) #define bswapLE32(X) ARM_get32(&X)
#define bswapBE16(X) bswap_16(ARM_get16(&X)) #define bswapBE16(X) bswap_16(ARM_get16(&X))
#define bswapBE32(X) bswap_32(ARM_get32(&X)) #define bswapBE32(X) bswap_32(ARM_get32(&X))
// From libsdl // From libsdl
#elif WORDS_BIGENDIAN #elif defined(WORDS_BIGENDIAN) && WORDS_BIGENDIAN
#define bswapLE16(X) bswap_16(X) #define bswapLE16(X) bswap_16(X)
#define bswapLE32(X) bswap_32(X) #define bswapLE32(X) bswap_32(X)
#define bswapBE16(X) (X) #define bswapBE16(X) (X)
#define bswapBE32(X) (X) #define bswapBE32(X) (X)
#else #else
#define bswapLE16(X) (X) #define bswapLE16(X) (X)
#define bswapLE32(X) (X) #define bswapLE32(X) (X)
#define bswapBE16(X) bswap_16(X) #define bswapBE16(X) bswap_16(X)
#define bswapBE32(X) bswap_32(X) #define bswapBE32(X) bswap_32(X)
#endif #endif
 End of changes. 2 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/