Moved midiplugin.h to sound/ since it will be used for more than just the native MIDI drivers.

svn-id: r32097

12 files changed, 22 insertions, 84 deletions

diff --git a/backends/midi/alsa.cpp b/backends/midi/alsa.cpp
index 3139fadf24..fc43925643 100644
--- a/backends/midi/alsa.cpp
+++ b/backends/midi/alsa.cpp
@@ -26,9 +26,9 @@
 
 #if defined(UNIX) && defined(USE_ALSA)
 
-#include "backends/midi/midiplugin.h"
 #include "common/config-manager.h"
 #include "common/util.h"
+#include "sound/midiplugin.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 MidiPlugin {
+class AlsaMidiPlugin : public MidiPluginObject {
 public:
 	virtual const char *getName() const {
 		return "ALSA";
diff --git a/backends/midi/camd.cpp b/backends/midi/camd.cpp
index 11459af4f3..2b5ea0e065 100644
--- a/backends/midi/camd.cpp
+++ b/backends/midi/camd.cpp
@@ -26,9 +26,9 @@
 
 #if defined(__amigaos4__)
 
-#include "backends/midi/midiplugin.h"
 #include "common/endian.h"
 #include "common/util.h"
+#include "sound/midiplugin.h"
 #include "sound/mpu401.h"
 
 #include <proto/camd.h>
@@ -166,7 +166,7 @@ void MidiDriver_CAMD::closeAll() {
 
 // Plugin interface
 
-class CamdMidiPlugin : public MidiPlugin {
+class CamdMidiPlugin : public MidiPluginObject {
 public:
 	virtual const char *getName() const {
 		return "CAMD";
diff --git a/backends/midi/coreaudio.cpp b/backends/midi/coreaudio.cpp
index 1ff4a56a6b..0e8409b3d8 100644
--- a/backends/midi/coreaudio.cpp
+++ b/backends/midi/coreaudio.cpp
@@ -24,9 +24,9 @@
 
 #ifdef MACOSX
 
-#include "backends/midi/midiplugin.h"
 #include "common/config-manager.h"
 #include "common/util.h"
+#include "sound/midiplugin.h"
 #include "sound/mpu401.h"
 
 #include <AudioToolbox/AUGraph.h>
@@ -196,7 +196,7 @@ void MidiDriver_CORE::sysEx(const byte *msg, uint16 length) {
 
 // Plugin interface
 
-class CoreAudioMidiPlugin : public MidiPlugin {
+class CoreAudioMidiPlugin : public MidiPluginObject {
 public:
 	virtual const char *getName() const {
 		return "CoreAudio";
diff --git a/backends/midi/coremidi.cpp b/backends/midi/coremidi.cpp
index 8df9ef79f4..b16e2a91af 100644
--- a/backends/midi/coremidi.cpp
+++ b/backends/midi/coremidi.cpp
@@ -24,9 +24,9 @@
 
 #ifdef MACOSX
 
-#include "backends/midi/midiplugin.h"
 #include "common/config-manager.h"
 #include "common/util.h"
+#include "sound/midiplugin.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 MidiPlugin {
+class CoreMIDIMidiPlugin : public MidiPluginObject {
 public:
 	virtual const char *getName() const {
 		return "CoreMIDI";
diff --git a/backends/midi/dmedia.cpp b/backends/midi/dmedia.cpp
index f67784be7e..0891af4ecb 100644
--- a/backends/midi/dmedia.cpp
+++ b/backends/midi/dmedia.cpp
@@ -29,9 +29,9 @@
 
 #if defined(IRIX)
 
-#include "backends/midi/midiplugin.h"
 #include "common/scummsys.h"
 #include "common/util.h"
+#include "sound/midiplugin.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 MidiPlugin {
+class DMediaMidiPlugin : public MidiPluginObject {
 public:
 	virtual const char *getName() const {
 		return "DMedia";
diff --git a/backends/midi/midiplugin.h b/backends/midi/midiplugin.h
deleted file mode 100644
index 0de14e8d55..0000000000
--- a/backends/midi/midiplugin.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- */
-
-#ifndef BACKENDS_MIDI_MIDIPLUGIN_H
-#define BACKENDS_MIDI_MIDIPLUGIN_H
-
-#include "base/plugins.h"
-#include "sound/mididrv.h"
-
-/**
- * A MidiPlugin is essentially a factory for MidiDriver instances with the
- * added ability of listing the available devices and their capabilities.
- */
-class MidiPlugin : public PluginObject {
-public:
-	virtual ~MidiPlugin() {}
-
-	/**
-	 * Returns a list of the available devices. The empty string means the
-	 * default device.
-	 */
-	virtual Common::StringList getDevices() const {
-		Common::StringList dev;
-		dev.push_back("");
-		return dev;
-	}
-
-	/**
-	 * Tries to instantiate an engine instance based on the settings of
-	 * the currently active ConfMan target. That is, the MidiPlugin 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 MidiPlugin sets to
-	 *				the newly create MidiDriver, or 0 in case of an error
-	 * @return		a PluginError describing the error which occurred, or kNoError
-	 */
-	virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const = 0;
-};
-
-#endif
diff --git a/backends/midi/quicktime.cpp b/backends/midi/quicktime.cpp
index 1e0e76ee1a..592d86c76b 100644
--- a/backends/midi/quicktime.cpp
+++ b/backends/midi/quicktime.cpp
@@ -24,9 +24,9 @@
 
 #if defined(MACOSX) || defined(macintosh)
 
-#include "backends/midi/midiplugin.h"
 #include "common/endian.h"
 #include "common/util.h"
+#include "sound/midiplugin.h"
 #include "sound/mpu401.h"
 
 #if defined(MACOSX)
@@ -253,7 +253,7 @@ void MidiDriver_QT::dispose()
 
 // Plugin interface
 
-class QuickTimeMidiPlugin : public MidiPlugin {
+class QuickTimeMidiPlugin : public MidiPluginObject {
 public:
 	virtual const char *getName() const {
 		return "QuickTime";
diff --git a/backends/midi/seq.cpp b/backends/midi/seq.cpp
index ec7f6b2f27..23baf60ea4 100644
--- a/backends/midi/seq.cpp
+++ b/backends/midi/seq.cpp
@@ -30,8 +30,8 @@
 
 #if defined(UNIX) && !defined(__BEOS__) && !defined(__MAEMO__)
 
-#include "backends/midi/midiplugin.h"
 #include "common/util.h"
+#include "sound/midiplugin.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 MidiPlugin {
+class SeqMidiPlugin : public MidiPluginObject {
 public:
 	virtual const char *getName() const {
 		return "SEQ";
diff --git a/backends/midi/timidity.cpp b/backends/midi/timidity.cpp
index 8fc6fefd4d..f146900a12 100644
--- a/backends/midi/timidity.cpp
+++ b/backends/midi/timidity.cpp
@@ -36,8 +36,8 @@
 
 #if defined (UNIX)
 
-#include "backends/midi/midiplugin.h"
 #include "common/util.h"
+#include "sound/midiplugin.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 MidiPlugin {
+class TimidityMidiPlugin : public MidiPluginObject {
 public:
 	virtual const char *getName() const {
 		return "TiMidity";
diff --git a/backends/midi/windows.cpp b/backends/midi/windows.cpp
index 4107c575ba..8c1d3bd9ed 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 "backends/midi/midiplugin.h"
+#include "sound/midiplugin.h"
 #include "sound/mpu401.h"
 
 #include <mmsystem.h>
@@ -147,7 +147,7 @@ void MidiDriver_WIN::check_error(MMRESULT result) {
 
 // Plugin interface
 
-class WindowsMidiPlugin : public MidiPlugin {
+class WindowsMidiPlugin : public MidiPluginObject {
 public:
 	virtual const char *getName() const {
 		return "Windows MIDI";
diff --git a/backends/midi/ypa1.cpp b/backends/midi/ypa1.cpp
index 3ea7d2170f..416215424e 100644
--- a/backends/midi/ypa1.cpp
+++ b/backends/midi/ypa1.cpp
@@ -22,8 +22,8 @@
  * $Id$
  */
 
-#include "backends/midi/midiplugin.h"
 #include "common/util.h"
+#include "sound/midiplugin.h"
 #include "sound/mpu401.h"
 
 #include "Pa1Lib.h"
@@ -106,7 +106,7 @@ void MidiDriver_YamahaPa1::send(uint32 b) {
 
 // Plugin interface
 
-class YamahaPa1MidiPlugin : public MidiPlugin {
+class YamahaPa1MidiPlugin : public MidiPluginObject {
 public:
 	virtual const char *getName() const {
 		return "Yamaha Pa1";
diff --git a/backends/midi/zodiac.cpp b/backends/midi/zodiac.cpp
index 55148b113b..0cc848f1d5 100644
--- a/backends/midi/zodiac.cpp
+++ b/backends/midi/zodiac.cpp
@@ -22,8 +22,8 @@
  * $Id$
  */
 
-#include "backends/midi/midiplugin.h"
 #include "common/util.h"
+#include "sound/midiplugin.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 MidiPlugin {
+class ZodiacMidiPlugin : public MidiPluginObject {
 public:
 	virtual const char *getName() const {
 		return "Tapwave Zodiac";