diff options
Diffstat (limited to 'base')
| -rw-r--r-- | base/plugins.cpp | 14 | ||||
| -rw-r--r-- | base/plugins.h | 4 |
2 files changed, 9 insertions, 9 deletions
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]; |