[Scummvm-cvs-logs] SF.net SVN: scummvm:[54456] scummvm/trunk/engines/sci/sound

[thebluegr at users.sourceforge.net]

Revision: 54456
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54456&view=rev
Author:   thebluegr
Date:     2010-11-24 14:15:46 +0000 (Wed, 24 Nov 2010)

Log Message:
-----------
SCI: Added a getReverb() accessor to the SciMusic class

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sound/drivers/mididriver.h
    scummvm/trunk/engines/sci/sound/music.cpp
    scummvm/trunk/engines/sci/sound/music.h

Modified: scummvm/trunk/engines/sci/sound/drivers/mididriver.h
===================================================================
--- scummvm/trunk/engines/sci/sound/drivers/mididriver.h	2010-11-24 11:57:11 UTC (rev 54455)
+++ scummvm/trunk/engines/sci/sound/drivers/mididriver.h	2010-11-24 14:15:46 UTC (rev 54456)
@@ -111,7 +111,7 @@
 		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) {

Modified: scummvm/trunk/engines/sci/sound/music.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/music.cpp	2010-11-24 11:57:11 UTC (rev 54455)
+++ scummvm/trunk/engines/sci/sound/music.cpp	2010-11-24 14:15:46 UTC (rev 54456)
@@ -230,6 +230,11 @@
 	_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);
 }

Modified: scummvm/trunk/engines/sci/sound/music.h
===================================================================
--- scummvm/trunk/engines/sci/sound/music.h	2010-11-24 11:57:11 UTC (rev 54455)
+++ scummvm/trunk/engines/sci/sound/music.h	2010-11-24 14:15:46 UTC (rev 54456)
@@ -188,6 +188,7 @@
 	void sendMidiCommand(MusicEntry *pSnd, uint32 cmd);
 
 	void setReverb(byte reverb);
+	byte getReverb();
 
 	virtual void saveLoadWithSerializer(Common::Serializer &ser);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.