mixer_all: convert to C++

12 files changed, 20 insertions, 27 deletions

diff --git a/Makefile.am b/Makefile.am
index 8ccc04f38..132dd6974 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,7 +52,6 @@ mpd_headers = \
 	src/audio_parser.h \
 	src/output_internal.h \
 	src/output_api.h \
-	src/output_all.h \
 	src/filter_internal.h \
 	src/filter_config.h \
 	src/filter_plugin.h \
@@ -97,7 +96,6 @@ mpd_headers = \
 	src/server_socket.h \
 	src/log.h \
 	src/ls.h \
-	src/mixer_all.h \
 	src/mixer_api.h \
 	src/mixer_control.h \
 	src/mixer_list.h \
@@ -780,7 +778,7 @@ OUTPUT_LIBS = \
 
 OUTPUT_API_SRC = \
 	src/OutputList.cxx src/OutputList.hxx \
-	src/OutputAll.cxx \
+	src/OutputAll.cxx src/OutputAll.hxx \
 	src/OutputThread.cxx src/OutputThread.hxx \
 	src/OutputError.hxx \
 	src/OutputControl.cxx src/OutputControl.hxx \
@@ -802,7 +800,7 @@ MIXER_LIBS = \
 MIXER_API_SRC = \
 	src/mixer_control.c \
 	src/mixer_type.c \
-	src/mixer_all.c \
+	src/MixerAll.cxx src/MixerAll.hxx \
 	src/mixer_api.c
 
 libmixer_plugins_a_SOURCES = \
diff --git a/src/Main.cxx b/src/Main.cxx
index 82816fcf9..808a445f0 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -35,6 +35,7 @@
 #include "AllCommands.hxx"
 #include "Partition.hxx"
 #include "Volume.hxx"
+#include "OutputAll.hxx"
 
 extern "C" {
 #include "daemon.h"
@@ -45,7 +46,6 @@ extern "C" {
 #include "stats.h"
 #include "sig_handlers.h"
 #include "audio_config.h"
-#include "output_all.h"
 #include "log.h"
 #include "pcm_resample.h"
 #include "replay_gain_config.h"
diff --git a/src/mixer_all.c b/src/MixerAll.cxx
index 5801b7921..a214c1e24 100644
--- a/src/mixer_all.c
+++ b/src/MixerAll.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,12 +18,15 @@
  */
 
 #include "config.h"
-#include "mixer_all.h"
+#include "MixerAll.hxx"
+#include "pcm_volume.h"
+#include "OutputAll.hxx"
+
+extern "C" {
 #include "mixer_control.h"
-#include "output_all.h"
 #include "output_internal.h"
-#include "pcm_volume.h"
 #include "mixer_api.h"
+}
 
 #include <glib.h>
 
diff --git a/src/mixer_all.h b/src/MixerAll.hxx
index fe873e713..23350a843 100644
--- a/src/mixer_all.h
+++ b/src/MixerAll.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,10 +22,8 @@
  * Functions which affect the mixers of all audio outputs.
  */
 
-#ifndef MPD_MIXER_ALL_H
-#define MPD_MIXER_ALL_H
-
-#include <stdbool.h>
+#ifndef MPD_MIXER_ALL_HXX
+#define MPD_MIXER_ALL_HXX
 
 /**
  * Returns the average volume of all available mixers (range 0..100).
diff --git a/src/OutputAll.cxx b/src/OutputAll.cxx
index 9c65ddcae..37f2e1ee9 100644
--- a/src/OutputAll.cxx
+++ b/src/OutputAll.cxx
@@ -18,9 +18,9 @@
  */
 
 #include "config.h"
+#include "OutputAll.hxx"
 
 extern "C" {
-#include "output_all.h"
 #include "output_internal.h"
 }
 
diff --git a/src/output_all.h b/src/OutputAll.hxx
index becf4b695..becf4b695 100644
--- a/src/output_all.h
+++ b/src/OutputAll.hxx
diff --git a/src/OutputCommand.cxx b/src/OutputCommand.cxx
index cce1a5b04..3c9ff56fe 100644
--- a/src/OutputCommand.cxx
+++ b/src/OutputCommand.cxx
@@ -26,10 +26,10 @@
 
 #include "config.h"
 #include "OutputCommand.hxx"
+#include "OutputAll.hxx"
 #include "PlayerControl.hxx"
 
 extern "C" {
-#include "output_all.h"
 #include "output_internal.h"
 #include "output_plugin.h"
 #include "mixer_control.h"
diff --git a/src/OutputPrint.cxx b/src/OutputPrint.cxx
index ed4391547..240ea967b 100644
--- a/src/OutputPrint.cxx
+++ b/src/OutputPrint.cxx
@@ -24,13 +24,10 @@
 
 #include "config.h"
 #include "OutputPrint.hxx"
+#include "OutputAll.hxx"
 #include "output_internal.h"
 #include "Client.hxx"
 
-extern "C" {
-#include "output_all.h"
-}
-
 void
 printAudioDevices(Client *client)
 {
diff --git a/src/OutputState.cxx b/src/OutputState.cxx
index 95aeacbca..27fa34f8f 100644
--- a/src/OutputState.cxx
+++ b/src/OutputState.cxx
@@ -24,12 +24,9 @@
 
 #include "config.h"
 #include "OutputState.hxx"
+#include "OutputAll.hxx"
 #include "output_internal.h"
 
-extern "C" {
-#include "output_all.h"
-}
-
 #include <glib.h>
 
 #include <assert.h>
diff --git a/src/PlayerCommands.cxx b/src/PlayerCommands.cxx
index 5920863a6..c272ae354 100644
--- a/src/PlayerCommands.cxx
+++ b/src/PlayerCommands.cxx
@@ -25,13 +25,13 @@
 #include "UpdateGlue.hxx"
 #include "ClientInternal.hxx"
 #include "Volume.hxx"
+#include "OutputAll.hxx"
 #include "protocol/Result.hxx"
 #include "protocol/ArgParser.hxx"
 
 extern "C" {
 #include "audio_format.h"
 #include "replay_gain_config.h"
-#include "output_all.h"
 }
 
 #include "PlayerControl.hxx"
diff --git a/src/PlayerThread.cxx b/src/PlayerThread.cxx
index 0343b9fcd..cba6c0fcd 100644
--- a/src/PlayerThread.cxx
+++ b/src/PlayerThread.cxx
@@ -29,9 +29,9 @@
 #include "mpd_error.h"
 #include "CrossFade.hxx"
 #include "PlayerControl.hxx"
+#include "OutputAll.hxx"
 
 extern "C" {
-#include "output_all.h"
 #include "event_pipe.h"
 #include "tag.h"
 #include "idle.h"
diff --git a/src/Volume.cxx b/src/Volume.cxx
index f6643a905..2c954fae9 100644
--- a/src/Volume.cxx
+++ b/src/Volume.cxx
@@ -19,10 +19,10 @@
 
 #include "config.h"
 #include "Volume.hxx"
+#include "MixerAll.hxx"
 
 extern "C" {
 #include "idle.h"
-#include "mixer_all.h"
 #include "event_pipe.h"
 }