aboutsummaryrefslogtreecommitdiff
path: root/scumm/player_mod.h
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/player_mod.h
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/player_mod.h')
-rw-r--r--scumm/player_mod.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/player_mod.h b/scumm/player_mod.h
index 8169ec7059..35d322e971 100644
--- a/scumm/player_mod.h
+++ b/scumm/player_mod.h
@@ -38,7 +38,7 @@ class Player_MOD : public AudioStream {
public:
Player_MOD(ScummEngine *scumm);
virtual ~Player_MOD();
- virtual void setMasterVolume(int vol);
+ virtual void setMusicVolume(int vol);
virtual void startChannel(int id, void *data, int size, int rate, uint8 vol, int loopStart = 0, int loopEnd = 0, int8 pan = 0);
virtual void stopChannel(int id);