mixer_plugin: convert to C++

2013-02-22 20:51:23 +01:00 · 2013-02-22 20:51:23 +01:00 · 496f70fc0d
commit 496f70fc0d
parent 9ede4c5f3c
28 changed files with 59 additions and 74 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -75,11 +75,7 @@ mpd_headers = \
 	src/input_stream.h \
 	src/text_input_stream.h \
 	src/ls.h \
-	src/mixer_api.h \
-	src/mixer_control.h \
-	src/mixer_list.h \
 	src/mixer_plugin.h \
-	src/mixer_type.h \
 	src/daemon.h \
 	src/AudioCompress/config.h \
 	src/AudioCompress/compress.h \
@ -798,10 +794,11 @@ MIXER_LIBS = \
 	$(PULSE_LIBS)

 MIXER_API_SRC = \
-	src/mixer_control.c \
-	src/mixer_type.c \
+	src/MixerList.hxx \
+	src/MixerControl.cxx src/MixerControl.hxx \
+	src/MixerType.cxx src/MixerType.hxx \
 	src/MixerAll.cxx src/MixerAll.hxx \
-	src/mixer_api.c
+	src/MixerInternal.cxx src/MixerInternal.hxx

 libmixer_plugins_a_SOURCES = \
 	src/mixer/SoftwareMixerPlugin.cxx \
@ -1344,9 +1341,9 @@ test_run_output_SOURCES = test/run_output.cxx \
 	src/resolver.c \
 	src/OutputInit.cxx src/OutputFinish.cxx src/OutputList.cxx \
 	src/OutputPlugin.cxx \
-	src/mixer_api.c \
-	src/mixer_control.c \
-	src/mixer_type.c \
+	src/MixerInternal.cxx \
+	src/MixerControl.cxx \
+	src/MixerType.cxx \
 	src/FilterPlugin.cxx \
 	src/FilterConfig.cxx \
 	src/AudioCompress/compress.c \
@ -1363,7 +1360,8 @@ test_read_mixer_LDADD = \
 	$(GLIB_LIBS)
 test_read_mixer_SOURCES = test/read_mixer.cxx \
 	src/tokenizer.c src/utils.c src/string_util.c \
-	src/mixer_control.c src/mixer_api.c \
+	src/MixerControl.cxx \
+	src/MixerInternal.cxx \
 	src/FilterPlugin.cxx \
 	src/filter/VolumeFilterPlugin.cxx \
 	src/fd_util.c
--- a/src/MixerAll.cxx
+++ b/src/MixerAll.cxx
@ -19,13 +19,14 @@

 #include "config.h"
 #include "MixerAll.hxx"
+#include "MixerControl.hxx"
+#include "MixerInternal.hxx"
+#include "MixerList.hxx"
 #include "OutputAll.hxx"
 #include "PcmVolume.hxx"

 extern "C" {
-#include "mixer_control.h"
 #include "output_internal.h"
-#include "mixer_api.h"
 }

 #include <glib.h>
--- a/src/MixerControl.cxx
+++ b/src/MixerControl.cxx
@ -1,5 +1,5 @@
 /*
- * 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
@ -18,8 +18,8 @@
 */

 #include "config.h"
-#include "mixer_control.h"
-#include "mixer_api.h"
+#include "MixerControl.hxx"
+#include "MixerInternal.hxx"

 #include <assert.h>
 #include <stddef.h>
--- a/src/MixerControl.hxx
+++ b/src/MixerControl.hxx
@ -1,5 +1,5 @@
 /*
- * 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
@ -22,13 +22,11 @@
 * Functions which manipulate a #mixer object.
 */

-#ifndef MPD_MIXER_CONTROL_H
-#define MPD_MIXER_CONTROL_H
+#ifndef MPD_MIXER_CONTROL_HXX
+#define MPD_MIXER_CONTROL_HXX

 #include "gerror.h"

-#include <stdbool.h>
-
 struct mixer;
 struct mixer_plugin;
 struct config_param;
--- a/src/MixerInternal.cxx
+++ b/src/MixerInternal.cxx
@ -1,5 +1,5 @@
 /*
- * 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
@ -18,7 +18,7 @@
 */

 #include "config.h"
-#include "mixer_api.h"
+#include "MixerInternal.hxx"

 #undef G_LOG_DOMAIN
 #define G_LOG_DOMAIN "mixer"
