audio_check: convert to C++

21 files changed, 34 insertions, 61 deletions

diff --git a/Makefile.am b/Makefile.am
index dd991f2f2..7b10163fd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,7 +52,6 @@ mpd_headers = \
 	src/check.h \
 	src/ack.h \
 	src/audio_format.h \
-	src/audio_check.h \
 	src/output_api.h \
 	src/filter_internal.h \
 	src/command.h \
@@ -101,7 +100,7 @@ src_mpd_SOURCES = \
 	src/clock.c src/clock.h \
 	src/notify.cxx src/notify.hxx \
 	src/AudioConfig.cxx src/AudioConfig.hxx \
-	src/audio_check.c \
+	src/CheckAudioFormat.cxx src/CheckAudioFormat.hxx \
 	src/audio_format.c \
 	src/AudioParser.cxx src/AudioParser.hxx \
 	src/protocol/ArgParser.cxx src/protocol/ArgParser.hxx \
@@ -1139,7 +1138,7 @@ test_dump_playlist_SOURCES = test/dump_playlist.cxx \
 	src/IOThread.cxx \
 	src/Song.cxx src/Tag.cxx src/TagNames.c src/TagPool.cxx src/TagSave.cxx \
 	src/TagHandler.cxx src/TagFile.cxx \
-	src/audio_check.c \
+	src/CheckAudioFormat.cxx \
 	src/TextInputStream.cxx \
 	src/cue/CueParser.cxx src/cue/CueParser.hxx \
 	src/fd_util.c
@@ -1167,7 +1166,7 @@ test_run_decoder_SOURCES = test/run_decoder.cxx \
 	src/Tag.cxx src/TagNames.c src/TagPool.cxx src/TagHandler.cxx \
 	src/ReplayGainInfo.cxx \
 	src/fd_util.c \
-	src/audio_check.c \
+	src/CheckAudioFormat.cxx \
 	src/audio_format.c \
 	$(ARCHIVE_SRC) \
 	$(INPUT_SRC) \
@@ -1190,7 +1189,7 @@ test_read_tags_SOURCES = test/read_tags.cxx \
 	src/Tag.cxx src/TagNames.c src/TagPool.cxx src/TagHandler.cxx \
 	src/ReplayGainInfo.cxx \
 	src/fd_util.c \
-	src/audio_check.c \
+	src/CheckAudioFormat.cxx \
 	$(DECODER_SRC)
 
 if HAVE_ID3TAG
@@ -1214,7 +1213,7 @@ test_run_filter_SOURCES = test/run_filter.cxx \
 	test/FakeReplayGainConfig.cxx \
 	test/stdbin.h \
 	src/FilterPlugin.cxx src/FilterRegistry.cxx \
-	src/audio_check.c \
+	src/CheckAudioFormat.cxx \
 	src/audio_format.c \
 	src/AudioParser.cxx \
 	src/ReplayGainInfo.cxx \
@@ -1233,7 +1232,7 @@ noinst_PROGRAMS += test/run_encoder
 test_run_encoder_SOURCES = test/run_encoder.cxx \
 	test/stdbin.h \
 	src/Tag.cxx src/TagNames.c src/TagPool.cxx \
-	src/audio_check.c \
+	src/CheckAudioFormat.cxx \
 	src/audio_format.c \
 	src/AudioParser.cxx
 test_run_encoder_LDADD = \
@@ -1251,7 +1250,7 @@ noinst_PROGRAMS += test/test_vorbis_encoder
 test_test_vorbis_encoder_SOURCES = test/test_vorbis_encoder.cxx \
 	test/stdbin.h \
 	src/Tag.cxx src/TagNames.c src/TagPool.cxx \
-	src/audio_check.c \
+	src/CheckAudioFormat.cxx \
 	src/audio_format.c \
 	src/AudioParser.cxx \
 	$(ENCODER_SRC)
@@ -1268,7 +1267,7 @@ endif
 
 test_software_volume_SOURCES = test/software_volume.cxx \
 	test/stdbin.h \
-	src/audio_check.c \
+	src/CheckAudioFormat.cxx \
 	src/AudioParser.cxx
 test_software_volume_LDADD = \
 	$(PCM_LIBS) \
@@ -1276,7 +1275,7 @@ test_software_volume_LDADD = \
 
 test_run_normalize_SOURCES = test/run_normalize.cxx \
 	test/stdbin.h \
