aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sound
diff options
context:
space:
mode:
authorFilippos Karapetis2010-11-24 14:15:46 +0000
committerFilippos Karapetis2010-11-24 14:15:46 +0000
commit642d15e43f8f6d1b989eb4e64edc095e74da5a61 (patch)
treead8bea8db785c0dcddcd04fac88952026fee2951 /engines/sci/sound
parent7fc171e3bc84be94162288397af679d437e537b4 (diff)
downloadscummvm-rg350-642d15e43f8f6d1b989eb4e64edc095e74da5a61.tar.gz
scummvm-rg350-642d15e43f8f6d1b989eb4e64edc095e74da5a61.tar.bz2
scummvm-rg350-642d15e43f8f6d1b989eb4e64edc095e74da5a61.zip
SCI: Added a getReverb() accessor to the SciMusic class
svn-id: r54456
Diffstat (limited to 'engines/sci/sound')
-rw-r--r--engines/sci/sound/drivers/mididriver.h2
-rw-r--r--engines/sci/sound/music.cpp5
-rw-r--r--engines/sci/sound/music.h1
3 files changed, 7 insertions, 1 deletions
diff --git a/engines/sci/sound/drivers/mididriver.h b/engines/sci/sound/drivers/mididriver.h
index 129159ecdc..c9cde09494 100644
--- a/engines/sci/sound/drivers/mididriver.h
+++ b/engines/sci/sound/drivers/mididriver.h
@@ -111,7 +111,7 @@ public:
return _driver ? _driver->property(MIDI_PROP_MASTER_VOLUME, 0xffff) : 0;
}
- virtual byte getReverb() const { return _reverb; }
+ byte getReverb() const { return _reverb; }
virtual void setReverb(byte reverb) { _reverb = reverb; }
virtual void playSwitch(bool play) {
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index 252ea5489c..010f161a7a 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -230,6 +230,11 @@ void SciMusic::setReverb(byte reverb) {
_pMidiDrv->setReverb(reverb);
}
+byte SciMusic::getReverb() {
+ Common::StackLock lock(_mutex);
+ return _pMidiDrv->getReverb();
+}
+
static bool musicEntryCompare(const MusicEntry *l, const MusicEntry *r) {
return (l->priority > r->priority);
}
diff --git a/engines/sci/sound/music.h b/engines/sci/sound/music.h
index 9fcbb9346d..71f923367d 100644
--- a/engines/sci/sound/music.h
+++ b/engines/sci/sound/music.h
@@ -188,6 +188,7 @@ public:
void sendMidiCommand(MusicEntry *pSnd, uint32 cmd);
void setReverb(byte reverb);
+ byte getReverb();
virtual void saveLoadWithSerializer(Common::Serializer &ser);