aboutsummaryrefslogtreecommitdiffstats
path: root/src/output
diff options
context:
space:
mode:
Diffstat (limited to 'src/output')
-rw-r--r--src/output/PulseOutputPlugin.cxx7
-rw-r--r--src/output/PulseOutputPlugin.hxx6
2 files changed, 6 insertions, 7 deletions
diff --git a/src/output/PulseOutputPlugin.cxx b/src/output/PulseOutputPlugin.cxx
index a893b0087..261c92a04 100644
--- a/src/output/PulseOutputPlugin.cxx
+++ b/src/output/PulseOutputPlugin.cxx
@@ -52,7 +52,7 @@ struct PulseOutput {
const char *server;
const char *sink;
- struct pulse_mixer *mixer;
+ PulseMixer *mixer;
struct pa_threaded_mainloop *mainloop;
struct pa_context *context;
@@ -91,7 +91,7 @@ pulse_output_unlock(PulseOutput *po)
}
void
-pulse_output_set_mixer(PulseOutput *po, struct pulse_mixer *pm)
+pulse_output_set_mixer(PulseOutput *po, PulseMixer *pm)
{
assert(po != nullptr);
assert(po->mixer == nullptr);
@@ -117,8 +117,7 @@ pulse_output_set_mixer(PulseOutput *po, struct pulse_mixer *pm)
}
void
-pulse_output_clear_mixer(PulseOutput *po,
- G_GNUC_UNUSED struct pulse_mixer *pm)
+pulse_output_clear_mixer(PulseOutput *po, gcc_unused PulseMixer *pm)
{
assert(po != nullptr);
assert(pm != nullptr);
diff --git a/src/output/PulseOutputPlugin.hxx b/src/output/PulseOutputPlugin.hxx
index b120aa182..26ee25a41 100644
--- a/src/output/PulseOutputPlugin.hxx
+++ b/src/output/PulseOutputPlugin.hxx
@@ -25,7 +25,7 @@
#include <stdbool.h>
struct PulseOutput;
-struct pulse_mixer;
+struct PulseMixer;
struct pa_cvolume;
extern const struct audio_output_plugin pulse_output_plugin;
@@ -41,10 +41,10 @@ void
pulse_output_unlock(PulseOutput *po);
void
-pulse_output_set_mixer(PulseOutput *po, struct pulse_mixer *pm);
+pulse_output_set_mixer(PulseOutput *po, PulseMixer *pm);
void
-pulse_output_clear_mixer(PulseOutput *po, struct pulse_mixer *pm);
+pulse_output_clear_mixer(PulseOutput *po, PulseMixer *pm);
bool
pulse_output_set_volume(PulseOutput *po,