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

Cleanup.

Browse source 
svn-id: r40502
This commit is contained in:
Johannes Schickel 2009-05-12 19:03:54 +00:00
parent a0a44ef498
commit 4190e256bf
2 changed files with 24 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

30
sound/fmopl.cpp
View file

@ -34,12 +34,13 @@ namespace OPL {
// Config implementation // Config implementation
enum OplEmulator { enum OplEmulator {
kAuto = 0,
kMame = 1, kMame = 1,
kDOSBox = 2 kDOSBox = 2
}; };
const Config::EmulatorDescription Config::_drivers[] = { const Config::EmulatorDescription Config::_drivers[] = {
{ "auto", "<default>", 0, kFlagOpl2 | kFlagDualOpl2 | kFlagOpl3 }, { "auto", "<default>", kAuto, kFlagOpl2 | kFlagDualOpl2 | kFlagOpl3 },
{ "mame", "MAME OPL emulator", kMame, kFlagOpl2 }, { "mame", "MAME OPL emulator", kMame, kFlagOpl2 },
#ifndef DISABLE_DOSBOX_OPL #ifndef DISABLE_DOSBOX_OPL
{ "db", "DOSBox OPL emulator (experimental)", kDOSBox, kFlagOpl2 | kFlagDualOpl2 | kFlagOpl3 }, { "db", "DOSBox OPL emulator (experimental)", kDOSBox, kFlagOpl2 | kFlagDualOpl2 | kFlagOpl3 },
@ -53,7 +54,7 @@ Config::DriverId Config::parse(const Common::String &name) {
return _drivers[i].id; return _drivers[i].id;
} }
return 0; return -1;
} }
Config::DriverId Config::detect(OplType type) { Config::DriverId Config::detect(OplType type) {
@ -76,12 +77,13 @@ Config::DriverId Config::detect(OplType type) {
// When a valid driver is selected, check whether it supports // When a valid driver is selected, check whether it supports
// the requested OPL chip. // the requested OPL chip.
if (validDriver(drv)) { if (drv != -1 && drv != kAuto) {
// If the chip is supported, just use the driver. // If the chip is supported, just use the driver.
if ((flags & _drivers[drv].flags)) if ((flags & _drivers[drv].flags))
return drv; return drv;
// When it doesn't support the flags fall back to auto detection // When it doesn't support the flags fall back to auto detection
else
drv = -1;
} }
// Detect the first matching emulator // Detect the first matching emulator
@ -96,10 +98,26 @@ Config::DriverId Config::detect(OplType type) {
} }
OPL *Config::create(DriverId driver, OplType type) { OPL *Config::create(DriverId driver, OplType type) {
if (!validDriver(driver)) // On invalid driver selection, we try to do some fallback detection
if (driver == -1) {
warning("Invalid OPL driver selected, trying to detect a fallback emulator");
driver = kAuto;
}
// If autodetection is selected, we search for a matching
// driver.
if (driver == kAuto) {
driver = detect(type); driver = detect(type);
switch (driver) { // No emulator for the specified OPL chip could
// be found, thus stop here.
if (driver == -1) {
warning("No OPL emulator available for type %d", type);
return 0;
}
}
switch (driver) {
case kMame: case kMame:
if (type == kOpl2) if (type == kOpl2)
return new MAME::OPL(); return new MAME::OPL();

5
sound/fmopl.h
View file

@ -74,11 +74,6 @@ public:
*/ */
static DriverId detect(OplType type = kOpl2); static DriverId detect(OplType type = kOpl2);
/**
* Checks whether the driver id is valid.
*/
static bool validDriver(DriverId id) { return (id > 0); }
/** /**
* Creates the specific driver with a specific type setup. * Creates the specific driver with a specific type setup.
*/ */