ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

metaspu: have it compiled under gcc too 

Based on patches from Tobias Jakobi (liquidacid) in #3250391
This commit is contained in:
riccardom 2011-04-09 17:09:26 +00:00
parent 79684686c3
commit 74b8df277c
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desmume/src/metaspu/SndOut.h
View File

@ -83,7 +83,7 @@ static const int SndOutVolumeShift = 0;
////static const int SampleRate = 48000; ////static const int SampleRate = 48000;
//static const int SampleRate = 44100; //static const int SampleRate = 44100;
//edit - nitsuja: make it use the global sample rate define //edit - nitsuja: make it use the global sample rate define
#include "..\SPU.h" #include "../SPU.h"
static const int SampleRate = DESMUME_SAMPLE_RATE; static const int SampleRate = DESMUME_SAMPLE_RATE;
extern int FindOutputModuleById( const wchar_t* omodid ); extern int FindOutputModuleById( const wchar_t* omodid );

12
desmume/src/metaspu/Timestretcher.cpp
View File

@ -18,12 +18,18 @@
//#include "Global.h" //#include "Global.h"
#include <math.h> #include <math.h>
#include "types.h" #include "types.h"
#include "SoundTouch/SoundTouch.h"
#include "SndOut.h" #include "SndOut.h"
//#include "SoundTouch/WavFile.h" //#include "SoundTouch/WavFile.h"
#include "win32/Dialogs.h" #ifdef HAVE_LIBSOUNDTOUCH
#include <SoundTouch.h>
#else
#include "SoundTouch/SoundTouch.h"
#endif
#ifdef _WINDOWS
#include "win32/Dialogs.h"
#endif
static soundtouch::SoundTouch* pSoundTouch = NULL; static soundtouch::SoundTouch* pSoundTouch = NULL;
@ -313,7 +319,9 @@ void SndBuffer::soundtouchInit()
pSoundTouch->setSetting( SETTING_USE_QUICKSEEK, 0 ); pSoundTouch->setSetting( SETTING_USE_QUICKSEEK, 0 );
pSoundTouch->setSetting( SETTING_USE_AA_FILTER, 0 ); pSoundTouch->setSetting( SETTING_USE_AA_FILTER, 0 );
#ifdef _WINDOWS
SoundtouchCfg::ApplySettings( *pSoundTouch ); SoundtouchCfg::ApplySettings( *pSoundTouch );
#endif
pSoundTouch->setTempo(1); pSoundTouch->setTempo(1);

9
desmume/src/metaspu/metaspu.cpp
View File

@ -24,8 +24,7 @@
#include <assert.h> #include <assert.h>
//for pcsx2 method //for pcsx2 method
//(havent bothered to get it compiling in gcc yet) #if defined(_MSC_VER) || defined(HAVE_LIBSOUNDTOUCH)
#ifdef _MSC_VER
#include "SndOut.h" #include "SndOut.h"
#endif #endif
@ -466,7 +465,7 @@ private:
}; //NitsujaSynchronizer }; //NitsujaSynchronizer
#ifdef _MSC_VER #if defined(_MSC_VER) || defined(HAVE_LIBSOUNDTOUCH)
class PCSX2Synchronizer : public ISynchronizingAudioBuffer class PCSX2Synchronizer : public ISynchronizingAudioBuffer
{ {
public: public:
@ -513,9 +512,9 @@ ISynchronizingAudioBuffer* metaspu_construct(ESynchMethod method)
{ {
case ESynchMethod_N: return new NitsujaSynchronizer(); case ESynchMethod_N: return new NitsujaSynchronizer();
case ESynchMethod_Z: return new ZeromusSynchronizer(); case ESynchMethod_Z: return new ZeromusSynchronizer();
#ifdef _MSC_VER #if defined(_MSC_VER) || defined(HAVE_LIBSOUNDTOUCH)
case ESynchMethod_P: return new PCSX2Synchronizer(); case ESynchMethod_P: return new PCSX2Synchronizer();
#endif #endif
default: return NULL; default: return NULL;
} }
} }