[Scummvm-cvs-logs] CVS: scummvm/base main.cpp,1.61,1.62

[Max Horn]

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

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

Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/main.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- main.cpp	14 Dec 2004 22:59:00 -0000	1.61
+++ main.cpp	25 Dec 2004 18:34:43 -0000	1.62
@@ -438,58 +438,3 @@
 }
 #endif
 */
-
-
-// WORKAROUND bug # 1083058: We put this here and not in sound/mididrv.cpp
-// where it belongs to avoid the annoying behavior of some unix linkers (which
-// leads to linker errors due to too much code being stripped from the binary.
-MidiDriver *MidiDriver::createMidi(int midiDriver) {
-	switch(midiDriver) {
-	case MD_NULL:      return MidiDriver_NULL_create();
-
-	// In the case of Adlib, we won't specify anything.
-	// IMuse is designed to set up its own Adlib driver
-	// if need be, and we only have to specify a native
-	// driver.
-	case MD_ADLIB:     return NULL;
-
-#ifdef USE_MT32EMU
-	case MD_MT32:      return MidiDriver_MT32_create(g_engine->_mixer);
-#endif
-
-	case MD_TOWNS:     return MidiDriver_YM2612_create(g_engine->_mixer);
-
-	// Right now PC Speaker and PCjr are handled
-	// outside the MidiDriver architecture, so
-	// don't create anything for now.
-	case MD_PCSPK:
-	case MD_PCJR:      return NULL;
-#if defined(__PALM_OS__)
-	case MD_YPA1:      return MidiDriver_YamahaPa1_create();
-#ifndef DISABLE_TAPWAVE
-	case MD_ZODIAC:    return MidiDriver_Zodiac_create();
-#endif
-#endif
-#if defined(WIN32) && !defined(_WIN32_WCE)
-	case MD_WINDOWS:   return MidiDriver_WIN_create();
-#endif
-#if defined(__MORPHOS__)
-	case MD_ETUDE:     return MidiDriver_ETUDE_create();
-#endif
-#if defined(UNIX) && !defined(__BEOS__) && !defined(MACOSX)
-	case MD_SEQ:       return MidiDriver_SEQ_create();
-#endif
-#if (defined(MACOSX) || defined(macintosh)) && !defined(__PALM_OS__)
-	case MD_QTMUSIC:   return MidiDriver_QT_create();
-#endif
-#if defined(MACOSX)
-	case MD_COREAUDIO: return MidiDriver_CORE_create();
-#endif
-#if defined(UNIX) && defined(USE_ALSA)
-	case MD_ALSA:      return MidiDriver_ALSA_create();
-#endif
-	}
-
-	error("Invalid midi driver selected");
-	return NULL;
-}