[Scummvm-cvs-logs] CVS: scummvm/backends/midi mt32.cpp,1.14,1.15

[Jerome Fisher]

Update of /cvsroot/scummvm/scummvm/backends/midi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12377

Modified Files:
	mt32.cpp 
Log Message:
- Now sets the palette earlier, and only once.


Index: mt32.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/mt32.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- mt32.cpp	28 Nov 2004 22:17:06 -0000	1.14
+++ mt32.cpp	28 Nov 2004 22:23:13 -0000	1.15
@@ -192,16 +192,6 @@
 		break;
 	case MT32Emu::ReportType_progressInit:
 		if (((MidiDriver_MT32 *)userData)->_initialising) {
-			const byte dummy_palette[] = {
-				0, 0, 0, 0, 
-				0, 0, 171, 0, 
-				0, 171, 0, 0, 
-				0, 171, 171, 0, 
-				171, 0, 0, 0
-			};
-
-			g_system->setPalette(dummy_palette, 0, 5);
-
 			drawProgress(*((const float *)reportData));
 			return eatSystemEvents();
 		}
@@ -262,6 +252,15 @@
 	prop.openFile = MT32_OpenFile;
 	_synth = new MT32Emu::Synth();
 	_initialising = true;
+	const byte dummy_palette[] = {
+		0, 0, 0, 0, 
+		0, 0, 171, 0, 
+		0, 171, 0, 0, 
+		0, 171, 171, 0, 
+		171, 0, 0, 0
+	};
+
+	g_system->setPalette(dummy_palette, 0, 5);
 	drawMessage(-1, "Initialising MT-32 Emulator");
 	if (!_synth->open(prop))
 		return MERR_DEVICE_NOT_AVAILABLE;