filter/Internal: rename struct AudioOutput to FilteredAudioOutput

Prepare to add an abstract class AudioOutput, to be implemented by
plugins, to get rid of the C-style vtable.

11 files changed, 16 insertions, 14 deletions

diff --git a/src/mixer/MixerControl.cxx b/src/mixer/MixerControl.cxx
index 3c6f86236..117fdfbcd 100644
--- a/src/mixer/MixerControl.cxx
+++ b/src/mixer/MixerControl.cxx
@@ -25,7 +25,7 @@
 
 Mixer *
 mixer_new(EventLoop &event_loop,
-	  const MixerPlugin &plugin, AudioOutput &ao,
+	  const MixerPlugin &plugin, FilteredAudioOutput &ao,
 	  MixerListener &listener,
 	  const ConfigBlock &block)
 {
diff --git a/src/mixer/MixerControl.hxx b/src/mixer/MixerControl.hxx
index e71592edb..bc4e54801 100644
--- a/src/mixer/MixerControl.hxx
+++ b/src/mixer/MixerControl.hxx
@@ -27,7 +27,7 @@
 
 class Mixer;
 class EventLoop;
-struct AudioOutput;
+struct FilteredAudioOutput;
 struct MixerPlugin;
 class MixerListener;
 struct ConfigBlock;
@@ -36,7 +36,8 @@ struct ConfigBlock;
  * Throws std::runtime_error on error.
  */
 Mixer *
-mixer_new(EventLoop &event_loop, const MixerPlugin &plugin, AudioOutput &ao,
+mixer_new(EventLoop &event_loop, const MixerPlugin &plugin,
+	  FilteredAudioOutput &ao,
 	  MixerListener &listener,
 	  const ConfigBlock &block);
 
diff --git a/src/mixer/MixerPlugin.hxx b/src/mixer/MixerPlugin.hxx
index a5693ddd2..d9cded5f5 100644
--- a/src/mixer/MixerPlugin.hxx
+++ b/src/mixer/MixerPlugin.hxx
@@ -28,7 +28,7 @@
 #define MPD_MIXER_PLUGIN_HXX
 
 struct ConfigBlock;
-struct AudioOutput;
+struct FilteredAudioOutput;
 class Mixer;
 class MixerListener;
 class EventLoop;
@@ -39,11 +39,11 @@ struct MixerPlugin {
 	 *
 	 * Throws std::runtime_error on error.
 	 *
-	 * @param ao the associated AudioOutput
+	 * @param ao the associated #AudioOutput
 	 * @param param the configuration section
 	 * @return a mixer object
 	 */
-	Mixer *(*init)(EventLoop &event_loop, AudioOutput &ao,
+	Mixer *(*init)(EventLoop &event_loop, FilteredAudioOutput &ao,
 		       MixerListener &listener,
 		       const ConfigBlock &block);
 
diff --git a/src/mixer/plugins/AlsaMixerPlugin.cxx b/src/mixer/plugins/AlsaMixerPlugin.cxx
index 49ec15c3b..76ad79d92 100644
--- a/src/mixer/plugins/AlsaMixerPlugin.cxx
+++ b/src/mixer/plugins/AlsaMixerPlugin.cxx
@@ -173,7 +173,7 @@ AlsaMixer::Configure(const ConfigBlock &block)
 }
 
 static Mixer *
-alsa_mixer_init(EventLoop &event_loop, gcc_unused AudioOutput &ao,
+alsa_mixer_init(EventLoop &event_loop, gcc_unused FilteredAudioOutput &ao,
 		MixerListener &listener,
 		const ConfigBlock &block)
 {
diff --git a/src/mixer/plugins/HaikuMixerPlugin.cxx b/src/mixer/plugins/HaikuMixerPlugin.cxx
index f0b50a91c..23f096430 100644
--- a/src/mixer/plugins/HaikuMixerPlugin.cxx
+++ b/src/mixer/plugins/HaikuMixerPlugin.cxx
@@ -48,7 +48,7 @@ public:
 };
 
 static Mixer *
-haiku_mixer_init(gcc_unused EventLoop &event_loop, AudioOutput &ao,
+haiku_mixer_init(gcc_unused EventLoop &event_loop, FilteredAudioOutput &ao,
 		MixerListener &listener,
 		gcc_unused const ConfigBlock &block)
 {
diff --git a/src/mixer/plugins/NullMixerPlugin.cxx b/src/mixer/plugins/NullMixerPlugin.cxx
index 66b6409b1..bacfe86c2 100644
--- a/src/mixer/plugins/NullMixerPlugin.cxx
+++ b/src/mixer/plugins/NullMixerPlugin.cxx
@@ -51,7 +51,7 @@ public:
 
 static Mixer *
 null_mixer_init(gcc_unused EventLoop &event_loop,
-		gcc_unused AudioOutput &ao,
+		gcc_unused FilteredAudioOutput &ao,
 		MixerListener &listener,
 		gcc_unused const ConfigBlock &block)
 {
diff --git a/src/mixer/plugins/OssMixerPlugin.cxx b/src/mixer/plugins/OssMixerPlugin.cxx
index 72cb72a47..23135c477 100644
--- a/src/mixer/plugins/OssMixerPlugin.cxx
+++ b/src/mixer/plugins/OssMixerPlugin.cxx
@@ -97,7 +97,8 @@ OssMixer::Configure(const ConfigBlock &block)
 }
 
 static Mixer *
-oss_mixer_init(gcc_unused EventLoop &event_loop, gcc_unused AudioOutput &ao,
+oss_mixer_init(gcc_unused EventLoop &event_loop,
+	       gcc_unused FilteredAudioOutput &ao,
 	       MixerListener &listener,
 	       const ConfigBlock &block)
 {
diff --git a/src/mixer/plugins/PulseMixerPlugin.cxx b/src/mixer/plugins/PulseMixerPlugin.cxx
index 5919e0ee6..670c4053e 100644
--- a/src/mixer/plugins/PulseMixerPlugin.cxx
+++ b/src/mixer/plugins/PulseMixerPlugin.cxx
@@ -161,7 +161,7 @@ pulse_mixer_on_change(PulseMixer &pm,
 }
 
 static Mixer *
-pulse_mixer_init(gcc_unused EventLoop &event_loop, AudioOutput &ao,
+pulse_mixer_init(gcc_unused EventLoop &event_loop, FilteredAudioOutput &ao,
 		 MixerListener &listener,
 		 gcc_unused const ConfigBlock &block)
 {
diff --git a/src/mixer/plugins/RoarMixerPlugin.cxx b/src/mixer/plugins/RoarMixerPlugin.cxx
index d3df5f910..e94c6ec78 100644
--- a/src/mixer/plugins/RoarMixerPlugin.cxx
+++ b/src/mixer/plugins/RoarMixerPlugin.cxx
@@ -45,7 +45,7 @@ public:
 };
 
 static Mixer *
-roar_mixer_init(gcc_unused EventLoop &event_loop, AudioOutput &ao,
+roar_mixer_init(gcc_unused EventLoop &event_loop, FilteredAudioOutput &ao,
 		MixerListener &listener,
 		gcc_unused const ConfigBlock &block)
 {
diff --git a/src/mixer/plugins/SoftwareMixerPlugin.cxx b/src/mixer/plugins/SoftwareMixerPlugin.cxx
index 0a1684b47..df54a1ae9 100644
--- a/src/mixer/plugins/SoftwareMixerPlugin.cxx
+++ b/src/mixer/plugins/SoftwareMixerPlugin.cxx
@@ -58,7 +58,7 @@ public:
 
 static Mixer *
 software_mixer_init(gcc_unused EventLoop &event_loop,
-		    gcc_unused AudioOutput &ao,
+		    gcc_unused FilteredAudioOutput &ao,
 		    MixerListener &listener,
 		    gcc_unused const ConfigBlock &block)
 {
diff --git a/src/mixer/plugins/WinmmMixerPlugin.cxx b/src/mixer/plugins/WinmmMixerPlugin.cxx
index bfbbe9d3d..eb00ddf66 100644
--- a/src/mixer/plugins/WinmmMixerPlugin.cxx
+++ b/src/mixer/plugins/WinmmMixerPlugin.cxx
@@ -64,7 +64,7 @@ winmm_volume_encode(int volume)
 }
 
 static Mixer *
-winmm_mixer_init(gcc_unused EventLoop &event_loop, AudioOutput &ao,
+winmm_mixer_init(gcc_unused EventLoop &event_loop, FilteredAudioOutput &ao,
 		 MixerListener &listener,
 		 gcc_unused const ConfigBlock &block)
 {