From d5516dee005075a7569890c0cea4235659687ea1 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 10 Jan 2013 10:15:09 +0100 Subject: input_stream: convert to C++ (internally) --- test/dump_playlist.cxx | 2 +- test/dump_text_file.c | 167 --------------------------------- test/dump_text_file.cxx | 170 +++++++++++++++++++++++++++++++++ test/read_tags.c | 241 ----------------------------------------------- test/read_tags.cxx | 245 ++++++++++++++++++++++++++++++++++++++++++++++++ test/run_decoder.c | 225 -------------------------------------------- test/run_decoder.cxx | 227 ++++++++++++++++++++++++++++++++++++++++++++ test/run_input.cxx | 2 +- 8 files changed, 644 insertions(+), 635 deletions(-) delete mode 100644 test/dump_text_file.c create mode 100644 test/dump_text_file.cxx delete mode 100644 test/read_tags.c create mode 100644 test/read_tags.cxx delete mode 100644 test/run_decoder.c create mode 100644 test/run_decoder.cxx (limited to 'test') diff --git a/test/dump_playlist.cxx b/test/dump_playlist.cxx index ee54c465..b3d03a85 100644 --- a/test/dump_playlist.cxx +++ b/test/dump_playlist.cxx @@ -24,10 +24,10 @@ #include "input_stream.h" #include "conf.h" #include "decoder_api.h" +#include "InputInit.hxx" extern "C" { #include "io_thread.h" -#include "input_init.h" #include "decoder_list.h" #include "playlist_list.h" #include "playlist_plugin.h" diff --git a/test/dump_text_file.c b/test/dump_text_file.c deleted file mode 100644 index f13e648b..00000000 --- a/test/dump_text_file.c +++ /dev/null @@ -1,167 +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. - */ - -#include "config.h" -#include "io_thread.h" -#include "input_init.h" -#include "input_stream.h" -#include "text_input_stream.h" -#include "conf.h" -#include "stdbin.h" - -#ifdef ENABLE_ARCHIVE -#include "archive_list.h" -#endif - -#include - -#include -#include -#include - -static void -my_log_func(const gchar *log_domain, G_GNUC_UNUSED GLogLevelFlags log_level, - const gchar *message, G_GNUC_UNUSED gpointer user_data) -{ - if (log_domain != NULL) - g_printerr("%s: %s\n", log_domain, message); - else - g_printerr("%s\n", message); -} - -static void -dump_text_file(struct text_input_stream *is) -{ - const char *line; - while ((line = text_input_stream_read(is)) != NULL) - printf("'%s'\n", line); -} - -static int -dump_input_stream(struct input_stream *is) -{ - GError *error = NULL; - - input_stream_lock(is); - - /* wait until the stream becomes ready */ - - input_stream_wait_ready(is); - - if (!input_stream_check(is, &error)) { - g_warning("%s", error->message); - g_error_free(error); - input_stream_unlock(is); - return EXIT_FAILURE; - } - - /* read data and tags from the stream */ - - input_stream_unlock(is); - - struct text_input_stream *tis = text_input_stream_new(is); - dump_text_file(tis); - text_input_stream_free(tis); - - input_stream_lock(is); - - if (!input_stream_check(is, &error)) { - g_warning("%s", error->message); - g_error_free(error); - input_stream_unlock(is); - return EXIT_FAILURE; - } - - input_stream_unlock(is); - - return 0; -} - -int main(int argc, char **argv) -{ - GError *error = NULL; - struct input_stream *is; - int ret; - - if (argc != 2) { - g_printerr("Usage: run_input URI\n"); - return 1; - } - - /* initialize GLib */ - - g_thread_init(NULL); - g_log_set_default_handler(my_log_func, NULL); - - /* initialize MPD */ - - config_global_init(); - - io_thread_init(); - if (!io_thread_start(&error)) { - g_warning("%s", error->message); - g_error_free(error); - return EXIT_FAILURE; - } - -#ifdef ENABLE_ARCHIVE - archive_plugin_init_all(); -#endif - - if (!input_stream_global_init(&error)) { - g_warning("%s", error->message); - g_error_free(error); - return 2; - } - - /* open the stream and dump it */ - - GMutex *mutex = g_mutex_new(); - GCond *cond = g_cond_new(); - - is = input_stream_open(argv[1], mutex, cond, &error); - if (is != NULL) { - ret = dump_input_stream(is); - input_stream_close(is); - } else { - if (error != NULL) { - g_warning("%s", error->message); - g_error_free(error); - } else - g_printerr("input_stream_open() failed\n"); - ret = 2; - } - - g_cond_free(cond); - g_mutex_free(mutex); - - /* deinitialize everything */ - - input_stream_global_finish(); - -#ifdef ENABLE_ARCHIVE - archive_plugin_deinit_all(); -#endif - - io_thread_deinit(); - - config_global_finish(); - - return ret; -} diff --git a/test/dump_text_file.cxx b/test/dump_text_file.cxx new file mode 100644 index 00000000..c0f1c86f --- /dev/null +++ b/test/dump_text_file.cxx @@ -0,0 +1,170 @@ +/* + * 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. + */ + +#include "config.h" +#include "InputInit.hxx" +#include "input_stream.h" +#include "conf.h" +#include "stdbin.h" + +extern "C" { +#include "io_thread.h" +#include "text_input_stream.h" + +#ifdef ENABLE_ARCHIVE +#include "archive_list.h" +#endif +} + +#include + +#include +#include +#include + +static void +my_log_func(const gchar *log_domain, G_GNUC_UNUSED GLogLevelFlags log_level, + const gchar *message, G_GNUC_UNUSED gpointer user_data) +{ + if (log_domain != NULL) + g_printerr("%s: %s\n", log_domain, message); + else + g_printerr("%s\n", message); +} + +static void +dump_text_file(struct text_input_stream *is) +{ + const char *line; + while ((line = text_input_stream_read(is)) != NULL) + printf("'%s'\n", line); +} + +static int +dump_input_stream(struct input_stream *is) +{ + GError *error = NULL; + + input_stream_lock(is); + + /* wait until the stream becomes ready */ + + input_stream_wait_ready(is); + + if (!input_stream_check(is, &error)) { + g_warning("%s", error->message); + g_error_free(error); + input_stream_unlock(is); + return EXIT_FAILURE; + } + + /* read data and tags from the stream */ + + input_stream_unlock(is); + + struct text_input_stream *tis = text_input_stream_new(is); + dump_text_file(tis); + text_input_stream_free(tis); + + input_stream_lock(is); + + if (!input_stream_check(is, &error)) { + g_warning("%s", error->message); + g_error_free(error); + input_stream_unlock(is); + return EXIT_FAILURE; + } + + input_stream_unlock(is); + + return 0; +} + +int main(int argc, char **argv) +{ + GError *error = NULL; + struct input_stream *is; + int ret; + + if (argc != 2) { + g_printerr("Usage: run_input URI\n"); + return 1; + } + + /* initialize GLib */ + + g_thread_init(NULL); + g_log_set_default_handler(my_log_func, NULL); + + /* initialize MPD */ + + config_global_init(); + + io_thread_init(); + if (!io_thread_start(&error)) { + g_warning("%s", error->message); + g_error_free(error); + return EXIT_FAILURE; + } + +#ifdef ENABLE_ARCHIVE + archive_plugin_init_all(); +#endif + + if (!input_stream_global_init(&error)) { + g_warning("%s", error->message); + g_error_free(error); + return 2; + } + + /* open the stream and dump it */ + + GMutex *mutex = g_mutex_new(); + GCond *cond = g_cond_new(); + + is = input_stream_open(argv[1], mutex, cond, &error); + if (is != NULL) { + ret = dump_input_stream(is); + input_stream_close(is); + } else { + if (error != NULL) { + g_warning("%s", error->message); + g_error_free(error); + } else + g_printerr("input_stream_open() failed\n"); + ret = 2; + } + + g_cond_free(cond); + g_mutex_free(mutex); + + /* deinitialize everything */ + + input_stream_global_finish(); + +#ifdef ENABLE_ARCHIVE + archive_plugin_deinit_all(); +#endif + + io_thread_deinit(); + + config_global_finish(); + + return ret; +} diff --git a/test/read_tags.c b/test/read_tags.c deleted file mode 100644 index 43335ec2..00000000 --- a/test/read_tags.c +++ /dev/null @@ -1,241 +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. - */ - -#include "config.h" -#include "io_thread.h" -#include "decoder_list.h" -#include "decoder_api.h" -#include "input_init.h" -#include "input_stream.h" -#include "audio_format.h" -#include "tag_ape.h" -#include "tag_id3.h" -#include "tag_handler.h" - -#include - -#include -#include -#include - -#ifdef HAVE_LOCALE_H -#include -#endif - -void -decoder_initialized(G_GNUC_UNUSED struct decoder *decoder, - G_GNUC_UNUSED const struct audio_format *audio_format, - G_GNUC_UNUSED bool seekable, - G_GNUC_UNUSED float total_time) -{ -} - -enum decoder_command -decoder_get_command(G_GNUC_UNUSED struct decoder *decoder) -{ - return DECODE_COMMAND_NONE; -} - -void decoder_command_finished(G_GNUC_UNUSED struct decoder *decoder) -{ -} - -double decoder_seek_where(G_GNUC_UNUSED struct decoder *decoder) -{ - return 1.0; -} - -void decoder_seek_error(G_GNUC_UNUSED struct decoder *decoder) -{ -} - -size_t -decoder_read(G_GNUC_UNUSED struct decoder *decoder, - struct input_stream *is, - void *buffer, size_t length) -{ - return input_stream_lock_read(is, buffer, length, NULL); -} - -void -decoder_timestamp(G_GNUC_UNUSED struct decoder *decoder, - G_GNUC_UNUSED double t) -{ -} - -enum decoder_command -decoder_data(G_GNUC_UNUSED struct decoder *decoder, - G_GNUC_UNUSED struct input_stream *is, - const void *data, size_t datalen, - G_GNUC_UNUSED uint16_t bit_rate) -{ - G_GNUC_UNUSED ssize_t nbytes = write(1, data, datalen); - return DECODE_COMMAND_NONE; -} - -enum decoder_command -decoder_tag(G_GNUC_UNUSED struct decoder *decoder, - G_GNUC_UNUSED struct input_stream *is, - G_GNUC_UNUSED const struct tag *tag) -{ - return DECODE_COMMAND_NONE; -} - -void -decoder_replay_gain(G_GNUC_UNUSED struct decoder *decoder, - G_GNUC_UNUSED const struct replay_gain_info *replay_gain_info) -{ -} - -void -decoder_mixramp(G_GNUC_UNUSED struct decoder *decoder, - char *mixramp_start, char *mixramp_end) -{ - g_free(mixramp_start); - g_free(mixramp_end); -} - -static bool empty = true; - -static void -print_duration(unsigned seconds, G_GNUC_UNUSED void *ctx) -{ - g_print("duration=%d\n", seconds); -} - -static void -print_tag(enum tag_type type, const char *value, G_GNUC_UNUSED void *ctx) -{ - g_print("[%s]=%s\n", tag_item_names[type], value); - empty = false; -} - -static void -print_pair(const char *name, const char *value, G_GNUC_UNUSED void *ctx) -{ - g_print("\"%s\"=%s\n", name, value); -} - -static const struct tag_handler print_handler = { - .duration = print_duration, - .tag = print_tag, - .pair = print_pair, -}; - -int main(int argc, char **argv) -{ - GError *error = NULL; - const char *decoder_name, *path; - const struct decoder_plugin *plugin; - -#ifdef HAVE_LOCALE_H - /* initialize locale */ - setlocale(LC_CTYPE,""); -#endif - - if (argc != 3) { - g_printerr("Usage: read_tags DECODER FILE\n"); - return 1; - } - - decoder_name = argv[1]; - path = argv[2]; - - g_thread_init(NULL); - io_thread_init(); - if (!io_thread_start(&error)) { - g_warning("%s", error->message); - g_error_free(error); - return EXIT_FAILURE; - } - - if (!input_stream_global_init(&error)) { - g_warning("%s", error->message); - g_error_free(error); - return 2; - } - - decoder_plugin_init_all(); - - plugin = decoder_plugin_from_name(decoder_name); - if (plugin == NULL) { - g_printerr("No such decoder: %s\n", decoder_name); - return 1; - } - - bool success = decoder_plugin_scan_file(plugin, path, - &print_handler, NULL); - if (!success && plugin->scan_stream != NULL) { - GMutex *mutex = g_mutex_new(); - GCond *cond = g_cond_new(); - - struct input_stream *is = - input_stream_open(path, mutex, cond, &error); - - if (is == NULL) { - g_printerr("Failed to open %s: %s\n", - path, error->message); - g_error_free(error); - return 1; - } - - g_mutex_lock(mutex); - - while (!is->ready) { - g_cond_wait(cond, mutex); - input_stream_update(is); - } - - if (!input_stream_check(is, &error)) { - g_mutex_unlock(mutex); - - g_printerr("Failed to read %s: %s\n", - path, error->message); - g_error_free(error); - - return EXIT_FAILURE; - } - - g_mutex_unlock(mutex); - - success = decoder_plugin_scan_stream(plugin, is, - &print_handler, NULL); - input_stream_close(is); - - g_cond_free(cond); - g_mutex_free(mutex); - } - - decoder_plugin_deinit_all(); - input_stream_global_finish(); - io_thread_deinit(); - - if (!success) { - g_printerr("Failed to read tags\n"); - return 1; - } - - if (empty) { - tag_ape_scan2(path, &print_handler, NULL); - if (empty) - tag_id3_scan(path, &print_handler, NULL); - } - - return 0; -} diff --git a/test/read_tags.cxx b/test/read_tags.cxx new file mode 100644 index 00000000..9fabddc6 --- /dev/null +++ b/test/read_tags.cxx @@ -0,0 +1,245 @@ +/* + * 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. + */ + +#include "config.h" +extern "C" { +#include "io_thread.h" +#include "decoder_list.h" +} +#include "decoder_api.h" +#include "InputInit.hxx" +#include "input_stream.h" +#include "audio_format.h" +extern "C" { +#include "tag_ape.h" +#include "tag_id3.h" +} +#include "tag_handler.h" + +#include + +#include +#include +#include + +#ifdef HAVE_LOCALE_H +#include +#endif + +void +decoder_initialized(G_GNUC_UNUSED struct decoder *decoder, + G_GNUC_UNUSED const struct audio_format *audio_format, + G_GNUC_UNUSED bool seekable, + G_GNUC_UNUSED float total_time) +{ +} + +enum decoder_command +decoder_get_command(G_GNUC_UNUSED struct decoder *decoder) +{ + return DECODE_COMMAND_NONE; +} + +void decoder_command_finished(G_GNUC_UNUSED struct decoder *decoder) +{ +} + +double decoder_seek_where(G_GNUC_UNUSED struct decoder *decoder) +{ + return 1.0; +} + +void decoder_seek_error(G_GNUC_UNUSED struct decoder *decoder) +{ +} + +size_t +decoder_read(G_GNUC_UNUSED struct decoder *decoder, + struct input_stream *is, + void *buffer, size_t length) +{ + return input_stream_lock_read(is, buffer, length, NULL); +} + +void +decoder_timestamp(G_GNUC_UNUSED struct decoder *decoder, + G_GNUC_UNUSED double t) +{ +} + +enum decoder_command +decoder_data(G_GNUC_UNUSED struct decoder *decoder, + G_GNUC_UNUSED struct input_stream *is, + const void *data, size_t datalen, + G_GNUC_UNUSED uint16_t bit_rate) +{ + G_GNUC_UNUSED ssize_t nbytes = write(1, data, datalen); + return DECODE_COMMAND_NONE; +} + +enum decoder_command +decoder_tag(G_GNUC_UNUSED struct decoder *decoder, + G_GNUC_UNUSED struct input_stream *is, + G_GNUC_UNUSED const struct tag *tag) +{ + return DECODE_COMMAND_NONE; +} + +void +decoder_replay_gain(G_GNUC_UNUSED struct decoder *decoder, + G_GNUC_UNUSED const struct replay_gain_info *replay_gain_info) +{ +} + +void +decoder_mixramp(G_GNUC_UNUSED struct decoder *decoder, + char *mixramp_start, char *mixramp_end) +{ + g_free(mixramp_start); + g_free(mixramp_end); +} + +static bool empty = true; + +static void +print_duration(unsigned seconds, G_GNUC_UNUSED void *ctx) +{ + g_print("duration=%d\n", seconds); +} + +static void +print_tag(enum tag_type type, const char *value, G_GNUC_UNUSED void *ctx) +{ + g_print("[%s]=%s\n", tag_item_names[type], value); + empty = false; +} + +static void +print_pair(const char *name, const char *value, G_GNUC_UNUSED void *ctx) +{ + g_print("\"%s\"=%s\n", name, value); +} + +static const struct tag_handler print_handler = { + print_duration, + print_tag, + print_pair, +}; + +int main(int argc, char **argv) +{ + GError *error = NULL; + const char *decoder_name, *path; + const struct decoder_plugin *plugin; + +#ifdef HAVE_LOCALE_H + /* initialize locale */ + setlocale(LC_CTYPE,""); +#endif + + if (argc != 3) { + g_printerr("Usage: read_tags DECODER FILE\n"); + return 1; + } + + decoder_name = argv[1]; + path = argv[2]; + + g_thread_init(NULL); + io_thread_init(); + if (!io_thread_start(&error)) { + g_warning("%s", error->message); + g_error_free(error); + return EXIT_FAILURE; + } + + if (!input_stream_global_init(&error)) { + g_warning("%s", error->message); + g_error_free(error); + return 2; + } + + decoder_plugin_init_all(); + + plugin = decoder_plugin_from_name(decoder_name); + if (plugin == NULL) { + g_printerr("No such decoder: %s\n", decoder_name); + return 1; + } + + bool success = decoder_plugin_scan_file(plugin, path, + &print_handler, NULL); + if (!success && plugin->scan_stream != NULL) { + GMutex *mutex = g_mutex_new(); + GCond *cond = g_cond_new(); + + struct input_stream *is = + input_stream_open(path, mutex, cond, &error); + + if (is == NULL) { + g_printerr("Failed to open %s: %s\n", + path, error->message); + g_error_free(error); + return 1; + } + + g_mutex_lock(mutex); + + while (!is->ready) { + g_cond_wait(cond, mutex); + input_stream_update(is); + } + + if (!input_stream_check(is, &error)) { + g_mutex_unlock(mutex); + + g_printerr("Failed to read %s: %s\n", + path, error->message); + g_error_free(error); + + return EXIT_FAILURE; + } + + g_mutex_unlock(mutex); + + success = decoder_plugin_scan_stream(plugin, is, + &print_handler, NULL); + input_stream_close(is); + + g_cond_free(cond); + g_mutex_free(mutex); + } + + decoder_plugin_deinit_all(); + input_stream_global_finish(); + io_thread_deinit(); + + if (!success) { + g_printerr("Failed to read tags\n"); + return 1; + } + + if (empty) { + tag_ape_scan2(path, &print_handler, NULL); + if (empty) + tag_id3_scan(path, &print_handler, NULL); + } + + return 0; +} diff --git a/test/run_decoder.c b/test/run_decoder.c deleted file mode 100644 index d2f87c9a..00000000 --- a/test/run_decoder.c +++ /dev/null @@ -1,225 +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. - */ - -#include "config.h" -#include "io_thread.h" -#include "decoder_list.h" -#include "decoder_api.h" -#include "input_init.h" -#include "input_stream.h" -#include "audio_format.h" -#include "stdbin.h" - -#include - -#include -#include -#include - -static void -my_log_func(const gchar *log_domain, G_GNUC_UNUSED GLogLevelFlags log_level, - const gchar *message, G_GNUC_UNUSED gpointer user_data) -{ - if (log_domain != NULL) - g_printerr("%s: %s\n", log_domain, message); - else - g_printerr("%s\n", message); -} - -struct decoder { - const char *uri; - - const struct decoder_plugin *plugin; - - bool initialized; -}; - -void -decoder_initialized(struct decoder *decoder, - const struct audio_format *audio_format, - G_GNUC_UNUSED bool seekable, - G_GNUC_UNUSED float total_time) -{ - struct audio_format_string af_string; - - assert(!decoder->initialized); - assert(audio_format_valid(audio_format)); - - g_printerr("audio_format=%s\n", - audio_format_to_string(audio_format, &af_string)); - - decoder->initialized = true; -} - -enum decoder_command -decoder_get_command(G_GNUC_UNUSED struct decoder *decoder) -{ - return DECODE_COMMAND_NONE; -} - -void decoder_command_finished(G_GNUC_UNUSED struct decoder *decoder) -{ -} - -double decoder_seek_where(G_GNUC_UNUSED struct decoder *decoder) -{ - return 1.0; -} - -void decoder_seek_error(G_GNUC_UNUSED struct decoder *decoder) -{ -} - -size_t -decoder_read(G_GNUC_UNUSED struct decoder *decoder, - struct input_stream *is, - void *buffer, size_t length) -{ - return input_stream_lock_read(is, buffer, length, NULL); -} - -void -decoder_timestamp(G_GNUC_UNUSED struct decoder *decoder, - G_GNUC_UNUSED double t) -{ -} - -enum decoder_command -decoder_data(G_GNUC_UNUSED struct decoder *decoder, - G_GNUC_UNUSED struct input_stream *is, - const void *data, size_t datalen, - G_GNUC_UNUSED uint16_t kbit_rate) -{ - G_GNUC_UNUSED ssize_t nbytes = write(1, data, datalen); - return DECODE_COMMAND_NONE; -} - -enum decoder_command -decoder_tag(G_GNUC_UNUSED struct decoder *decoder, - G_GNUC_UNUSED struct input_stream *is, - G_GNUC_UNUSED const struct tag *tag) -{ - return DECODE_COMMAND_NONE; -} - -void -decoder_replay_gain(G_GNUC_UNUSED struct decoder *decoder, - const struct replay_gain_info *replay_gain_info) -{ - const struct replay_gain_tuple *tuple = - &replay_gain_info->tuples[REPLAY_GAIN_ALBUM]; - if (replay_gain_tuple_defined(tuple)) - g_printerr("replay_gain[album]: gain=%f peak=%f\n", - tuple->gain, tuple->peak); - - tuple = &replay_gain_info->tuples[REPLAY_GAIN_TRACK]; - if (replay_gain_tuple_defined(tuple)) - g_printerr("replay_gain[track]: gain=%f peak=%f\n", - tuple->gain, tuple->peak); -} - -void -decoder_mixramp(G_GNUC_UNUSED struct decoder *decoder, - char *mixramp_start, char *mixramp_end) -{ - g_free(mixramp_start); - g_free(mixramp_end); -} - -int main(int argc, char **argv) -{ - GError *error = NULL; - const char *decoder_name; - struct decoder decoder; - - if (argc != 3) { - g_printerr("Usage: run_decoder DECODER URI >OUT\n"); - return 1; - } - - decoder_name = argv[1]; - decoder.uri = argv[2]; - - g_thread_init(NULL); - g_log_set_default_handler(my_log_func, NULL); - - io_thread_init(); - if (!io_thread_start(&error)) { - g_warning("%s", error->message); - g_error_free(error); - return EXIT_FAILURE; - } - - if (!input_stream_global_init(&error)) { - g_warning("%s", error->message); - g_error_free(error); - return 2; - } - - decoder_plugin_init_all(); - - decoder.plugin = decoder_plugin_from_name(decoder_name); - if (decoder.plugin == NULL) { - g_printerr("No such decoder: %s\n", decoder_name); - return 1; - } - - decoder.initialized = false; - - if (decoder.plugin->file_decode != NULL) { - decoder_plugin_file_decode(decoder.plugin, &decoder, - decoder.uri); - } else if (decoder.plugin->stream_decode != NULL) { - GMutex *mutex = g_mutex_new(); - GCond *cond = g_cond_new(); - - struct input_stream *is = - input_stream_open(decoder.uri, mutex, cond, &error); - if (is == NULL) { - if (error != NULL) { - g_warning("%s", error->message); - g_error_free(error); - } else - g_printerr("input_stream_open() failed\n"); - - return 1; - } - - decoder_plugin_stream_decode(decoder.plugin, &decoder, is); - - input_stream_close(is); - - g_cond_free(cond); - g_mutex_free(mutex); - } else { - g_printerr("Decoder plugin is not usable\n"); - return 1; - } - - decoder_plugin_deinit_all(); - input_stream_global_finish(); - io_thread_deinit(); - - if (!decoder.initialized) { - g_printerr("Decoding failed\n"); - return 1; - } - - return 0; -} diff --git a/test/run_decoder.cxx b/test/run_decoder.cxx new file mode 100644 index 00000000..776c11e8 --- /dev/null +++ b/test/run_decoder.cxx @@ -0,0 +1,227 @@ +/* + * 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. + */ + +#include "config.h" +extern "C" { +#include "io_thread.h" +#include "decoder_list.h" +} +#include "decoder_api.h" +#include "InputInit.hxx" +#include "input_stream.h" +#include "audio_format.h" +#include "stdbin.h" + +#include + +#include +#include +#include + +static void +my_log_func(const gchar *log_domain, G_GNUC_UNUSED GLogLevelFlags log_level, + const gchar *message, G_GNUC_UNUSED gpointer user_data) +{ + if (log_domain != NULL) + g_printerr("%s: %s\n", log_domain, message); + else + g_printerr("%s\n", message); +} + +struct decoder { + const char *uri; + + const struct decoder_plugin *plugin; + + bool initialized; +}; + +void +decoder_initialized(struct decoder *decoder, + const struct audio_format *audio_format, + G_GNUC_UNUSED bool seekable, + G_GNUC_UNUSED float total_time) +{ + struct audio_format_string af_string; + + assert(!decoder->initialized); + assert(audio_format_valid(audio_format)); + + g_printerr("audio_format=%s\n", + audio_format_to_string(audio_format, &af_string)); + + decoder->initialized = true; +} + +enum decoder_command +decoder_get_command(G_GNUC_UNUSED struct decoder *decoder) +{ + return DECODE_COMMAND_NONE; +} + +void decoder_command_finished(G_GNUC_UNUSED struct decoder *decoder) +{ +} + +double decoder_seek_where(G_GNUC_UNUSED struct decoder *decoder) +{ + return 1.0; +} + +void decoder_seek_error(G_GNUC_UNUSED struct decoder *decoder) +{ +} + +size_t +decoder_read(G_GNUC_UNUSED struct decoder *decoder, + struct input_stream *is, + void *buffer, size_t length) +{ + return input_stream_lock_read(is, buffer, length, NULL); +} + +void +decoder_timestamp(G_GNUC_UNUSED struct decoder *decoder, + G_GNUC_UNUSED double t) +{ +} + +enum decoder_command +decoder_data(G_GNUC_UNUSED struct decoder *decoder, + G_GNUC_UNUSED struct input_stream *is, + const void *data, size_t datalen, + G_GNUC_UNUSED uint16_t kbit_rate) +{ + G_GNUC_UNUSED ssize_t nbytes = write(1, data, datalen); + return DECODE_COMMAND_NONE; +} + +enum decoder_command +decoder_tag(G_GNUC_UNUSED struct decoder *decoder, + G_GNUC_UNUSED struct input_stream *is, + G_GNUC_UNUSED const struct tag *tag) +{ + return DECODE_COMMAND_NONE; +} + +void +decoder_replay_gain(G_GNUC_UNUSED struct decoder *decoder, + const struct replay_gain_info *replay_gain_info) +{ + const struct replay_gain_tuple *tuple = + &replay_gain_info->tuples[REPLAY_GAIN_ALBUM]; + if (replay_gain_tuple_defined(tuple)) + g_printerr("replay_gain[album]: gain=%f peak=%f\n", + tuple->gain, tuple->peak); + + tuple = &replay_gain_info->tuples[REPLAY_GAIN_TRACK]; + if (replay_gain_tuple_defined(tuple)) + g_printerr("replay_gain[track]: gain=%f peak=%f\n", + tuple->gain, tuple->peak); +} + +void +decoder_mixramp(G_GNUC_UNUSED struct decoder *decoder, + char *mixramp_start, char *mixramp_end) +{ + g_free(mixramp_start); + g_free(mixramp_end); +} + +int main(int argc, char **argv) +{ + GError *error = NULL; + const char *decoder_name; + struct decoder decoder; + + if (argc != 3) { + g_printerr("Usage: run_decoder DECODER URI >OUT\n"); + return 1; + } + + decoder_name = argv[1]; + decoder.uri = argv[2]; + + g_thread_init(NULL); + g_log_set_default_handler(my_log_func, NULL); + + io_thread_init(); + if (!io_thread_start(&error)) { + g_warning("%s", error->message); + g_error_free(error); + return EXIT_FAILURE; + } + + if (!input_stream_global_init(&error)) { + g_warning("%s", error->message); + g_error_free(error); + return 2; + } + + decoder_plugin_init_all(); + + decoder.plugin = decoder_plugin_from_name(decoder_name); + if (decoder.plugin == NULL) { + g_printerr("No such decoder: %s\n", decoder_name); + return 1; + } + + decoder.initialized = false; + + if (decoder.plugin->file_decode != NULL) { + decoder_plugin_file_decode(decoder.plugin, &decoder, + decoder.uri); + } else if (decoder.plugin->stream_decode != NULL) { + GMutex *mutex = g_mutex_new(); + GCond *cond = g_cond_new(); + + struct input_stream *is = + input_stream_open(decoder.uri, mutex, cond, &error); + if (is == NULL) { + if (error != NULL) { + g_warning("%s", error->message); + g_error_free(error); + } else + g_printerr("input_stream_open() failed\n"); + + return 1; + } + + decoder_plugin_stream_decode(decoder.plugin, &decoder, is); + + input_stream_close(is); + + g_cond_free(cond); + g_mutex_free(mutex); + } else { + g_printerr("Decoder plugin is not usable\n"); + return 1; + } + + decoder_plugin_deinit_all(); + input_stream_global_finish(); + io_thread_deinit(); + + if (!decoder.initialized) { + g_printerr("Decoding failed\n"); + return 1; + } + + return 0; +} diff --git a/test/run_input.cxx b/test/run_input.cxx index 2df5e69f..adf380f0 100644 --- a/test/run_input.cxx +++ b/test/run_input.cxx @@ -23,10 +23,10 @@ #include "tag.h" #include "conf.h" #include "input_stream.h" +#include "InputInit.hxx" extern "C" { #include "io_thread.h" -#include "input_init.h" #ifdef ENABLE_ARCHIVE #include "archive_list.h" -- cgit v1.2.3