audio_check: convert to C++

2013-07-29 07:50:08 +02:00
parent 14f21378e3
commit 43166130b5
21 changed files with 34 additions and 61 deletions
--- 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>
--- a/src/CheckAudioFormat.cxx
+++ 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>
--- a/src/CheckAudioFormat.hxx
+++ 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
--- 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>
--- 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>
--- 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"
--- 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"
--- 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>
--- 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>

--- 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>

--- 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>
--- 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"

--- 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>
--- 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
--- 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>
--- 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"

--- 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>
--- 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
--- 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"

--- 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"