[Scummvm-cvs-logs] SF.net SVN: scummvm:[40335] scummvm/trunk/sound/fmopl.cpp

[lordhoto at users.sourceforge.net]

Revision: 40335
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40335&view=rev
Author:   lordhoto
Date:     2009-05-05 22:06:54 +0000 (Tue, 05 May 2009)

Log Message:
-----------
At request by DrMcCoy enable DOSBox OPL2 by default whenever DISABLE_DOSBOX_OPL isn't defined.

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

Modified: scummvm/trunk/sound/fmopl.cpp
===================================================================
--- scummvm/trunk/sound/fmopl.cpp	2009-05-05 21:47:12 UTC (rev 40334)
+++ scummvm/trunk/sound/fmopl.cpp	2009-05-05 22:06:54 UTC (rev 40335)
@@ -38,13 +38,13 @@
 	assert(!_hasInstance);
 	_hasInstance = true;
 
-	if (type == kOpl2)
+#ifdef DISABLE_DOSBOX_OPL
+	if (type != kOpl2)
+		return 0;
+	else
 		return new MAME::OPL_MAME();
-	else
-#ifndef DISABLE_DOSBOX_ADLIB
-		return new DOSBox::OPL_DOSBox(type);
 #else
-		return 0;
+	return new DOSBox::OPL_DOSBox(type);
 #endif
 }
 


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