oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

mixer/Pulse: convert to a class

Browse Source
This commit is contained in:
Max Kellermann
2013-04-16 20:47:55 +02:00
parent bc1b4131cb
commit 9f625b0a0d
5 changed files with 30 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/output/PulseOutputPlugin.cxx
+3 -4
View File
@@ -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);
src/output/PulseOutputPlugin.hxx
+3 -3
View File
@@ -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,