[Scummvm-cvs-logs] CVS: scummvm/sound mididrv.cpp,1.60,1.61 mididrv.h,1.42,1.43 module.mk,1.19,1.20

[Torbjörn Andersson]

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

Modified Files:
	mididrv.cpp mididrv.h module.mk 
Log Message:
Applied patch #1175374 ("FluidSynth MIDI driver"), with a few documentation 
changes. There are a few things that could use a bit more work, and I've
only tested it on my Linux box. I have verified that ScummVM still compiles
when it's disabled, though, so it shouldn't break anything too badly.


Index: mididrv.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mididrv.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- mididrv.cpp	3 Apr 2005 22:01:37 -0000	1.60
+++ mididrv.cpp	10 Apr 2005 14:33:44 -0000	1.61
@@ -58,6 +58,9 @@
 	{"towns", "FM Towns", MD_TOWNS},
 	{"pcspk", "PC Speaker", MD_PCSPK},
 	{"pcjr", "IBM PCjr", MD_PCJR},
+#ifdef USE_FLUIDSYNTH
+	{"fluidsynth", "FluidSynth", MD_FLUIDSYNTH},
+#endif
 #ifdef USE_MT32EMU
 	{"mt32", "MT-32", MD_MT32},
 #endif
@@ -172,6 +175,9 @@
 	// driver.
 	case MD_ADLIB:     return NULL;
 
+#ifdef USE_FLUIDSYNTH
+	case MD_FLUIDSYNTH:	return MidiDriver_FluidSynth_create(g_engine->_mixer);
+#endif
 #ifdef USE_MT32EMU
 	case MD_MT32:      return MidiDriver_MT32_create(g_engine->_mixer);
 #endif

Index: mididrv.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mididrv.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- mididrv.h	3 Apr 2005 22:01:38 -0000	1.42
+++ mididrv.h	10 Apr 2005 14:33:44 -0000	1.43
@@ -48,7 +48,8 @@
 	MD_TOWNS = 13,
 	MD_YPA1 = 14, // PalmOS
 	MD_ZODIAC = 15, // PalmOS
-	MD_MT32 = 16
+	MD_MT32 = 16,
+	MD_FLUIDSYNTH = 17
 };
 
 enum MidiDriverType {
@@ -195,6 +196,9 @@
 extern MidiDriver *MidiDriver_ETUDE_create();
 extern MidiDriver *MidiDriver_ALSA_create();
 extern MidiDriver *MidiDriver_YM2612_create(SoundMixer *mixer);
+#ifdef USE_FLUIDSYNTH
+extern MidiDriver *MidiDriver_FluidSynth_create(SoundMixer *mixer);
+#endif
 #ifdef USE_MT32EMU
 extern MidiDriver *MidiDriver_MT32_create(SoundMixer *mixer);
 #endif

Index: module.mk
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/module.mk,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- module.mk	9 Jan 2005 15:49:43 -0000	1.19
+++ module.mk	10 Apr 2005 14:33:44 -0000	1.20
@@ -18,6 +18,7 @@
 	sound/wave.o \
 	sound/softsynth/adlib.o \
 	sound/softsynth/ym2612.o \
+	sound/softsynth/fluidsynth.o \
 	sound/softsynth/mt32.o \
 
 MODULE_DIRS += \