--- a/src/MixerInternal.hxx
+++ b/src/MixerInternal.hxx
@ -1,5 +1,5 @@
 /*
- * 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,11 +17,11 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#ifndef MPD_MIXER_H
-#define MPD_MIXER_H
+#ifndef MPD_MIXER_INTERNAL_HXX
+#define MPD_MIXER_INTERNAL_HXX

-#include "mixer_plugin.h"
-#include "mixer_list.h"
+#include "MixerPlugin.hxx"
+#include "MixerList.hxx"

 #include <glib.h>

@ -46,15 +46,7 @@ struct mixer {
 	bool failed;
 };

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 void
 mixer_init(struct mixer *mixer, const struct mixer_plugin *plugin);

-#ifdef __cplusplus
-}
-#endif
-
 #endif
--- a/src/MixerList.hxx
+++ b/src/MixerList.hxx
@ -1,5 +1,5 @@
 /*
- * 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
@ -22,8 +22,8 @@
 * This header provides "extern" declarations for all mixer plugins.
 */

-#ifndef MPD_MIXER_LIST_H
-#define MPD_MIXER_LIST_H
+#ifndef MPD_MIXER_LIST_HXX
+#define MPD_MIXER_LIST_HXX

 extern const struct mixer_plugin software_mixer_plugin;
 extern const struct mixer_plugin alsa_mixer_plugin;
--- a/src/MixerPlugin.hxx
+++ b/src/MixerPlugin.hxx
@ -1,5 +1,5 @@
 /*
- * 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
@ -20,12 +20,12 @@
 /** \file
 *
 * This header declares the mixer_plugin class.  It should not be
- * included directly; use mixer_api.h instead in mixer
+ * included directly; use MixerInternal.hxx instead in mixer
 * implementations.
 */

-#ifndef MPD_MIXER_PLUGIN_H
-#define MPD_MIXER_PLUGIN_H
+#ifndef MPD_MIXER_PLUGIN_HXX
+#define MPD_MIXER_PLUGIN_HXX

 #include "gerror.h"

--- a/src/MixerType.cxx
+++ b/src/MixerType.cxx
@ -1,5 +1,5 @@
 /*
- * 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
@ -18,7 +18,7 @@
 */

 #include "config.h"
-#include "mixer_type.h"
+#include "MixerType.hxx"

 #include <assert.h>
 #include <string.h>
--- a/src/MixerType.hxx
+++ b/src/MixerType.hxx
@ -1,5 +1,5 @@
 /*
- * 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,8 +17,8 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#ifndef MPD_MIXER_TYPE_H
-#define MPD_MIXER_TYPE_H
+#ifndef MPD_MIXER_TYPE_HXX
+#define MPD_MIXER_TYPE_HXX

 enum mixer_type {
 	/** parser error */
--- a/src/OutputCommand.cxx
+++ b/src/OutputCommand.cxx
@ -28,12 +28,12 @@
 #include "OutputCommand.hxx"
 #include "OutputAll.hxx"
 #include "PlayerControl.hxx"
+#include "MixerControl.hxx"
 #include "Idle.hxx"

 extern "C" {
 #include "output_internal.h"
 #include "output_plugin.h"
-#include "mixer_control.h"
 }

 extern unsigned audio_output_state_version;
--- a/src/OutputControl.cxx
+++ b/src/OutputControl.cxx
@ -24,10 +24,10 @@

 extern "C" {
 #include "output_internal.h"
-#include "mixer_control.h"
-#include "mixer_plugin.h"
 }

+#include "MixerPlugin.hxx"
+#include "MixerControl.hxx"
 #include "notify.hxx"
 #include "filter/ReplayGainFilterPlugin.hxx"
 #include "FilterPlugin.hxx"
--- a/src/OutputFinish.cxx
+++ b/src/OutputFinish.cxx
@ -22,9 +22,9 @@
 extern "C" {
 #include "output_internal.h"
 #include "output_plugin.h"
-#include "mixer_control.h"
 }

+#include "MixerControl.hxx"
 #include "FilterInternal.hxx"

 #include <assert.h>
--- a/src/OutputInit.cxx
+++ b/src/OutputInit.cxx
@ -27,11 +27,11 @@

 extern "C" {
 #include "output_internal.h"
-#include "mixer_control.h"
-#include "mixer_type.h"
-#include "mixer_list.h"
 }

+#include "MixerList.hxx"
+#include "MixerType.hxx"
+#include "MixerControl.hxx"
 #include "mixer/SoftwareMixerPlugin.hxx"
 #include "FilterPlugin.hxx"
 #include "FilterRegistry.hxx"
--- a/src/filter/ReplayGainFilterPlugin.cxx
+++ b/src/filter/ReplayGainFilterPlugin.cxx
@ -25,7 +25,7 @@
 #include "audio_format.h"
 #include "replay_gain_info.h"
 #include "replay_gain_config.h"
