thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Created SdlMixerImpl. Added setSampleRate method to Audio::MixerImpl. Updated and removed mixer code in OSystem_SDL for using SdlMixerImpl.

Browse source 
svn-id: r49602
This commit is contained in:
Alejandro Marzini 2010-06-12 02:54:51 +00:00
parent 1447396d3f
commit 3cfa482b43
6 changed files with 299 additions and 224 deletions
Download patch file Download diff file Expand all files Collapse all files

32
backends/platform/sdl/sdl.h
View file

@ -50,15 +50,6 @@ namespace Audio {
#define USE_OSD 1
#endif
#if defined(MACOSX)
// On Mac OS X, we need to double buffer the audio buffer, else anything
// which produces sampled data with high latency (like the MT-32 emulator)
// will sound terribly.
// This could be enabled for more / most ports in the future, but needs some
// testing.
#define MIXER_DOUBLE_BUFFERING 1
#endif
class OSystem_SDL : public ModularBackend {
public:
OSystem_SDL();
@ -83,11 +74,6 @@ public:
virtual void preprocessEvents(SDL_Event *event) {}
// Set function that generates samples
virtual void setupMixer();
static void mixCallback(void *s, byte *samples, int len);
virtual void closeMixer();
// Quit
virtual void quit(); // overloaded by CE backend
@ -101,7 +87,6 @@ public:
protected:
bool _inited;
SDL_AudioSpec _obtainedRate;
// Keyboard mouse emulation. Disabled by fingolfin 2004-12-18.
// I am keeping the rest of the code in for now, since the joystick
@ -134,23 +119,6 @@ protected:
virtual bool handleJoyButtonUp(SDL_Event &ev, Common::Event &event);
virtual bool handleJoyAxisMotion(SDL_Event &ev, Common::Event &event);
#ifdef MIXER_DOUBLE_BUFFERING
SDL_mutex *_soundMutex;
SDL_cond *_soundCond;
SDL_Thread *_soundThread;
bool _soundThreadIsRunning;
bool _soundThreadShouldQuit;
byte _activeSoundBuf;
uint _soundBufSize;
byte *_soundBuffers[2];
void mixerProducerThread();
static int SDLCALL mixerProducerThreadEntry(void *arg);
void initThreadedMixer(Audio::Mixer *mixer, uint bufSize);
void deinitThreadedMixer();
#endif
SDL_TimerID _timerID;
virtual void fillMouseEvent(Common::Event &event, int x, int y); // overloaded by CE backend