[Scummvm-cvs-logs] CVS: scummvm Makefile.common,1.95,1.96 TODO,1.201,1.202 configure,1.108,1.109

[Max Horn]

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

Modified Files:
	Makefile.common TODO configure 
Log Message:
Moved the softsynth midi drivers into a sound/softsynth; amongst other things, this fixes bug #1083058

Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.common,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- Makefile.common	24 Dec 2004 01:43:36 -0000	1.95
+++ Makefile.common	25 Dec 2004 18:34:41 -0000	1.96
@@ -90,7 +90,7 @@
 	common
 
 ifdef USE_MT32EMU
-MODULES += backends/midi/mt32
+MODULES += sound/softsynth/mt32
 endif
 
 ######################################################################

Index: TODO
===================================================================
RCS file: /cvsroot/scummvm/scummvm/TODO,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -d -r1.201 -r1.202
--- TODO	25 Dec 2004 15:02:25 -0000	1.201
+++ TODO	25 Dec 2004 18:34:41 -0000	1.202
@@ -166,11 +166,6 @@
 * Add "sound types" to the mixer; client code will be able to pass such a type
   whenever registering an audio stream. Then, volume control will be changed
   to be based on the sound type.
-* Move the 'softsynth' MIDI drivers (adlib, MT32, ym2612) from backends/midi
-  to sound/ (or a new dir like sound/mididrivers or sound/softsynth).
-  This would solve bug #1083058; it'd also be more logical, since the portable
-  softsynths don't really belong into the backends/ dir, which is meant for
-  platform specific code.
 
 Config Manager
 ==============

Index: configure
===================================================================
RCS file: /cvsroot/scummvm/scummvm/configure,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- configure	16 Dec 2004 22:15:32 -0000	1.108
+++ configure	25 Dec 2004 18:34:41 -0000	1.109
@@ -811,7 +811,6 @@
 else
 	_def_mt32emu='#define USE_MT32EMU'
 	_mak_mt32emu='USE_MT32EMU = 1'
-	INCLUDES="$INCLUDES -I\$(srcdir)/backends/midi/mt32"
 fi
 
 #