oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

audio_check: convert to C++

This commit is contained in:
Max Kellermann 2013-07-29 07:50:08 +02:00
parent 14f21378e3
commit 43166130b5
21 changed files with 34 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Makefile.am
View File

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

2
src/AudioParser.cxx
View File

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

4
src/audio_check.c → src/CheckAudioFormat.cxx
View File

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

15
src/audio_check.h → src/CheckAudioFormat.hxx
View File

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

5
src/decoder/AdPlugDecoderPlugin.cxx
View File

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

2
src/decoder/AudiofileDecoderPlugin.cxx
View File

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

2
src/decoder/DsdiffDecoderPlugin.cxx
View File

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

2
src/decoder/DsfDecoderPlugin.cxx
View File

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

2
src/decoder/FaadDecoderPlugin.cxx
View File

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

5
src/decoder/FfmpegDecoderPlugin.cxx
View File

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

5
src/decoder/FlacCommon.cxx
View File

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

2
src/decoder/FluidsynthDecoderPlugin.cxx
View File

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

2
src/decoder/GmeDecoderPlugin.cxx
View File

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

2
src/decoder/MadDecoderPlugin.cxx
View File

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

2
src/decoder/MpcdecDecoderPlugin.cxx
View File

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

2
src/decoder/Mpg123DecoderPlugin.cxx
View File

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

2
src/decoder/OpusDecoderPlugin.cxx
View File

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

2
src/decoder/SndfileDecoderPlugin.cxx
View File

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

6
src/decoder/VorbisDecoderPlugin.cxx
View File

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

6
src/decoder/WavpackDecoderPlugin.cxx
View File

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

2
src/filter/RouteFilterPlugin.cxx
View File

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