[Scummvm-cvs-logs] CVS: scummvm/gui options.cpp,1.61,1.62

[Max Horn]

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

Modified Files:
	options.cpp 
Log Message:
Moved MidiDriver creation code into the MidiDriver class (as static methods), same for some other MIDI related stuff

Index: options.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/options.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- options.cpp	20 Nov 2004 21:35:49 -0000	1.61
+++ options.cpp	2 Dec 2004 00:33:39 -0000	1.62
@@ -112,11 +112,11 @@
 
 	if (_multiMidiCheckbox) {
 		// Music driver
-		const MidiDriverDescription *md = getAvailableMidiDrivers();
+		const MidiDriverDescription *md = MidiDriver::getAvailableMidiDrivers();
 		int i = 0;
 		const int midiDriver =
 			ConfMan.hasKey("music_driver", _domain)
-				? parseMusicDriver(ConfMan.get("music_driver", _domain))
+				? MidiDriver::parseMusicDriver(ConfMan.get("music_driver", _domain))
 				: MD_AUTO;
 		while (md->name && md->id != midiDriver) {
 			i++;
@@ -190,7 +190,7 @@
 				ConfMan.set("multi_midi", _multiMidiCheckbox->getState(), _domain);
 				ConfMan.set("native_mt32", _mt32Checkbox->getState(), _domain);
 				ConfMan.set("subtitles", _subCheckbox->getState(), _domain); 
-				const MidiDriverDescription *md = getAvailableMidiDrivers();
+				const MidiDriverDescription *md = MidiDriver::getAvailableMidiDrivers();
 				while (md->name && md->id != (int)_midiPopUp->getSelectedTag())
 					md++;
 				if (md->name)
@@ -315,7 +315,7 @@
 	yoffset += 16;
 	
 	// Populate it
-	const MidiDriverDescription *md = getAvailableMidiDrivers();
+	const MidiDriverDescription *md = MidiDriver::getAvailableMidiDrivers();
 	while (md->name) {
 		_midiPopUp->appendEntry(md->description, md->id);
 		md++;