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

[lordhoto at users.sourceforge.net]

Revision: 40503
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40503&view=rev
Author:   lordhoto
Date:     2009-05-12 19:24:04 +0000 (Tue, 12 May 2009)

Log Message:
-----------
Make 'create' return an OPL2 by default.

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

Modified: scummvm/trunk/sound/fmopl.cpp
===================================================================
--- scummvm/trunk/sound/fmopl.cpp	2009-05-12 19:03:54 UTC (rev 40502)
+++ scummvm/trunk/sound/fmopl.cpp	2009-05-12 19:24:04 UTC (rev 40503)
@@ -167,7 +167,7 @@
 }
 
 FM_OPL *makeAdlibOPL(int rate) {
-	FM_OPL *opl = OPL::Config::create(OPL::Config::kOpl2);
+	FM_OPL *opl = OPL::Config::create();
 
 	if (opl) {
 		if (!opl->init(rate)) {

Modified: scummvm/trunk/sound/fmopl.h
===================================================================
--- scummvm/trunk/sound/fmopl.h	2009-05-12 19:03:54 UTC (rev 40502)
+++ scummvm/trunk/sound/fmopl.h	2009-05-12 19:24:04 UTC (rev 40503)
@@ -72,7 +72,7 @@
 	/**
 	 * Detects a driver for the specific type.
 	 */
-	static DriverId detect(OplType type = kOpl2);
+	static DriverId detect(OplType type);
 
 	/**
 	 * Creates the specific driver with a specific type setup.
@@ -81,8 +81,9 @@
 
 	/**
 	 * 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) { return create(detect(type), type); }
+	static OPL *create(OplType type = kOpl2) { return create(detect(type), type); }
 
 private:
 	static const EmulatorDescription _drivers[];	


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