Renamed MIDI plugins to Music plugins

svn-id: r32693

23 files changed, 124 insertions, 124 deletions

diff --git a/backends/midi/alsa.cpp b/backends/midi/alsa.cpp
index 6b0e424d68..2b564de294 100644
--- a/backends/midi/alsa.cpp
+++ b/backends/midi/alsa.cpp
@@ -28,7 +28,7 @@
 
 #include "common/config-manager.h"
 #include "common/util.h"
-#include "sound/midiplugin.h"
+#include "sound/musicplugin.h"
 #include "sound/mpu401.h"
 
 #include <alsa/asoundlib.h>
@@ -241,7 +241,7 @@ void MidiDriver_ALSA::send_event(int do_flush) {
 
 // Plugin interface
 
-class AlsaMidiPlugin : public MidiPluginObject {
+class AlsaMusicPlugin : public MusicPluginObject {
 public:
 	virtual const char *getName() const {
 		return "ALSA";
@@ -271,7 +271,7 @@ static int check_permission(snd_seq_port_info_t *pinfo)
 	return 0;
 }
 
-Common::StringList AlsaMidiPlugin::getDevices() const {
+Common::StringList AlsaMusicPlugin::getDevices() const {
 	Common::StringList devices;
 
 	snd_seq_t *seq;
@@ -302,7 +302,7 @@ Common::StringList AlsaMidiPlugin::getDevices() const {
 	return devices;
 }
 
-PluginError AlsaMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+PluginError AlsaMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
 	*mididriver = new MidiDriver_ALSA();
 
 	return kNoError;
@@ -311,16 +311,16 @@ PluginError AlsaMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mid
 MidiDriver *MidiDriver_ALSA_create(Audio::Mixer *mixer) {
 	MidiDriver *mididriver;
 
-	AlsaMidiPlugin p;
+	AlsaMusicPlugin p;
 	p.createInstance(mixer, &mididriver);
 
 	return mididriver;
 }
 
 //#if PLUGIN_ENABLED_DYNAMIC(ALSA)
-	//REGISTER_PLUGIN_DYNAMIC(ALSA, PLUGIN_TYPE_MIDI, AlsaMidiPlugin);
+	//REGISTER_PLUGIN_DYNAMIC(ALSA, PLUGIN_TYPE_MUSIC, AlsaMusicPlugin);
 //#else
-	REGISTER_PLUGIN_STATIC(ALSA, PLUGIN_TYPE_MIDI, AlsaMidiPlugin);
+	REGISTER_PLUGIN_STATIC(ALSA, PLUGIN_TYPE_MUSIC, AlsaMusicPlugin);
 //#endif
 
 #endif
diff --git a/backends/midi/camd.cpp b/backends/midi/camd.cpp
index 6aa79eb260..67600c004a 100644
--- a/backends/midi/camd.cpp
+++ b/backends/midi/camd.cpp
@@ -28,7 +28,7 @@
 
 #include "common/endian.h"
 #include "common/util.h"
-#include "sound/midiplugin.h"
+#include "sound/musicplugin.h"
 #include "sound/mpu401.h"
 
 #include <proto/camd.h>
@@ -166,7 +166,7 @@ void MidiDriver_CAMD::closeAll() {
 
 // Plugin interface
 
-class CamdMidiPlugin : public MidiPluginObject {
+class CamdMusicPlugin : public MusicPluginObject {
 public:
 	virtual const char *getName() const {
 		return "CAMD";
@@ -185,7 +185,7 @@ public:
 	virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
 };
 
-PluginError CamdMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+PluginError CamdMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
 	*mididriver = new MidiDriver_CAMD();
 
 	return kNoError;
@@ -194,16 +194,16 @@ PluginError CamdMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mid
 MidiDriver *MidiDriver_CAMD_create(Audio::Mixer *mixer) {
 	MidiDriver *mididriver;
 
-	CamdMidiPlugin p;
+	CamdMusicPlugin p;
 	p.createInstance(mixer, &mididriver);
 
 	return mididriver;
 }
 
 //#if PLUGIN_ENABLED_DYNAMIC(CAMD)
-	//REGISTER_PLUGIN_DYNAMIC(CAMD, PLUGIN_TYPE_MIDI, CamdMidiPlugin);
+	//REGISTER_PLUGIN_DYNAMIC(CAMD, PLUGIN_TYPE_MUSIC, CamdMusicPlugin);
 //#else
-	REGISTER_PLUGIN_STATIC(CAMD, PLUGIN_TYPE_MIDI, CamdMidiPlugin);
+	REGISTER_PLUGIN_STATIC(CAMD, PLUGIN_TYPE_MUSIC, CamdMusicPlugin);
 //#endif
 
 #endif
diff --git a/backends/midi/coreaudio.cpp b/backends/midi/coreaudio.cpp
index d7ab93a90a..62df5a70b4 100644
--- a/backends/midi/coreaudio.cpp
+++ b/backends/midi/coreaudio.cpp
@@ -37,7 +37,7 @@
 
 #include "common/config-manager.h"
 #include "common/util.h"
-#include "sound/midiplugin.h"
+#include "sound/musicplugin.h"
 #include "sound/mpu401.h"
 
 #include <AudioToolbox/AUGraph.h>
@@ -207,7 +207,7 @@ void MidiDriver_CORE::sysEx(const byte *msg, uint16 length) {
 
 // Plugin interface
 
-class CoreAudioMidiPlugin : public MidiPluginObject {
+class CoreAudioMusicPlugin : public MusicPluginObject {
 public:
 	virtual const char *getName() const {
 		return "CoreAudio";
@@ -224,7 +224,7 @@ public:
 	virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
 };
 
-PluginError CoreAudioMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+PluginError CoreAudioMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
 	*mididriver = new MidiDriver_CORE();
 
 	return kNoError;
@@ -233,16 +233,16 @@ PluginError CoreAudioMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver
 MidiDriver *MidiDriver_CORE_create(Audio::Mixer *mixer) {
 	MidiDriver *mididriver;
 
-	CoreAudioMidiPlugin p;
+	CoreAudioMusicPlugin p;
 	p.createInstance(mixer, &mididriver);
 
 	return mididriver;
 }
 
 //#if PLUGIN_ENABLED_DYNAMIC(COREAUDIO)
-	//REGISTER_PLUGIN_DYNAMIC(COREAUDIO, PLUGIN_TYPE_MIDI, CoreAudioMidiPlugin);
+	//REGISTER_PLUGIN_DYNAMIC(COREAUDIO, PLUGIN_TYPE_MUSIC, CoreAudioMusicPlugin);
 //#else
-	REGISTER_PLUGIN_STATIC(COREAUDIO, PLUGIN_TYPE_MIDI, CoreAudioMidiPlugin);
+	REGISTER_PLUGIN_STATIC(COREAUDIO, PLUGIN_TYPE_MUSIC, CoreAudioMusicPlugin);
 //#endif
 
 #endif // MACOSX
diff --git a/backends/midi/coremidi.cpp b/backends/midi/coremidi.cpp
index efbdaad4e4..613534d5b1 100644
--- a/backends/midi/coremidi.cpp
+++ b/backends/midi/coremidi.cpp
@@ -26,7 +26,7 @@
 
 #include "common/config-manager.h"
 #include "common/util.h"
-#include "sound/midiplugin.h"
+#include "sound/musicplugin.h"
 #include "sound/mpu401.h"
 
 #include <CoreMIDI/CoreMIDI.h>
@@ -179,7 +179,7 @@ void MidiDriver_CoreMIDI::sysEx(const byte *msg, uint16 length) {
 
 // Plugin interface
 
-class CoreMIDIMidiPlugin : public MidiPluginObject {
+class CoreMIDIMusicPlugin : public MusicPluginObject {
 public:
 	virtual const char *getName() const {
 		return "CoreMIDI";
@@ -196,7 +196,7 @@ public:
 	virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
 };
 
-PluginError CoreMIDIMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+PluginError CoreMIDIMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
 	*mididriver = new MidiDriver_CoreMIDI();
 
 	return kNoError;
@@ -205,16 +205,16 @@ PluginError CoreMIDIMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver *
 MidiDriver *MidiDriver_CoreMIDI_create(Audio::Mixer *mixer) {
 	MidiDriver *mididriver;
 
-	CoreMIDIMidiPlugin p;
+	CoreMIDIMusicPlugin p;
 	p.createInstance(mixer, &mididriver);
 
 	return mididriver;
 }
 
 //#if PLUGIN_ENABLED_DYNAMIC(COREMIDI)
-	//REGISTER_PLUGIN_DYNAMIC(COREMIDI, PLUGIN_TYPE_MIDI, CoreMIDIMidiPlugin);
+	//REGISTER_PLUGIN_DYNAMIC(COREMIDI, PLUGIN_TYPE_MUSIC, CoreMIDIMusicPlugin);
 //#else
-	REGISTER_PLUGIN_STATIC(COREMIDI, PLUGIN_TYPE_MIDI, CoreMIDIMidiPlugin);
+	REGISTER_PLUGIN_STATIC(COREMIDI, PLUGIN_TYPE_MUSIC, CoreMIDIMusicPlugin);
 //#endif
 
 #endif // MACOSX
diff --git a/backends/midi/dmedia.cpp b/backends/midi/dmedia.cpp
index 885081e3e0..257f9ba07c 100644
--- a/backends/midi/dmedia.cpp
+++ b/backends/midi/dmedia.cpp
@@ -31,7 +31,7 @@
 
 #include "common/scummsys.h"
 #include "common/util.h"
-#include "sound/midiplugin.h"
+#include "sound/musicplugin.h"
 #include "sound/mpu401.h"
 
 #include <dmedia/midi.h>
@@ -178,7 +178,7 @@ void MidiDriver_DMEDIA::sysEx (const byte *msg, uint16 length) {
 
 // Plugin interface
 
-class DMediaMidiPlugin : public MidiPluginObject {
+class DMediaMusicPlugin : public MusicPluginObject {
 public:
 	virtual const char *getName() const {
 		return "DMedia";
@@ -195,7 +195,7 @@ public:
 	virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
 };
 
-PluginError DMediaMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+PluginError DMediaMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
 	*mididriver = new MidiDriver_DMEDIA();
 
 	return kNoError;
@@ -204,16 +204,16 @@ PluginError DMediaMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **m
 MidiDriver *MidiDriver_DMEDIA_create(Audio::Mixer *mixer) {
 	MidiDriver *mididriver;
 
-	DMediaMidiPlugin p;
+	DMediaMusicPlugin p;
 	p.createInstance(mixer, &mididriver);
 
 	return mididriver;
 }
 
 //#if PLUGIN_ENABLED_DYNAMIC(DMEDIA)
-	//REGISTER_PLUGIN_DYNAMIC(DMEDIA, PLUGIN_TYPE_MIDI, DMediaMidiPlugin);
+	//REGISTER_PLUGIN_DYNAMIC(DMEDIA, PLUGIN_TYPE_MUSIC, DMediaMusicPlugin);
 //#else
-	REGISTER_PLUGIN_STATIC(DMEDIA, PLUGIN_TYPE_MIDI, DMediaMidiPlugin);
+	REGISTER_PLUGIN_STATIC(DMEDIA, PLUGIN_TYPE_MUSIC, DMediaMusicPlugin);
 //#endif
 
 #endif
diff --git a/backends/midi/quicktime.cpp b/backends/midi/quicktime.cpp
index 63905212e6..1443f895a6 100644
--- a/backends/midi/quicktime.cpp
+++ b/backends/midi/quicktime.cpp
@@ -38,7 +38,7 @@
 
 #include "common/endian.h"
 #include "common/util.h"
-#include "sound/midiplugin.h"
+#include "sound/musicplugin.h"
 #include "sound/mpu401.h"
 
 #if defined(MACOSX)
@@ -265,7 +265,7 @@ void MidiDriver_QT::dispose()
 
 // Plugin interface
 
-class QuickTimeMidiPlugin : public MidiPluginObject {
+class QuickTimeMusicPlugin : public MusicPluginObject {
 public:
 	virtual const char *getName() const {
 		return "QuickTime";
@@ -282,7 +282,7 @@ public:
 	virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
 };
 
-PluginError QuickTimeMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+PluginError QuickTimeMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
 	*mididriver = new MidiDriver_QT();
 
 	return kNoError;
@@ -291,16 +291,16 @@ PluginError QuickTimeMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver
 MidiDriver *MidiDriver_QT_create(Audio::Mixer *mixer) {
 	MidiDriver *mididriver;
 
-	QuickTimeMidiPlugin p;
+	QuickTimeMusicPlugin p;
 	p.createInstance(mixer, &mididriver);
 
 	return mididriver;
 }
 
 //#if PLUGIN_ENABLED_DYNAMIC(QUICKTIME)
-	//REGISTER_PLUGIN_DYNAMIC(QUICKTIME, PLUGIN_TYPE_MIDI, QuickTimeMidiPlugin);
+	//REGISTER_PLUGIN_DYNAMIC(QUICKTIME, PLUGIN_TYPE_MUSIC, QuickTimeMusicPlugin);
 //#else
-	REGISTER_PLUGIN_STATIC(QUICKTIME, PLUGIN_TYPE_MIDI, QuickTimeMidiPlugin);
+	REGISTER_PLUGIN_STATIC(QUICKTIME, PLUGIN_TYPE_MUSIC, QuickTimeMusicPlugin);
 //#endif
 
 #endif // MACOSX || macintosh
diff --git a/backends/midi/seq.cpp b/backends/midi/seq.cpp
index 07dfc25142..fc7ebb060b 100644
--- a/backends/midi/seq.cpp
+++ b/backends/midi/seq.cpp
@@ -31,7 +31,7 @@
 #if defined(UNIX) && !defined(__BEOS__) && !defined(__MAEMO__)
 
 #include "common/util.h"
-#include "sound/midiplugin.h"
+#include "sound/musicplugin.h"
 #include "sound/mpu401.h"
 
 #include <fcntl.h>
@@ -173,7 +173,7 @@ void MidiDriver_SEQ::sysEx (const byte *msg, uint16 length) {
 
 // Plugin interface
 
-class SeqMidiPlugin : public MidiPluginObject {
+class SeqMusicPlugin : public MusicPluginObject {
 public:
 	virtual const char *getName() const {
 		return "SEQ";
@@ -190,7 +190,7 @@ public:
 	virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
 };
 
-PluginError SeqMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+PluginError SeqMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
 	*mididriver = new MidiDriver_SEQ();
 
 	return kNoError;
@@ -199,16 +199,16 @@ PluginError SeqMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **midi
 MidiDriver *MidiDriver_SEQ_create(Audio::Mixer *mixer) {
 	MidiDriver *mididriver;
 
-	SeqMidiPlugin p;
+	SeqMusicPlugin p;
 	p.createInstance(mixer, &mididriver);
 
 	return mididriver;
 }
 
 //#if PLUGIN_ENABLED_DYNAMIC(SEQ)
-	//REGISTER_PLUGIN_DYNAMIC(SEQ, PLUGIN_TYPE_MIDI, SeqMidiPlugin);
+	//REGISTER_PLUGIN_DYNAMIC(SEQ, PLUGIN_TYPE_MUSIC, SeqMusicPlugin);
 //#else
-	REGISTER_PLUGIN_STATIC(SEQ, PLUGIN_TYPE_MIDI, SeqMidiPlugin);
+	REGISTER_PLUGIN_STATIC(SEQ, PLUGIN_TYPE_MUSIC, SeqMusicPlugin);
 //#endif
 
 #endif
diff --git a/backends/midi/timidity.cpp b/backends/midi/timidity.cpp
index 842fb358bf..40b684e664 100644
--- a/backends/midi/timidity.cpp
+++ b/backends/midi/timidity.cpp
@@ -37,7 +37,7 @@
 #if defined (UNIX)
 
 #include "common/util.h"
-#include "sound/midiplugin.h"
+#include "sound/musicplugin.h"
 #include "sound/mpu401.h"
 
 #include <fcntl.h>
@@ -514,7 +514,7 @@ void MidiDriver_TIMIDITY::sysEx(const byte *msg, uint16 length) {
 
 // Plugin interface
 
-class TimidityMidiPlugin : public MidiPluginObject {
+class TimidityMusicPlugin : public MusicPluginObject {
 public:
 	virtual const char *getName() const {
 		return "TiMidity";
@@ -531,7 +531,7 @@ public:
 	virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
 };
 
-PluginError TimidityMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+PluginError TimidityMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
 	*mididriver = new MidiDriver_TIMIDITY();
 
 	return kNoError;
@@ -540,16 +540,16 @@ PluginError TimidityMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver *
 MidiDriver *MidiDriver_TIMIDITY_create(Audio::Mixer *mixer) {
 	MidiDriver *mididriver;
 
-	TimidityMidiPlugin p;
+	TimidityMusicPlugin p;
 	p.createInstance(mixer, &mididriver);
 
 	return mididriver;
 }
 
 //#if PLUGIN_ENABLED_DYNAMIC(TIMIDITY)
-	//REGISTER_PLUGIN_DYNAMIC(TIMIDITY, PLUGIN_TYPE_MIDI, TimidityMidiPlugin);
+	//REGISTER_PLUGIN_DYNAMIC(TIMIDITY, PLUGIN_TYPE_MUSIC, TimidityMusicPlugin);
 //#else
-	REGISTER_PLUGIN_STATIC(TIMIDITY, PLUGIN_TYPE_MIDI, TimidityMidiPlugin);
+	REGISTER_PLUGIN_STATIC(TIMIDITY, PLUGIN_TYPE_MUSIC, TimidityMusicPlugin);
 //#endif
 
 #endif // defined (UNIX)
diff --git a/backends/midi/windows.cpp b/backends/midi/windows.cpp
index 083f0eaf96..8393082fea 100644
--- a/backends/midi/windows.cpp
+++ b/backends/midi/windows.cpp
@@ -28,7 +28,7 @@
 // winnt.h defines ARRAYSIZE, but we want our own one...
 #undef ARRAYSIZE
 
-#include "sound/midiplugin.h"
+#include "sound/musicplugin.h"
 #include "sound/mpu401.h"
 
 #include <mmsystem.h>
@@ -147,7 +147,7 @@ void MidiDriver_WIN::check_error(MMRESULT result) {
 
 // Plugin interface
 
-class WindowsMidiPlugin : public MidiPluginObject {
+class WindowsMusicPlugin : public MusicPluginObject {
 public:
 	virtual const char *getName() const {
 		return "Windows MIDI";
@@ -164,7 +164,7 @@ public:
 	virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
 };
 
-PluginError WindowsMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+PluginError WindowsMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
 	*mididriver = new MidiDriver_WIN();
 
 	return kNoError;
@@ -173,16 +173,16 @@ PluginError WindowsMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **
 MidiDriver *MidiDriver_WIN_create(Audio::Mixer *mixer) {
 	MidiDriver *mididriver;
 
-	WindowsMidiPlugin p;
+	WindowsMusicPlugin p;
 	p.createInstance(mixer, &mididriver);
 
 	return mididriver;
 }
 
 //#if PLUGIN_ENABLED_DYNAMIC(WINDOWS)
-	//REGISTER_PLUGIN_DYNAMIC(WINDOWS, PLUGIN_TYPE_MIDI, WindowsMidiPlugin);
+	//REGISTER_PLUGIN_DYNAMIC(WINDOWS, PLUGIN_TYPE_MUSIC, WindowsMusicPlugin);
 //#else
-	REGISTER_PLUGIN_STATIC(WINDOWS, PLUGIN_TYPE_MIDI, WindowsMidiPlugin);
+	REGISTER_PLUGIN_STATIC(WINDOWS, PLUGIN_TYPE_MUSIC, WindowsMusicPlugin);
 //#endif
 
 #endif
diff --git a/backends/midi/ypa1.cpp b/backends/midi/ypa1.cpp
index 37d90d45b0..d2fc6a8c91 100644
--- a/backends/midi/ypa1.cpp
+++ b/backends/midi/ypa1.cpp
@@ -23,7 +23,7 @@
  */
 
 #include "common/util.h"
-#include "sound/midiplugin.h"
+#include "sound/musicplugin.h"
 #include "sound/mpu401.h"
 
 #include "Pa1Lib.h"
@@ -106,7 +106,7 @@ void MidiDriver_YamahaPa1::send(uint32 b) {
 
 // Plugin interface
 
-class YamahaPa1MidiPlugin : public MidiPluginObject {
+class YamahaPa1MusicPlugin : public MusicPluginObject {
 public:
 	virtual const char *getName() const {
 		return "Yamaha Pa1";
@@ -123,7 +123,7 @@ public:
 	virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
 };
 
-PluginError YamahaPa1MidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+PluginError YamahaPa1MusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
 	*mididriver = new MidiDriver_YamahaPa1();
 
 	return kNoError;
@@ -132,14 +132,14 @@ PluginError YamahaPa1MidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver
 MidiDriver *MidiDriver_YamahaPa1_create(Audio::Mixer *mixer) {
 	MidiDriver *mididriver;
 
-	YamahaPa1MidiPlugin p;
+	YamahaPa1MusicPlugin p;
 	p.createInstance(mixer, &mididriver);
 
 	return mididriver;
 }
 
 //#if PLUGIN_ENABLED_DYNAMIC(YPA1)
-	//REGISTER_PLUGIN_DYNAMIC(YPA1, PLUGIN_TYPE_MIDI, YamahaPa1MidiPlugin);
+	//REGISTER_PLUGIN_DYNAMIC(YPA1, PLUGIN_TYPE_MUSIC, YamahaPa1MusicPlugin);
 //#else
-	REGISTER_PLUGIN_STATIC(YPA1, PLUGIN_TYPE_MIDI, YamahaPa1MidiPlugin);
+	REGISTER_PLUGIN_STATIC(YPA1, PLUGIN_TYPE_MUSIC, YamahaPa1MusicPlugin);
 //#endif
diff --git a/backends/midi/zodiac.cpp b/backends/midi/zodiac.cpp
index f27c042de8..b210b0cfc3 100644
--- a/backends/midi/zodiac.cpp
+++ b/backends/midi/zodiac.cpp
@@ -23,7 +23,7 @@
  */
 
 #include "common/util.h"
-#include "sound/midiplugin.h"
+#include "sound/musicplugin.h"
 #include "sound/mpu401.h"
 
 #ifndef DISABLE_TAPWAVE
@@ -124,7 +124,7 @@ void MidiDriver_Zodiac::sysEx(const byte *msg, uint16 length) {
 
 // Plugin interface
 
-class ZodiacMidiPlugin : public MidiPluginObject {
+class ZodiacMusicPlugin : public MusicPluginObject {
 public:
 	virtual const char *getName() const {
 		return "Tapwave Zodiac";
@@ -141,7 +141,7 @@ public:
 	virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
 };
 
-PluginError ZodiacMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+PluginError ZodiacMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
 	*mididriver = new MidiDriver_Zodiac();
 
 	return kNoError;
@@ -150,16 +150,16 @@ PluginError ZodiacMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **m
 MidiDriver *MidiDriver_Zodiac_create(Audio::Mixer *mixer) {
 	MidiDriver *mididriver;
 
-	ZodiacMidiPlugin p;
+	ZodiacMusicPlugin p;
 	p.createInstance(mixer, &mididriver);
 
 	return mididriver;
 }
 
 //#if PLUGIN_ENABLED_DYNAMIC(ZODIAC)
-	//REGISTER_PLUGIN_DYNAMIC(ZODIAC, PLUGIN_TYPE_MIDI, ZodiacMidiPlugin);
+	//REGISTER_PLUGIN_DYNAMIC(ZODIAC, PLUGIN_TYPE_MUSIC, ZodiacMusicPlugin);
 //#else
-	REGISTER_PLUGIN_STATIC(ZODIAC, PLUGIN_TYPE_MIDI, ZodiacMidiPlugin);
+	REGISTER_PLUGIN_STATIC(ZODIAC, PLUGIN_TYPE_MUSIC, ZodiacMusicPlugin);
 //#endif
 
 #endif
diff --git a/base/plugins.cpp b/base/plugins.cpp
index 7c365c7eb6..dcd394495f 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -35,7 +35,7 @@
 
 int pluginTypeVersions[PLUGIN_TYPE_MAX] = {
 	PLUGIN_TYPE_ENGINE_VERSION,
-	PLUGIN_TYPE_MIDI_VERSION,
+	PLUGIN_TYPE_MUSIC_VERSION,
 };
 
 
@@ -144,7 +144,7 @@ public:
 		LINK_PLUGIN(TOUCHE)
 		#endif
 
-		// MIDI plugins
+		// Music plugins
 		// TODO: Use defines to disable or enable each MIDI driver as a
 		// static/dynamic plugin, like it's done for the engines
 		LINK_PLUGIN(NULL)
@@ -393,12 +393,12 @@ const EnginePlugin::List &EngineManager::getPlugins() const {
 }
 
 
-// MIDI plugins
+// Music plugins
 
-#include "sound/midiplugin.h"
+#include "sound/musicplugin.h"
 
-DECLARE_SINGLETON(MidiManager);
+DECLARE_SINGLETON(MusicManager);
 
-const MidiPlugin::List &MidiManager::getPlugins() const {
-	return (const MidiPlugin::List &)PluginManager::instance().getPlugins(PLUGIN_TYPE_MIDI);
+const MusicPlugin::List &MusicManager::getPlugins() const {
+	return (const MusicPlugin::List &)PluginManager::instance().getPlugins(PLUGIN_TYPE_MUSIC);
 }
diff --git a/base/plugins.h b/base/plugins.h
index aef95a6650..9d3ce97c3b 100644
--- a/base/plugins.h
+++ b/base/plugins.h
@@ -62,7 +62,7 @@
 
 enum PluginType {
 	PLUGIN_TYPE_ENGINE = 0,
-	PLUGIN_TYPE_MIDI,
+	PLUGIN_TYPE_MUSIC,
 	/* PLUGIN_TYPE_SCALER, */	// TODO: Add graphics scaler plugins
 
 	PLUGIN_TYPE_MAX
@@ -71,7 +71,7 @@ enum PluginType {
 // TODO: Make the engine API version depend on ScummVM's version
 // because of the backlinking (posibly from the SVN revision)
 #define PLUGIN_TYPE_ENGINE_VERSION 1
-#define PLUGIN_TYPE_MIDI_VERSION 1
+#define PLUGIN_TYPE_MUSIC_VERSION 1
 
 extern int pluginTypeVersions[PLUGIN_TYPE_MAX];
 
diff --git a/dists/msvc7/scummvm.vcproj b/dists/msvc7/scummvm.vcproj
index 89cb1ff697..5efde22725 100644
--- a/dists/msvc7/scummvm.vcproj
+++ b/dists/msvc7/scummvm.vcproj
@@ -396,7 +396,7 @@
 				RelativePath="..\..\sound\midiparser_xmidi.cpp">
 			</File>
 			<File
-				RelativePath="..\..\sound\midiplugin.h">
+				RelativePath="..\..\sound\musicplugin.h">
 			</File>
 			<File
 				RelativePath="..\..\sound\mixer.cpp">
diff --git a/dists/msvc71/scummvm.vcproj b/dists/msvc71/scummvm.vcproj
index 08102bd9b2..16f56e3004 100644
--- a/dists/msvc71/scummvm.vcproj
+++ b/dists/msvc71/scummvm.vcproj
@@ -410,7 +410,7 @@
 				RelativePath="..\..\sound\midiparser_xmidi.cpp">
 			</File>
 			<File
-				RelativePath="..\..\sound\midiplugin.h">
+				RelativePath="..\..\sound\musicplugin.h">
 			</File>
 			<File
 				RelativePath="..\..\sound\mixer.cpp">
diff --git a/dists/msvc8/scummvm.vcproj b/dists/msvc8/scummvm.vcproj
index 3dcaf09f83..bee416b549 100644
--- a/dists/msvc8/scummvm.vcproj
+++ b/dists/msvc8/scummvm.vcproj
@@ -565,7 +565,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\sound\midiplugin.h"
+				RelativePath="..\..\sound\musicplugin.h"
 				>
 			</File>
 			<File
diff --git a/dists/msvc9/scummvm.vcproj b/dists/msvc9/scummvm.vcproj
index daf6ae6c99..26f3f79ad4 100644
--- a/dists/msvc9/scummvm.vcproj
+++ b/dists/msvc9/scummvm.vcproj
@@ -570,7 +570,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\sound\midiplugin.h"
+				RelativePath="..\..\sound\musicplugin.h"
 				>
 			</File>
 			<File
diff --git a/sound/midiplugin.h b/sound/musicplugin.h
index 0247e160e1..316ee1fbf3 100644
--- a/sound/midiplugin.h
+++ b/sound/musicplugin.h
@@ -22,19 +22,19 @@
  * $Id$
  */
 
-#ifndef BACKENDS_MIDI_MIDIPLUGIN_H
-#define BACKENDS_MIDI_MIDIPLUGIN_H
+#ifndef SOUND_MUSICPLUGIN_H
+#define SOUND_MUSICPLUGIN_H
 
 #include "base/plugins.h"
 #include "sound/mididrv.h"
 
 /**
- * A MidiPluginObject is essentially a factory for MidiDriver instances with
+ * A MusicPluginObject is essentially a factory for MidiDriver instances with
  * the added ability of listing the available devices and their capabilities.
  */
-class MidiPluginObject : public PluginObject {
+class MusicPluginObject : public PluginObject {
 public:
-	virtual ~MidiPluginObject() {}
+	virtual ~MusicPluginObject() {}
 
 	/**
 	 * Returns a unique string identifier which will be used to save the
@@ -60,11 +60,11 @@ public:
 
 	/**
 	 * Tries to instantiate a MIDI Driver instance based on the settings of
-	 * the currently active ConfMan target. That is, the MidiPluginObject
+	 * the currently active ConfMan target. That is, the MusicPluginObject
 	 * should query the ConfMan singleton for the device name, port, etc.
 	 *
 	 * @param mixer			Pointer to the global Mixer object
-	 * @param mididriver	Pointer to a pointer which the MidiPluginObject sets
+	 * @param mididriver	Pointer to a pointer which the MusicPluginObject sets
 	 *				to the newly create MidiDriver, or 0 in case of an error
 	 * @return		a PluginError describing the error which occurred, or kNoError
 	 */
@@ -72,22 +72,22 @@ public:
 };
 
 
-// MIDI plugins
+// Music plugins
 
-typedef PluginSubclass<MidiPluginObject> MidiPlugin;
+typedef PluginSubclass<MusicPluginObject> MusicPlugin;
 
 /**
- * Singleton class which manages all MIDI plugins.
+ * Singleton class which manages all Music plugins.
  */
-class MidiManager : public Common::Singleton<MidiManager> {
+class MusicManager : public Common::Singleton<MusicManager> {
 private:
 	friend class Common::Singleton<SingletonBaseType>;
 
 public:
-	const MidiPlugin::List &getPlugins() const;
+	const MusicPlugin::List &getPlugins() const;
 };
 
-/** Convenience shortcut for accessing the MIDI manager. */
-#define MidiMan MidiManager::instance()
+/** Convenience shortcut for accessing the Music manager. */
+#define MusicMan MusicManager::instance()
 
 #endif
diff --git a/sound/null.cpp b/sound/null.cpp
index 9bb3a76344..763299d5a3 100644
--- a/sound/null.cpp
+++ b/sound/null.cpp
@@ -22,7 +22,7 @@
  * $Id$
  */
 
-#include "sound/midiplugin.h"
+#include "sound/musicplugin.h"
 #include "sound/mpu401.h"
 
 /* NULL driver */
@@ -35,7 +35,7 @@ public:
 
 // Plugin interface
 
-class NullMidiPlugin : public MidiPluginObject {
+class NullMusicPlugin : public MusicPluginObject {
 public:
 	virtual const char *getName() const {
 		return "No music";
@@ -52,7 +52,7 @@ public:
 	virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
 };
 
-PluginError NullMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+PluginError NullMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
 	*mididriver = new MidiDriver_NULL();
 
 	return kNoError;
@@ -61,7 +61,7 @@ PluginError NullMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mid
 MidiDriver *MidiDriver_NULL_create(Audio::Mixer *mixer) {
 	MidiDriver *mididriver;
 
-	NullMidiPlugin p;
+	NullMusicPlugin p;
 	p.createInstance(mixer, &mididriver);
 
 	return mididriver;
@@ -74,7 +74,7 @@ MidiDriver *MidiDriver_ADLIB_create(Audio::Mixer *mixer) {
 #endif
 
 //#if PLUGIN_ENABLED_DYNAMIC(NULL)
-	//REGISTER_PLUGIN_DYNAMIC(NULL, PLUGIN_TYPE_MIDI, NullMidiPlugin);
+	//REGISTER_PLUGIN_DYNAMIC(NULL, PLUGIN_TYPE_MUSIC, NullMusicPlugin);
 //#else
-	REGISTER_PLUGIN_STATIC(NULL, PLUGIN_TYPE_MIDI, NullMidiPlugin);
+	REGISTER_PLUGIN_STATIC(NULL, PLUGIN_TYPE_MUSIC, NullMusicPlugin);
 //#endif
diff --git a/sound/softsynth/adlib.cpp b/sound/softsynth/adlib.cpp
index 3936843f52..beedaf5c3b 100644
--- a/sound/softsynth/adlib.cpp
+++ b/sound/softsynth/adlib.cpp
@@ -25,7 +25,7 @@
 #include "sound/softsynth/emumidi.h"
 #include "common/util.h"
 #include "sound/fmopl.h"
-#include "sound/midiplugin.h"
+#include "sound/musicplugin.h"
 
 #ifdef DEBUG_ADLIB
 static int tick;
@@ -1518,7 +1518,7 @@ void MidiDriver_ADLIB::adlib_note_on(int chan, byte note, int mod) {
 
 // Plugin interface
 
-class AdlibMidiPlugin : public MidiPluginObject {
+class AdlibMusicPlugin : public MusicPluginObject {
 public:
 	virtual const char *getName() const {
 		return "AdLib Emulator";
@@ -1535,7 +1535,7 @@ public:
 	virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
 };
 
-PluginError AdlibMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+PluginError AdlibMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
 	*mididriver = new MidiDriver_ADLIB(mixer);
 
 	return kNoError;
@@ -1544,14 +1544,14 @@ PluginError AdlibMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mi
 MidiDriver *MidiDriver_ADLIB_create(Audio::Mixer *mixer) {
 	MidiDriver *mididriver;
 
-	AdlibMidiPlugin p;
+	AdlibMusicPlugin p;
 	p.createInstance(mixer, &mididriver);
 
 	return mididriver;
 }
 
 //#if PLUGIN_ENABLED_DYNAMIC(ADLIB)
-	//REGISTER_PLUGIN_DYNAMIC(ADLIB, PLUGIN_TYPE_MIDI, AdlibMidiPlugin);
+	//REGISTER_PLUGIN_DYNAMIC(ADLIB, PLUGIN_TYPE_MUSIC, AdlibMusicPlugin);
 //#else
-	REGISTER_PLUGIN_STATIC(ADLIB, PLUGIN_TYPE_MIDI, AdlibMidiPlugin);
+	REGISTER_PLUGIN_STATIC(ADLIB, PLUGIN_TYPE_MUSIC, AdlibMusicPlugin);
 //#endif
diff --git a/sound/softsynth/fluidsynth.cpp b/sound/softsynth/fluidsynth.cpp
index ae89a8df8a..f2dcb2de7a 100644
--- a/sound/softsynth/fluidsynth.cpp
+++ b/sound/softsynth/fluidsynth.cpp
@@ -27,7 +27,7 @@
 #ifdef USE_FLUIDSYNTH
 
 #include "common/config-manager.h"
-#include "sound/midiplugin.h"
+#include "sound/musicplugin.h"
 #include "sound/mpu401.h"
 #include "sound/softsynth/emumidi.h"
 
@@ -219,7 +219,7 @@ void MidiDriver_FluidSynth::generateSamples(int16 *data, int len) {
 
 // Plugin interface
 
-class FluidSynthMidiPlugin : public MidiPluginObject {
+class FluidSynthMusicPlugin : public MusicPluginObject {
 public:
 	virtual const char *getName() const {
 		return "FluidSynth";
@@ -236,7 +236,7 @@ public:
 	virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
 };
 
-PluginError FluidSynthMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+PluginError FluidSynthMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
 	*mididriver = new MidiDriver_FluidSynth(mixer);
 
 	return kNoError;
@@ -245,16 +245,16 @@ PluginError FluidSynthMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver
 MidiDriver *MidiDriver_FluidSynth_create(Audio::Mixer *mixer) {
 	MidiDriver *mididriver;
 
-	FluidSynthMidiPlugin p;
+	FluidSynthMusicPlugin p;
 	p.createInstance(mixer, &mididriver);
 
 	return mididriver;
 }
 
 //#if PLUGIN_ENABLED_DYNAMIC(FLUIDSYNTH)
-	//REGISTER_PLUGIN_DYNAMIC(FLUIDSYNTH, PLUGIN_TYPE_MIDI, FluidSynthMidiPlugin);
+	//REGISTER_PLUGIN_DYNAMIC(FLUIDSYNTH, PLUGIN_TYPE_MUSIC, FluidSynthMusicPlugin);
 //#else
-	REGISTER_PLUGIN_STATIC(FLUIDSYNTH, PLUGIN_TYPE_MIDI, FluidSynthMidiPlugin);
+	REGISTER_PLUGIN_STATIC(FLUIDSYNTH, PLUGIN_TYPE_MUSIC, FluidSynthMusicPlugin);
 //#endif
 
 #endif
diff --git a/sound/softsynth/mt32.cpp b/sound/softsynth/mt32.cpp
index 2c9c4f24be..112fbb4bfe 100644
--- a/sound/softsynth/mt32.cpp
+++ b/sound/softsynth/mt32.cpp
@@ -29,7 +29,7 @@
 #include "sound/softsynth/mt32/mt32emu.h"
 
 #include "sound/softsynth/emumidi.h"
-#include "sound/midiplugin.h"
+#include "sound/musicplugin.h"
 #include "sound/mpu401.h"
 
 #include "common/config-manager.h"
@@ -483,7 +483,7 @@ void MidiDriver_ThreadedMT32::onTimer() {
 
 // Plugin interface
 
-class MT32MidiPlugin : public MidiPluginObject {
+class MT32MusicPlugin : public MusicPluginObject {
 public:
 	virtual const char *getName() const {
 		return "MT-32 Emulator";
@@ -500,7 +500,7 @@ public:
 	virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
 };
 
-PluginError MT32MidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+PluginError MT32MusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
 	*mididriver = new MidiDriver_MT32(mixer);
 
 	return kNoError;
@@ -513,16 +513,16 @@ MidiDriver *MidiDriver_MT32_create(Audio::Mixer *mixer) {
 
 	MidiDriver *mididriver;
 
-	MT32MidiPlugin p;
+	MT32MusicPlugin p;
 	p.createInstance(mixer, &mididriver);
 
 	return mididriver;
 }
 
 //#if PLUGIN_ENABLED_DYNAMIC(MT32)
-	//REGISTER_PLUGIN_DYNAMIC(MT32, PLUGIN_TYPE_MIDI, MT32MidiPlugin);
+	//REGISTER_PLUGIN_DYNAMIC(MT32, PLUGIN_TYPE_MUSIC, MT32MusicPlugin);
 //#else
-	REGISTER_PLUGIN_STATIC(MT32, PLUGIN_TYPE_MIDI, MT32MidiPlugin);
+	REGISTER_PLUGIN_STATIC(MT32, PLUGIN_TYPE_MUSIC, MT32MusicPlugin);
 //#endif
 
 #endif
diff --git a/sound/softsynth/ym2612.cpp b/sound/softsynth/ym2612.cpp
index 3fcc2c3fc4..186300e1fe 100644
--- a/sound/softsynth/ym2612.cpp
+++ b/sound/softsynth/ym2612.cpp
@@ -26,7 +26,7 @@
 
 #include "sound/softsynth/ym2612.h"
 #include "common/util.h"
-#include "sound/midiplugin.h"
+#include "sound/musicplugin.h"
 
 ////////////////////////////////////////
 //
@@ -755,7 +755,7 @@ void MidiDriver_YM2612::removeLookupTables() {
 
 // Plugin interface
 
-class TownsMidiPlugin : public MidiPluginObject {
+class TownsMusicPlugin : public MusicPluginObject {
 public:
 	virtual const char *getName() const {
 		return "FM Towns Emulator";
@@ -772,7 +772,7 @@ public:
 	virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
 };
 
-PluginError TownsMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+PluginError TownsMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
 	*mididriver = new MidiDriver_YM2612(mixer);
 
 	return kNoError;
@@ -781,14 +781,14 @@ PluginError TownsMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mi
 MidiDriver *MidiDriver_YM2612_create(Audio::Mixer *mixer) {
 	MidiDriver *mididriver;
 
-	TownsMidiPlugin p;
+	TownsMusicPlugin p;
 	p.createInstance(mixer, &mididriver);
 
 	return mididriver;
 }
 
 //#if PLUGIN_ENABLED_DYNAMIC(TOWNS)
-	//REGISTER_PLUGIN_DYNAMIC(TOWNS, PLUGIN_TYPE_MIDI, TownsMidiPlugin);
+	//REGISTER_PLUGIN_DYNAMIC(TOWNS, PLUGIN_TYPE_MUSIC, TownsMusicPlugin);
 //#else
-	REGISTER_PLUGIN_STATIC(TOWNS, PLUGIN_TYPE_MIDI, TownsMidiPlugin);
+	REGISTER_PLUGIN_STATIC(TOWNS, PLUGIN_TYPE_MUSIC, TownsMusicPlugin);
 //#endif