libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-11-27 11:20:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SDL: Remove code for unused DoubleBufferSDLMixerManager

Browse Source
This commit is contained in:
Thierry Crozat 2017-09-12 21:46:20 +01:00
parent f7436a9b3a
commit 20e628cac3
3 changed files with 0 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
backends/mixer/doublebuffersdl/doublebuffersdl-mixer.cpp
View File

@ -1,137 +0,0 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* 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 the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
#if defined(MACOSX) || defined(GP2X) || defined(CAANOO) || defined(GP2XWIZ)
#include "backends/mixer/doublebuffersdl/doublebuffersdl-mixer.h"
DoubleBufferSDLMixerManager::DoubleBufferSDLMixerManager()
:
_soundMutex(0), _soundCond(0), _soundThread(0),
_soundThreadIsRunning(false), _soundThreadShouldQuit(false) {
}
DoubleBufferSDLMixerManager::~DoubleBufferSDLMixerManager() {
deinitThreadedMixer();
}
void DoubleBufferSDLMixerManager::startAudio() {
_soundThreadIsRunning = false;
_soundThreadShouldQuit = false;
// Create mutex and condition variable
_soundMutex = SDL_CreateMutex();
_soundCond = SDL_CreateCond();
// Create two sound buffers
_activeSoundBuf = 0;
uint bufSize = _obtained.samples * 4;
_soundBufSize = bufSize;
_soundBuffers[0] = (byte *)calloc(1, bufSize);
_soundBuffers[1] = (byte *)calloc(1, bufSize);
_soundThreadIsRunning = true;
// Finally start the thread
#if SDL_VERSION_ATLEAST(2, 0, 0)
_soundThread = SDL_CreateThread(mixerProducerThreadEntry, "ScummVM Double Buffer Mixer", this);
#else
_soundThread = SDL_CreateThread(mixerProducerThreadEntry, this);
#endif
SdlMixerManager::startAudio();
}
SDL_AudioSpec DoubleBufferSDLMixerManager::getAudioSpec(uint32 rate) {
SDL_AudioSpec desired = SdlMixerManager::getAudioSpec(rate);
// Don't double audio latency when double buffering
desired.samples /= 2;
return desired;
}
void DoubleBufferSDLMixerManager::mixerProducerThread() {
byte nextSoundBuffer;
SDL_LockMutex(_soundMutex);
while (true) {
// Wait till we are allowed to produce data
SDL_CondWait(_soundCond, _soundMutex);
if (_soundThreadShouldQuit)
break;
// Generate samples and put them into the next buffer
nextSoundBuffer = _activeSoundBuf ^ 1;
_mixer->mixCallback(_soundBuffers[nextSoundBuffer], _soundBufSize);
// Swap buffers
_activeSoundBuf = nextSoundBuffer;
}
SDL_UnlockMutex(_soundMutex);
}
int SDLCALL DoubleBufferSDLMixerManager::mixerProducerThreadEntry(void *arg) {
DoubleBufferSDLMixerManager *mixer = (DoubleBufferSDLMixerManager *)arg;
assert(mixer);
mixer->mixerProducerThread();
return 0;
}
void DoubleBufferSDLMixerManager::deinitThreadedMixer() {
// Kill thread?? _soundThread
if (_soundThreadIsRunning) {
// Signal the producer thread to end, and wait for it to actually finish.
_soundThreadShouldQuit = true;
SDL_CondBroadcast(_soundCond);
SDL_WaitThread(_soundThread, NULL);
// Kill the mutex & cond variables.
// Attention: AT this point, the mixer callback must not be running
// anymore, else we will crash!
SDL_DestroyMutex(_soundMutex);
SDL_DestroyCond(_soundCond);
_soundThreadIsRunning = false;
free(_soundBuffers[0]);
free(_soundBuffers[1]);
}
}
void DoubleBufferSDLMixerManager::callbackHandler(byte *samples, int len) {
assert(_mixer);
assert((int)_soundBufSize == len);
// Lock mutex, to ensure our data is not overwritten by the producer thread
SDL_LockMutex(_soundMutex);
// Copy data from the current sound buffer
memcpy(samples, _soundBuffers[_activeSoundBuf], len);
// Unlock mutex and wake up the produced thread
SDL_UnlockMutex(_soundMutex);
SDL_CondSignal(_soundCond);
}
#endif

68
backends/mixer/doublebuffersdl/doublebuffersdl-mixer.h
View File

@ -1,68 +0,0 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* 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 the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
#ifndef BACKENDS_MIXER_DOUBLEBUFFERSDL_H
#define BACKENDS_MIXER_DOUBLEBUFFERSDL_H
#include "backends/mixer/sdl/sdl-mixer.h"
/**
* SDL mixer manager with double buffering support.
*/
class DoubleBufferSDLMixerManager : public SdlMixerManager {
public:
DoubleBufferSDLMixerManager();
virtual ~DoubleBufferSDLMixerManager();
protected:
SDL_mutex *_soundMutex;
SDL_cond *_soundCond;
SDL_Thread *_soundThread;
bool _soundThreadIsRunning;
bool _soundThreadShouldQuit;
byte _activeSoundBuf;
uint _soundBufSize;
byte *_soundBuffers[2];
virtual SDL_AudioSpec getAudioSpec(uint32 rate) override;
/**
* Handles and swap the sound buffers
*/
void mixerProducerThread();
/**
* Finish the mixer manager
*/
void deinitThreadedMixer();
/**
* Callback entry point for the sound thread
*/
static int SDLCALL mixerProducerThreadEntry(void *arg);
virtual void startAudio();
virtual void callbackHandler(byte *samples, int len);
};
#endif

1
backends/module.mk
View File

@ -139,7 +139,6 @@ MODULE_OBJS += \
events/sdl/sdl-events.o \
graphics/sdl/sdl-graphics.o \
graphics/surfacesdl/surfacesdl-graphics.o \
mixer/doublebuffersdl/doublebuffersdl-mixer.o \
mixer/sdl/sdl-mixer.o \
mutex/sdl/sdl-mutex.o \
plugins/sdl/sdl-provider.o \