-#include "mixer_control.h"
+#include "MixerControl.hxx"
 #include "PcmVolume.hxx"

 extern "C" {
--- a/src/mixer/AlsaMixerPlugin.cxx
+++ b/src/mixer/AlsaMixerPlugin.cxx
@ -18,7 +18,7 @@
 */

 #include "config.h"
-#include "mixer_api.h"
+#include "MixerInternal.hxx"
 #include "output_api.h"
 #include "GlobalEvents.hxx"
 #include "Main.hxx"
--- a/src/mixer/OssMixerPlugin.cxx
+++ b/src/mixer/OssMixerPlugin.cxx
@ -18,7 +18,7 @@
 */

 #include "config.h"
-#include "mixer_api.h"
+#include "MixerInternal.hxx"
 #include "output_api.h"
 #include "fd_util.h"

--- a/src/mixer/PulseMixerPlugin.cxx
+++ b/src/mixer/PulseMixerPlugin.cxx
@ -19,7 +19,7 @@

 #include "config.h"
 #include "PulseMixerPlugin.h"
-#include "mixer_api.h"
+#include "MixerInternal.hxx"
 #include "output/pulse_output_plugin.h"
 #include "conf.h"
 #include "GlobalEvents.hxx"
--- a/src/mixer/RoarMixerPlugin.cxx
+++ b/src/mixer/RoarMixerPlugin.cxx
@ -20,7 +20,7 @@


 #include "config.h"
-#include "mixer_api.h"
+#include "MixerInternal.hxx"
 #include "output_api.h"
 #include "output/RoarOutputPlugin.hxx"

--- a/src/mixer/SoftwareMixerPlugin.cxx
+++ b/src/mixer/SoftwareMixerPlugin.cxx
@ -19,7 +19,7 @@

 #include "config.h"
 #include "SoftwareMixerPlugin.hxx"
-#include "mixer_api.h"
+#include "MixerInternal.hxx"
 #include "FilterPlugin.hxx"
 #include "FilterRegistry.hxx"
 #include "filter/VolumeFilterPlugin.hxx"
--- a/src/mixer/WinmmMixerPlugin.cxx
+++ b/src/mixer/WinmmMixerPlugin.cxx
@ -18,7 +18,7 @@
 */

 #include "config.h"
-#include "mixer_api.h"
+#include "MixerInternal.hxx"
 #include "output_api.h"
 #include "output/WinmmOutputPlugin.hxx"

--- a/src/output/AlsaOutputPlugin.cxx
+++ b/src/output/AlsaOutputPlugin.cxx
@ -20,7 +20,7 @@
 #include "config.h"
 #include "AlsaOutputPlugin.hxx"
 #include "output_api.h"
-#include "mixer_list.h"
+#include "MixerList.hxx"
 #include "pcm_export.h"

 #include <glib.h>
--- a/src/output/OssOutputPlugin.cxx
+++ b/src/output/OssOutputPlugin.cxx
@ -20,7 +20,7 @@
 #include "config.h"
 #include "OssOutputPlugin.hxx"
 #include "output_api.h"
-#include "mixer_list.h"
+#include "MixerList.hxx"
 #include "fd_util.h"

 #include <glib.h>
--- a/src/output/RoarOutputPlugin.cxx
+++ b/src/output/RoarOutputPlugin.cxx
@ -21,7 +21,7 @@
 #include "config.h"
 #include "RoarOutputPlugin.hxx"
 #include "output_api.h"
-#include "mixer_list.h"
+#include "MixerList.hxx"
 #include "thread/Mutex.hxx"

 #include <glib.h>
--- a/src/output/WinmmOutputPlugin.cxx
+++ b/src/output/WinmmOutputPlugin.cxx
@ -21,7 +21,7 @@
 #include "WinmmOutputPlugin.hxx"
 #include "output_api.h"
 #include "pcm_buffer.h"
-#include "mixer_list.h"
+#include "MixerList.hxx"

 #include <stdlib.h>
 #include <string.h>
--- a/src/output/pulse_output_plugin.c
+++ b/src/output/pulse_output_plugin.c
@ -20,7 +20,7 @@
 #include "config.h"
 #include "pulse_output_plugin.h"
 #include "output_api.h"
-#include "mixer_list.h"
+#include "MixerList.hxx"
 #include "mixer/PulseMixerPlugin.h"

 #include <glib.h>
--- a/test/read_mixer.cxx
+++ b/test/read_mixer.cxx
@ -18,12 +18,8 @@
 */

 #include "config.h"
-
-extern "C" {
-#include "mixer_control.h"
-#include "mixer_list.h"
-}
-
+#include "MixerControl.hxx"
+#include "MixerList.hxx"
 #include "FilterRegistry.hxx"
 #include "PcmVolume.hxx"
 #include "GlobalEvents.hxx"
--- a/test/run_filter.cxx
+++ b/test/run_filter.cxx
@ -25,7 +25,7 @@
 #include "FilterPlugin.hxx"
 #include "FilterInternal.hxx"
 #include "PcmVolume.hxx"
-#include "mixer_control.h"
+#include "MixerControl.hxx"
 #include "stdbin.h"

 #include <glib.h>