-	src/audio_check.c \
+	src/CheckAudioFormat.cxx \
 	src/AudioParser.cxx \
 	src/AudioCompress/compress.c
 test_run_normalize_LDADD = \
@@ -1284,7 +1283,7 @@ test_run_normalize_LDADD = \
 
 test_run_convert_SOURCES = test/run_convert.cxx \
 	src/audio_format.c \
-	src/audio_check.c \
+	src/CheckAudioFormat.cxx \
 	src/AudioParser.cxx
 test_run_convert_LDADD = \
 	$(PCM_LIBS) \
@@ -1306,7 +1305,7 @@ test_run_output_SOURCES = test/run_output.cxx \
 	test/FakeReplayGainConfig.cxx \
 	test/stdbin.h \
 	src/IOThread.cxx \
-	src/audio_check.c \
+	src/CheckAudioFormat.cxx \
 	src/audio_format.c \
 	src/AudioParser.cxx \
 	src/Timer.cxx src/clock.c \
diff --git a/src/AudioParser.cxx b/src/AudioParser.cxx
index 9178c3e1a..297d99f12 100644
--- a/src/AudioParser.cxx
+++ b/src/AudioParser.cxx
@@ -25,7 +25,7 @@
 #include "config.h"
 #include "AudioParser.hxx"
 #include "audio_format.h"
-#include "audio_check.h"
+#include "CheckAudioFormat.hxx"
 #include "gcc.h"
 
 #include <assert.h>
diff --git a/src/audio_check.c b/src/CheckAudioFormat.cxx
index a9aa2dd82..6d484be19 100644
--- a/src/audio_check.c
+++ b/src/CheckAudioFormat.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
@@ -17,7 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "audio_check.h"
+#include "CheckAudioFormat.hxx"
 #include "audio_format.h"
 
 #include <assert.h>
diff --git a/src/audio_check.h b/src/CheckAudioFormat.hxx
index d4d3f13fd..cb3e43c22 100644
--- a/src/audio_check.h
+++ b/src/CheckAudioFormat.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,13 +17,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef MPD_AUDIO_CHECK_H
-#define MPD_AUDIO_CHECK_H
+#ifndef MPD_CHECK_AUDIO_FORMAT_HXX
+#define MPD_CHECK_AUDIO_FORMAT_HXX
 
 #include "audio_format.h"
 
 #include <glib.h>
