[Scummvm-cvs-logs] CVS: scummvm/gui launcher.cpp,1.72,1.73 options.cpp,1.37,1.38
Max Horn
fingolfin at users.sourceforge.net
Tue Nov 4 17:23:11 CET 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/gui launcher.cpp,1.71,1.72 options.cpp,1.36,1.37 options.h,1.8,1.9
- Next message: [Scummvm-cvs-logs] CVS: scummvm/queen walk.h,1.10,1.11 walk.cpp,1.18,1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv2762
Modified Files:
launcher.cpp options.cpp
Log Message:
added multi_midi/native_mt32 settings (we *really* need to come up with a good way to share code between GlobalOptionsDialog and EditGameDialog)
Index: launcher.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/launcher.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- launcher.cpp 5 Nov 2003 01:15:09 -0000 1.72
+++ launcher.cpp 5 Nov 2003 01:22:19 -0000 1.73
@@ -95,6 +95,9 @@
PopUpWidget *_gfxPopUp;
CheckboxWidget *_fullscreenCheckbox;
CheckboxWidget *_aspectCheckbox;
+
+ CheckboxWidget *_multiMidiCheckbox;
+ CheckboxWidget *_mt32Checkbox;
};
EditGameDialog::EditGameDialog(const String &domain, GameSettings target)
@@ -215,6 +218,17 @@
tab->addTab("Audio");
yoffset = vBorder;
+ // Multi midi setting
+ _multiMidiCheckbox = new CheckboxWidget(tab, 10, yoffset, 280, 16, "Mixed Adlib/MIDI mode");
+ _multiMidiCheckbox->setState(ConfMan.getBool("multi_midi", _domain));
+ yoffset += 16;
+
+ // Native mt32 setting
+ _mt32Checkbox = new CheckboxWidget(tab, 10, yoffset, 280, 16, "True Roland MT-32 (disable GM emulation)");
+ _mt32Checkbox->setState(ConfMan.getBool("native_mt32", _domain));
+ yoffset += 16;
+
+
// TODO: Volume/driver/midi/... settings
@@ -242,6 +256,8 @@
ConfMan.set("description", _descriptionWidget->getLabel(), newDomain);
ConfMan.set("fullscreen", _fullscreenCheckbox->getState(), newDomain);
ConfMan.set("aspect_ratio", _aspectCheckbox->getState(), newDomain);
+ ConfMan.set("multi_midi", _multiMidiCheckbox->getState(), newDomain);
+ ConfMan.set("native_mt32", _mt32Checkbox->getState(), newDomain);
Common::Language lang = (Common::Language)_langPopUp->getSelectedTag();
if (lang < 0)
Index: options.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/options.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- options.cpp 5 Nov 2003 01:15:10 -0000 1.37
+++ options.cpp 5 Nov 2003 01:22:19 -0000 1.38
@@ -157,19 +157,17 @@
_sfxVolumeLabel->setFlags(WIDGET_CLEARBG);
yoffset += 16;
-#if 1
- // TODO: cd drive setting
- // TODO: multi midi setting
- // TODO: native mt32 setting
+ // Multi midi setting
_multiMidiCheckbox = new CheckboxWidget(tab, 10, yoffset, 280, 16, "Mixed Adlib/MIDI mode");
_multiMidiCheckbox->setState(ConfMan.getBool("multi_midi"));
yoffset += 16;
+ // Native mt32 setting
_mt32Checkbox = new CheckboxWidget(tab, 10, yoffset, 280, 16, "True Roland MT-32 (disable GM emulation)");
_mt32Checkbox->setState(ConfMan.getBool("native_mt32"));
yoffset += 16;
-#endif
+ // TODO: cd drive setting
//
// 3) The miscellaneous tab
@@ -268,6 +266,8 @@
ConfMan.set("sfx_volume", _sfxVolumeSlider->getValue());
ConfMan.set("fullscreen", _fullscreenCheckbox->getState());
ConfMan.set("aspect_ratio", _aspectCheckbox->getState());
+ ConfMan.set("multi_midi", _multiMidiCheckbox->getState());
+ ConfMan.set("native_mt32", _mt32Checkbox->getState());
const MidiDriverDescription *md = getAvailableMidiDrivers();
for (; md->name; md++) {
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/gui launcher.cpp,1.71,1.72 options.cpp,1.36,1.37 options.h,1.8,1.9
- Next message: [Scummvm-cvs-logs] CVS: scummvm/queen walk.h,1.10,1.11 walk.cpp,1.18,1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list