libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-02 15:16:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some cleanup by peres

Browse Source 
svn-id: r34308
This commit is contained in:
Max Horn 2008-09-03 15:22:19 +00:00
parent 196ce8eb98
commit 55a05dc0f4
6 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
backends/platform/sdl/sdl.cpp
View File

@ -34,7 +34,6 @@
#include "backends/platform/sdl/sdl.h"
#include "common/config-manager.h"
#include "common/events.h"
#include "common/file.h"
#include "common/util.h"
#include "backends/saves/default/default-saves.h"
@ -516,7 +515,7 @@ void OSystem_SDL::mixerProducerThread() {
// Generate samples and put them into the next buffer
nextSoundBuffer = _activeSoundBuf ^ 1;
_mixer->mixCallback(_soundBuffers[nextSoundBuffer], _soundBufSize);
// Swap buffers
_activeSoundBuf = nextSoundBuffer;
}
@ -560,7 +559,7 @@ void OSystem_SDL::deinitThreadedMixer() {
SDL_CondBroadcast(_soundCond);
SDL_WaitThread(_soundThread, NULL);
// Kill the mutex & cond variables.
// Kill the mutex & cond variables.
// Attention: AT this point, the mixer callback must not be running
// anymore, else we will crash!
SDL_DestroyMutex(_soundMutex);
@ -583,10 +582,10 @@ void OSystem_SDL::mixCallback(void *arg, byte *samples, int len) {
// Lock mutex, to ensure our data is not overwritten by the producer thread
SDL_LockMutex(this_->_soundMutex);
// Copy data from the current sound buffer
memcpy(samples, this_->_soundBuffers[this_->_activeSoundBuf], len);
// Unlock mutex and wake up the produced thread
SDL_UnlockMutex(this_->_soundMutex);
SDL_CondSignal(this_->_soundCond);
@ -646,7 +645,7 @@ void OSystem_SDL::setupMixer() {
// even if it didn't. Probably only happens for "weird" rates, though.
_samplesPerSec = obtained.freq;
debug(1, "Output sample rate: %d Hz", _samplesPerSec);
// Tell the mixer that we are ready and start the sound processing
_mixer->setOutputRate(_samplesPerSec);
_mixer->setReady(true);

1
backends/saves/default/default-saves.cpp
View File

@ -28,7 +28,6 @@
#include "common/savefile.h"
#include "common/util.h"
#include "common/fs.h"
#include "common/file.h"
#include "common/config-manager.h"
#include "backends/saves/default/default-saves.h"
#include "backends/saves/compressed/compressed-saves.h"

3
sound/flac.cpp
View File

@ -72,9 +72,6 @@ typedef FLAC__StreamDecoder FLAC__SeekableStreamDecoder;
#endif
using Common::File;
namespace Audio {
#pragma mark -

1
sound/flac.h
View File

@ -31,7 +31,6 @@
#ifdef USE_FLAC
namespace Common {
class File;
class SeekableReadStream;
}

1
sound/mp3.h
View File

@ -31,7 +31,6 @@
#ifdef USE_MAD
namespace Common {
class File;
class SeekableReadStream;
}

1
sound/vorbis.h
View File

@ -31,7 +31,6 @@
#ifdef USE_VORBIS
namespace Common {
class File;
class SeekableReadStream;
}