output/Pulse: convert to C++

Makefile.am

@@ -867,9 +867,9 @@ endif
 
 if HAVE_PULSE
 liboutput_plugins_a_SOURCES += \
-	src/output/pulse_output_plugin.c src/output/pulse_output_plugin.h
+	src/output/PulseOutputPlugin.cxx src/output/PulseOutputPlugin.hxx
 libmixer_plugins_a_SOURCES += \
-	src/mixer/PulseMixerPlugin.cxx src/mixer/PulseMixerPlugin.h
+	src/mixer/PulseMixerPlugin.cxx src/mixer/PulseMixerPlugin.hxx
 endif
 
 if HAVE_SHOUT

src/OutputList.cxx

@@ -32,7 +32,7 @@
 #include "output/OssOutputPlugin.hxx"
 #include "output/OSXOutputPlugin.hxx"
 #include "output/pipe_output_plugin.h"
-#include "output/pulse_output_plugin.h"
+#include "output/PulseOutputPlugin.hxx"
 #include "output/recorder_output_plugin.h"
 #include "output/RoarOutputPlugin.hxx"
 #include "output/shout_output_plugin.h"

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,

src/mixer/PulseMixerPlugin.h → 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>
 

src/output/pulse_output_plugin.h → src/output/PulseOutputPlugin.hxx

 /*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * Copyright (C) 2003-2013 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -17,14 +17,14 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef MPD_PULSE_OUTPUT_PLUGIN_H
-#define MPD_PULSE_OUTPUT_PLUGIN_H
+#ifndef MPD_PULSE_OUTPUT_PLUGIN_HXX
+#define MPD_PULSE_OUTPUT_PLUGIN_HXX
 
 #include "gerror.h"
 
 #include <stdbool.h>
 
-struct pulse_output;
+struct PulseOutput;
 struct pulse_mixer;
 struct pa_cvolume;
 
@@ -35,19 +35,19 @@ extern "C" {
 #endif
 
 void
-pulse_output_lock(struct pulse_output *po);
+pulse_output_lock(PulseOutput *po);
 
 void
-pulse_output_unlock(struct pulse_output *po);
+pulse_output_unlock(PulseOutput *po);
 
 void
-pulse_output_set_mixer(struct pulse_output *po, struct pulse_mixer *pm);
+pulse_output_set_mixer(PulseOutput *po, struct pulse_mixer *pm);
 
 void
-pulse_output_clear_mixer(struct pulse_output *po, struct pulse_mixer *pm);
+pulse_output_clear_mixer(PulseOutput *po, struct pulse_mixer *pm);
 
 bool
-pulse_output_set_volume(struct pulse_output *po,
+pulse_output_set_volume(PulseOutput *po,
 			const struct pa_cvolume *volume, GError **error_r);
 
 #ifdef __cplusplus

test/read_mixer.cxx

@@ -35,32 +35,32 @@
 EventLoop *main_loop;
 
 #ifdef HAVE_PULSE
-#include "output/pulse_output_plugin.h"
+#include "output/PulseOutputPlugin.hxx"
 
 void
-pulse_output_lock(G_GNUC_UNUSED struct pulse_output *po)
+pulse_output_lock(G_GNUC_UNUSED PulseOutput *po)
 {
 }
 
 void
-pulse_output_unlock(G_GNUC_UNUSED struct pulse_output *po)
+pulse_output_unlock(G_GNUC_UNUSED PulseOutput *po)
 {
 }
 
 void
-pulse_output_set_mixer(G_GNUC_UNUSED struct pulse_output *po,
+pulse_output_set_mixer(G_GNUC_UNUSED PulseOutput *po,
 		       G_GNUC_UNUSED struct pulse_mixer *pm)
 {
 }
 
 void
-pulse_output_clear_mixer(G_GNUC_UNUSED struct pulse_output *po,
+pulse_output_clear_mixer(G_GNUC_UNUSED PulseOutput *po,
 			 G_GNUC_UNUSED struct pulse_mixer *pm)
 {
 }
 
 bool
-pulse_output_set_volume(G_GNUC_UNUSED struct pulse_output *po,
+pulse_output_set_volume(G_GNUC_UNUSED PulseOutput *po,
 			G_GNUC_UNUSED const struct pa_cvolume *volume,
 			G_GNUC_UNUSED GError **error_r)
 {