diff options
| author | Max Kellermann <max@duempel.org> | 2013-01-30 21:47:12 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-01-30 21:47:12 +0100 |
| commit | d664baff2699842f2182968f5c26dbf63babdeff (patch) | |
| tree | 387920b40478228d7c0ba0574c2415dd3ee91a8c /test | |
| parent | 3275d4c6fa40c66c410bd279f3571ba36f95c4d6 (diff) | |
audio_{parser,config}: convert to C++
Diffstat (limited to 'test')
| -rw-r--r-- | test/run_convert.cxx | 2 | ||||
| -rw-r--r-- | test/run_encoder.cxx | 2 | ||||
| -rw-r--r-- | test/run_filter.cxx | 6 | ||||
| -rw-r--r-- | test/run_normalize.cxx (renamed from test/run_normalize.c) | 4 | ||||
| -rw-r--r-- | test/run_output.cxx | 2 | ||||
| -rw-r--r-- | test/software_volume.cxx | 2 |
6 files changed, 7 insertions, 11 deletions
diff --git a/test/run_convert.cxx b/test/run_convert.cxx index a71ebc2c..1e54f2d3 100644 --- a/test/run_convert.cxx +++ b/test/run_convert.cxx @@ -24,7 +24,7 @@ */ #include "config.h" -#include "audio_parser.h" +#include "AudioParser.hxx" #include "audio_format.h" #include "pcm_convert.h" #include "conf.h" diff --git a/test/run_encoder.cxx b/test/run_encoder.cxx index 6a141296..3d500d0b 100644 --- a/test/run_encoder.cxx +++ b/test/run_encoder.cxx @@ -21,7 +21,7 @@ #include "encoder_list.h" #include "encoder_plugin.h" #include "audio_format.h" -#include "audio_parser.h" +#include "AudioParser.hxx" #include "conf.h" #include "stdbin.h" diff --git a/test/run_filter.cxx b/test/run_filter.cxx index dbf6caa9..87672adc 100644 --- a/test/run_filter.cxx +++ b/test/run_filter.cxx @@ -20,11 +20,7 @@ #include "config.h" #include "conf.h" #include "fs/Path.hxx" - -extern "C" { -#include "audio_parser.h" -} - +#include "AudioParser.hxx" #include "audio_format.h" #include "filter_plugin.h" #include "pcm_volume.h" diff --git a/test/run_normalize.c b/test/run_normalize.cxx index fc26829e..070dbaf5 100644 --- a/test/run_normalize.c +++ b/test/run_normalize.cxx @@ -25,7 +25,7 @@ #include "config.h" #include "AudioCompress/compress.h" -#include "audio_parser.h" +#include "AudioParser.hxx" #include "audio_format.h" #include "stdbin.h" @@ -58,7 +58,7 @@ int main(int argc, char **argv) return 1; } } else - audio_format_init(&audio_format, 48000, 16, 2); + audio_format_init(&audio_format, 48000, SAMPLE_FORMAT_S16, 2); compressor = Compressor_new(0); diff --git a/test/run_output.cxx b/test/run_output.cxx index ec94beaa..e9daf3c1 100644 --- a/test/run_output.cxx +++ b/test/run_output.cxx @@ -26,11 +26,11 @@ #include "GlobalEvents.hxx" #include "IOThread.hxx" #include "fs/Path.hxx" +#include "AudioParser.hxx" extern "C" { #include "output_plugin.h" #include "output_internal.h" -#include "audio_parser.h" #include "filter_registry.h" #include "pcm_convert.h" } diff --git a/test/software_volume.cxx b/test/software_volume.cxx index 18068665..2579a4f0 100644 --- a/test/software_volume.cxx +++ b/test/software_volume.cxx @@ -25,7 +25,7 @@ #include "config.h" #include "pcm_volume.h" -#include "audio_parser.h" +#include "AudioParser.hxx" #include "audio_format.h" #include "stdbin.h" |