[Scummvm-cvs-logs] SF.net SVN: scummvm:[48229] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Wed Mar 10 22:01:45 CET 2010
Revision: 48229
http://scummvm.svn.sourceforge.net/scummvm/?rev=48229&view=rev
Author: fingolfin
Date: 2010-03-10 21:01:44 +0000 (Wed, 10 Mar 2010)
Log Message:
-----------
Remove last traces of OSystem::getOutputSampleRate()
Modified Paths:
--------------
scummvm/trunk/backends/platform/PalmOS/Src/be_base.h
scummvm/trunk/backends/platform/PalmOS/Src/os5_sound.cpp
scummvm/trunk/backends/platform/dc/dc.h
scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp
scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.h
scummvm/trunk/backends/platform/gp2x/gp2x-common.h
scummvm/trunk/backends/platform/gp2x/gp2x.cpp
scummvm/trunk/backends/platform/iphone/osys_main.h
scummvm/trunk/backends/platform/iphone/osys_sound.cpp
scummvm/trunk/backends/platform/n64/osys_n64_base.cpp
scummvm/trunk/backends/platform/psp/osys_psp.cpp
scummvm/trunk/backends/platform/psp/osys_psp.h
scummvm/trunk/backends/platform/sdl/sdl.cpp
scummvm/trunk/backends/platform/sdl/sdl.h
scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
scummvm/trunk/backends/platform/wince/wince-sdl.cpp
scummvm/trunk/backends/platform/wince/wince-sdl.h
scummvm/trunk/sound/mixer.h
Modified: scummvm/trunk/backends/platform/PalmOS/Src/be_base.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/be_base.h 2010-03-10 20:58:09 UTC (rev 48228)
+++ scummvm/trunk/backends/platform/PalmOS/Src/be_base.h 2010-03-10 21:01:44 UTC (rev 48229)
@@ -184,8 +184,6 @@
Boolean _useNumPad, _showBatLow;
UInt32 _batCheckTicks, _batCheckLast;
- int _samplesPerSec;
-
public:
void initBackend();
@@ -251,7 +249,6 @@
virtual void unlockMutex(MutexRef mutex) {}
virtual void deleteMutex(MutexRef mutex) {}
- int getOutputSampleRate() const { return _samplesPerSec; }
virtual Audio::Mixer *getMixer();
void quit();
Modified: scummvm/trunk/backends/platform/PalmOS/Src/os5_sound.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/os5_sound.cpp 2010-03-10 20:58:09 UTC (rev 48228)
+++ scummvm/trunk/backends/platform/PalmOS/Src/os5_sound.cpp 2010-03-10 21:01:44 UTC (rev 48229)
@@ -98,10 +98,11 @@
_soundEx.set = false;
_soundEx.dataP = NULL; // set by the handler
+ uint32 samplesPerSec;
if (ConfMan.hasKey("output_rate"))
- _samplesPerSec = ConfMan.getInt("output_rate");
+ samplesPerSec = ConfMan.getInt("output_rate");
else
- _samplesPerSec = SAMPLES_PER_SEC;
+ samplesPerSec = SAMPLES_PER_SEC;
// try to create sound stream
if (OPTIONS_TST(kOptPalmSoundAPI)) {
@@ -109,7 +110,7 @@
&_soundEx.handle,
sndOutput,
sndFormatPCM,
- _samplesPerSec,
+ samplesPerSec,
sndInt16Little,
sndStereo,
sound_callback(),
@@ -132,7 +133,7 @@
}
// if not true some scenes (indy3 256,...) may freeze (ESC to skip)
- _mixerMgr->setOutputRate(_samplesPerSec);
+ _mixerMgr->setOutputRate(samplesPerSec);
_mixerMgr->setReady(true);
return true;
Modified: scummvm/trunk/backends/platform/dc/dc.h
===================================================================
--- scummvm/trunk/backends/platform/dc/dc.h 2010-03-10 20:58:09 UTC (rev 48228)
+++ scummvm/trunk/backends/platform/dc/dc.h 2010-03-10 21:01:44 UTC (rev 48229)
@@ -135,10 +135,6 @@
// Returns true if an event was retrieved.
bool pollEvent(Common::Event &event);
- // Determine the output sample rate. Audio data provided by the sound
- // callback will be played using this rate.
- int getOutputSampleRate() const;
-
// Initialise the specified CD drive for audio playback.
bool openCD(int drive);
Modified: scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp 2010-03-10 20:58:09 UTC (rev 48228)
+++ scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp 2010-03-10 21:01:44 UTC (rev 48229)
@@ -697,10 +697,6 @@
void OSystem_DS::deleteMutex(MutexRef mutex) {
}
-int OSystem_DS::getOutputSampleRate() const {
- return DS::getSoundFrequency();
-}
-
bool OSystem_DS::openCD(int drive) {
return DS::CD::checkCD();
}
Modified: scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.h
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.h 2010-03-10 20:58:09 UTC (rev 48228)
+++ scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.h 2010-03-10 21:01:44 UTC (rev 48229)
@@ -125,8 +125,6 @@
virtual void unlockMutex(MutexRef mutex);
virtual void deleteMutex(MutexRef mutex);
- virtual int getOutputSampleRate() const;
-
virtual bool openCD(int drive);
virtual bool pollCD();
Modified: scummvm/trunk/backends/platform/gp2x/gp2x-common.h
===================================================================
--- scummvm/trunk/backends/platform/gp2x/gp2x-common.h 2010-03-10 20:58:09 UTC (rev 48228)
+++ scummvm/trunk/backends/platform/gp2x/gp2x-common.h 2010-03-10 21:01:44 UTC (rev 48229)
@@ -207,9 +207,6 @@
bool _overlayVisible;
Graphics::PixelFormat _overlayFormat;
- // Audio
- int _samplesPerSec;
-
// CD Audio
SDL_CD *_cdrom;
int _cdTrack, _cdNumLoops, _cdStartFrame, _cdDuration;
Modified: scummvm/trunk/backends/platform/gp2x/gp2x.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp2x/gp2x.cpp 2010-03-10 20:58:09 UTC (rev 48228)
+++ scummvm/trunk/backends/platform/gp2x/gp2x.cpp 2010-03-10 21:01:44 UTC (rev 48229)
@@ -246,7 +246,6 @@
_hwscreen(0), _screen(0), _tmpscreen(0),
_overlayVisible(false),
_overlayscreen(0), _tmpscreen2(0),
- _samplesPerSec(0),
_cdrom(0), _scalerProc(0), _modeChanged(false), _screenChangeCount(0), _dirtyChecksums(0),
_mouseVisible(false), _mouseNeedsRedraw(false), _mouseData(0), _mouseSurface(0),
_mouseOrigSurface(0), _cursorTargetScale(1), _cursorPaletteDisabled(true),
@@ -582,25 +581,25 @@
SDL_AudioSpec obtained;
// Determine the desired output sampling frequency.
- _samplesPerSec = 0;
+ uint32 samplesPerSec = 0;
if (ConfMan.hasKey("output_rate"))
- _samplesPerSec = ConfMan.getInt("output_rate");
- if (_samplesPerSec <= 0)
- _samplesPerSec = SAMPLES_PER_SEC;
+ samplesPerSec = ConfMan.getInt("output_rate");
+ if (samplesPerSec <= 0)
+ samplesPerSec = SAMPLES_PER_SEC;
//Quick EVIL Hack - DJWillis
-// _samplesPerSec = 11025;
+// samplesPerSec = 11025;
// Determine the sample buffer size. We want it to store enough data for
// about 1/16th of a second. Note that it must be a power of two.
// So e.g. at 22050 Hz, we request a sample buffer size of 2048.
- int samples = 8192;
- while (16 * samples >= _samplesPerSec) {
+ uint32 samples = 8192;
+ while (16 * samples >= samplesPerSec) {
samples >>= 1;
}
memset(&desired, 0, sizeof(desired));
- desired.freq = _samplesPerSec;
+ desired.freq = samplesPerSec;
desired.format = AUDIO_S16SYS;
desired.channels = 2;
//desired.samples = (uint16)samples;
@@ -615,17 +614,17 @@
if (SDL_OpenAudio(&desired, &obtained) != 0) {
warning("Could not open audio device: %s", SDL_GetError());
- _samplesPerSec = 0;
+ samplesPerSec = 0;
_mixer->setReady(false);
} else {
// Note: This should be the obtained output rate, but it seems that at
// least on some platforms SDL will lie and claim it did get the rate
// even if it didn't. Probably only happens for "weird" rates, though.
- _samplesPerSec = obtained.freq;
- debug(1, "Output sample rate: %d Hz", _samplesPerSec);
+ 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->setOutputRate(samplesPerSec);
_mixer->setReady(true);
#ifdef MIXER_DOUBLE_BUFFERING
Modified: scummvm/trunk/backends/platform/iphone/osys_main.h
===================================================================
--- scummvm/trunk/backends/platform/iphone/osys_main.h 2010-03-10 20:58:09 UTC (rev 48228)
+++ scummvm/trunk/backends/platform/iphone/osys_main.h 2010-03-10 21:01:44 UTC (rev 48229)
@@ -162,7 +162,6 @@
static void mixCallback(void *sys, byte *samples, int len);
virtual void setupMixer(void);
- virtual int getOutputSampleRate() const;
virtual void setTimerCallback(TimerProc callback, int interval);
virtual int getScreenChangeID() const { return _screenChangeCount; }
virtual void quit();
Modified: scummvm/trunk/backends/platform/iphone/osys_sound.cpp
===================================================================
--- scummvm/trunk/backends/platform/iphone/osys_sound.cpp 2010-03-10 20:58:09 UTC (rev 48228)
+++ scummvm/trunk/backends/platform/iphone/osys_sound.cpp 2010-03-10 21:01:44 UTC (rev 48229)
@@ -105,7 +105,3 @@
AudioQueueDispose(s_AudioQueue.queue, true);
_mixer->setReady(false);
}
-
-int OSystem_IPHONE::getOutputSampleRate() const {
- return AUDIO_SAMPLE_RATE;
-}
Modified: scummvm/trunk/backends/platform/n64/osys_n64_base.cpp
===================================================================
--- scummvm/trunk/backends/platform/n64/osys_n64_base.cpp 2010-03-10 20:58:09 UTC (rev 48228)
+++ scummvm/trunk/backends/platform/n64/osys_n64_base.cpp 2010-03-10 21:01:44 UTC (rev 48229)
@@ -183,9 +183,6 @@
_savefile = new PAKSaveManager();
}
- _mixer = new Audio::MixerImpl(this);
- _mixer->setReady(false);
-
_timer = new DefaultTimerManager();
setTimerCallback(&timer_handler, 10);
@@ -890,6 +887,9 @@
}
void OSystem_N64::setupMixer(void) {
+ _mixer = new Audio::MixerImpl(this);
+ _mixer->setReady(false);
+
enableAudioPlayback();
}
Modified: scummvm/trunk/backends/platform/psp/osys_psp.cpp
===================================================================
--- scummvm/trunk/backends/platform/psp/osys_psp.cpp 2010-03-10 20:58:09 UTC (rev 48228)
+++ scummvm/trunk/backends/platform/psp/osys_psp.cpp 2010-03-10 21:01:44 UTC (rev 48229)
@@ -90,8 +90,6 @@
_cursorPaletteDisabled = true;
- _samplesPerSec = 0;
-
//init SDL
uint32 sdlFlags = SDL_INIT_AUDIO | SDL_INIT_TIMER;
SDL_Init(sdlFlags);
@@ -951,27 +949,28 @@
void OSystem_PSP::setupMixer(void) {
SDL_AudioSpec desired;
SDL_AudioSpec obtained;
+ uint32 samplesPerSec;
memset(&desired, 0, sizeof(desired));
if (ConfMan.hasKey("output_rate"))
- _samplesPerSec = ConfMan.getInt("output_rate");
+ samplesPerSec = ConfMan.getInt("output_rate");
else
- _samplesPerSec = SAMPLES_PER_SEC;
+ samplesPerSec = SAMPLES_PER_SEC;
// Originally, we always used 2048 samples. This loop will produce the
// same result at 22050 Hz, and should hopefully produce something
// sensible for other frequencies. Note that it must be a power of two.
- uint16 samples = 0x8000;
+ uint32 samples = 0x8000;
for (;;) {
- if (samples / (_samplesPerSec / 1000) < 100)
+ if (samples / (samplesPerSec / 1000) < 100)
break;
samples >>= 1;
}
- desired.freq = _samplesPerSec;
+ desired.freq = samplesPerSec;
desired.format = AUDIO_S16SYS;
desired.channels = 2;
desired.samples = samples;
@@ -984,16 +983,16 @@
if (SDL_OpenAudio(&desired, &obtained) != 0) {
warning("Could not open audio: %s", SDL_GetError());
- _samplesPerSec = 0;
+ samplesPerSec = 0;
_mixer->setReady(false);
} else {
// Note: This should be the obtained output rate, but it seems that at
// least on some platforms SDL will lie and claim it did get the rate
// even if it didn't. Probably only happens for "weird" rates, though.
- _samplesPerSec = obtained.freq;
+ samplesPerSec = obtained.freq;
// Tell the mixer that we are ready and start the sound processing
- _mixer->setOutputRate(_samplesPerSec);
+ _mixer->setOutputRate(samplesPerSec);
_mixer->setReady(true);
SDL_PauseAudio(0);
Modified: scummvm/trunk/backends/platform/psp/osys_psp.h
===================================================================
--- scummvm/trunk/backends/platform/psp/osys_psp.h 2010-03-10 20:58:09 UTC (rev 48228)
+++ scummvm/trunk/backends/platform/psp/osys_psp.h 2010-03-10 21:01:44 UTC (rev 48229)
@@ -86,7 +86,6 @@
uint32 _lastPadCheck;
uint32 _padAccel;
- uint32 _samplesPerSec;
SceCtrlData pad;
Common::SaveFileManager *_savefile;
Modified: scummvm/trunk/backends/platform/sdl/sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.cpp 2010-03-10 20:58:09 UTC (rev 48228)
+++ scummvm/trunk/backends/platform/sdl/sdl.cpp 2010-03-10 21:01:44 UTC (rev 48229)
@@ -230,7 +230,6 @@
#endif
_overlayVisible(false),
_overlayscreen(0), _tmpscreen2(0),
- _samplesPerSec(0),
_cdrom(0), _scalerProc(0), _modeChanged(false), _screenChangeCount(0), _dirtyChecksums(0),
_scrollLock(false),
_mouseVisible(false), _mouseNeedsRedraw(false), _mouseData(0), _mouseSurface(0),
@@ -709,22 +708,22 @@
SDL_AudioSpec desired;
// Determine the desired output sampling frequency.
- _samplesPerSec = 0;
+ uint32 samplesPerSec = 0;
if (ConfMan.hasKey("output_rate"))
- _samplesPerSec = ConfMan.getInt("output_rate");
- if (_samplesPerSec <= 0)
- _samplesPerSec = SAMPLES_PER_SEC;
+ samplesPerSec = ConfMan.getInt("output_rate");
+ if (samplesPerSec <= 0)
+ samplesPerSec = SAMPLES_PER_SEC;
// Determine the sample buffer size. We want it to store enough data for
// at least 1/16th of a second (though at maximum 8192 samples). Note
// that it must be a power of two. So e.g. at 22050 Hz, we request a
// sample buffer size of 2048.
- int samples = 8192;
- while (samples * 16 > _samplesPerSec * 2)
+ uint32 samples = 8192;
+ while (samples * 16 > samplesPerSec * 2)
samples >>= 1;
memset(&desired, 0, sizeof(desired));
- desired.freq = _samplesPerSec;
+ desired.freq = samplesPerSec;
desired.format = AUDIO_S16SYS;
desired.channels = 2;
desired.samples = (uint16)samples;
@@ -738,17 +737,17 @@
if (SDL_OpenAudio(&desired, &_obtainedRate) != 0) {
warning("Could not open audio device: %s", SDL_GetError());
- _samplesPerSec = 0;
+ samplesPerSec = 0;
_mixer->setReady(false);
} else {
// Note: This should be the obtained output rate, but it seems that at
// least on some platforms SDL will lie and claim it did get the rate
// even if it didn't. Probably only happens for "weird" rates, though.
- _samplesPerSec = _obtainedRate.freq;
- debug(1, "Output sample rate: %d Hz", _samplesPerSec);
+ samplesPerSec = _obtainedRate.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->setOutputRate(samplesPerSec);
_mixer->setReady(true);
#if MIXER_DOUBLE_BUFFERING
Modified: scummvm/trunk/backends/platform/sdl/sdl.h
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.h 2010-03-10 20:58:09 UTC (rev 48228)
+++ scummvm/trunk/backends/platform/sdl/sdl.h 2010-03-10 21:01:44 UTC (rev 48229)
@@ -283,9 +283,6 @@
bool _overlayVisible;
Graphics::PixelFormat _overlayFormat;
- // Audio
- int _samplesPerSec;
-
// CD Audio
SDL_CD *_cdrom;
int _cdTrack, _cdNumLoops, _cdStartFrame, _cdDuration;
Modified: scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp 2010-03-10 20:58:09 UTC (rev 48228)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp 2010-03-10 21:01:44 UTC (rev 48229)
@@ -222,13 +222,13 @@
memset(&desired, 0, sizeof(desired));
- _samplesPerSec = 0;
+ uint32 samplesPerSec = 0;
if (ConfMan.hasKey("output_rate"))
- _samplesPerSec = ConfMan.getInt("output_rate");
+ samplesPerSec = ConfMan.getInt("output_rate");
- if (_samplesPerSec <= 0)
- _samplesPerSec = SAMPLES_PER_SEC;
+ if (samplesPerSec <= 0)
+ samplesPerSec = SAMPLES_PER_SEC;
// Originally, we always used 2048 samples. This loop will produce the
// same result at 22050 Hz, and should hopefully produce something
@@ -237,12 +237,12 @@
uint32 samples = 0x8000;
for (;;) {
- if ((1000 * samples) / _samplesPerSec < 100)
+ if ((1000 * samples) / samplesPerSec < 100)
break;
samples >>= 1;
}
- desired.freq = _samplesPerSec;
+ desired.freq = samplesPerSec;
desired.format = AUDIO_S16SYS;
desired.channels = 2;
desired.samples = (uint16)samples;
@@ -256,13 +256,13 @@
if (SDL_OpenAudio(&desired, &obtained) != 0) {
warning("Could not open audio device: %s", SDL_GetError());
- _samplesPerSec = 0;
+ samplesPerSec = 0;
_mixer->setReady(false);
} else {
// Note: This should be the obtained output rate, but it seems that at
// least on some platforms SDL will lie and claim it did get the rate
// even if it didn't. Probably only happens for "weird" rates, though.
- _samplesPerSec = obtained.freq;
+ samplesPerSec = obtained.freq;
_channels = obtained.channels;
// Need to create mixbuffer for stereo mix to downmix
@@ -271,7 +271,7 @@
}
// Tell the mixer that we are ready and start the sound processing
- _mixer->setOutputRate(_samplesPerSec);
+ _mixer->setOutputRate(samplesPerSec);
_mixer->setReady(true);
SDL_PauseAudio(0);
}
Modified: scummvm/trunk/backends/platform/wince/wince-sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/wince-sdl.cpp 2010-03-10 20:58:09 UTC (rev 48228)
+++ scummvm/trunk/backends/platform/wince/wince-sdl.cpp 2010-03-10 21:01:44 UTC (rev 48229)
@@ -783,16 +783,16 @@
SDL_AudioSpec desired;
int thread_priority;
- compute_sample_rate();
- if (_sampleRate == 0)
- warning("setSoundCallback called with 0 _sampleRate - audio will not work");
- else if (_mixer && _mixer->getOutputRate() == _sampleRate) {
+ uint32 sampleRate = compute_sample_rate();
+ if (sampleRate == 0)
+ warning("setSoundCallback called with sample rate 0 - audio will not work");
+ else if (_mixer && _mixer->getOutputRate() == sampleRate) {
debug(1, "Skipping sound mixer re-init: samplerate is good");
return;
}
memset(&desired, 0, sizeof(desired));
- desired.freq = _sampleRate;
+ desired.freq = sampleRate;
desired.format = AUDIO_S16SYS;
desired.channels = 2;
desired.samples = 128;
@@ -817,7 +817,7 @@
_mixer->setReady(false);
} else {
- debug(1, "Sound opened OK, mixing at %d Hz", _sampleRate);
+ debug(1, "Sound opened OK, mixing at %d Hz", sampleRate);
// Re-create mixer to match the output rate
int vol1 = _mixer->getVolumeForSoundType(Audio::Mixer::kPlainSoundType);
@@ -830,7 +830,7 @@
_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, vol2);
_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, vol3);
_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, vol4);
- _mixer->setOutputRate(_sampleRate);
+ _mixer->setOutputRate(sampleRate);
_mixer->setReady(true);
SDL_PauseAudio(0);
}
@@ -875,7 +875,9 @@
}
#endif
-void OSystem_WINCE3::compute_sample_rate() {
+uint32 OSystem_WINCE3::compute_sample_rate() {
+ uint32 sampleRate;
+
// Force at least medium quality FM synthesis for FOTAQ
Common::String gameid(ConfMan.get("gameid"));
if (gameid == "queen") {
@@ -887,24 +889,22 @@
}
// See if the output frequency is forced by the game
if (gameid == "ft" || gameid == "dig" || gameid == "comi" || gameid == "queen" || gameid == "sword" || gameid == "agi")
- _sampleRate = SAMPLES_PER_SEC_NEW;
+ sampleRate = SAMPLES_PER_SEC_NEW;
else {
if (ConfMan.hasKey("high_sample_rate") && ConfMan.getBool("high_sample_rate"))
- _sampleRate = SAMPLES_PER_SEC_NEW;
+ sampleRate = SAMPLES_PER_SEC_NEW;
else
- _sampleRate = SAMPLES_PER_SEC_OLD;
+ sampleRate = SAMPLES_PER_SEC_OLD;
}
#ifdef USE_VORBIS
// Modify the sample rate on the fly if OGG is involved
- if (_sampleRate == SAMPLES_PER_SEC_OLD)
+ if (sampleRate == SAMPLES_PER_SEC_OLD)
if (checkOggHighSampleRate())
- _sampleRate = SAMPLES_PER_SEC_NEW;
+ sampleRate = SAMPLES_PER_SEC_NEW;
#endif
-}
-int OSystem_WINCE3::getOutputSampleRate() const {
- return _sampleRate;
+ return sampleRate;
}
void OSystem_WINCE3::engineInit() {
Modified: scummvm/trunk/backends/platform/wince/wince-sdl.h
===================================================================
--- scummvm/trunk/backends/platform/wince/wince-sdl.h 2010-03-10 20:58:09 UTC (rev 48228)
+++ scummvm/trunk/backends/platform/wince/wince-sdl.h 2010-03-10 21:01:44 UTC (rev 48229)
@@ -132,7 +132,6 @@
int getDefaultGraphicsMode() const;
bool openCD(int drive);
- int getOutputSampleRate() const;
bool hasFeature(Feature f);
void setFeatureState(Feature f, bool enable);
@@ -153,7 +152,7 @@
void create_toolbar();
void update_game_settings();
void check_mappings();
- void compute_sample_rate();
+ uint32 compute_sample_rate();
void retrieve_mouse_location(int &x, int &y);
@@ -163,8 +162,6 @@
SDL_Surface *_toolbarHigh; // toolbar 640x80
bool _toolbarHighDrawn; // cache toolbar 640x80
- uint16 _sampleRate; // current audio sample rate
-
bool _freeLook; // freeLook mode (do not send mouse button events)
bool _forceHideMouse; // force invisible mouse cursor
Modified: scummvm/trunk/sound/mixer.h
===================================================================
--- scummvm/trunk/sound/mixer.h 2010-03-10 20:58:09 UTC (rev 48228)
+++ scummvm/trunk/sound/mixer.h 2010-03-10 21:01:44 UTC (rev 48229)
@@ -253,8 +253,7 @@
virtual int getVolumeForSoundType(SoundType type) const = 0;
/**
- * Query the system's audio output sample rate. This returns
- * the same value as OSystem::getOutputSampleRate().
+ * Query the system's audio output sample rate.
*
* @return the output sample rate in Hz
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list