volume: convert to C++

Makefile.am

@@ -152,7 +152,6 @@ mpd_headers = \
 	src/uri.h \
 	src/utils.h \
 	src/string_util.h \
-	src/volume.h \
 	src/zeroconf.h src/zeroconf-internal.h \
 	src/timer.h \
 	src/archive_api.h \
@@ -306,7 +305,7 @@ src_mpd_SOURCES = \
 	src/uri.c \
 	src/utils.c \
 	src/string_util.c \
-	src/volume.c \
+	src/Volume.cxx src/Volume.hxx \
 	src/SongFilter.cxx src/SongFilter.hxx \
 	src/PlaylistFile.cxx src/PlaylistFile.hxx \
 	src/timer.c

src/Main.cxx

@@ -34,6 +34,7 @@
 #include "Client.hxx"
 #include "AllCommands.hxx"
 #include "Partition.hxx"
+#include "Volume.hxx"
 
 extern "C" {
 #include "daemon.h"
@@ -45,7 +46,6 @@ extern "C" {
 #include "sig_handlers.h"
 #include "audio_config.h"
 #include "output_all.h"
-#include "volume.h"
 #include "log.h"
 #include "pcm_resample.h"
 #include "replay_gain_config.h"

src/OtherCommands.cxx

@@ -32,10 +32,10 @@
 #include "protocol/ArgParser.hxx"
 #include "protocol/Result.hxx"
 #include "ls.hxx"
+#include "Volume.hxx"
 
 extern "C" {
 #include "uri.h"
-#include "volume.h"
 #include "stats.h"
 }
 

src/PlayerCommands.cxx

@@ -24,12 +24,12 @@
 #include "PlaylistPrint.hxx"
 #include "UpdateGlue.hxx"
 #include "ClientInternal.hxx"
+#include "Volume.hxx"
 #include "protocol/Result.hxx"
 #include "protocol/ArgParser.hxx"
 
 extern "C" {
 #include "audio_format.h"
-#include "volume.h"
 #include "replay_gain_config.h"
 #include "output_all.h"
 }

src/StateFile.cxx

@@ -23,10 +23,7 @@
 #include "PlaylistState.hxx"
 #include "TextFile.hxx"
 #include "Partition.hxx"
-
-extern "C" {
-#include "volume.h"
-}
+#include "Volume.hxx"
 
 #include <glib.h>
 #include <assert.h>

src/volume.c → src/Volume.cxx

 /*
- * 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,10 +18,13 @@
  */
 
 #include "config.h"
-#include "volume.h"
+#include "Volume.hxx"
+
+extern "C" {
 #include "idle.h"
 #include "mixer_all.h"
 #include "event_pipe.h"
+}
 
 #include <glib.h>
 

src/volume.h → src/Volume.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,10 +17,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef MPD_VOLUME_H
-#define MPD_VOLUME_H
+#ifndef MPD_VOLUME_HXX
+#define MPD_VOLUME_HXX
 
-#include <stdbool.h>
 #include <stdio.h>
 
 void volume_init(void);