-#include <stdbool.h>
 
 /**
  * The GLib quark used for errors reported by this library.
@@ -35,10 +34,6 @@ audio_format_quark(void)
 	return g_quark_from_static_string("audio_format");
 }
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 bool
 audio_check_sample_rate(unsigned long sample_rate, GError **error_r);
 
@@ -56,8 +51,4 @@ audio_format_init_checked(struct audio_format *af, unsigned long sample_rate,
 			  enum sample_format sample_format, unsigned channels,
 			  GError **error_r);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
diff --git a/src/decoder/AdPlugDecoderPlugin.cxx b/src/decoder/AdPlugDecoderPlugin.cxx
index d1ed07891..a9a90c283 100644
--- a/src/decoder/AdPlugDecoderPlugin.cxx
+++ b/src/decoder/AdPlugDecoderPlugin.cxx
@@ -21,10 +21,7 @@
 #include "AdPlugDecoderPlugin.h"
 #include "TagHandler.hxx"
 #include "DecoderAPI.hxx"
-
-extern "C" {
-#include "audio_check.h"
-}
+#include "CheckAudioFormat.hxx"
 
 #include <adplug/adplug.h>
 #include <adplug/emuopl.h>
diff --git a/src/decoder/AudiofileDecoderPlugin.cxx b/src/decoder/AudiofileDecoderPlugin.cxx
index ee7d0da14..b77c41d02 100644
--- a/src/decoder/AudiofileDecoderPlugin.cxx
+++ b/src/decoder/AudiofileDecoderPlugin.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "AudiofileDecoderPlugin.hxx"
 #include "DecoderAPI.hxx"
-#include "audio_check.h"
+#include "CheckAudioFormat.hxx"
 #include "TagHandler.hxx"
 
 #include <audiofile.h>
diff --git a/src/decoder/DsdiffDecoderPlugin.cxx b/src/decoder/DsdiffDecoderPlugin.cxx
index fb542c3b7..4b9a59a7a 100644
--- a/src/decoder/DsdiffDecoderPlugin.cxx
+++ b/src/decoder/DsdiffDecoderPlugin.cxx
@@ -29,7 +29,7 @@
 #include "config.h"
 #include "DsdiffDecoderPlugin.hxx"
 #include "DecoderAPI.hxx"
-#include "audio_check.h"
+#include "CheckAudioFormat.hxx"
 #include "util/bit_reverse.h"
 #include "TagHandler.hxx"
 #include "DsdLib.hxx"
diff --git a/src/decoder/DsfDecoderPlugin.cxx b/src/decoder/DsfDecoderPlugin.cxx
index c19669dd6..9661d70e6 100644
--- a/src/decoder/DsfDecoderPlugin.cxx
+++ b/src/decoder/DsfDecoderPlugin.cxx
@@ -30,7 +30,7 @@
 #include "config.h"
 #include "DsfDecoderPlugin.hxx"
 #include "DecoderAPI.hxx"
-#include "audio_check.h"
+#include "CheckAudioFormat.hxx"
 #include "util/bit_reverse.h"
 #include "DsdLib.hxx"
 #include "TagHandler.hxx"
diff --git a/src/decoder/FaadDecoderPlugin.cxx b/src/decoder/FaadDecoderPlugin.cxx
index 4c21ae7c9..d87c48628 100644
--- a/src/decoder/FaadDecoderPlugin.cxx
+++ b/src/decoder/FaadDecoderPlugin.cxx
@@ -21,7 +21,7 @@
 #include "FaadDecoderPlugin.hxx"
 #include "DecoderAPI.hxx"
 #include "DecoderBuffer.hxx"
-#include "audio_check.h"
+#include "CheckAudioFormat.hxx"
 #include "TagHandler.hxx"
 
 #include <neaacdec.h>
diff --git a/src/decoder/FfmpegDecoderPlugin.cxx b/src/decoder/FfmpegDecoderPlugin.cxx
index 5930f7fa7..ae95dec09 100644
--- a/src/decoder/FfmpegDecoderPlugin.cxx
+++ b/src/decoder/FfmpegDecoderPlugin.cxx
@@ -26,10 +26,7 @@
 #include "FfmpegMetaData.hxx"
 #include "TagHandler.hxx"
 #include "InputStream.hxx"
-
-extern "C" {
-#include "audio_check.h"
-}
+#include "CheckAudioFormat.hxx"
 
 #include <glib.h>
 
diff --git a/src/decoder/FlacCommon.cxx b/src/decoder/FlacCommon.cxx
index 425ab55df..07a377055 100644
--- a/src/decoder/FlacCommon.cxx
+++ b/src/decoder/FlacCommon.cxx
@@ -25,10 +25,7 @@
 #include "FlacCommon.hxx"
 #include "FlacMetadata.hxx"
 #include "FlacPcm.hxx"
-
-extern "C" {
-#include "audio_check.h"
-}
+#include "CheckAudioFormat.hxx"
 
 #include <glib.h>
 
diff --git a/src/decoder/FluidsynthDecoderPlugin.cxx b/src/decoder/FluidsynthDecoderPlugin.cxx
index 5fbc83bdf..15d2f5e6b 100644
--- a/src/decoder/FluidsynthDecoderPlugin.cxx
+++ b/src/decoder/FluidsynthDecoderPlugin.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "FluidsynthDecoderPlugin.hxx"
 #include "DecoderAPI.hxx"
-#include "audio_check.h"
+#include "CheckAudioFormat.hxx"
 #include "conf.h"
 
 #include <glib.h>
diff --git a/src/decoder/GmeDecoderPlugin.cxx b/src/decoder/GmeDecoderPlugin.cxx
index 14367e311..8158ab553 100644
--- a/src/decoder/GmeDecoderPlugin.cxx
+++ b/src/decoder/GmeDecoderPlugin.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "GmeDecoderPlugin.hxx"
 #include "DecoderAPI.hxx"
-#include "audio_check.h"
+#include "CheckAudioFormat.hxx"
 #include "TagHandler.hxx"
 #include "util/UriUtil.hxx"
 
diff --git a/src/decoder/MadDecoderPlugin.cxx b/src/decoder/MadDecoderPlugin.cxx
index 0d74caf91..c9b2f0a6c 100644
--- a/src/decoder/MadDecoderPlugin.cxx
+++ b/src/decoder/MadDecoderPlugin.cxx
@@ -24,7 +24,7 @@
 #include "TagId3.hxx"
 #include "TagRva2.hxx"
 #include "TagHandler.hxx"
-#include "audio_check.h"
+#include "CheckAudioFormat.hxx"
 
 #include <assert.h>
 #include <unistd.h>
diff --git a/src/decoder/MpcdecDecoderPlugin.cxx b/src/decoder/MpcdecDecoderPlugin.cxx
index 482610e2d..d4333a527 100644
--- a/src/decoder/MpcdecDecoderPlugin.cxx
+++ b/src/decoder/MpcdecDecoderPlugin.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "MpcdecDecoderPlugin.hxx"
 #include "DecoderAPI.hxx"
-#include "audio_check.h"
+#include "CheckAudioFormat.hxx"
 #include "TagHandler.hxx"
 
 #ifdef MPC_IS_OLD_API
diff --git a/src/decoder/Mpg123DecoderPlugin.cxx b/src/decoder/Mpg123DecoderPlugin.cxx
index a22f926f5..73f94ea44 100644
--- a/src/decoder/Mpg123DecoderPlugin.cxx
+++ b/src/decoder/Mpg123DecoderPlugin.cxx
@@ -20,7 +20,7 @@
 #include "config.h" /* must be first for large file support */
 #include "Mpg123DecoderPlugin.hxx"
 #include "DecoderAPI.hxx"
