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

[lordhoto at users.sourceforge.net]

Revision: 52779
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52779&view=rev
Author:   lordhoto
Date:     2010-09-17 20:02:29 +0000 (Fri, 17 Sep 2010)

Log Message:
-----------
SOUND: Properly add CMS as plugin.

Modified Paths:
--------------
    scummvm/trunk/base/plugins.cpp
    scummvm/trunk/sound/mididrv.cpp
    scummvm/trunk/sound/softsynth/cms.cpp

Modified: scummvm/trunk/base/plugins.cpp
===================================================================
--- scummvm/trunk/base/plugins.cpp	2010-09-17 20:02:03 UTC (rev 52778)
+++ scummvm/trunk/base/plugins.cpp	2010-09-17 20:02:29 UTC (rev 52779)
@@ -206,6 +206,7 @@
 		LINK_PLUGIN(ADLIB)
 		LINK_PLUGIN(PCSPK)
 		LINK_PLUGIN(PCJR)
+		LINK_PLUGIN(CMS)
 		#ifndef DISABLE_SID
 		LINK_PLUGIN(C64)
 		#endif

Modified: scummvm/trunk/sound/mididrv.cpp
===================================================================
--- scummvm/trunk/sound/mididrv.cpp	2010-09-17 20:02:03 UTC (rev 52778)
+++ scummvm/trunk/sound/mididrv.cpp	2010-09-17 20:02:29 UTC (rev 52779)
@@ -58,7 +58,7 @@
 
 static const uint32 GUIOMapping[] = {
 	MT_PCSPK,		Common::GUIO_MIDIPCSPK,
-	/*MDT_CMS,		Common::GUIO_MIDICMS,*/
+	MT_CMS,			Common::GUIO_MIDICMS,
 	MT_PCJR,		Common::GUIO_MIDIPCJR,
 	MT_ADLIB,		Common::GUIO_MIDIADLIB,
 	MT_C64,		    Common::GUIO_MIDIC64,

Modified: scummvm/trunk/sound/softsynth/cms.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/cms.cpp	2010-09-17 20:02:03 UTC (rev 52778)
+++ scummvm/trunk/sound/softsynth/cms.cpp	2010-09-17 20:02:29 UTC (rev 52779)
@@ -23,8 +23,10 @@
  */
 
 #include "sound/softsynth/cms.h"
+#include "sound/null.h"
 
 #include "common/textconsole.h"
+#include "common/translation.h"
 
 // CMS/Gameblaster Emulation taken from DosBox
 
@@ -341,3 +343,27 @@
 	}
 }
 
+class CMSMusicPlugin : public NullMusicPlugin {
+public:
+	const char *getName() const {
+		return _s("Creative Music System Emulator");
+	}
+
+	const char *getId() const {
+		return "cms";
+	}
+
+	MusicDevices getDevices() const;
+};
+
+MusicDevices CMSMusicPlugin::getDevices() const {
+	MusicDevices devices;
+	devices.push_back(MusicDevice(this, "", MT_CMS));
+	return devices;
+}
+
+//#if PLUGIN_ENABLED_DYNAMIC(CMS)
+	//REGISTER_PLUGIN_DYNAMIC(CMS, PLUGIN_TYPE_MUSIC, CMSMusicPlugin);
+//#else
+	REGISTER_PLUGIN_STATIC(CMS, PLUGIN_TYPE_MUSIC, CMSMusicPlugin);
+//#endif


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