aboutsummaryrefslogtreecommitdiffstats
path: root/src/decoder
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-07-29 07:50:08 +0200
committerMax Kellermann <max@duempel.org>2013-07-29 07:50:08 +0200
commit43166130b51e995ada4130f6400efbb5d38eeb47 (patch)
tree102dabc975dc40727dff78deba52bb43785c27d5 /src/decoder
parent14f21378e3c623ef8ab1a0fa734a6b35bc4d9b58 (diff)
downloadmpd-43166130b51e995ada4130f6400efbb5d38eeb47.tar.gz
mpd-43166130b51e995ada4130f6400efbb5d38eeb47.tar.xz
mpd-43166130b51e995ada4130f6400efbb5d38eeb47.zip
audio_check: convert to C++
Diffstat (limited to 'src/decoder')
-rw-r--r--src/decoder/AdPlugDecoderPlugin.cxx5
-rw-r--r--src/decoder/AudiofileDecoderPlugin.cxx2
-rw-r--r--src/decoder/DsdiffDecoderPlugin.cxx2
-rw-r--r--src/decoder/DsfDecoderPlugin.cxx2
-rw-r--r--src/decoder/FaadDecoderPlugin.cxx2
-rw-r--r--src/decoder/FfmpegDecoderPlugin.cxx5
-rw-r--r--src/decoder/FlacCommon.cxx5
-rw-r--r--src/decoder/FluidsynthDecoderPlugin.cxx2
-rw-r--r--src/decoder/GmeDecoderPlugin.cxx2
-rw-r--r--src/decoder/MadDecoderPlugin.cxx2
-rw-r--r--src/decoder/MpcdecDecoderPlugin.cxx2
-rw-r--r--src/decoder/Mpg123DecoderPlugin.cxx2
-rw-r--r--src/decoder/OpusDecoderPlugin.cxx2
-rw-r--r--src/decoder/SndfileDecoderPlugin.cxx2
-rw-r--r--src/decoder/VorbisDecoderPlugin.cxx6
-rw-r--r--src/decoder/WavpackDecoderPlugin.cxx6
16 files changed, 16 insertions, 33 deletions
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"