thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed MidiDriver::createMidi to take a MidiDriverType instead of an int

Browse source 
svn-id: r46316
This commit is contained in:
Max Horn 2009-12-09 18:12:51 +00:00
parent 84f3c98fad
commit c8873d8492
19 changed files with 23 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/agos/agos.cpp
View file

@ -552,7 +552,7 @@ Common::Error AGOSEngine::init() {
(getPlatform() == Common::kPlatformPC)) { (getPlatform() == Common::kPlatformPC)) {
// Setup midi driver // 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")); _nativeMT32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"));
_driver = MidiDriver::createMidi(midiDriver); _driver = MidiDriver::createMidi(midiDriver);

2
engines/draci/draci.cpp
View file

@ -119,7 +119,7 @@ int DraciEngine::init() {
_dubbingArchive = new SoundArchive(dubbingPath, kDubbingFrequency); _dubbingArchive = new SoundArchive(dubbingPath, kDubbingFrequency);
_sound = new Sound(_mixer); _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 native_mt32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"));
//bool adlib = (midiDriver == MD_ADLIB); //bool adlib = (midiDriver == MD_ADLIB);

2
engines/groovie/music.cpp
View file

@ -383,7 +383,7 @@ MusicPlayerXMI::MusicPlayerXMI(GroovieEngine *vm, const Common::String &gtlName)
_midiParser = MidiParser::createParser_XMIDI(); _midiParser = MidiParser::createParser_XMIDI();
// Create the driver // 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); _driver = createMidi(driver);
this->open(); this->open();

2
engines/kyra/kyra_v1.cpp
View file

@ -105,7 +105,7 @@ Common::Error KyraEngine_v1::init() {
if (!_flags.useDigSound) { if (!_flags.useDigSound) {
// We prefer AdLib over MIDI, since generally AdLib is better supported // 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.platform == Common::kPlatformFMTowns) {
if (_flags.gameID == GI_KYRA1) if (_flags.gameID == GI_KYRA1)

2
engines/lure/sound.cpp
View file

@ -46,7 +46,7 @@ SoundManager::SoundManager() {
_soundData = NULL; _soundData = NULL;
_paused = false; _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; _isRoland = midiDriver != MD_ADLIB;
_nativeMT32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32")); _nativeMT32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"));

2
engines/m4/m4.cpp
View file

@ -150,7 +150,7 @@ Common::Error M4Engine::run() {
_screen = new M4Surface(true); // Special form for creating screen reference _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")); bool native_mt32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"));
MidiDriver *driver = MidiDriver::createMidi(midiDriver); MidiDriver *driver = MidiDriver::createMidi(midiDriver);

2
engines/made/made.cpp
View file

@ -95,7 +95,7 @@ MadeEngine::MadeEngine(OSystem *syst, const MadeGameDescription *gameDesc) : Eng
_script = new ScriptInterpreter(this); _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 native_mt32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"));
//bool adlib = (midiDriver == MD_ADLIB); //bool adlib = (midiDriver == MD_ADLIB);

2
engines/parallaction/parallaction_br.cpp
View file

@ -61,7 +61,7 @@ Common::Error Parallaction_br::init() {
_disk = new DosDisk_br(this); _disk = new DosDisk_br(this);
} }
_disk->setLanguage(2); // NOTE: language is now hardcoded to English. Original used command-line parameters. _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); MidiDriver *driver = MidiDriver::createMidi(midiDriver);
_soundManI = new DosSoundMan_br(this, driver); _soundManI = new DosSoundMan_br(this, driver);
} else { } else {

2
engines/parallaction/parallaction_ns.cpp
View file

@ -167,7 +167,7 @@ Common::Error Parallaction_ns::init() {
_disk->init(); _disk->init();
if (getPlatform() == Common::kPlatformPC) { 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); MidiDriver *driver = MidiDriver::createMidi(midiDriver);
_soundManI = new DosSoundMan_ns(this, driver); _soundManI = new DosSoundMan_ns(this, driver);
_soundManI->setMusicVolume(ConfMan.getInt("music_volume")); _soundManI->setMusicVolume(ConfMan.getInt("music_volume"));

2
engines/queen/music.cpp
View file

@ -45,7 +45,7 @@ MidiMusic::MidiMusic(QueenEngine *vm)
_queuePos = _lastSong = _currentSong = 0; _queuePos = _lastSong = _currentSong = 0;
queueClear(); 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); _adlib = (midiDriver == MD_ADLIB);
_nativeMT32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32")); _nativeMT32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"));

2
engines/saga/saga.cpp
View file

@ -227,7 +227,7 @@ Common::Error SagaEngine::run() {
_console = new Console(this); _console = new Console(this);
// Graphics should be initialized before music // 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 native_mt32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"));
bool adlib = (midiDriver == MD_ADLIB); bool adlib = (midiDriver == MD_ADLIB);

2
engines/sci/sfx/music.cpp
View file

@ -268,6 +268,8 @@ void SciMusic::soundInitSnd(SoundRes*res, sciSound *pSnd) {
case MD_MT32: case MD_MT32:
pTrack = res->getTrackByType(SoundRes::kTrackMT32); pTrack = res->getTrackByType(SoundRes::kTrackMT32);
break; break;
default:
break;
} }
// attempting to select default MT-32/Roland track // attempting to select default MT-32/Roland track
if (!pTrack) if (!pTrack)

2
engines/sci/sfx/music.h
View file

@ -163,7 +163,7 @@ protected:
Audio::Mixer *_pMixer; Audio::Mixer *_pMixer;
MidiDriver *_pMidiDrv; MidiDriver *_pMidiDrv;
int _midiType; MidiDriverType _midiType;
Common::Mutex _mutex; Common::Mutex _mutex;
Common::Array<sciSound *> _playList; Common::Array<sciSound *> _playList;

2
engines/scumm/scumm.cpp
View file

@ -1635,7 +1635,7 @@ void ScummEngine_v100he::resetScumm() {
#endif #endif
void ScummEngine::setupMusic(int midi) { void ScummEngine::setupMusic(int midi) {
int midiDriver = MidiDriver::detectMusicDriver(midi); MidiDriverType midiDriver = MidiDriver::detectMusicDriver(midi);
_native_mt32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32")); _native_mt32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"));
switch (midiDriver) { switch (midiDriver) {

2
engines/sky/sky.cpp
View file

@ -256,7 +256,7 @@ Common::Error SkyEngine::init() {
_systemVars.gameVersion = _skyDisk->determineGameVersion(); _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) { if (midiDriver == MD_ADLIB) {
_systemVars.systemFlags |= SF_SBLASTER; _systemVars.systemFlags |= SF_SBLASTER;
_skyMusic = new AdlibMusic(_mixer, _skyDisk); _skyMusic = new AdlibMusic(_mixer, _skyDisk);

2
engines/tinsel/tinsel.cpp
View file

@ -850,7 +850,7 @@ TinselEngine::TinselEngine(OSystem *syst, const TinselGameDescription *gameDesc)
if (cd_num >= 0) if (cd_num >= 0)
_system->openCD(cd_num); _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 native_mt32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"));
//bool adlib = (midiDriver == MD_ADLIB); //bool adlib = (midiDriver == MD_ADLIB);

2
engines/touche/midi.cpp
View file

@ -92,7 +92,7 @@ void MidiPlayer::setVolume(int volume) {
} }
int MidiPlayer::open() { 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")); _nativeMT32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"));
_driver = MidiDriver::createMidi(midiDriver); _driver = MidiDriver::createMidi(midiDriver);
int ret = _driver->open(); int ret = _driver->open();

5
sound/mididrv.cpp
View file

@ -224,7 +224,7 @@ MidiDriverType MidiDriver::detectMusicDriver(int flags) {
return musicDriver; return musicDriver;
} }
MidiDriver *MidiDriver::createMidi(int midiDriver) { MidiDriver *MidiDriver::createMidi(MidiDriverType midiDriver) {
switch (midiDriver) { switch (midiDriver) {
case MD_NULL: return MidiDriver_NULL_create(); case MD_NULL: return MidiDriver_NULL_create();
@ -280,8 +280,9 @@ MidiDriver *MidiDriver::createMidi(int midiDriver) {
#if defined(__amigaos4__) #if defined(__amigaos4__)
case MD_CAMD: return MidiDriver_CAMD_create(); case MD_CAMD: return MidiDriver_CAMD_create();
#endif #endif
default:
error("Invalid midi driver selected");
} }
error("Invalid midi driver selected");
return NULL; return NULL;
} }

2
sound/mididrv.h
View file

@ -139,7 +139,7 @@ public:
*/ */
static const MidiDriverDescription *getAvailableMidiDrivers(); static const MidiDriverDescription *getAvailableMidiDrivers();
static MidiDriver *createMidi(int midiDriver); static MidiDriver *createMidi(MidiDriverType midiDriver);
static MidiDriverType detectMusicDriver(int flags); static MidiDriverType detectMusicDriver(int flags);