[Scummvm-cvs-logs] CVS: scummvm/saga music.cpp,1.33,1.34

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3069

Modified Files:
	music.cpp 
Log Message:
o Removed astray debug output.
o MT-32 music is correct, though Adlib is not. There is apparently custom
 instrument remapping similiar to mt32->gm but it is different. With
 that remapping it sounds much closer to original.


Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/music.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- music.cpp	20 Nov 2004 17:19:15 -0000	1.33
+++ music.cpp	21 Nov 2004 00:37:18 -0000	1.34
@@ -179,7 +179,7 @@
 	return audioStream;
 }
 
-MusicPlayer::MusicPlayer(MidiDriver *driver) : _parser(0), _driver(driver), _looping(false), _isPlaying(false), _passThrough(false)  {
+	MusicPlayer::MusicPlayer(MidiDriver *driver) : _parser(0), _driver(driver), _looping(false), _isPlaying(false), _passThrough(false), _isGM(false) {
 	memset(_channel, 0, sizeof(_channel));
 	_masterVolume = 0;
 	this->open();
@@ -320,7 +320,6 @@
 		if (_musicContext != NULL) {
 			_hasDigiMusic = true;
 
-			debug(0, "DHFJKHDFKJLHDFKLJHDFKJHDASF");
 			_musicFname = RSC_FileName(_musicContext);
 
 			file.open(_musicFname);
@@ -475,7 +474,12 @@
 			return FAILURE;
 		}
 
-		_player->setGM(true);
+		// FIXME: This is weird, but this way Adlib sounds closer to original, 
+		// though instrument mapping is not correct
+		if (hasAdlib()) {
+			_player->setGM(false);
+		}
+
 		parser = MidiParser::createParser_XMIDI();
 	}