[Scummvm-cvs-logs] CVS: scummvm/saga music.cpp,1.3,1.4

[Eugene Sandulenko]

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

Modified Files:
	music.cpp 
Log Message:
Now it produces sound, but it's clear that XMIDI parsing is wrong


Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/music.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- music.cpp	29 Apr 2004 04:07:14 -0000	1.3
+++ music.cpp	29 Apr 2004 04:24:55 -0000	1.4
@@ -30,6 +30,7 @@
 #include "game_mod.h"
 #include "sound/mididrv.h"                                                      
 #include "sound/midiparser.h"
+#include "common/config-manager.h"
 
 namespace Saga {
 
@@ -66,10 +67,12 @@
 		return;
 			
 	_masterVolume = volume;
-		
+
 	for (int i = 0; i < 16; ++i) {
-		if (_channel[i])
+		if (_channel[i]) {
+			debug(0, "%d %d", _channelVolume[i], _masterVolume);
 			_channel[i]->volume(_channelVolume[i] * _masterVolume / 255);
+		}
 	}
 }
 	
@@ -135,7 +138,6 @@
 }
 	
 void MusicPlayer::playMusic() {
-	_parser->setMidiDriver(this);
 	_isPlaying = true;
 }
 	
@@ -188,8 +190,10 @@
 	debug(0, "Music::play(%d, %d)", music_rn, flags);
 
 	parser->setTrack(0);	
+	parser->setMidiDriver(_player);
 	_player->_parser = parser;
-	_player->playMusic();				
+	_player->setVolume(ConfMan.getInt("music_volume") * ConfMan.getInt("master_volume") / 255);
+	_player->playMusic();
 	return R_SUCCESS;
 }