aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
Diffstat (limited to 'sound')
-rw-r--r--sound/musicplugin.h (renamed from sound/midiplugin.h)28
-rw-r--r--sound/null.cpp12
-rw-r--r--sound/softsynth/adlib.cpp12
-rw-r--r--sound/softsynth/fluidsynth.cpp12
-rw-r--r--sound/softsynth/mt32.cpp12
-rw-r--r--sound/softsynth/ym2612.cpp12
6 files changed, 44 insertions, 44 deletions
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-11 21:44:26 +0000