summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/mixer/MixerControl.cxx2
-rw-r--r--src/mixer/MixerControl.hxx4
-rw-r--r--src/mixer/MixerPlugin.hxx4
-rw-r--r--src/mixer/plugins/AlsaMixerPlugin.cxx2
-rw-r--r--src/mixer/plugins/HaikuMixerPlugin.cxx2
-rw-r--r--src/mixer/plugins/NullMixerPlugin.cxx2
-rw-r--r--src/mixer/plugins/OssMixerPlugin.cxx2
-rw-r--r--src/mixer/plugins/PulseMixerPlugin.cxx2
-rw-r--r--src/mixer/plugins/RoarMixerPlugin.cxx2
-rw-r--r--src/mixer/plugins/SoftwareMixerPlugin.cxx2
-rw-r--r--src/mixer/plugins/WinmmMixerPlugin.cxx2
-rw-r--r--src/output/Init.cxx10
-rw-r--r--test/read_mixer.cxx2
13 files changed, 20 insertions, 18 deletions
diff --git a/src/mixer/MixerControl.cxx b/src/mixer/MixerControl.cxx
index 117fdfbcd..3c6f86236 100644
--- a/src/mixer/MixerControl.cxx
+++ b/src/mixer/MixerControl.cxx
@@ -25,7 +25,7 @@
Mixer *
mixer_new(EventLoop &event_loop,
- const MixerPlugin &plugin, FilteredAudioOutput &ao,
+ const MixerPlugin &plugin, AudioOutput &ao,
MixerListener &listener,
const ConfigBlock &block)
{
diff --git a/src/mixer/MixerControl.hxx b/src/mixer/MixerControl.hxx
index bc4e54801..6bfe0d4cf 100644
--- a/src/mixer/MixerControl.hxx
+++ b/src/mixer/MixerControl.hxx
@@ -27,7 +27,7 @@
class Mixer;
class EventLoop;
-struct FilteredAudioOutput;
+class AudioOutput;
struct MixerPlugin;
class MixerListener;
struct ConfigBlock;
@@ -37,7 +37,7 @@ struct ConfigBlock;
*/
Mixer *
mixer_new(EventLoop &event_loop, const MixerPlugin &plugin,
- FilteredAudioOutput &ao,
+ AudioOutput &ao,
MixerListener &listener,
const ConfigBlock &block);
diff --git a/src/mixer/MixerPlugin.hxx b/src/mixer/MixerPlugin.hxx
index d9cded5f5..d428631d0 100644
--- a/src/mixer/MixerPlugin.hxx
+++ b/src/mixer/MixerPlugin.hxx
@@ -28,7 +28,7 @@
#define MPD_MIXER_PLUGIN_HXX
struct ConfigBlock;
-struct FilteredAudioOutput;
+class AudioOutput;
class Mixer;
class MixerListener;
class EventLoop;
@@ -43,7 +43,7 @@ struct MixerPlugin {
* @param param the configuration section
* @return a mixer object
*/
- Mixer *(*init)(EventLoop &event_loop, FilteredAudioOutput &ao,
+ Mixer *(*init)(EventLoop &event_loop, AudioOutput &ao,
MixerListener &listener,
const ConfigBlock &block);
diff --git a/src/mixer/plugins/AlsaMixerPlugin.cxx b/src/mixer/plugins/AlsaMixerPlugin.cxx
index 76ad79d92..49ec15c3b 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 FilteredAudioOutput &ao,
+alsa_mixer_init(EventLoop &event_loop, gcc_unused AudioOutput &ao,
MixerListener &listener,
const ConfigBlock &block)
{
diff --git a/src/mixer/plugins/HaikuMixerPlugin.cxx b/src/mixer/plugins/HaikuMixerPlugin.cxx
index 23f096430..f0b50a91c 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, FilteredAudioOutput &ao,
+haiku_mixer_init(gcc_unused EventLoop &event_loop, AudioOutput &ao,
MixerListener &listener,
gcc_unused const ConfigBlock &block)
{
diff --git a/src/mixer/plugins/NullMixerPlugin.cxx b/src/mixer/plugins/NullMixerPlugin.cxx
index bacfe86c2..66b6409b1 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 FilteredAudioOutput &ao,
+ gcc_unused AudioOutput &ao,
MixerListener &listener,
gcc_unused const ConfigBlock &block)
{
diff --git a/src/mixer/plugins/OssMixerPlugin.cxx b/src/mixer/plugins/OssMixerPlugin.cxx
index 23135c477..117f4658e 100644
--- a/src/mixer/plugins/OssMixerPlugin.cxx
+++ b/src/mixer/plugins/OssMixerPlugin.cxx
@@ -98,7 +98,7 @@ OssMixer::Configure(const ConfigBlock &block)
static Mixer *
oss_mixer_init(gcc_unused EventLoop &event_loop,
- gcc_unused FilteredAudioOutput &ao,
+ gcc_unused AudioOutput &ao,
MixerListener &listener,
const ConfigBlock &block)
{
diff --git a/src/mixer/plugins/PulseMixerPlugin.cxx b/src/mixer/plugins/PulseMixerPlugin.cxx
index 670c4053e..5919e0ee6 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, FilteredAudioOutput &ao,
+pulse_mixer_init(gcc_unused EventLoop &event_loop, AudioOutput &ao,
MixerListener &listener,
gcc_unused const ConfigBlock &block)
{
diff --git a/src/mixer/plugins/RoarMixerPlugin.cxx b/src/mixer/plugins/RoarMixerPlugin.cxx
index e94c6ec78..d3df5f910 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, FilteredAudioOutput &ao,
+roar_mixer_init(gcc_unused EventLoop &event_loop, AudioOutput &ao,
MixerListener &listener,
gcc_unused const ConfigBlock &block)
{
diff --git a/src/mixer/plugins/SoftwareMixerPlugin.cxx b/src/mixer/plugins/SoftwareMixerPlugin.cxx
index df54a1ae9..0a1684b47 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 FilteredAudioOutput &ao,
+ gcc_unused AudioOutput &ao,
MixerListener &listener,
gcc_unused const ConfigBlock &block)
{
diff --git a/src/mixer/plugins/WinmmMixerPlugin.cxx b/src/mixer/plugins/WinmmMixerPlugin.cxx
index eb00ddf66..bfbbe9d3d 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, FilteredAudioOutput &ao,
+winmm_mixer_init(gcc_unused EventLoop &event_loop, AudioOutput &ao,
MixerListener &listener,
gcc_unused const ConfigBlock &block)
{
diff --git a/src/output/Init.cxx b/src/output/Init.cxx
index c8756bb18..06d801926 100644
--- a/src/output/Init.cxx
+++ b/src/output/Init.cxx
@@ -118,19 +118,21 @@ audio_output_load_mixer(EventLoop &event_loop, FilteredAudioOutput &ao,
return nullptr;
case MixerType::NULL_:
- return mixer_new(event_loop, null_mixer_plugin, ao, listener,
+ return mixer_new(event_loop, null_mixer_plugin,
+ *ao.output, listener,
block);
case MixerType::HARDWARE:
if (plugin == nullptr)
return nullptr;
- return mixer_new(event_loop, *plugin, ao, listener,
+ return mixer_new(event_loop, *plugin,
+ *ao.output, listener,
block);
case MixerType::SOFTWARE:
- mixer = mixer_new(event_loop, software_mixer_plugin, ao,
- listener,
+ mixer = mixer_new(event_loop, software_mixer_plugin,
+ *ao.output, listener,
ConfigBlock());
assert(mixer != nullptr);
diff --git a/test/read_mixer.cxx b/test/read_mixer.cxx
index f133e426d..4c7efabe3 100644
--- a/test/read_mixer.cxx
+++ b/test/read_mixer.cxx
@@ -51,7 +51,7 @@ try {
EventLoop event_loop;
Mixer *mixer = mixer_new(event_loop, alsa_mixer_plugin,
- *(FilteredAudioOutput *)nullptr,
+ *(AudioOutput *)nullptr,
*(MixerListener *)nullptr,
ConfigBlock());
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 18:02:09 +0000