-#include "audio_check.h"
+#include "CheckAudioFormat.hxx"
 #include "TagHandler.hxx"
 
 #include <glib.h>
diff --git a/src/decoder/OpusDecoderPlugin.cxx b/src/decoder/OpusDecoderPlugin.cxx
index 063d13d79..84467371c 100644
--- a/src/decoder/OpusDecoderPlugin.cxx
+++ b/src/decoder/OpusDecoderPlugin.cxx
@@ -26,7 +26,7 @@
 #include "OggSyncState.hxx"
 #include "DecoderAPI.hxx"
 #include "OggCodec.hxx"
-#include "audio_check.h"
+#include "CheckAudioFormat.hxx"
 #include "TagHandler.hxx"
 #include "InputStream.hxx"
 
diff --git a/src/decoder/SndfileDecoderPlugin.cxx b/src/decoder/SndfileDecoderPlugin.cxx
index 186f357ff..b1bb97538 100644
--- a/src/decoder/SndfileDecoderPlugin.cxx
+++ b/src/decoder/SndfileDecoderPlugin.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "SndfileDecoderPlugin.hxx"
 #include "DecoderAPI.hxx"
-#include "audio_check.h"
+#include "CheckAudioFormat.hxx"
 #include "TagHandler.hxx"
 
 #include <sndfile.h>
diff --git a/src/decoder/VorbisDecoderPlugin.cxx b/src/decoder/VorbisDecoderPlugin.cxx
index 438ba5949..7e039ab1e 100644
--- a/src/decoder/VorbisDecoderPlugin.cxx
+++ b/src/decoder/VorbisDecoderPlugin.cxx
@@ -24,11 +24,7 @@
 #include "InputStream.hxx"
 #include "OggCodec.hxx"
 #include "util/UriUtil.hxx"
-
-extern "C" {
-#include "audio_check.h"
-}
-
+#include "CheckAudioFormat.hxx"
 #include "TagHandler.hxx"
 
 #ifndef HAVE_TREMOR
diff --git a/src/decoder/WavpackDecoderPlugin.cxx b/src/decoder/WavpackDecoderPlugin.cxx
index dbec7e82c..1a31b7aac 100644
--- a/src/decoder/WavpackDecoderPlugin.cxx
+++ b/src/decoder/WavpackDecoderPlugin.cxx
@@ -21,11 +21,7 @@
 #include "WavpackDecoderPlugin.hxx"
 #include "DecoderAPI.hxx"
 #include "InputStream.hxx"
-
-extern "C" {
-#include "audio_check.h"
-}
-
+#include "CheckAudioFormat.hxx"
 #include "TagHandler.hxx"
 #include "ApeTag.hxx"
 
diff --git a/src/filter/RouteFilterPlugin.cxx b/src/filter/RouteFilterPlugin.cxx
index c6cf302b2..85db7e9ea 100644
--- a/src/filter/RouteFilterPlugin.cxx
+++ b/src/filter/RouteFilterPlugin.cxx
@@ -43,7 +43,7 @@
 #include "conf.h"
 #include "ConfigQuark.hxx"
 #include "audio_format.h"
-#include "audio_check.h"
+#include "CheckAudioFormat.hxx"
 #include "FilterPlugin.hxx"
 #include "FilterInternal.hxx"
 #include "FilterRegistry.hxx"