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

[thebluegr at users.sourceforge.net]

Revision: 54483
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54483&view=rev
Author:   thebluegr
Date:     2010-11-25 22:17:23 +0000 (Thu, 25 Nov 2010)

Log Message:
-----------
SCI: Initialize reverb in the music driver correctly. Based on a patch by waltervn

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

Modified: scummvm/trunk/engines/sci/sound/drivers/midi.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/drivers/midi.cpp	2010-11-25 22:16:22 UTC (rev 54482)
+++ scummvm/trunk/engines/sci/sound/drivers/midi.cpp	2010-11-25 22:17:23 UTC (rev 54483)
@@ -69,7 +69,7 @@
 	int getLastChannel() const;
 	void setVolume(byte volume);
 	int getVolume();
-	void setReverb(byte reverb);
+	void setReverb(int8 reverb);
 	void playSwitch(bool play);
 
 private:
@@ -383,7 +383,7 @@
 	return _masterVolume;
 }
 
-void MidiPlayer_Midi::setReverb(byte reverb) {
+void MidiPlayer_Midi::setReverb(int8 reverb) {
 	assert(reverb < kReverbConfigNr);
 	_reverb = reverb;
 

Modified: scummvm/trunk/engines/sci/sound/drivers/mididriver.h
===================================================================
--- scummvm/trunk/engines/sci/sound/drivers/mididriver.h	2010-11-25 22:16:22 UTC (rev 54482)
+++ scummvm/trunk/engines/sci/sound/drivers/mididriver.h	2010-11-25 22:17:23 UTC (rev 54483)
@@ -79,10 +79,10 @@
 class MidiPlayer : public MidiDriver {
 protected:
 	MidiDriver *_driver;
-	byte _reverb;
+	int8 _reverb;
 
 public:
-	MidiPlayer(SciVersion version) : _driver(0), _reverb(0), _version(version) { }
+	MidiPlayer(SciVersion version) : _driver(0), _reverb(-1), _version(version) { }
 
 	int open() {
 		ResourceManager *resMan = g_sci->getResMan();	// HACK
@@ -111,10 +111,10 @@
 		return _driver ? _driver->property(MIDI_PROP_MASTER_VOLUME, 0xffff) : 0;
 	}
 
-	// Returns the current reverb
-	byte getReverb() const { return _reverb; }
+	// Returns the current reverb, or -1 when no reverb is active
+	int8 getReverb() const { return _reverb; }
 	// Sets the current reverb, used mainly in MT-32
-	virtual void setReverb(byte reverb) { _reverb = reverb; }
+	virtual void setReverb(int8 reverb) { _reverb = reverb; }
 
 	virtual void playSwitch(bool play) {
 		if (!play) {


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