[Scummvm-cvs-logs] CVS: scummvm/common gameDetector.cpp,1.133,1.134 gameDetector.h,1.51,1.52
Jamieson Christian
jamieson630 at users.sourceforge.net
Wed Aug 13 07:10:08 CEST 2003
Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1:/tmp/cvs-serv32007/common
Modified Files:
gameDetector.cpp gameDetector.h
Log Message:
Added PC Speaker and PCjr command line options,
in preparation for Kirben's addition of WA support
for games that already have AD tracks.
Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/gameDetector.cpp,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- gameDetector.cpp 11 Aug 2003 09:48:26 -0000 1.133
+++ gameDetector.cpp 13 Aug 2003 14:07:56 -0000 1.134
@@ -150,6 +150,8 @@
{"etude", "Etude", MD_ETUDE},
{"alsa", "ALSA", MD_ALSA},
{"adlib", "Adlib", MD_ADLIB},
+ {"pcspk", "PC Speaker", MD_PCSPK},
+ {"pcjr", "IBM PCjr", MD_PCJR},
#else
{"ypa1", "Yamaha Pa1", MD_YPA1},
#endif
@@ -167,8 +169,6 @@
_fullScreen = false;
_aspectRatio = false;
- _use_adlib = false;
-
_master_volume = kDefaultMasterVolume;
_music_volume = kDefaultMusicVolume;
_sfx_volume = kDefaultSFXVolume;
@@ -605,7 +605,9 @@
case MD_AUTO:
case MD_NULL: return true;
#ifndef __PALM_OS__ // don't show it on palmos
- case MD_ADLIB: return true;
+ case MD_ADLIB:
+ case MD_PCSPK:
+ case MD_PCJR: return true;
#else
case MD_YPA1: return true;
#endif
@@ -640,7 +642,6 @@
while (md->name) {
if (!scumm_stricmp(md->name, s)) {
- _use_adlib = (md->id == MD_ADLIB);
_midi_driver = md->id;
return true;
}
@@ -706,7 +707,6 @@
if ((_game.adlib & VersionSettings::ADLIB_ALWAYS) && _midi_driver != MD_NULL ||
(_game.adlib & VersionSettings::ADLIB_PREFERRED) && _midi_driver == MD_AUTO) {
_midi_driver = MD_ADLIB;
- _use_adlib = true;
}
if (!_gameDataPath) {
@@ -781,32 +781,38 @@
int drv = getMidiDriverType();
switch(drv) {
- case MD_NULL: return MidiDriver_NULL_create();
+ 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: _use_adlib = true; return NULL;
+ case MD_ADLIB: return NULL;
+
+ // 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();
+ case MD_YPA1: return MidiDriver_YamahaPa1_create();
#endif
#if defined(WIN32) && !defined(_WIN32_WCE)
- case MD_WINDOWS: return MidiDriver_WIN_create();
+ case MD_WINDOWS: return MidiDriver_WIN_create();
#endif
#if defined(__MORPHOS__)
- case MD_ETUDE: return MidiDriver_ETUDE_create();
+ case MD_ETUDE: return MidiDriver_ETUDE_create();
#endif
#if defined(UNIX) && !defined(__BEOS__) && !defined(MACOSX)
- case MD_SEQ: return MidiDriver_SEQ_create();
+ case MD_SEQ: return MidiDriver_SEQ_create();
#endif
#if (defined(MACOSX) || defined(macintosh)) && !defined(__PALM_OS__)
- case MD_QTMUSIC: return MidiDriver_QT_create();
+ case MD_QTMUSIC: return MidiDriver_QT_create();
#endif
#if defined(MACOSX)
- case MD_COREAUDIO: return MidiDriver_CORE_create();
+ case MD_COREAUDIO: return MidiDriver_CORE_create();
#endif
#if defined(UNIX) && defined(USE_ALSA)
- case MD_ALSA: return MidiDriver_ALSA_create();
+ case MD_ALSA: return MidiDriver_ALSA_create();
#endif
}
Index: gameDetector.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/gameDetector.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- gameDetector.h 29 Jul 2003 12:13:39 -0000 1.51
+++ gameDetector.h 13 Aug 2003 14:07:56 -0000 1.52
@@ -114,8 +114,6 @@
bool _fullScreen;
bool _aspectRatio;
- bool _use_adlib;
-
int _master_volume;
int _music_volume;
int _sfx_volume;
More information about the Scummvm-git-logs
mailing list