diff options
| author | Max Kellermann <max@duempel.org> | 2013-04-16 20:51:21 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-04-16 20:51:21 +0200 |
| commit | e63420a8c2cfe4d93e43bf41348738bf67758c76 (patch) | |
| tree | f71f556bb3bf095ed129e691eafaf3b9a370013f /src/mixer | |
| parent | e02d8ad8d29ac102582a1a27bd652ec7a46dabbc (diff) | |
| download | mpd-e63420a8c2cfe4d93e43bf41348738bf67758c76.tar.gz mpd-e63420a8c2cfe4d93e43bf41348738bf67758c76.tar.xz mpd-e63420a8c2cfe4d93e43bf41348738bf67758c76.zip | |
output/Pulse: convert to C++
Diffstat (limited to 'src/mixer')
| -rw-r--r-- | src/mixer/PulseMixerPlugin.cxx | 8 | ||||
| -rw-r--r-- | src/mixer/PulseMixerPlugin.hxx (renamed from src/mixer/PulseMixerPlugin.h) | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/mixer/PulseMixerPlugin.cxx b/src/mixer/PulseMixerPlugin.cxx index d7c6c8043..70d0247ac 100644 --- a/src/mixer/PulseMixerPlugin.cxx +++ b/src/mixer/PulseMixerPlugin.cxx @@ -18,9 +18,9 @@ */ #include "config.h" -#include "PulseMixerPlugin.h" +#include "PulseMixerPlugin.hxx" #include "MixerInternal.hxx" -#include "output/pulse_output_plugin.h" +#include "output/PulseOutputPlugin.hxx" #include "conf.h" #include "GlobalEvents.hxx" @@ -42,7 +42,7 @@ struct pulse_mixer { struct mixer base; - struct pulse_output *output; + PulseOutput *output; bool online; struct pa_cvolume volume; @@ -153,7 +153,7 @@ static struct mixer * pulse_mixer_init(void *ao, G_GNUC_UNUSED const struct config_param *param, GError **error_r) { - struct pulse_output *po = (struct pulse_output *)ao; + PulseOutput *po = (PulseOutput *)ao; if (ao == NULL) { g_set_error(error_r, pulse_mixer_quark(), 0, diff --git a/src/mixer/PulseMixerPlugin.h b/src/mixer/PulseMixerPlugin.hxx index f432c44a0..4c12beffb 100644 --- a/src/mixer/PulseMixerPlugin.h +++ b/src/mixer/PulseMixerPlugin.hxx @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef MPD_PULSE_MIXER_PLUGIN_H -#define MPD_PULSE_MIXER_PLUGIN_H +#ifndef MPD_PULSE_MIXER_PLUGIN_HXX +#define MPD_PULSE_MIXER_PLUGIN_HXX #include <pulse/def.h> |