From d664baff2699842f2182968f5c26dbf63babdeff Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 30 Jan 2013 21:47:12 +0100 Subject: audio_{parser,config}: convert to C++ --- test/run_convert.cxx | 2 +- test/run_encoder.cxx | 2 +- test/run_filter.cxx | 6 +--- test/run_normalize.c | 73 ------------------------------------------------ test/run_normalize.cxx | 73 ++++++++++++++++++++++++++++++++++++++++++++++++ test/run_output.cxx | 2 +- test/software_volume.cxx | 2 +- 7 files changed, 78 insertions(+), 82 deletions(-) delete mode 100644 test/run_normalize.c create mode 100644 test/run_normalize.cxx (limited to 'test') 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.c deleted file mode 100644 index fc26829e..00000000 --- a/test/run_normalize.c +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (C) 2003-2011 The Music Player Daemon Project - * http://www.musicpd.org - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -/* - * This program is a command line interface to MPD's normalize library - * (based on AudioCompress). - * - */ - -#include "config.h" -#include "AudioCompress/compress.h" -#include "audio_parser.h" -#include "audio_format.h" -#include "stdbin.h" - -#include - -#include -#include -#include - -int main(int argc, char **argv) -{ - GError *error = NULL; - struct audio_format audio_format; - bool ret; - struct Compressor *compressor; - static char buffer[4096]; - ssize_t nbytes; - - if (argc > 2) { - g_printerr("Usage: run_normalize [FORMAT] OUT\n"); - return 1; - } - - if (argc > 1) { - ret = audio_format_parse(&audio_format, argv[1], - false, &error); - if (!ret) { - g_printerr("Failed to parse audio format: %s\n", - error->message); - return 1; - } - } else - audio_format_init(&audio_format, 48000, 16, 2); - - compressor = Compressor_new(0); - - while ((nbytes = read(0, buffer, sizeof(buffer))) > 0) { - Compressor_Process_int16(compressor, - (int16_t *)buffer, nbytes / 2); - - G_GNUC_UNUSED ssize_t ignored = write(1, buffer, nbytes); - } - - Compressor_delete(compressor); -} diff --git a/test/run_normalize.cxx b/test/run_normalize.cxx new file mode 100644 index 00000000..070dbaf5 --- /dev/null +++ b/test/run_normalize.cxx @@ -0,0 +1,73 @@ +/* + * Copyright (C) 2003-2011 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +/* + * This program is a command line interface to MPD's normalize library + * (based on AudioCompress). + * + */ + +#include "config.h" +#include "AudioCompress/compress.h" +#include "AudioParser.hxx" +#include "audio_format.h" +#include "stdbin.h" + +#include + +#include +#include +#include + +int main(int argc, char **argv) +{ + GError *error = NULL; + struct audio_format audio_format; + bool ret; + struct Compressor *compressor; + static char buffer[4096]; + ssize_t nbytes; + + if (argc > 2) { + g_printerr("Usage: run_normalize [FORMAT] OUT\n"); + return 1; + } + + if (argc > 1) { + ret = audio_format_parse(&audio_format, argv[1], + false, &error); + if (!ret) { + g_printerr("Failed to parse audio format: %s\n", + error->message); + return 1; + } + } else + audio_format_init(&audio_format, 48000, SAMPLE_FORMAT_S16, 2); + + compressor = Compressor_new(0); + + while ((nbytes = read(0, buffer, sizeof(buffer))) > 0) { + Compressor_Process_int16(compressor, + (int16_t *)buffer, nbytes / 2); + + G_GNUC_UNUSED ssize_t ignored = write(1, buffer, nbytes); + } + + Compressor_delete(compressor); +} 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" -- cgit v1.2.3