diff options
| author | Max Horn | 2004-11-28 21:24:02 +0000 |
|---|---|---|
| committer | Max Horn | 2004-11-28 21:24:02 +0000 |
| commit | 1ae87c0fbbbb38950e2364da212adeb96d464d0c (patch) | |
| tree | ca2ce9c9325468b6d6f1b1c8f799bb81853824a5 /scumm/imuse.h | |
| parent | 6c84bbf2bd808c7e72cdcc9e5d5f68562916606b (diff) | |
| download | scummvm-rg350-1ae87c0fbbbb38950e2364da212adeb96d464d0c.tar.gz scummvm-rg350-1ae87c0fbbbb38950e2364da212adeb96d464d0c.tar.bz2 scummvm-rg350-1ae87c0fbbbb38950e2364da212adeb96d464d0c.zip | |
Trying to cleanup the volume control mess inside the SCUMM engine: renamed MusicEngine::setMasterVolume to setMusicVolume; fixed iMuse to use the correct method for setMusicVolume (previously modified the iMuse internal volume control); hooked up the volume control of various other music engines; added ScummEngine::setupVolume method which can be called whenever volume settings change, and which gurantees that those are handled uniformly
svn-id: r15944
Diffstat (limited to 'scumm/imuse.h')
| -rw-r--r-- | scumm/imuse.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scumm/imuse.h b/scumm/imuse.h index 3362f46079..e66aa472f7 100644 --- a/scumm/imuse.h +++ b/scumm/imuse.h @@ -61,8 +61,7 @@ public: void on_timer(MidiDriver *midi); void pause(bool paused); int save_or_load(Serializer *ser, ScummEngine *scumm); - int set_music_volume(uint vol); - void setMasterVolume(int vol); + void setMusicVolume(int vol); void startSound(int sound); void stopSound(int sound); void stopAllSounds(); |