[Scummvm-cvs-logs] SF.net SVN: scummvm:[47843] scummvm/trunk/sound

[lordhoto at users.sourceforge.net]

Revision: 47843
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47843&view=rev
Author:   lordhoto
Date:     2010-02-03 09:11:55 +0000 (Wed, 03 Feb 2010)

Log Message:
-----------
Cleanup.

Modified Paths:
--------------
    scummvm/trunk/sound/fmopl.cpp
    scummvm/trunk/sound/fmopl.h

Modified: scummvm/trunk/sound/fmopl.cpp
===================================================================
--- scummvm/trunk/sound/fmopl.cpp	2010-02-03 08:59:10 UTC (rev 47842)
+++ scummvm/trunk/sound/fmopl.cpp	2010-02-03 09:11:55 UTC (rev 47843)
@@ -90,6 +90,8 @@
 	}
 
 	// Detect the first matching emulator
+	drv = -1;
+
 	for (int i = 1; _drivers[i].name; ++i) {
 		if (_drivers[i].flags & flags) {
 			drv = _drivers[i].id;
@@ -100,6 +102,10 @@
 	return drv;
 }
 
+OPL *Config::create(OplType type) {
+	return create(kAuto, type);
+}
+
 OPL *Config::create(DriverId driver, OplType type) {
 	// On invalid driver selection, we try to do some fallback detection
 	if (driver == -1) {

Modified: scummvm/trunk/sound/fmopl.h
===================================================================
--- scummvm/trunk/sound/fmopl.h	2010-02-03 08:59:10 UTC (rev 47842)
+++ scummvm/trunk/sound/fmopl.h	2010-02-03 09:11:55 UTC (rev 47843)
@@ -85,7 +85,7 @@
 	 * Wrapper to easily init an OPL chip, without specifing an emulator.
 	 * By default it will try to initialize an OPL2 emulator, thus an AdLib card.
 	 */
-	static OPL *create(OplType type = kOpl2) { return create(detect(type), type); }
+	static OPL *create(OplType type = kOpl2);
 
 private:
 	static const EmulatorDescription _drivers[];


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.