aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorAlejandro Marzini2010-06-12 02:54:51 +0000
committerAlejandro Marzini2010-06-12 02:54:51 +0000
commit3cfa482b43dcfef774fb0c284bf19ab07cdc4f20 (patch)
treec7db7cc92cdbb6eb41811dc7f2b9abaa20839a5d /sound
parent1447396d3f1ba8161c13a29935f1ebcc0ba50f5a (diff)
downloadscummvm-rg350-3cfa482b43dcfef774fb0c284bf19ab07cdc4f20.tar.gz
scummvm-rg350-3cfa482b43dcfef774fb0c284bf19ab07cdc4f20.tar.bz2
scummvm-rg350-3cfa482b43dcfef774fb0c284bf19ab07cdc4f20.zip
Created SdlMixerImpl. Added setSampleRate method to Audio::MixerImpl. Updated and removed mixer code in OSystem_SDL for using SdlMixerImpl.
svn-id: r49602
Diffstat (limited to 'sound')
-rw-r--r--sound/mixer.cpp3
-rw-r--r--sound/mixer_intern.h4
2 files changed, 6 insertions, 1 deletions
diff --git a/sound/mixer.cpp b/sound/mixer.cpp
index 08a4ad921d..17ae723650 100644
--- a/sound/mixer.cpp
+++ b/sound/mixer.cpp
@@ -431,6 +431,9 @@ int MixerImpl::getVolumeForSoundType(SoundType type) const {
return _volumeForSoundType[type];
}
+void MixerImpl::setSampleRate(uint sampleRate) {
+ _sampleRate = sampleRate;
+}
#pragma mark -
#pragma mark --- Channel implementations ---
diff --git a/sound/mixer_intern.h b/sound/mixer_intern.h
index 014be7abf2..c1b7df941f 100644
--- a/sound/mixer_intern.h
+++ b/sound/mixer_intern.h
@@ -60,7 +60,7 @@ private:
OSystem *_syst;
Common::Mutex _mutex;
- const uint _sampleRate;
+ uint _sampleRate;
bool _mixerReady;
uint32 _handleSeed;
@@ -127,6 +127,8 @@ public:
* their audio system has been completed.
*/
void setReady(bool ready);
+
+ void setSampleRate(uint sampleRate);
};