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

LAUNCHER: hopefully fixed music driver selection via command line

Browse source 
svn-id: r50158
This commit is contained in:
Florian Kagerer 2010-06-22 18:27:00 +00:00
parent 3a394793b6
commit 78fb62bcdf
3 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
base/main.cpp
View file

@ -54,6 +54,7 @@
#include "gui/error.h"
#include "sound/audiocd.h"
#include "sound/mididrv.h"
#include "backends/keymapper/keymapper.h"
@ -341,6 +342,16 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
// Load the plugins.
PluginManager::instance().loadPlugins();
// If we received an invalid music parameter via command line we check this here.
// We can't check this before loading the music plugins.
// On the other hand we cannot load the plugins before we know the file paths (in case of external plugins).
if (!settings["music-driver"].empty()) {
if (MidiDriver::getMusicType(MidiDriver::getDeviceHandle(settings["music-driver"])) == MT_NULL) {
warning("Unrecognized music driver '%s'\nSwitching to default device.", settings["music-driver"].c_str());
settings["music-driver"] = "auto";
}
}
// Process the remaining command line settings. Must be done after the
// config file and the plugins have been loaded.
Common::Error res;