diff options
author | Johannes Schickel | 2007-12-21 09:28:27 +0000 |
---|---|---|
committer | Johannes Schickel | 2007-12-21 09:28:27 +0000 |
commit | 1ecbde083f09ff545dcc6db4553c6c03e8ccf26a (patch) | |
tree | 0a7314fa1d3a700b6dc8351e5275b7e2da604e13 /engines/kyra/sound.h | |
parent | 72e899d164d58cf7f4a6ce087cd650cc4bb30629 (diff) | |
download | scummvm-rg350-1ecbde083f09ff545dcc6db4553c6c03e8ccf26a.tar.gz scummvm-rg350-1ecbde083f09ff545dcc6db4553c6c03e8ccf26a.tar.bz2 scummvm-rg350-1ecbde083f09ff545dcc6db4553c6c03e8ccf26a.zip |
Reverted too complicated (and unneeded) volume settings code for towns driver.
svn-id: r29939
Diffstat (limited to 'engines/kyra/sound.h')
-rw-r--r-- | engines/kyra/sound.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/engines/kyra/sound.h b/engines/kyra/sound.h index 9cf712e8ce..e0c5398300 100644 --- a/engines/kyra/sound.h +++ b/engines/kyra/sound.h @@ -370,12 +370,6 @@ public: void setVolume(int) {} int getVolume() { return 255; } - // TODO: this should be moved to Sound or at least - // supplied by Sound as a pure virtual method. - // TODO: define ranges for those two functions - void setMusicVolume(int volume); - void setSoundEffectsVolume(int volume) { _sfxVolume = CLIP(volume, 0, 255); } - void loadSoundFile(uint file); void playTrack(uint8 track); @@ -412,7 +406,6 @@ private: uint _sfxFileIndex; uint8 *_sfxFileData; - uint8 _sfxVolume; SoundTowns_EuphonyDriver * _driver; MidiParser * _parser; @@ -435,12 +428,6 @@ public: void setVolume(int) {} int getVolume() { return 255; } - // TODO: this should be moved to Sound or at least - // supplied by Sound as a pure virtual method. - // TODO: define ranges for those two functions - void setMusicVolume(int volume); - void setSoundEffectsVolume(int volume) { _sfxVolume = CLIP(volume, 0, 255); } - void loadSoundFile(uint file) {} void playTrack(uint8 track); @@ -455,7 +442,6 @@ private: Audio::AudioStream *_currentSFX; Audio::SoundHandle _sfxHandle; - uint8 _sfxVolume; //SoundTowns_v2_TwnDriver * _driver; uint8 * _twnTrackData; |