diff options
| -rw-r--r-- | test/run_input.c | 90 |
1 files changed, 50 insertions, 40 deletions
diff --git a/test/run_input.c b/test/run_input.c index b91d367ba..5d74473e3 100644 --- a/test/run_input.c +++ b/test/run_input.c @@ -41,45 +41,17 @@ my_log_func(const gchar *log_domain, G_GNUC_UNUSED GLogLevelFlags log_level, g_printerr("%s\n", message); } -int main(int argc, char **argv) +static int +dump_input_stream(struct input_stream *is) { - struct input_stream is; - bool success; char buffer[4096]; size_t num_read; ssize_t num_written; - 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 */ - - tag_pool_init(); - config_global_init(); - -#ifdef ENABLE_ARCHIVE - archive_plugin_init_all(); -#endif - - input_stream_global_init(); - - /* open the stream and wait until it becomes ready */ + /* wait until the stream becomes ready */ - success = input_stream_open(&is, argv[1]); - if (!success) { - g_printerr("input_stream_open() failed\n"); - return 2; - } - - while (!is.ready) { - int ret = input_stream_buffer(&is); + while (!is->ready) { + int ret = input_stream_buffer(is); if (ret < 0) /* error */ return 2; @@ -91,20 +63,20 @@ int main(int argc, char **argv) /* print meta data */ - if (is.mime != NULL) - g_printerr("MIME type: %s\n", is.mime); + if (is->mime != NULL) + g_printerr("MIME type: %s\n", is->mime); /* read data and tags from the stream */ - while (!input_stream_eof(&is)) { - struct tag *tag = input_stream_tag(&is); + while (!input_stream_eof(is)) { + struct tag *tag = input_stream_tag(is); if (tag != NULL) { g_printerr("Received a tag:\n"); tag_save(stderr, tag); tag_free(tag); } - num_read = input_stream_read(&is, buffer, sizeof(buffer)); + num_read = input_stream_read(is, buffer, sizeof(buffer)); if (num_read == 0) break; @@ -113,9 +85,47 @@ int main(int argc, char **argv) break; } + return 0; +} + +int main(int argc, char **argv) +{ + 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 */ + + tag_pool_init(); + config_global_init(); + +#ifdef ENABLE_ARCHIVE + archive_plugin_init_all(); +#endif + + input_stream_global_init(); + + /* open the stream and dump it */ + + if (input_stream_open(&is, argv[1])) { + ret = dump_input_stream(&is); + input_stream_close(&is); + } else { + g_printerr("input_stream_open() failed\n"); + ret = 2; + } + /* deinitialize everything */ - input_stream_close(&is); input_stream_global_finish(); #ifdef ENABLE_ARCHIVE @@ -125,5 +135,5 @@ int main(int argc, char **argv) config_global_finish(); tag_pool_deinit(); - return 0; + return ret; } |