aboutsummaryrefslogtreecommitdiff
path: root/scumm/player_v3a.cpp
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_v3a.cpp
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_v3a.cpp')
-rw-r--r--scumm/player_v3a.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/player_v3a.cpp b/scumm/player_v3a.cpp
index cc25d2482f..52865cc5b8 100644
--- a/scumm/player_v3a.cpp
+++ b/scumm/player_v3a.cpp
@@ -75,8 +75,8 @@ Player_V3A::~Player_V3A() {
}
}
-void Player_V3A::setMasterVolume (int vol) {
- _mod->setMasterVolume(vol);
+void Player_V3A::setMusicVolume (int vol) {
+ _mod->setMusicVolume(vol);
}
int Player_V3A::getMusChan (int id) const {