thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
svn-id: r32097
This commit is contained in:
Jordi Vilalta Prat 2008-05-14 05:47:29 +00:00
parent 6a9429613b
commit d942fd42bb
16 changed files with 35 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backends/midi/alsa.cpp
View file

@ -26,9 +26,9 @@
#if defined(UNIX) && defined(USE_ALSA) #if defined(UNIX) && defined(USE_ALSA)
#include "backends/midi/midiplugin.h"
#include "common/config-manager.h" #include "common/config-manager.h"
#include "common/util.h" #include "common/util.h"
#include "sound/midiplugin.h"
#include "sound/mpu401.h" #include "sound/mpu401.h"
#include <alsa/asoundlib.h> #include <alsa/asoundlib.h>
@ -241,7 +241,7 @@ void MidiDriver_ALSA::send_event(int do_flush) {
// Plugin interface // Plugin interface
class AlsaMidiPlugin : public MidiPlugin { class AlsaMidiPlugin : public MidiPluginObject {
public: public:
virtual const char *getName() const { virtual const char *getName() const {
return "ALSA"; return "ALSA";

4
backends/midi/camd.cpp
View file

@ -26,9 +26,9 @@
#if defined(__amigaos4__) #if defined(__amigaos4__)
#include "backends/midi/midiplugin.h"
#include "common/endian.h" #include "common/endian.h"
#include "common/util.h" #include "common/util.h"
#include "sound/midiplugin.h"
#include "sound/mpu401.h" #include "sound/mpu401.h"
#include <proto/camd.h> #include <proto/camd.h>
@ -166,7 +166,7 @@ void MidiDriver_CAMD::closeAll() {
// Plugin interface // Plugin interface
class CamdMidiPlugin : public MidiPlugin { class CamdMidiPlugin : public MidiPluginObject {
public: public:
virtual const char *getName() const { virtual const char *getName() const {
return "CAMD"; return "CAMD";

4
backends/midi/coreaudio.cpp
View file

@ -24,9 +24,9 @@
#ifdef MACOSX #ifdef MACOSX
#include "backends/midi/midiplugin.h"
#include "common/config-manager.h" #include "common/config-manager.h"
#include "common/util.h" #include "common/util.h"
#include "sound/midiplugin.h"
#include "sound/mpu401.h" #include "sound/mpu401.h"
#include <AudioToolbox/AUGraph.h> #include <AudioToolbox/AUGraph.h>
@ -196,7 +196,7 @@ void MidiDriver_CORE::sysEx(const byte *msg, uint16 length) {
// Plugin interface // Plugin interface
class CoreAudioMidiPlugin : public MidiPlugin { class CoreAudioMidiPlugin : public MidiPluginObject {
public: public:
virtual const char *getName() const { virtual const char *getName() const {
return "CoreAudio"; return "CoreAudio";

4
backends/midi/coremidi.cpp
View file

@ -24,9 +24,9 @@
#ifdef MACOSX #ifdef MACOSX
#include "backends/midi/midiplugin.h"
#include "common/config-manager.h" #include "common/config-manager.h"
#include "common/util.h" #include "common/util.h"
#include "sound/midiplugin.h"
#include "sound/mpu401.h" #include "sound/mpu401.h"
#include <CoreMIDI/CoreMIDI.h> #include <CoreMIDI/CoreMIDI.h>
@ -179,7 +179,7 @@ void MidiDriver_CoreMIDI::sysEx(const byte *msg, uint16 length) {
// Plugin interface // Plugin interface
class CoreMIDIMidiPlugin : public MidiPlugin { class CoreMIDIMidiPlugin : public MidiPluginObject {
public: public:
virtual const char *getName() const { virtual const char *getName() const {
return "CoreMIDI"; return "CoreMIDI";

4
backends/midi/dmedia.cpp
View file

@ -29,9 +29,9 @@
#if defined(IRIX) #if defined(IRIX)
#include "backends/midi/midiplugin.h"
#include "common/scummsys.h" #include "common/scummsys.h"
#include "common/util.h" #include "common/util.h"
#include "sound/midiplugin.h"
#include "sound/mpu401.h" #include "sound/mpu401.h"
#include <dmedia/midi.h> #include <dmedia/midi.h>
@ -178,7 +178,7 @@ void MidiDriver_DMEDIA::sysEx (const byte *msg, uint16 length) {
// Plugin interface // Plugin interface
class DMediaMidiPlugin : public MidiPlugin { class DMediaMidiPlugin : public MidiPluginObject {
public: public:
virtual const char *getName() const { virtual const char *getName() const {
return "DMedia"; return "DMedia";

4
backends/midi/quicktime.cpp
View file

@ -24,9 +24,9 @@
#if defined(MACOSX) || defined(macintosh) #if defined(MACOSX) || defined(macintosh)
#include "backends/midi/midiplugin.h"
#include "common/endian.h" #include "common/endian.h"
#include "common/util.h" #include "common/util.h"
#include "sound/midiplugin.h"
#include "sound/mpu401.h" #include "sound/mpu401.h"
#if defined(MACOSX) #if defined(MACOSX)
@ -253,7 +253,7 @@ void MidiDriver_QT::dispose()
// Plugin interface // Plugin interface
class QuickTimeMidiPlugin : public MidiPlugin { class QuickTimeMidiPlugin : public MidiPluginObject {
public: public:
virtual const char *getName() const { virtual const char *getName() const {
return "QuickTime"; return "QuickTime";

4
backends/midi/seq.cpp
View file

@ -30,8 +30,8 @@
#if defined(UNIX) && !defined(__BEOS__) && !defined(__MAEMO__) #if defined(UNIX) && !defined(__BEOS__) && !defined(__MAEMO__)
#include "backends/midi/midiplugin.h"
#include "common/util.h" #include "common/util.h"
#include "sound/midiplugin.h"
#include "sound/mpu401.h" #include "sound/mpu401.h"
#include <fcntl.h> #include <fcntl.h>
@ -173,7 +173,7 @@ void MidiDriver_SEQ::sysEx (const byte *msg, uint16 length) {
// Plugin interface // Plugin interface
class SeqMidiPlugin : public MidiPlugin { class SeqMidiPlugin : public MidiPluginObject {
public: public:
virtual const char *getName() const { virtual const char *getName() const {
return "SEQ"; return "SEQ";

4
backends/midi/timidity.cpp
View file

@ -36,8 +36,8 @@
#if defined (UNIX) #if defined (UNIX)
#include "backends/midi/midiplugin.h"
#include "common/util.h" #include "common/util.h"
#include "sound/midiplugin.h"
#include "sound/mpu401.h" #include "sound/mpu401.h"
#include <fcntl.h> #include <fcntl.h>
@ -514,7 +514,7 @@ void MidiDriver_TIMIDITY::sysEx(const byte *msg, uint16 length) {
// Plugin interface // Plugin interface
class TimidityMidiPlugin : public MidiPlugin { class TimidityMidiPlugin : public MidiPluginObject {
public: public:
virtual const char *getName() const { virtual const char *getName() const {
return "TiMidity"; return "TiMidity";

4
backends/midi/windows.cpp
View file

@ -28,7 +28,7 @@
// winnt.h defines ARRAYSIZE, but we want our own one... // winnt.h defines ARRAYSIZE, but we want our own one...
#undef ARRAYSIZE #undef ARRAYSIZE
#include "backends/midi/midiplugin.h" #include "sound/midiplugin.h"
#include "sound/mpu401.h" #include "sound/mpu401.h"
#include <mmsystem.h> #include <mmsystem.h>
@ -147,7 +147,7 @@ void MidiDriver_WIN::check_error(MMRESULT result) {
// Plugin interface // Plugin interface
class WindowsMidiPlugin : public MidiPlugin { class WindowsMidiPlugin : public MidiPluginObject {
public: public:
virtual const char *getName() const { virtual const char *getName() const {
return "Windows MIDI"; return "Windows MIDI";

4
backends/midi/ypa1.cpp
View file

@ -22,8 +22,8 @@
* $Id$ * $Id$
*/ */
#include "backends/midi/midiplugin.h"
#include "common/util.h" #include "common/util.h"
#include "sound/midiplugin.h"
#include "sound/mpu401.h" #include "sound/mpu401.h"
#include "Pa1Lib.h" #include "Pa1Lib.h"
@ -106,7 +106,7 @@ void MidiDriver_YamahaPa1::send(uint32 b) {
// Plugin interface // Plugin interface
class YamahaPa1MidiPlugin : public MidiPlugin { class YamahaPa1MidiPlugin : public MidiPluginObject {
public: public:
virtual const char *getName() const { virtual const char *getName() const {
return "Yamaha Pa1"; return "Yamaha Pa1";

4
backends/midi/zodiac.cpp
View file

@ -22,8 +22,8 @@
* $Id$ * $Id$
*/ */
#include "backends/midi/midiplugin.h"
#include "common/util.h" #include "common/util.h"
#include "sound/midiplugin.h"
#include "sound/mpu401.h" #include "sound/mpu401.h"
#ifndef DISABLE_TAPWAVE #ifndef DISABLE_TAPWAVE
@ -124,7 +124,7 @@ void MidiDriver_Zodiac::sysEx(const byte *msg, uint16 length) {
// Plugin interface // Plugin interface
class ZodiacMidiPlugin : public MidiPlugin { class ZodiacMidiPlugin : public MidiPluginObject {
public: public:
virtual const char *getName() const { virtual const char *getName() const {
return "Tapwave Zodiac"; return "Tapwave Zodiac";

2
dists/msvc7/scummvm.vcproj
View file

@ -679,7 +679,7 @@
<Filter <Filter
Name="midi"> Name="midi">
<File <File
RelativePath="..\..\backends\midi\midiplugin.h"> RelativePath="..\..\sound\midiplugin.h">
</File> </File>
<File <File
RelativePath="..\..\backends\midi\windows.cpp"> RelativePath="..\..\backends\midi\windows.cpp">

2
dists/msvc71/scummvm.vcproj
View file

@ -693,7 +693,7 @@
<Filter <Filter
Name="midi"> Name="midi">
<File <File
RelativePath="..\..\backends\midi\midiplugin.h"> RelativePath="..\..\sound\midiplugin.h">
</File> </File>
<File <File
RelativePath="..\..\backends\midi\windows.cpp"> RelativePath="..\..\backends\midi\windows.cpp">

2
dists/msvc8/scummvm.vcproj
View file

@ -939,7 +939,7 @@
Name="midi" Name="midi"
> >
<File <File
RelativePath="..\..\backends\midi\midiplugin.h" RelativePath="..\..\sound\midiplugin.h"
> >
</File> </File>
<File <File

2
dists/msvc9/scummvm.vcproj
View file

@ -944,7 +944,7 @@
Name="midi" Name="midi"
> >
<File <File
RelativePath="..\..\backends\midi\midiplugin.h" RelativePath="..\..\sound\midiplugin.h"
> >
</File> </File>
<File <File

18
backends/midi/midiplugin.h → sound/midiplugin.h
View file

@ -29,12 +29,12 @@
#include "sound/mididrv.h" #include "sound/mididrv.h"
/** /**
* A MidiPlugin is essentially a factory for MidiDriver instances with the * A MidiPluginObject is essentially a factory for MidiDriver instances with
* added ability of listing the available devices and their capabilities. * the added ability of listing the available devices and their capabilities.
*/ */
class MidiPlugin : public PluginObject { class MidiPluginObject : public PluginObject {
public: public:
virtual ~MidiPlugin() {} virtual ~MidiPluginObject() {}
/** /**
* Returns a list of the available devices. The empty string means the * Returns a list of the available devices. The empty string means the
@ -47,13 +47,13 @@ public:
} }
/** /**
* Tries to instantiate an engine instance based on the settings of * Tries to instantiate a MIDI Driver instance based on the settings of
* the currently active ConfMan target. That is, the MidiPlugin should * the currently active ConfMan target. That is, the MidiPluginObject
* query the ConfMan singleton for the device name, port, etc. * should query the ConfMan singleton for the device name, port, etc.
* *
* @param mixer Pointer to the global Mixer object * @param mixer Pointer to the global Mixer object
* @param mididriver Pointer to a pointer which the MidiPlugin sets to * @param mididriver Pointer to a pointer which the MidiPluginObject sets
* the newly create MidiDriver, or 0 in case of an error * to the newly create MidiDriver, or 0 in case of an error
* @return a PluginError describing the error which occurred, or kNoError * @return a PluginError describing the error which occurred, or kNoError
*/ */
virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const = 0; virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const = 0;