[Scummvm-cvs-logs] SF.net SVN: scummvm:[46316] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Wed Dec 9 19:12:59 CET 2009
Revision: 46316
http://scummvm.svn.sourceforge.net/scummvm/?rev=46316&view=rev
Author: fingolfin
Date: 2009-12-09 18:12:51 +0000 (Wed, 09 Dec 2009)
Log Message:
-----------
Changed MidiDriver::createMidi to take a MidiDriverType instead of an int
Modified Paths:
--------------
scummvm/trunk/engines/agos/agos.cpp
scummvm/trunk/engines/draci/draci.cpp
scummvm/trunk/engines/groovie/music.cpp
scummvm/trunk/engines/kyra/kyra_v1.cpp
scummvm/trunk/engines/lure/sound.cpp
scummvm/trunk/engines/m4/m4.cpp
scummvm/trunk/engines/made/made.cpp
scummvm/trunk/engines/parallaction/parallaction_br.cpp
scummvm/trunk/engines/parallaction/parallaction_ns.cpp
scummvm/trunk/engines/queen/music.cpp
scummvm/trunk/engines/saga/saga.cpp
scummvm/trunk/engines/sci/sfx/music.cpp
scummvm/trunk/engines/sci/sfx/music.h
scummvm/trunk/engines/scumm/scumm.cpp
scummvm/trunk/engines/sky/sky.cpp
scummvm/trunk/engines/tinsel/tinsel.cpp
scummvm/trunk/engines/touche/midi.cpp
scummvm/trunk/sound/mididrv.cpp
scummvm/trunk/sound/mididrv.h
Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp 2009-12-09 18:05:20 UTC (rev 46315)
+++ scummvm/trunk/engines/agos/agos.cpp 2009-12-09 18:12:51 UTC (rev 46316)
@@ -552,7 +552,7 @@
(getPlatform() == Common::kPlatformPC)) {
// Setup midi driver
- int midiDriver = MidiDriver::detectMusicDriver(MDT_ADLIB | MDT_MIDI);
+ MidiDriverType midiDriver = MidiDriver::detectMusicDriver(MDT_ADLIB | MDT_MIDI);
_nativeMT32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"));
_driver = MidiDriver::createMidi(midiDriver);
Modified: scummvm/trunk/engines/draci/draci.cpp
===================================================================
--- scummvm/trunk/engines/draci/draci.cpp 2009-12-09 18:05:20 UTC (rev 46315)
+++ scummvm/trunk/engines/draci/draci.cpp 2009-12-09 18:12:51 UTC (rev 46316)
@@ -119,7 +119,7 @@
_dubbingArchive = new SoundArchive(dubbingPath, kDubbingFrequency);
_sound = new Sound(_mixer);
- int midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI);
+ MidiDriverType midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI);
bool native_mt32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"));
//bool adlib = (midiDriver == MD_ADLIB);
Modified: scummvm/trunk/engines/groovie/music.cpp
===================================================================
--- scummvm/trunk/engines/groovie/music.cpp 2009-12-09 18:05:20 UTC (rev 46315)
+++ scummvm/trunk/engines/groovie/music.cpp 2009-12-09 18:12:51 UTC (rev 46316)
@@ -383,7 +383,7 @@
_midiParser = MidiParser::createParser_XMIDI();
// Create the driver
- int driver = detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI);
+ MidiDriverType driver = detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI);
_driver = createMidi(driver);
this->open();
Modified: scummvm/trunk/engines/kyra/kyra_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.cpp 2009-12-09 18:05:20 UTC (rev 46315)
+++ scummvm/trunk/engines/kyra/kyra_v1.cpp 2009-12-09 18:12:51 UTC (rev 46316)
@@ -105,7 +105,7 @@
if (!_flags.useDigSound) {
// We prefer AdLib over MIDI, since generally AdLib is better supported
- int midiDriver = MidiDriver::detectMusicDriver(MDT_PCSPK | MDT_MIDI | MDT_ADLIB);
+ MidiDriverType midiDriver = MidiDriver::detectMusicDriver(MDT_PCSPK | MDT_MIDI | MDT_ADLIB);
if (_flags.platform == Common::kPlatformFMTowns) {
if (_flags.gameID == GI_KYRA1)
Modified: scummvm/trunk/engines/lure/sound.cpp
===================================================================
--- scummvm/trunk/engines/lure/sound.cpp 2009-12-09 18:05:20 UTC (rev 46315)
+++ scummvm/trunk/engines/lure/sound.cpp 2009-12-09 18:12:51 UTC (rev 46316)
@@ -46,7 +46,7 @@
_soundData = NULL;
_paused = false;
- int midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI);
+ MidiDriverType midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI);
_isRoland = midiDriver != MD_ADLIB;
_nativeMT32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"));
Modified: scummvm/trunk/engines/m4/m4.cpp
===================================================================
--- scummvm/trunk/engines/m4/m4.cpp 2009-12-09 18:05:20 UTC (rev 46315)
+++ scummvm/trunk/engines/m4/m4.cpp 2009-12-09 18:12:51 UTC (rev 46316)
@@ -150,7 +150,7 @@
_screen = new M4Surface(true); // Special form for creating screen reference
- int midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI);
+ MidiDriverType midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI);
bool native_mt32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"));
MidiDriver *driver = MidiDriver::createMidi(midiDriver);
Modified: scummvm/trunk/engines/made/made.cpp
===================================================================
--- scummvm/trunk/engines/made/made.cpp 2009-12-09 18:05:20 UTC (rev 46315)
+++ scummvm/trunk/engines/made/made.cpp 2009-12-09 18:12:51 UTC (rev 46316)
@@ -95,7 +95,7 @@
_script = new ScriptInterpreter(this);
- int midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI);
+ MidiDriverType midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI);
bool native_mt32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"));
//bool adlib = (midiDriver == MD_ADLIB);
Modified: scummvm/trunk/engines/parallaction/parallaction_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction_br.cpp 2009-12-09 18:05:20 UTC (rev 46315)
+++ scummvm/trunk/engines/parallaction/parallaction_br.cpp 2009-12-09 18:12:51 UTC (rev 46316)
@@ -61,7 +61,7 @@
_disk = new DosDisk_br(this);
}
_disk->setLanguage(2); // NOTE: language is now hardcoded to English. Original used command-line parameters.
- int midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI);
+ MidiDriverType midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI);
MidiDriver *driver = MidiDriver::createMidi(midiDriver);
_soundManI = new DosSoundMan_br(this, driver);
} else {
Modified: scummvm/trunk/engines/parallaction/parallaction_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction_ns.cpp 2009-12-09 18:05:20 UTC (rev 46315)
+++ scummvm/trunk/engines/parallaction/parallaction_ns.cpp 2009-12-09 18:12:51 UTC (rev 46316)
@@ -167,7 +167,7 @@
_disk->init();
if (getPlatform() == Common::kPlatformPC) {
- int midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI);
+ MidiDriverType midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI);
MidiDriver *driver = MidiDriver::createMidi(midiDriver);
_soundManI = new DosSoundMan_ns(this, driver);
_soundManI->setMusicVolume(ConfMan.getInt("music_volume"));
Modified: scummvm/trunk/engines/queen/music.cpp
===================================================================
--- scummvm/trunk/engines/queen/music.cpp 2009-12-09 18:05:20 UTC (rev 46315)
+++ scummvm/trunk/engines/queen/music.cpp 2009-12-09 18:12:51 UTC (rev 46316)
@@ -45,7 +45,7 @@
_queuePos = _lastSong = _currentSong = 0;
queueClear();
- int midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI);
+ MidiDriverType midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI);
_adlib = (midiDriver == MD_ADLIB);
_nativeMT32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"));
Modified: scummvm/trunk/engines/saga/saga.cpp
===================================================================
--- scummvm/trunk/engines/saga/saga.cpp 2009-12-09 18:05:20 UTC (rev 46315)
+++ scummvm/trunk/engines/saga/saga.cpp 2009-12-09 18:12:51 UTC (rev 46316)
@@ -227,7 +227,7 @@
_console = new Console(this);
// Graphics should be initialized before music
- int midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI);
+ MidiDriverType midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI);
bool native_mt32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"));
bool adlib = (midiDriver == MD_ADLIB);
Modified: scummvm/trunk/engines/sci/sfx/music.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/music.cpp 2009-12-09 18:05:20 UTC (rev 46315)
+++ scummvm/trunk/engines/sci/sfx/music.cpp 2009-12-09 18:12:51 UTC (rev 46316)
@@ -252,7 +252,7 @@
}
}
//----------------------------------------
-void SciMusic::soundInitSnd(SoundRes*res, sciSound *pSnd) {
+void SciMusic::soundInitSnd(SoundRes *res, sciSound *pSnd) {
//_mutex.lock();
SoundRes::tagTrack *pTrack = NULL;
switch (_midiType) {
@@ -268,6 +268,8 @@
case MD_MT32:
pTrack = res->getTrackByType(SoundRes::kTrackMT32);
break;
+ default:
+ break;
}
// attempting to select default MT-32/Roland track
if (!pTrack)
Modified: scummvm/trunk/engines/sci/sfx/music.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/music.h 2009-12-09 18:05:20 UTC (rev 46315)
+++ scummvm/trunk/engines/sci/sfx/music.h 2009-12-09 18:12:51 UTC (rev 46316)
@@ -163,7 +163,7 @@
Audio::Mixer *_pMixer;
MidiDriver *_pMidiDrv;
- int _midiType;
+ MidiDriverType _midiType;
Common::Mutex _mutex;
Common::Array<sciSound *> _playList;
Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp 2009-12-09 18:05:20 UTC (rev 46315)
+++ scummvm/trunk/engines/scumm/scumm.cpp 2009-12-09 18:12:51 UTC (rev 46316)
@@ -1635,7 +1635,7 @@
#endif
void ScummEngine::setupMusic(int midi) {
- int midiDriver = MidiDriver::detectMusicDriver(midi);
+ MidiDriverType midiDriver = MidiDriver::detectMusicDriver(midi);
_native_mt32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"));
switch (midiDriver) {
Modified: scummvm/trunk/engines/sky/sky.cpp
===================================================================
--- scummvm/trunk/engines/sky/sky.cpp 2009-12-09 18:05:20 UTC (rev 46315)
+++ scummvm/trunk/engines/sky/sky.cpp 2009-12-09 18:12:51 UTC (rev 46316)
@@ -256,7 +256,7 @@
_systemVars.gameVersion = _skyDisk->determineGameVersion();
- int midiDriver = MidiDriver::detectMusicDriver(MDT_ADLIB | MDT_MIDI | MDT_PREFER_MIDI);
+ MidiDriverType midiDriver = MidiDriver::detectMusicDriver(MDT_ADLIB | MDT_MIDI | MDT_PREFER_MIDI);
if (midiDriver == MD_ADLIB) {
_systemVars.systemFlags |= SF_SBLASTER;
_skyMusic = new AdlibMusic(_mixer, _skyDisk);
Modified: scummvm/trunk/engines/tinsel/tinsel.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/tinsel.cpp 2009-12-09 18:05:20 UTC (rev 46315)
+++ scummvm/trunk/engines/tinsel/tinsel.cpp 2009-12-09 18:12:51 UTC (rev 46316)
@@ -850,7 +850,7 @@
if (cd_num >= 0)
_system->openCD(cd_num);
- int midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI);
+ MidiDriverType midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI);
bool native_mt32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"));
//bool adlib = (midiDriver == MD_ADLIB);
Modified: scummvm/trunk/engines/touche/midi.cpp
===================================================================
--- scummvm/trunk/engines/touche/midi.cpp 2009-12-09 18:05:20 UTC (rev 46315)
+++ scummvm/trunk/engines/touche/midi.cpp 2009-12-09 18:12:51 UTC (rev 46316)
@@ -92,7 +92,7 @@
}
int MidiPlayer::open() {
- int midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI);
+ MidiDriverType midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI);
_nativeMT32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"));
_driver = MidiDriver::createMidi(midiDriver);
int ret = _driver->open();
Modified: scummvm/trunk/sound/mididrv.cpp
===================================================================
--- scummvm/trunk/sound/mididrv.cpp 2009-12-09 18:05:20 UTC (rev 46315)
+++ scummvm/trunk/sound/mididrv.cpp 2009-12-09 18:12:51 UTC (rev 46316)
@@ -224,7 +224,7 @@
return musicDriver;
}
-MidiDriver *MidiDriver::createMidi(int midiDriver) {
+MidiDriver *MidiDriver::createMidi(MidiDriverType midiDriver) {
switch (midiDriver) {
case MD_NULL: return MidiDriver_NULL_create();
@@ -280,8 +280,9 @@
#if defined(__amigaos4__)
case MD_CAMD: return MidiDriver_CAMD_create();
#endif
+ default:
+ error("Invalid midi driver selected");
}
- error("Invalid midi driver selected");
return NULL;
}
Modified: scummvm/trunk/sound/mididrv.h
===================================================================
--- scummvm/trunk/sound/mididrv.h 2009-12-09 18:05:20 UTC (rev 46315)
+++ scummvm/trunk/sound/mididrv.h 2009-12-09 18:12:51 UTC (rev 46316)
@@ -139,7 +139,7 @@
*/
static const MidiDriverDescription *getAvailableMidiDrivers();
- static MidiDriver *createMidi(int midiDriver);
+ static MidiDriver *createMidi(MidiDriverType midiDriver);
static MidiDriverType detectMusicDriver(int flags);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list