diff options
author | Max Horn | 2008-11-05 17:24:56 +0000 |
---|---|---|
committer | Max Horn | 2008-11-05 17:24:56 +0000 |
commit | f32be876337e3b280ee4ea257e9868a0d61e399d (patch) | |
tree | 999037656b6a01f8a0e379801f64c79d18a76dba /backends | |
parent | fe2935ad4b550afa68977169140267ef2ef4a3da (diff) | |
download | scummvm-rg350-f32be876337e3b280ee4ea257e9868a0d61e399d.tar.gz scummvm-rg350-f32be876337e3b280ee4ea257e9868a0d61e399d.tar.bz2 scummvm-rg350-f32be876337e3b280ee4ea257e9868a0d61e399d.zip |
Turned enum PluginError into Common::Error, which in the future is to be used in more places. Help with this is highly welcome
svn-id: r34906
Diffstat (limited to 'backends')
-rw-r--r-- | backends/midi/alsa.cpp | 6 | ||||
-rw-r--r-- | backends/midi/camd.cpp | 6 | ||||
-rw-r--r-- | backends/midi/coreaudio.cpp | 6 | ||||
-rw-r--r-- | backends/midi/coremidi.cpp | 6 | ||||
-rw-r--r-- | backends/midi/dmedia.cpp | 6 | ||||
-rw-r--r-- | backends/midi/quicktime.cpp | 6 | ||||
-rw-r--r-- | backends/midi/seq.cpp | 6 | ||||
-rw-r--r-- | backends/midi/stmidi.cpp | 6 | ||||
-rw-r--r-- | backends/midi/timidity.cpp | 6 | ||||
-rw-r--r-- | backends/midi/windows.cpp | 6 | ||||
-rw-r--r-- | backends/midi/ypa1.cpp | 6 | ||||
-rw-r--r-- | backends/midi/zodiac.cpp | 6 |
12 files changed, 36 insertions, 36 deletions
diff --git a/backends/midi/alsa.cpp b/backends/midi/alsa.cpp index 5a978a0fd2..b78066cdd4 100644 --- a/backends/midi/alsa.cpp +++ b/backends/midi/alsa.cpp @@ -269,7 +269,7 @@ public: } MusicDevices getDevices() const; - PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; + Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; }; #define perm_ok(pinfo,bits) ((snd_seq_port_info_get_capability(pinfo) & (bits)) == (bits)) @@ -315,10 +315,10 @@ MusicDevices AlsaMusicPlugin::getDevices() const { return devices; } -PluginError AlsaMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { +Common::Error AlsaMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { *mididriver = new MidiDriver_ALSA(); - return kNoError; + return Common::kNoError; } MidiDriver *MidiDriver_ALSA_create(Audio::Mixer *mixer) { diff --git a/backends/midi/camd.cpp b/backends/midi/camd.cpp index d6d5819a6e..bab047746b 100644 --- a/backends/midi/camd.cpp +++ b/backends/midi/camd.cpp @@ -177,7 +177,7 @@ public: } MusicDevices getDevices() const; - PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; + Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; }; MusicDevices CamdMusicPlugin::getDevices() const { @@ -188,10 +188,10 @@ MusicDevices CamdMusicPlugin::getDevices() const { return devices; } -PluginError CamdMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { +Common::Error CamdMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { *mididriver = new MidiDriver_CAMD(); - return kNoError; + return Common::kNoError; } MidiDriver *MidiDriver_CAMD_create(Audio::Mixer *mixer) { diff --git a/backends/midi/coreaudio.cpp b/backends/midi/coreaudio.cpp index bf35fb90ba..0d72a1576a 100644 --- a/backends/midi/coreaudio.cpp +++ b/backends/midi/coreaudio.cpp @@ -218,7 +218,7 @@ public: } MusicDevices getDevices() const; - PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; + Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; }; MusicDevices CoreAudioMusicPlugin::getDevices() const { @@ -229,10 +229,10 @@ MusicDevices CoreAudioMusicPlugin::getDevices() const { return devices; } -PluginError CoreAudioMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { +Common::Error CoreAudioMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { *mididriver = new MidiDriver_CORE(); - return kNoError; + return Common::kNoError; } MidiDriver *MidiDriver_CORE_create(Audio::Mixer *mixer) { diff --git a/backends/midi/coremidi.cpp b/backends/midi/coremidi.cpp index da82249792..e63788d154 100644 --- a/backends/midi/coremidi.cpp +++ b/backends/midi/coremidi.cpp @@ -190,7 +190,7 @@ public: } MusicDevices getDevices() const; - PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; + Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; }; MusicDevices CoreMIDIMusicPlugin::getDevices() const { @@ -201,10 +201,10 @@ MusicDevices CoreMIDIMusicPlugin::getDevices() const { return devices; } -PluginError CoreMIDIMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { +Common::Error CoreMIDIMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { *mididriver = new MidiDriver_CoreMIDI(); - return kNoError; + return Common::kNoError; } MidiDriver *MidiDriver_CoreMIDI_create(Audio::Mixer *mixer) { diff --git a/backends/midi/dmedia.cpp b/backends/midi/dmedia.cpp index b4bd426ca4..eb639cc6c8 100644 --- a/backends/midi/dmedia.cpp +++ b/backends/midi/dmedia.cpp @@ -189,7 +189,7 @@ public: } MusicDevices getDevices() const; - PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; + Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; }; MusicDevices DMediaMusicPlugin::getDevices() const { @@ -200,10 +200,10 @@ MusicDevices DMediaMusicPlugin::getDevices() const { return devices; } -PluginError DMediaMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { +Common::Error DMediaMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { *mididriver = new MidiDriver_DMEDIA(); - return kNoError; + return Common::kNoError; } MidiDriver *MidiDriver_DMEDIA_create(Audio::Mixer *mixer) { diff --git a/backends/midi/quicktime.cpp b/backends/midi/quicktime.cpp index a18eadcb30..3a21c65c20 100644 --- a/backends/midi/quicktime.cpp +++ b/backends/midi/quicktime.cpp @@ -274,7 +274,7 @@ public: } MusicDevices getDevices() const; - PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; + Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; }; MusicDevices QuickTimeMusicPlugin::getDevices() const { @@ -285,10 +285,10 @@ MusicDevices QuickTimeMusicPlugin::getDevices() const { return devices; } -PluginError QuickTimeMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { +Common::Error QuickTimeMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { *mididriver = new MidiDriver_QT(); - return kNoError; + return Common::kNoError; } MidiDriver *MidiDriver_QT_create(Audio::Mixer *mixer) { diff --git a/backends/midi/seq.cpp b/backends/midi/seq.cpp index 9e86181674..920356147f 100644 --- a/backends/midi/seq.cpp +++ b/backends/midi/seq.cpp @@ -184,7 +184,7 @@ public: } MusicDevices getDevices() const; - PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; + Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; }; MusicDevices SeqMusicPlugin::getDevices() const { @@ -195,10 +195,10 @@ MusicDevices SeqMusicPlugin::getDevices() const { return devices; } -PluginError SeqMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { +Common::Error SeqMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { *mididriver = new MidiDriver_SEQ(); - return kNoError; + return Common::kNoError; } MidiDriver *MidiDriver_SEQ_create(Audio::Mixer *mixer) { diff --git a/backends/midi/stmidi.cpp b/backends/midi/stmidi.cpp index addb23c6bd..6cba1b819d 100644 --- a/backends/midi/stmidi.cpp +++ b/backends/midi/stmidi.cpp @@ -119,7 +119,7 @@ public: } MusicDevices getDevices() const; - PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) + Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; }; @@ -131,10 +131,10 @@ MusicDevices StMidiMusicPlugin::getDevices() const { return devices; } -PluginError StMidiMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { +Common::Error StMidiMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { *mididriver = new MidiDriver_STMIDI(); - return kNoError; + return Common::kNoError; } MidiDriver *MidiDriver_STMIDI_create(Audio::Mixer *mixer) { diff --git a/backends/midi/timidity.cpp b/backends/midi/timidity.cpp index b262fed88c..d13fc4b79a 100644 --- a/backends/midi/timidity.cpp +++ b/backends/midi/timidity.cpp @@ -525,7 +525,7 @@ public: } MusicDevices getDevices() const; - PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; + Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; }; MusicDevices TimidityMusicPlugin::getDevices() const { @@ -534,10 +534,10 @@ MusicDevices TimidityMusicPlugin::getDevices() const { return devices; } -PluginError TimidityMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { +Common::Error TimidityMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { *mididriver = new MidiDriver_TIMIDITY(); - return kNoError; + return Common::kNoError; } MidiDriver *MidiDriver_TIMIDITY_create(Audio::Mixer *mixer) { diff --git a/backends/midi/windows.cpp b/backends/midi/windows.cpp index c564c124fe..d1f79f4fa3 100644 --- a/backends/midi/windows.cpp +++ b/backends/midi/windows.cpp @@ -158,7 +158,7 @@ public: } MusicDevices getDevices() const; - PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; + Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; }; MusicDevices WindowsMusicPlugin::getDevices() const { @@ -169,10 +169,10 @@ MusicDevices WindowsMusicPlugin::getDevices() const { return devices; } -PluginError WindowsMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { +Common::Error WindowsMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { *mididriver = new MidiDriver_WIN(); - return kNoError; + return Common::kNoError; } MidiDriver *MidiDriver_WIN_create(Audio::Mixer *mixer) { diff --git a/backends/midi/ypa1.cpp b/backends/midi/ypa1.cpp index 88f9c3de8f..ab49136121 100644 --- a/backends/midi/ypa1.cpp +++ b/backends/midi/ypa1.cpp @@ -117,7 +117,7 @@ public: } MusicDevices getDevices() const; - PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; + Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; }; MusicDevices YamahaPa1MusicPlugin::getDevices() const { @@ -128,10 +128,10 @@ MusicDevices YamahaPa1MusicPlugin::getDevices() const { return devices; } -PluginError YamahaPa1MusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { +Common::Error YamahaPa1MusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { *mididriver = new MidiDriver_YamahaPa1(); - return kNoError; + return Common::kNoError; } MidiDriver *MidiDriver_YamahaPa1_create(Audio::Mixer *mixer) { diff --git a/backends/midi/zodiac.cpp b/backends/midi/zodiac.cpp index 456e4df43a..f17f6796b7 100644 --- a/backends/midi/zodiac.cpp +++ b/backends/midi/zodiac.cpp @@ -135,7 +135,7 @@ public: } MusicDevices getDevices() const; - PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; + Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const; }; MusicDevices ZodiacMusicPlugin::getDevices() const { @@ -146,10 +146,10 @@ MusicDevices ZodiacMusicPlugin::getDevices() const { return devices; } -PluginError ZodiacMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { +Common::Error ZodiacMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const { *mididriver = new MidiDriver_Zodiac(); - return kNoError; + return Common::kNoError; } MidiDriver *MidiDriver_Zodiac_create(Audio::Mixer *mixer) { |