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

Renamed MIDI plugins to Music plugins

Browse source 
svn-id: r32693
This commit is contained in:
Jordi Vilalta Prat 2008-06-13 14:30:47 +00:00
parent 2b94f21744
commit 177993b145
23 changed files with 124 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

14
backends/midi/alsa.cpp
View file

@ -28,7 +28,7 @@
#include "common/config-manager.h" #include "common/config-manager.h"
#include "common/util.h" #include "common/util.h"
#include "sound/midiplugin.h" #include "sound/musicplugin.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 MidiPluginObject { class AlsaMusicPlugin : public MusicPluginObject {
public: public:
virtual const char *getName() const { virtual const char *getName() const {
return "ALSA"; return "ALSA";
@ -271,7 +271,7 @@ static int check_permission(snd_seq_port_info_t *pinfo)
return 0; return 0;
} }
Common::StringList AlsaMidiPlugin::getDevices() const { Common::StringList AlsaMusicPlugin::getDevices() const {
Common::StringList devices; Common::StringList devices;
snd_seq_t *seq; snd_seq_t *seq;
@ -302,7 +302,7 @@ Common::StringList AlsaMidiPlugin::getDevices() const {
return devices; return devices;
} }
PluginError AlsaMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { PluginError AlsaMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
*mididriver = new MidiDriver_ALSA(); *mididriver = new MidiDriver_ALSA();
return kNoError; return kNoError;
@ -311,16 +311,16 @@ PluginError AlsaMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mid
MidiDriver *MidiDriver_ALSA_create(Audio::Mixer *mixer) { MidiDriver *MidiDriver_ALSA_create(Audio::Mixer *mixer) {
MidiDriver *mididriver; MidiDriver *mididriver;
AlsaMidiPlugin p; AlsaMusicPlugin p;
p.createInstance(mixer, &mididriver); p.createInstance(mixer, &mididriver);
return mididriver; return mididriver;
} }
//#if PLUGIN_ENABLED_DYNAMIC(ALSA) //#if PLUGIN_ENABLED_DYNAMIC(ALSA)
//REGISTER_PLUGIN_DYNAMIC(ALSA, PLUGIN_TYPE_MIDI, AlsaMidiPlugin); //REGISTER_PLUGIN_DYNAMIC(ALSA, PLUGIN_TYPE_MUSIC, AlsaMusicPlugin);
//#else //#else
REGISTER_PLUGIN_STATIC(ALSA, PLUGIN_TYPE_MIDI, AlsaMidiPlugin); REGISTER_PLUGIN_STATIC(ALSA, PLUGIN_TYPE_MUSIC, AlsaMusicPlugin);
//#endif //#endif
#endif #endif

12
backends/midi/camd.cpp
View file

@ -28,7 +28,7 @@
#include "common/endian.h" #include "common/endian.h"
#include "common/util.h" #include "common/util.h"
#include "sound/midiplugin.h" #include "sound/musicplugin.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 MidiPluginObject { class CamdMusicPlugin : public MusicPluginObject {
public: public:
virtual const char *getName() const { virtual const char *getName() const {
return "CAMD"; return "CAMD";
@ -185,7 +185,7 @@ public:
virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; 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(); *mididriver = new MidiDriver_CAMD();
return kNoError; return kNoError;
@ -194,16 +194,16 @@ PluginError CamdMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mid
MidiDriver *MidiDriver_CAMD_create(Audio::Mixer *mixer) { MidiDriver *MidiDriver_CAMD_create(Audio::Mixer *mixer) {
MidiDriver *mididriver; MidiDriver *mididriver;
CamdMidiPlugin p; CamdMusicPlugin p;
p.createInstance(mixer, &mididriver); p.createInstance(mixer, &mididriver);
return mididriver; return mididriver;
} }
//#if PLUGIN_ENABLED_DYNAMIC(CAMD) //#if PLUGIN_ENABLED_DYNAMIC(CAMD)
//REGISTER_PLUGIN_DYNAMIC(CAMD, PLUGIN_TYPE_MIDI, CamdMidiPlugin); //REGISTER_PLUGIN_DYNAMIC(CAMD, PLUGIN_TYPE_MUSIC, CamdMusicPlugin);
//#else //#else
REGISTER_PLUGIN_STATIC(CAMD, PLUGIN_TYPE_MIDI, CamdMidiPlugin); REGISTER_PLUGIN_STATIC(CAMD, PLUGIN_TYPE_MUSIC, CamdMusicPlugin);
//#endif //#endif
#endif #endif

12
backends/midi/coreaudio.cpp
View file

@ -37,7 +37,7 @@
#include "common/config-manager.h" #include "common/config-manager.h"
#include "common/util.h" #include "common/util.h"
#include "sound/midiplugin.h" #include "sound/musicplugin.h"
#include "sound/mpu401.h" #include "sound/mpu401.h"
#include <AudioToolbox/AUGraph.h> #include <AudioToolbox/AUGraph.h>
@ -207,7 +207,7 @@ void MidiDriver_CORE::sysEx(const byte *msg, uint16 length) {
// Plugin interface // Plugin interface
class CoreAudioMidiPlugin : public MidiPluginObject { class CoreAudioMusicPlugin : public MusicPluginObject {
public: public:
virtual const char *getName() const { virtual const char *getName() const {
return "CoreAudio"; return "CoreAudio";
@ -224,7 +224,7 @@ public:
virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; 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(); *mididriver = new MidiDriver_CORE();
return kNoError; return kNoError;
@ -233,16 +233,16 @@ PluginError CoreAudioMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver
MidiDriver *MidiDriver_CORE_create(Audio::Mixer *mixer) { MidiDriver *MidiDriver_CORE_create(Audio::Mixer *mixer) {
MidiDriver *mididriver; MidiDriver *mididriver;
CoreAudioMidiPlugin p; CoreAudioMusicPlugin p;
p.createInstance(mixer, &mididriver); p.createInstance(mixer, &mididriver);
return mididriver; return mididriver;
} }
//#if PLUGIN_ENABLED_DYNAMIC(COREAUDIO) //#if PLUGIN_ENABLED_DYNAMIC(COREAUDIO)
//REGISTER_PLUGIN_DYNAMIC(COREAUDIO, PLUGIN_TYPE_MIDI, CoreAudioMidiPlugin); //REGISTER_PLUGIN_DYNAMIC(COREAUDIO, PLUGIN_TYPE_MUSIC, CoreAudioMusicPlugin);
//#else //#else
REGISTER_PLUGIN_STATIC(COREAUDIO, PLUGIN_TYPE_MIDI, CoreAudioMidiPlugin); REGISTER_PLUGIN_STATIC(COREAUDIO, PLUGIN_TYPE_MUSIC, CoreAudioMusicPlugin);
//#endif //#endif
#endif // MACOSX #endif // MACOSX

12
backends/midi/coremidi.cpp
View file

@ -26,7 +26,7 @@
#include "common/config-manager.h" #include "common/config-manager.h"
#include "common/util.h" #include "common/util.h"
#include "sound/midiplugin.h" #include "sound/musicplugin.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 MidiPluginObject { class CoreMIDIMusicPlugin : public MusicPluginObject {
public: public:
virtual const char *getName() const { virtual const char *getName() const {
return "CoreMIDI"; return "CoreMIDI";
@ -196,7 +196,7 @@ public:
virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; 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(); *mididriver = new MidiDriver_CoreMIDI();
return kNoError; return kNoError;
@ -205,16 +205,16 @@ PluginError CoreMIDIMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver *
MidiDriver *MidiDriver_CoreMIDI_create(Audio::Mixer *mixer) { MidiDriver *MidiDriver_CoreMIDI_create(Audio::Mixer *mixer) {
MidiDriver *mididriver; MidiDriver *mididriver;
CoreMIDIMidiPlugin p; CoreMIDIMusicPlugin p;
p.createInstance(mixer, &mididriver); p.createInstance(mixer, &mididriver);
return mididriver; return mididriver;
} }
//#if PLUGIN_ENABLED_DYNAMIC(COREMIDI) //#if PLUGIN_ENABLED_DYNAMIC(COREMIDI)
//REGISTER_PLUGIN_DYNAMIC(COREMIDI, PLUGIN_TYPE_MIDI, CoreMIDIMidiPlugin); //REGISTER_PLUGIN_DYNAMIC(COREMIDI, PLUGIN_TYPE_MUSIC, CoreMIDIMusicPlugin);
//#else //#else
REGISTER_PLUGIN_STATIC(COREMIDI, PLUGIN_TYPE_MIDI, CoreMIDIMidiPlugin); REGISTER_PLUGIN_STATIC(COREMIDI, PLUGIN_TYPE_MUSIC, CoreMIDIMusicPlugin);
//#endif //#endif
#endif // MACOSX #endif // MACOSX

12
backends/midi/dmedia.cpp
View file

@ -31,7 +31,7 @@
#include "common/scummsys.h" #include "common/scummsys.h"
#include "common/util.h" #include "common/util.h"
#include "sound/midiplugin.h" #include "sound/musicplugin.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 MidiPluginObject { class DMediaMusicPlugin : public MusicPluginObject {
public: public:
virtual const char *getName() const { virtual const char *getName() const {
return "DMedia"; return "DMedia";
@ -195,7 +195,7 @@ public:
virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; 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(); *mididriver = new MidiDriver_DMEDIA();
return kNoError; return kNoError;
@ -204,16 +204,16 @@ PluginError DMediaMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **m
MidiDriver *MidiDriver_DMEDIA_create(Audio::Mixer *mixer) { MidiDriver *MidiDriver_DMEDIA_create(Audio::Mixer *mixer) {
MidiDriver *mididriver; MidiDriver *mididriver;
DMediaMidiPlugin p; DMediaMusicPlugin p;
p.createInstance(mixer, &mididriver); p.createInstance(mixer, &mididriver);
return mididriver; return mididriver;
} }
//#if PLUGIN_ENABLED_DYNAMIC(DMEDIA) //#if PLUGIN_ENABLED_DYNAMIC(DMEDIA)
//REGISTER_PLUGIN_DYNAMIC(DMEDIA, PLUGIN_TYPE_MIDI, DMediaMidiPlugin); //REGISTER_PLUGIN_DYNAMIC(DMEDIA, PLUGIN_TYPE_MUSIC, DMediaMusicPlugin);
//#else //#else
REGISTER_PLUGIN_STATIC(DMEDIA, PLUGIN_TYPE_MIDI, DMediaMidiPlugin); REGISTER_PLUGIN_STATIC(DMEDIA, PLUGIN_TYPE_MUSIC, DMediaMusicPlugin);
//#endif //#endif
#endif #endif

12
backends/midi/quicktime.cpp
View file

@ -38,7 +38,7 @@
#include "common/endian.h" #include "common/endian.h"
#include "common/util.h" #include "common/util.h"
#include "sound/midiplugin.h" #include "sound/musicplugin.h"
#include "sound/mpu401.h" #include "sound/mpu401.h"
#if defined(MACOSX) #if defined(MACOSX)
@ -265,7 +265,7 @@ void MidiDriver_QT::dispose()
// Plugin interface // Plugin interface
class QuickTimeMidiPlugin : public MidiPluginObject { class QuickTimeMusicPlugin : public MusicPluginObject {
public: public:
virtual const char *getName() const { virtual const char *getName() const {
return "QuickTime"; return "QuickTime";
@ -282,7 +282,7 @@ public:
virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; 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(); *mididriver = new MidiDriver_QT();
return kNoError; return kNoError;
@ -291,16 +291,16 @@ PluginError QuickTimeMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver
MidiDriver *MidiDriver_QT_create(Audio::Mixer *mixer) { MidiDriver *MidiDriver_QT_create(Audio::Mixer *mixer) {
MidiDriver *mididriver; MidiDriver *mididriver;
QuickTimeMidiPlugin p; QuickTimeMusicPlugin p;
p.createInstance(mixer, &mididriver); p.createInstance(mixer, &mididriver);
return mididriver; return mididriver;
} }
//#if PLUGIN_ENABLED_DYNAMIC(QUICKTIME) //#if PLUGIN_ENABLED_DYNAMIC(QUICKTIME)
//REGISTER_PLUGIN_DYNAMIC(QUICKTIME, PLUGIN_TYPE_MIDI, QuickTimeMidiPlugin); //REGISTER_PLUGIN_DYNAMIC(QUICKTIME, PLUGIN_TYPE_MUSIC, QuickTimeMusicPlugin);
//#else //#else
REGISTER_PLUGIN_STATIC(QUICKTIME, PLUGIN_TYPE_MIDI, QuickTimeMidiPlugin); REGISTER_PLUGIN_STATIC(QUICKTIME, PLUGIN_TYPE_MUSIC, QuickTimeMusicPlugin);
//#endif //#endif
#endif // MACOSX || macintosh #endif // MACOSX || macintosh

12
backends/midi/seq.cpp
View file

@ -31,7 +31,7 @@
#if defined(UNIX) && !defined(__BEOS__) && !defined(__MAEMO__) #if defined(UNIX) && !defined(__BEOS__) && !defined(__MAEMO__)
#include "common/util.h" #include "common/util.h"
#include "sound/midiplugin.h" #include "sound/musicplugin.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 MidiPluginObject { class SeqMusicPlugin : public MusicPluginObject {
public: public:
virtual const char *getName() const { virtual const char *getName() const {
return "SEQ"; return "SEQ";
@ -190,7 +190,7 @@ public:
virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; 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(); *mididriver = new MidiDriver_SEQ();
return kNoError; return kNoError;
@ -199,16 +199,16 @@ PluginError SeqMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **midi
MidiDriver *MidiDriver_SEQ_create(Audio::Mixer *mixer) { MidiDriver *MidiDriver_SEQ_create(Audio::Mixer *mixer) {
MidiDriver *mididriver; MidiDriver *mididriver;
SeqMidiPlugin p; SeqMusicPlugin p;
p.createInstance(mixer, &mididriver); p.createInstance(mixer, &mididriver);
return mididriver; return mididriver;
} }
//#if PLUGIN_ENABLED_DYNAMIC(SEQ) //#if PLUGIN_ENABLED_DYNAMIC(SEQ)
//REGISTER_PLUGIN_DYNAMIC(SEQ, PLUGIN_TYPE_MIDI, SeqMidiPlugin); //REGISTER_PLUGIN_DYNAMIC(SEQ, PLUGIN_TYPE_MUSIC, SeqMusicPlugin);
//#else //#else
REGISTER_PLUGIN_STATIC(SEQ, PLUGIN_TYPE_MIDI, SeqMidiPlugin); REGISTER_PLUGIN_STATIC(SEQ, PLUGIN_TYPE_MUSIC, SeqMusicPlugin);
//#endif //#endif
#endif #endif

12
backends/midi/timidity.cpp
View file

@ -37,7 +37,7 @@
#if defined (UNIX) #if defined (UNIX)
#include "common/util.h" #include "common/util.h"
#include "sound/midiplugin.h" #include "sound/musicplugin.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 MidiPluginObject { class TimidityMusicPlugin : public MusicPluginObject {
public: public:
virtual const char *getName() const { virtual const char *getName() const {
return "TiMidity"; return "TiMidity";
@ -531,7 +531,7 @@ public:
virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; 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(); *mididriver = new MidiDriver_TIMIDITY();
return kNoError; return kNoError;
@ -540,16 +540,16 @@ PluginError TimidityMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver *
MidiDriver *MidiDriver_TIMIDITY_create(Audio::Mixer *mixer) { MidiDriver *MidiDriver_TIMIDITY_create(Audio::Mixer *mixer) {
MidiDriver *mididriver; MidiDriver *mididriver;
TimidityMidiPlugin p; TimidityMusicPlugin p;
p.createInstance(mixer, &mididriver); p.createInstance(mixer, &mididriver);
return mididriver; return mididriver;
} }
//#if PLUGIN_ENABLED_DYNAMIC(TIMIDITY) //#if PLUGIN_ENABLED_DYNAMIC(TIMIDITY)
//REGISTER_PLUGIN_DYNAMIC(TIMIDITY, PLUGIN_TYPE_MIDI, TimidityMidiPlugin); //REGISTER_PLUGIN_DYNAMIC(TIMIDITY, PLUGIN_TYPE_MUSIC, TimidityMusicPlugin);
//#else //#else
REGISTER_PLUGIN_STATIC(TIMIDITY, PLUGIN_TYPE_MIDI, TimidityMidiPlugin); REGISTER_PLUGIN_STATIC(TIMIDITY, PLUGIN_TYPE_MUSIC, TimidityMusicPlugin);
//#endif //#endif
#endif // defined (UNIX) #endif // defined (UNIX)

12
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 "sound/midiplugin.h" #include "sound/musicplugin.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 MidiPluginObject { class WindowsMusicPlugin : public MusicPluginObject {
public: public:
virtual const char *getName() const { virtual const char *getName() const {
return "Windows MIDI"; return "Windows MIDI";
@ -164,7 +164,7 @@ public:
virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; 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(); *mididriver = new MidiDriver_WIN();
return kNoError; return kNoError;
@ -173,16 +173,16 @@ PluginError WindowsMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **
MidiDriver *MidiDriver_WIN_create(Audio::Mixer *mixer) { MidiDriver *MidiDriver_WIN_create(Audio::Mixer *mixer) {
MidiDriver *mididriver; MidiDriver *mididriver;
WindowsMidiPlugin p; WindowsMusicPlugin p;
p.createInstance(mixer, &mididriver); p.createInstance(mixer, &mididriver);
return mididriver; return mididriver;
} }
//#if PLUGIN_ENABLED_DYNAMIC(WINDOWS) //#if PLUGIN_ENABLED_DYNAMIC(WINDOWS)
//REGISTER_PLUGIN_DYNAMIC(WINDOWS, PLUGIN_TYPE_MIDI, WindowsMidiPlugin); //REGISTER_PLUGIN_DYNAMIC(WINDOWS, PLUGIN_TYPE_MUSIC, WindowsMusicPlugin);
//#else //#else
REGISTER_PLUGIN_STATIC(WINDOWS, PLUGIN_TYPE_MIDI, WindowsMidiPlugin); REGISTER_PLUGIN_STATIC(WINDOWS, PLUGIN_TYPE_MUSIC, WindowsMusicPlugin);
//#endif //#endif
#endif #endif

12
backends/midi/ypa1.cpp
View file

@ -23,7 +23,7 @@
*/ */
#include "common/util.h" #include "common/util.h"
#include "sound/midiplugin.h" #include "sound/musicplugin.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 MidiPluginObject { class YamahaPa1MusicPlugin : public MusicPluginObject {
public: public:
virtual const char *getName() const { virtual const char *getName() const {
return "Yamaha Pa1"; return "Yamaha Pa1";
@ -123,7 +123,7 @@ public:
virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; 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(); *mididriver = new MidiDriver_YamahaPa1();
return kNoError; return kNoError;
@ -132,14 +132,14 @@ PluginError YamahaPa1MidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver
MidiDriver *MidiDriver_YamahaPa1_create(Audio::Mixer *mixer) { MidiDriver *MidiDriver_YamahaPa1_create(Audio::Mixer *mixer) {
MidiDriver *mididriver; MidiDriver *mididriver;
YamahaPa1MidiPlugin p; YamahaPa1MusicPlugin p;
p.createInstance(mixer, &mididriver); p.createInstance(mixer, &mididriver);
return mididriver; return mididriver;
} }
//#if PLUGIN_ENABLED_DYNAMIC(YPA1) //#if PLUGIN_ENABLED_DYNAMIC(YPA1)
//REGISTER_PLUGIN_DYNAMIC(YPA1, PLUGIN_TYPE_MIDI, YamahaPa1MidiPlugin); //REGISTER_PLUGIN_DYNAMIC(YPA1, PLUGIN_TYPE_MUSIC, YamahaPa1MusicPlugin);
//#else //#else
REGISTER_PLUGIN_STATIC(YPA1, PLUGIN_TYPE_MIDI, YamahaPa1MidiPlugin); REGISTER_PLUGIN_STATIC(YPA1, PLUGIN_TYPE_MUSIC, YamahaPa1MusicPlugin);
//#endif //#endif

12
backends/midi/zodiac.cpp
View file

@ -23,7 +23,7 @@
*/ */
#include "common/util.h" #include "common/util.h"
#include "sound/midiplugin.h" #include "sound/musicplugin.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 MidiPluginObject { class ZodiacMusicPlugin : public MusicPluginObject {
public: public:
virtual const char *getName() const { virtual const char *getName() const {
return "Tapwave Zodiac"; return "Tapwave Zodiac";
@ -141,7 +141,7 @@ public:
virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; 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(); *mididriver = new MidiDriver_Zodiac();
return kNoError; return kNoError;
@ -150,16 +150,16 @@ PluginError ZodiacMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **m
MidiDriver *MidiDriver_Zodiac_create(Audio::Mixer *mixer) { MidiDriver *MidiDriver_Zodiac_create(Audio::Mixer *mixer) {
MidiDriver *mididriver; MidiDriver *mididriver;
ZodiacMidiPlugin p; ZodiacMusicPlugin p;
p.createInstance(mixer, &mididriver); p.createInstance(mixer, &mididriver);
return mididriver; return mididriver;
} }
//#if PLUGIN_ENABLED_DYNAMIC(ZODIAC) //#if PLUGIN_ENABLED_DYNAMIC(ZODIAC)
//REGISTER_PLUGIN_DYNAMIC(ZODIAC, PLUGIN_TYPE_MIDI, ZodiacMidiPlugin); //REGISTER_PLUGIN_DYNAMIC(ZODIAC, PLUGIN_TYPE_MUSIC, ZodiacMusicPlugin);
//#else //#else
REGISTER_PLUGIN_STATIC(ZODIAC, PLUGIN_TYPE_MIDI, ZodiacMidiPlugin); REGISTER_PLUGIN_STATIC(ZODIAC, PLUGIN_TYPE_MUSIC, ZodiacMusicPlugin);
//#endif //#endif
#endif #endif

14
base/plugins.cpp
View file

@ -35,7 +35,7 @@
int pluginTypeVersions[PLUGIN_TYPE_MAX] = { int pluginTypeVersions[PLUGIN_TYPE_MAX] = {
PLUGIN_TYPE_ENGINE_VERSION, PLUGIN_TYPE_ENGINE_VERSION,
PLUGIN_TYPE_MIDI_VERSION, PLUGIN_TYPE_MUSIC_VERSION,
}; };
@ -144,7 +144,7 @@ public:
LINK_PLUGIN(TOUCHE) LINK_PLUGIN(TOUCHE)
#endif #endif
// MIDI plugins // Music plugins
// TODO: Use defines to disable or enable each MIDI driver as a // TODO: Use defines to disable or enable each MIDI driver as a
// static/dynamic plugin, like it's done for the engines // static/dynamic plugin, like it's done for the engines
LINK_PLUGIN(NULL) 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 { const MusicPlugin::List &MusicManager::getPlugins() const {
return (const MidiPlugin::List &)PluginManager::instance().getPlugins(PLUGIN_TYPE_MIDI); return (const MusicPlugin::List &)PluginManager::instance().getPlugins(PLUGIN_TYPE_MUSIC);
} }

4
base/plugins.h
View file

@ -62,7 +62,7 @@
enum PluginType { enum PluginType {
PLUGIN_TYPE_ENGINE = 0, PLUGIN_TYPE_ENGINE = 0,
PLUGIN_TYPE_MIDI, PLUGIN_TYPE_MUSIC,
/* PLUGIN_TYPE_SCALER, */ // TODO: Add graphics scaler plugins /* PLUGIN_TYPE_SCALER, */ // TODO: Add graphics scaler plugins
PLUGIN_TYPE_MAX PLUGIN_TYPE_MAX
@ -71,7 +71,7 @@ enum PluginType {
// TODO: Make the engine API version depend on ScummVM's version // TODO: Make the engine API version depend on ScummVM's version
// because of the backlinking (posibly from the SVN revision) // because of the backlinking (posibly from the SVN revision)
#define PLUGIN_TYPE_ENGINE_VERSION 1 #define PLUGIN_TYPE_ENGINE_VERSION 1
#define PLUGIN_TYPE_MIDI_VERSION 1 #define PLUGIN_TYPE_MUSIC_VERSION 1
extern int pluginTypeVersions[PLUGIN_TYPE_MAX]; extern int pluginTypeVersions[PLUGIN_TYPE_MAX];

2
dists/msvc7/scummvm.vcproj
View file

@ -396,7 +396,7 @@
RelativePath="..\..\sound\midiparser_xmidi.cpp"> RelativePath="..\..\sound\midiparser_xmidi.cpp">
</File> </File>
<File <File
RelativePath="..\..\sound\midiplugin.h"> RelativePath="..\..\sound\musicplugin.h">
</File> </File>
<File <File
RelativePath="..\..\sound\mixer.cpp"> RelativePath="..\..\sound\mixer.cpp">

2
dists/msvc71/scummvm.vcproj
View file

@ -410,7 +410,7 @@
RelativePath="..\..\sound\midiparser_xmidi.cpp"> RelativePath="..\..\sound\midiparser_xmidi.cpp">
</File> </File>
<File <File
RelativePath="..\..\sound\midiplugin.h"> RelativePath="..\..\sound\musicplugin.h">
</File> </File>
<File <File
RelativePath="..\..\sound\mixer.cpp"> RelativePath="..\..\sound\mixer.cpp">

2
dists/msvc8/scummvm.vcproj
View file

@ -565,7 +565,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\sound\midiplugin.h" RelativePath="..\..\sound\musicplugin.h"
> >
</File> </File>
<File <File

2
dists/msvc9/scummvm.vcproj
View file

@ -570,7 +570,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\sound\midiplugin.h" RelativePath="..\..\sound\musicplugin.h"
> >
</File> </File>
<File <File

28
sound/midiplugin.h → sound/musicplugin.h
View file

@ -22,19 +22,19 @@
* $Id$ * $Id$
*/ */
#ifndef BACKENDS_MIDI_MIDIPLUGIN_H #ifndef SOUND_MUSICPLUGIN_H
#define BACKENDS_MIDI_MIDIPLUGIN_H #define SOUND_MUSICPLUGIN_H
#include "base/plugins.h" #include "base/plugins.h"
#include "sound/mididrv.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. * the added ability of listing the available devices and their capabilities.
*/ */
class MidiPluginObject : public PluginObject { class MusicPluginObject : public PluginObject {
public: public:
virtual ~MidiPluginObject() {} virtual ~MusicPluginObject() {}
/** /**
* Returns a unique string identifier which will be used to save the * 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 * 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. * 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 MidiPluginObject sets * @param mididriver Pointer to a pointer which the MusicPluginObject sets
* to 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
*/ */
@ -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: private:
friend class Common::Singleton<SingletonBaseType>; friend class Common::Singleton<SingletonBaseType>;
public: public:
const MidiPlugin::List &getPlugins() const; const MusicPlugin::List &getPlugins() const;
}; };
/** Convenience shortcut for accessing the MIDI manager. */ /** Convenience shortcut for accessing the Music manager. */
#define MidiMan MidiManager::instance() #define MusicMan MusicManager::instance()
#endif #endif

12
sound/null.cpp
View file

@ -22,7 +22,7 @@
* $Id$ * $Id$
*/ */
#include "sound/midiplugin.h" #include "sound/musicplugin.h"
#include "sound/mpu401.h" #include "sound/mpu401.h"
/* NULL driver */ /* NULL driver */
@ -35,7 +35,7 @@ public:
// Plugin interface // Plugin interface
class NullMidiPlugin : public MidiPluginObject { class NullMusicPlugin : public MusicPluginObject {
public: public:
virtual const char *getName() const { virtual const char *getName() const {
return "No music"; return "No music";
@ -52,7 +52,7 @@ public:
virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; 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(); *mididriver = new MidiDriver_NULL();
return kNoError; return kNoError;
@ -61,7 +61,7 @@ PluginError NullMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mid
MidiDriver *MidiDriver_NULL_create(Audio::Mixer *mixer) { MidiDriver *MidiDriver_NULL_create(Audio::Mixer *mixer) {
MidiDriver *mididriver; MidiDriver *mididriver;
NullMidiPlugin p; NullMusicPlugin p;
p.createInstance(mixer, &mididriver); p.createInstance(mixer, &mididriver);
return mididriver; return mididriver;
@ -74,7 +74,7 @@ MidiDriver *MidiDriver_ADLIB_create(Audio::Mixer *mixer) {
#endif #endif
//#if PLUGIN_ENABLED_DYNAMIC(NULL) //#if PLUGIN_ENABLED_DYNAMIC(NULL)
//REGISTER_PLUGIN_DYNAMIC(NULL, PLUGIN_TYPE_MIDI, NullMidiPlugin); //REGISTER_PLUGIN_DYNAMIC(NULL, PLUGIN_TYPE_MUSIC, NullMusicPlugin);
//#else //#else
REGISTER_PLUGIN_STATIC(NULL, PLUGIN_TYPE_MIDI, NullMidiPlugin); REGISTER_PLUGIN_STATIC(NULL, PLUGIN_TYPE_MUSIC, NullMusicPlugin);
//#endif //#endif

12
sound/softsynth/adlib.cpp
View file

@ -25,7 +25,7 @@
#include "sound/softsynth/emumidi.h" #include "sound/softsynth/emumidi.h"
#include "common/util.h" #include "common/util.h"
#include "sound/fmopl.h" #include "sound/fmopl.h"
#include "sound/midiplugin.h" #include "sound/musicplugin.h"
#ifdef DEBUG_ADLIB #ifdef DEBUG_ADLIB
static int tick; static int tick;
@ -1518,7 +1518,7 @@ void MidiDriver_ADLIB::adlib_note_on(int chan, byte note, int mod) {
// Plugin interface // Plugin interface
class AdlibMidiPlugin : public MidiPluginObject { class AdlibMusicPlugin : public MusicPluginObject {
public: public:
virtual const char *getName() const { virtual const char *getName() const {
return "AdLib Emulator"; return "AdLib Emulator";
@ -1535,7 +1535,7 @@ public:
virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; 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); *mididriver = new MidiDriver_ADLIB(mixer);
return kNoError; return kNoError;
@ -1544,14 +1544,14 @@ PluginError AdlibMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mi
MidiDriver *MidiDriver_ADLIB_create(Audio::Mixer *mixer) { MidiDriver *MidiDriver_ADLIB_create(Audio::Mixer *mixer) {
MidiDriver *mididriver; MidiDriver *mididriver;
AdlibMidiPlugin p; AdlibMusicPlugin p;
p.createInstance(mixer, &mididriver); p.createInstance(mixer, &mididriver);
return mididriver; return mididriver;
} }
//#if PLUGIN_ENABLED_DYNAMIC(ADLIB) //#if PLUGIN_ENABLED_DYNAMIC(ADLIB)
//REGISTER_PLUGIN_DYNAMIC(ADLIB, PLUGIN_TYPE_MIDI, AdlibMidiPlugin); //REGISTER_PLUGIN_DYNAMIC(ADLIB, PLUGIN_TYPE_MUSIC, AdlibMusicPlugin);
//#else //#else
REGISTER_PLUGIN_STATIC(ADLIB, PLUGIN_TYPE_MIDI, AdlibMidiPlugin); REGISTER_PLUGIN_STATIC(ADLIB, PLUGIN_TYPE_MUSIC, AdlibMusicPlugin);
//#endif //#endif

12
sound/softsynth/fluidsynth.cpp
View file

@ -27,7 +27,7 @@
#ifdef USE_FLUIDSYNTH #ifdef USE_FLUIDSYNTH
#include "common/config-manager.h" #include "common/config-manager.h"
#include "sound/midiplugin.h" #include "sound/musicplugin.h"
#include "sound/mpu401.h" #include "sound/mpu401.h"
#include "sound/softsynth/emumidi.h" #include "sound/softsynth/emumidi.h"
@ -219,7 +219,7 @@ void MidiDriver_FluidSynth::generateSamples(int16 *data, int len) {
// Plugin interface // Plugin interface
class FluidSynthMidiPlugin : public MidiPluginObject { class FluidSynthMusicPlugin : public MusicPluginObject {
public: public:
virtual const char *getName() const { virtual const char *getName() const {
return "FluidSynth"; return "FluidSynth";
@ -236,7 +236,7 @@ public:
virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; 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); *mididriver = new MidiDriver_FluidSynth(mixer);
return kNoError; return kNoError;
@ -245,16 +245,16 @@ PluginError FluidSynthMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver
MidiDriver *MidiDriver_FluidSynth_create(Audio::Mixer *mixer) { MidiDriver *MidiDriver_FluidSynth_create(Audio::Mixer *mixer) {
MidiDriver *mididriver; MidiDriver *mididriver;
FluidSynthMidiPlugin p; FluidSynthMusicPlugin p;
p.createInstance(mixer, &mididriver); p.createInstance(mixer, &mididriver);
return mididriver; return mididriver;
} }
//#if PLUGIN_ENABLED_DYNAMIC(FLUIDSYNTH) //#if PLUGIN_ENABLED_DYNAMIC(FLUIDSYNTH)
//REGISTER_PLUGIN_DYNAMIC(FLUIDSYNTH, PLUGIN_TYPE_MIDI, FluidSynthMidiPlugin); //REGISTER_PLUGIN_DYNAMIC(FLUIDSYNTH, PLUGIN_TYPE_MUSIC, FluidSynthMusicPlugin);
//#else //#else
REGISTER_PLUGIN_STATIC(FLUIDSYNTH, PLUGIN_TYPE_MIDI, FluidSynthMidiPlugin); REGISTER_PLUGIN_STATIC(FLUIDSYNTH, PLUGIN_TYPE_MUSIC, FluidSynthMusicPlugin);
//#endif //#endif
#endif #endif

12
sound/softsynth/mt32.cpp
View file

@ -29,7 +29,7 @@
#include "sound/softsynth/mt32/mt32emu.h" #include "sound/softsynth/mt32/mt32emu.h"
#include "sound/softsynth/emumidi.h" #include "sound/softsynth/emumidi.h"
#include "sound/midiplugin.h" #include "sound/musicplugin.h"
#include "sound/mpu401.h" #include "sound/mpu401.h"
#include "common/config-manager.h" #include "common/config-manager.h"
@ -483,7 +483,7 @@ void MidiDriver_ThreadedMT32::onTimer() {
// Plugin interface // Plugin interface
class MT32MidiPlugin : public MidiPluginObject { class MT32MusicPlugin : public MusicPluginObject {
public: public:
virtual const char *getName() const { virtual const char *getName() const {
return "MT-32 Emulator"; return "MT-32 Emulator";
@ -500,7 +500,7 @@ public:
virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; 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); *mididriver = new MidiDriver_MT32(mixer);
return kNoError; return kNoError;
@ -513,16 +513,16 @@ MidiDriver *MidiDriver_MT32_create(Audio::Mixer *mixer) {
MidiDriver *mididriver; MidiDriver *mididriver;
MT32MidiPlugin p; MT32MusicPlugin p;
p.createInstance(mixer, &mididriver); p.createInstance(mixer, &mididriver);
return mididriver; return mididriver;
} }
//#if PLUGIN_ENABLED_DYNAMIC(MT32) //#if PLUGIN_ENABLED_DYNAMIC(MT32)
//REGISTER_PLUGIN_DYNAMIC(MT32, PLUGIN_TYPE_MIDI, MT32MidiPlugin); //REGISTER_PLUGIN_DYNAMIC(MT32, PLUGIN_TYPE_MUSIC, MT32MusicPlugin);
//#else //#else
REGISTER_PLUGIN_STATIC(MT32, PLUGIN_TYPE_MIDI, MT32MidiPlugin); REGISTER_PLUGIN_STATIC(MT32, PLUGIN_TYPE_MUSIC, MT32MusicPlugin);
//#endif //#endif
#endif #endif

12
sound/softsynth/ym2612.cpp
View file

@ -26,7 +26,7 @@
#include "sound/softsynth/ym2612.h" #include "sound/softsynth/ym2612.h"
#include "common/util.h" #include "common/util.h"
#include "sound/midiplugin.h" #include "sound/musicplugin.h"
//////////////////////////////////////// ////////////////////////////////////////
// //
@ -755,7 +755,7 @@ void MidiDriver_YM2612::removeLookupTables() {
// Plugin interface // Plugin interface
class TownsMidiPlugin : public MidiPluginObject { class TownsMusicPlugin : public MusicPluginObject {
public: public:
virtual const char *getName() const { virtual const char *getName() const {
return "FM Towns Emulator"; return "FM Towns Emulator";
@ -772,7 +772,7 @@ public:
virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; 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); *mididriver = new MidiDriver_YM2612(mixer);
return kNoError; return kNoError;
@ -781,14 +781,14 @@ PluginError TownsMidiPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mi
MidiDriver *MidiDriver_YM2612_create(Audio::Mixer *mixer) { MidiDriver *MidiDriver_YM2612_create(Audio::Mixer *mixer) {
MidiDriver *mididriver; MidiDriver *mididriver;
TownsMidiPlugin p; TownsMusicPlugin p;
p.createInstance(mixer, &mididriver); p.createInstance(mixer, &mididriver);
return mididriver; return mididriver;
} }
//#if PLUGIN_ENABLED_DYNAMIC(TOWNS) //#if PLUGIN_ENABLED_DYNAMIC(TOWNS)
//REGISTER_PLUGIN_DYNAMIC(TOWNS, PLUGIN_TYPE_MIDI, TownsMidiPlugin); //REGISTER_PLUGIN_DYNAMIC(TOWNS, PLUGIN_TYPE_MUSIC, TownsMusicPlugin);
//#else //#else
REGISTER_PLUGIN_STATIC(TOWNS, PLUGIN_TYPE_MIDI, TownsMidiPlugin); REGISTER_PLUGIN_STATIC(TOWNS, PLUGIN_TYPE_MUSIC, TownsMusicPlugin);
//#endif //#endif