[Scummvm-cvs-logs] CVS: scummvm/gui options.cpp,1.23,1.24

[Max Horn]

Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv18865/gui

Modified Files:
	options.cpp 
Log Message:
cleanup & restructuring; in particular move the midi driver list to its own source file

Index: options.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/options.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- options.cpp	17 Sep 2003 22:40:58 -0000	1.23
+++ options.cpp	2 Oct 2003 22:52:56 -0000	1.24
@@ -19,15 +19,16 @@
  */
 
 #include "stdafx.h"
-#include "browser.h"
-#include "chooser.h"
-#include "newgui.h"
-#include "options.h"
-#include "PopUpWidget.h"
+#include "gui/browser.h"
+#include "gui/chooser.h"
+#include "gui/newgui.h"
+#include "gui/options.h"
+#include "gui/PopUpWidget.h"
 
 #include "backends/fs/fs.h"
-#include "common/config-file.h"
 #include "base/gameDetector.h"
+#include "common/config-file.h"
+#include "sound/mididrv.h"
 
 #if (!( defined(__DC__) || defined(__GP32__)) && !defined(_MSC_VER))
 #include <unistd.h>
@@ -90,14 +91,12 @@
 	int midiSelected = 0, i = 0;;
 	
 	// Populate it
-	const MusicDriver *md = GameDetector::getMusicDrivers();
+	const MidiDriverDescription *md = getAvailableMidiDrivers();
 	while (md->name) {
-		if (GameDetector::isMusicDriverAvailable(md->id)) {
-			_midiPopUp->appendEntry(md->description, md->id);
-			if (md->id == _detector._midi_driver)
-				midiSelected = i;
-			i++;
-		}
+		_midiPopUp->appendEntry(md->description, md->id);
+		if (md->id == _detector._midi_driver)
+			midiSelected = i;
+		i++;
 		md++;
 	}
 	_midiPopUp->setSelected(midiSelected);
@@ -205,7 +204,7 @@
 		break;
 	case kPopUpItemSelectedCmd:
 		if (sender == _midiPopUp) {
-			const MusicDriver *md = GameDetector::getMusicDrivers();
+			const MidiDriverDescription *md = getAvailableMidiDrivers();
 			for (; md->name; md++) {
 				if (md->id == (int) data) {
 					g_config->set ("music_driver", md->name, "_USER_OVERRIDES");