[Scummvm-cvs-logs] CVS: scummvm/gui options.cpp,1.15,1.16 options.h,1.3,1.4

[Max Horn]

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

Modified Files:
	options.cpp options.h 
Log Message:
Hook up the midi driver selection popup; disable GFX popup for now, till we modify the backends to properly allow for it's support

Index: options.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/options.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- options.cpp	25 Mar 2003 15:55:24 -0000	1.15
+++ options.cpp	26 Mar 2003 20:43:56 -0000	1.16
@@ -74,21 +74,30 @@
 	gfxPopUp->appendEntry("TV2x");
 	gfxPopUp->appendEntry("DotMatrix");
 	gfxPopUp->setSelected(0);
+	
+	// FIXME - disable GFX popup for now
+	gfxPopUp->setEnabled(false);
+	
 
 	// The MIDI mode popup & a label
-	new StaticTextWidget(this, 5, 26+1, 100, kLineHeight, "Music driver: ", kTextAlignRight);
-	PopUpWidget *midiPopUp;
-	midiPopUp = new PopUpWidget(this, 105, 26, 180, kLineHeight);
+	StaticTextWidget *foo = new StaticTextWidget(this, 5, 26+1, 100, kLineHeight, "Music driver: ", kTextAlignRight);
+	foo->setEnabled(false);
+	_midiPopUp = new PopUpWidget(this, 105, 26, 180, kLineHeight);
+	int midiSelected = 0, i = 0;;
 	
 	// Populate it
 	const MusicDriver *md = GameDetector::getMusicDrivers();
 	while (md->name) {
-		if (GameDetector::isMusicDriverAvailable(md->id))
-			midiPopUp->appendEntry(md->description, md->id);
+		if (GameDetector::isMusicDriverAvailable(md->id)) {
+			_midiPopUp->appendEntry(md->description, md->id);
+			if (md->id == _detector._midi_driver)
+				midiSelected = i;
+			i++;
+		}
 		md++;
 	}
-	midiPopUp->setSelected(0);
-
+	_midiPopUp->setSelected(midiSelected);
+	
 	//
 	// Sound controllers
 	//
@@ -187,6 +196,12 @@
 		_soundVolumeSfx = _sfxVolumeSlider->getValue();
 		_sfxVolumeLabel->setValue(_soundVolumeSfx);
 		_sfxVolumeLabel->draw();
+		break;
+	case kPopUpItemSelectedCmd:
+		if (sender == _midiPopUp) {
+			_detector._midi_driver = (int)data;
+			printf("Setting _detector._midi_driver to %d\n", _detector._midi_driver);
+		}
 		break;
 	case kOKCmd:
 		// TODO Write back changes made to config object

Index: options.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/options.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- options.h	25 Mar 2003 15:32:34 -0000	1.3
+++ options.h	26 Mar 2003 20:43:58 -0000	1.4
@@ -27,6 +27,7 @@
 
 class BrowserDialog;
 class GameDetector;
+class PopUpWidget;
 
 class GlobalOptionsDialog : public Dialog {
 	typedef ScummVM::String String;
@@ -43,6 +44,8 @@
 
 	BrowserDialog	*_browser;
 	StaticTextWidget*_savePath;
+
+	PopUpWidget *_midiPopUp;
 
 	int _soundVolumeMaster;
 	int _soundVolumeMusic;