diff options
| author | Alejandro Marzini | 2010-06-20 20:19:53 +0000 |
|---|---|---|
| committer | Alejandro Marzini | 2010-06-20 20:19:53 +0000 |
| commit | e0fe48032d6e27445a9c963e70cf82bf57b5fd5a (patch) | |
| tree | 401b0d2e6f9477373ae88033ddfd28362f8db647 /sound | |
| parent | 4a850209d739111b539fc39bcf003abd6e061538 (diff) | |
| download | scummvm-rg350-e0fe48032d6e27445a9c963e70cf82bf57b5fd5a.tar.gz scummvm-rg350-e0fe48032d6e27445a9c963e70cf82bf57b5fd5a.tar.bz2 scummvm-rg350-e0fe48032d6e27445a9c963e70cf82bf57b5fd5a.zip | |
Made _sampleRate constant again in Audio::MixerImpl. (And Committing "common/timer.h" that should have been included in r50095)
svn-id: r50097
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/mixer.cpp | 4 | ||||
| -rw-r--r-- | sound/mixer_intern.h | 4 |
2 files changed, 1 insertions, 7 deletions
diff --git a/sound/mixer.cpp b/sound/mixer.cpp index 17ae723650..3d8b55683f 100644 --- a/sound/mixer.cpp +++ b/sound/mixer.cpp @@ -431,10 +431,6 @@ int MixerImpl::getVolumeForSoundType(SoundType type) const { return _volumeForSoundType[type]; } -void MixerImpl::setSampleRate(uint sampleRate) { - _sampleRate = sampleRate; -} - #pragma mark - #pragma mark --- Channel implementations --- #pragma mark - diff --git a/sound/mixer_intern.h b/sound/mixer_intern.h index c1b7df941f..014be7abf2 100644 --- a/sound/mixer_intern.h +++ b/sound/mixer_intern.h @@ -60,7 +60,7 @@ private: OSystem *_syst; Common::Mutex _mutex; - uint _sampleRate; + const uint _sampleRate; bool _mixerReady; uint32 _handleSeed; @@ -127,8 +127,6 @@ public: * their audio system has been completed. */ void setReady(bool ready); - - void setSampleRate(uint sampleRate); }; |