From e63420a8c2cfe4d93e43bf41348738bf67758c76 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Tue, 16 Apr 2013 20:51:21 +0200
Subject: output/Pulse: convert to C++

---
 src/mixer/PulseMixerPlugin.cxx |  8 +++----
 src/mixer/PulseMixerPlugin.h   | 47 ------------------------------------------
 src/mixer/PulseMixerPlugin.hxx | 47 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 51 deletions(-)
 delete mode 100644 src/mixer/PulseMixerPlugin.h
 create mode 100644 src/mixer/PulseMixerPlugin.hxx

(limited to 'src/mixer')

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.h
deleted file mode 100644
index f432c44a0..000000000
--- a/src/mixer/PulseMixerPlugin.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MPD_PULSE_MIXER_PLUGIN_H
-#define MPD_PULSE_MIXER_PLUGIN_H
-
-#include <pulse/def.h>
-
-struct pulse_mixer;
-struct pa_context;
-struct pa_stream;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void
-pulse_mixer_on_connect(struct pulse_mixer *pm, struct pa_context *context);
-
-void
-pulse_mixer_on_disconnect(struct pulse_mixer *pm);
-
-void
-pulse_mixer_on_change(struct pulse_mixer *pm,
-		      struct pa_context *context, struct pa_stream *stream);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/mixer/PulseMixerPlugin.hxx b/src/mixer/PulseMixerPlugin.hxx
new file mode 100644
index 000000000..4c12beffb
--- /dev/null
+++ b/src/mixer/PulseMixerPlugin.hxx
@@ -0,0 +1,47 @@
+/*
+ * 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
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_PULSE_MIXER_PLUGIN_HXX
+#define MPD_PULSE_MIXER_PLUGIN_HXX
+
+#include <pulse/def.h>
+
+struct pulse_mixer;
+struct pa_context;
+struct pa_stream;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void
+pulse_mixer_on_connect(struct pulse_mixer *pm, struct pa_context *context);
+
+void
+pulse_mixer_on_disconnect(struct pulse_mixer *pm);
+
+void
+pulse_mixer_on_change(struct pulse_mixer *pm,
+		      struct pa_context *context, struct pa_stream *stream);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
-- 
cgit v1.2.3