aboutsummaryrefslogtreecommitdiff
path: root/scumm/imuse_digi
diff options
context:
space:
mode:
authorMax Horn2004-11-28 21:24:02 +0000
committerMax Horn2004-11-28 21:24:02 +0000
commit1ae87c0fbbbb38950e2364da212adeb96d464d0c (patch)
treeca2ce9c9325468b6d6f1b1c8f799bb81853824a5 /scumm/imuse_digi
parent6c84bbf2bd808c7e72cdcc9e5d5f68562916606b (diff)
downloadscummvm-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_digi')
-rw-r--r--scumm/imuse_digi/dimuse.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/imuse_digi/dimuse.h b/scumm/imuse_digi/dimuse.h
index d145e28376..b744718df6 100644
--- a/scumm/imuse_digi/dimuse.h
+++ b/scumm/imuse_digi/dimuse.h
@@ -154,7 +154,7 @@ public:
void setVolume(int soundId, int volume);
void setPan(int soundId, int pan);
void setFade(int soundId, int destVolume, int delay60HzTicks);
- void setMasterVolume(int vol) {}
+ void setMusicVolume(int vol) {}
void stopSound(int sound);
void stopAllSounds();
void pause(bool pause);