6 files changed, 16 insertions, 16 deletions
diff --git a/sound/musicplugin.h b/sound/musicplugin.h
index bdbd07ad31..cd49942b83 100644
--- a/sound/musicplugin.h
+++ b/sound/musicplugin.h
@@ -100,9 +100,9 @@ public:
 	 * @param mixer			Pointer to the global Mixer object
 	 * @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
+	 * @return		a Common::Error describing the error which occurred, or kNoError
 	 */
-	virtual PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const = 0;
+	virtual Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const = 0;
 };
 
 
diff --git a/sound/null.cpp b/sound/null.cpp
index 7559a6d816..fb5cbf806a 100644
--- a/sound/null.cpp
+++ b/sound/null.cpp
@@ -46,13 +46,13 @@ public:
 	}
 
 	MusicDevices getDevices() const;
-	PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
+	Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
 };
 
-PluginError NullMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+Common::Error NullMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
 	*mididriver = new MidiDriver_NULL();
 
-	return kNoError;
+	return Common::kNoError;
 }
 
 MusicDevices NullMusicPlugin::getDevices() const {
diff --git a/sound/softsynth/adlib.cpp b/sound/softsynth/adlib.cpp
index 3898956e15..86ee466065 100644
--- a/sound/softsynth/adlib.cpp
+++ b/sound/softsynth/adlib.cpp
@@ -1529,7 +1529,7 @@ public:
 	}
 
 	MusicDevices getDevices() const;
-	PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
+	Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
 };
 
 MusicDevices AdlibEmuMusicPlugin::getDevices() const {
@@ -1538,10 +1538,10 @@ MusicDevices AdlibEmuMusicPlugin::getDevices() const {
 	return devices;
 }
 
-PluginError AdlibEmuMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+Common::Error AdlibEmuMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
 	*mididriver = new MidiDriver_ADLIB(mixer);
 
-	return kNoError;
+	return Common::kNoError;
 }
 
 MidiDriver *MidiDriver_ADLIB_create(Audio::Mixer *mixer) {
diff --git a/sound/softsynth/fluidsynth.cpp b/sound/softsynth/fluidsynth.cpp
index eff9f4123c..4bf68afaea 100644
--- a/sound/softsynth/fluidsynth.cpp
+++ b/sound/softsynth/fluidsynth.cpp
@@ -230,7 +230,7 @@ public:
 	}
 
 	MusicDevices getDevices() const;
-	PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
+	Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
 };
 
 MusicDevices FluidSynthMusicPlugin::getDevices() const {
@@ -239,7 +239,7 @@ MusicDevices FluidSynthMusicPlugin::getDevices() const {
 	return devices;
 }
 
-PluginError FluidSynthMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+Common::Error FluidSynthMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
 	*mididriver = new MidiDriver_FluidSynth(mixer);
 
 	return kNoError;
diff --git a/sound/softsynth/mt32.cpp b/sound/softsynth/mt32.cpp
index 3e3f9d91ff..1987fee839 100644
--- a/sound/softsynth/mt32.cpp
+++ b/sound/softsynth/mt32.cpp
@@ -495,7 +495,7 @@ public:
 	}
 
 	MusicDevices getDevices() const;
-	PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
+	Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
 };
 
 MusicDevices MT32EmuMusicPlugin::getDevices() const {
@@ -504,10 +504,10 @@ MusicDevices MT32EmuMusicPlugin::getDevices() const {
 	return devices;
 }
 
-PluginError MT32EmuMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+Common::Error MT32EmuMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
 	*mididriver = new MidiDriver_MT32(mixer);
 
-	return kNoError;
+	return Common::kNoError;
 }
 
 MidiDriver *MidiDriver_MT32_create(Audio::Mixer *mixer) {
diff --git a/sound/softsynth/ym2612.cpp b/sound/softsynth/ym2612.cpp
index 2a08bf631e..efdf292150 100644
--- a/sound/softsynth/ym2612.cpp
+++ b/sound/softsynth/ym2612.cpp
@@ -766,7 +766,7 @@ public:
 	}
 
 	MusicDevices getDevices() const;
-	PluginError createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
+	Common::Error createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const;
 };
 
 MusicDevices TownsEmuMusicPlugin::getDevices() const {
@@ -775,10 +775,10 @@ MusicDevices TownsEmuMusicPlugin::getDevices() const {
 	return devices;
 }
 
-PluginError TownsEmuMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
+Common::Error TownsEmuMusicPlugin::createInstance(Audio::Mixer *mixer, MidiDriver **mididriver) const {
 	*mididriver = new MidiDriver_YM2612(mixer);
 
-	return kNoError;
+	return Common::kNoError;
 }
 
 MidiDriver *MidiDriver_YM2612_create(Audio::Mixer *mixer) {