From 25d053cbf288fb966526c554bea6158ef5c38202 Mon Sep 17 00:00:00 2001 From: Denis Krjuchkov Date: Sun, 3 Jun 2012 13:00:11 +0600 Subject: Work around incorrect g_file_test() behavior on Win32 g_file_test is redefined to be g_file_test_utf8 and thus can't handle non-ASCII characters. This fix adds simple wrapper (taken from glib) that fixes encoding and calls g_file_test_utf8. All required inclusions of glib_compat.h are added as well. --- src/cmdline.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/cmdline.c') diff --git a/src/cmdline.c b/src/cmdline.c index d986c8eb8..b1482c350 100644 --- a/src/cmdline.c +++ b/src/cmdline.c @@ -27,6 +27,7 @@ #include "output_list.h" #include "ls.h" #include "mpd_error.h" +#include "glib_compat.h" #ifdef ENABLE_ENCODER #include "encoder_list.h" -- cgit v1.2.3 From 9604e0aad2abf1e564766f039cb21da9849d1ac4 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 12 Jun 2012 19:55:30 +0200 Subject: cmdline: update copyright year --- src/cmdline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/cmdline.c') diff --git a/src/cmdline.c b/src/cmdline.c index b1482c350..10f0a3572 100644 --- a/src/cmdline.c +++ b/src/cmdline.c @@ -80,7 +80,7 @@ static void version(void) puts(PACKAGE " (MPD: Music Player Daemon) " VERSION " \n" "\n" "Copyright (C) 2003-2007 Warren Dukes \n" - "Copyright (C) 2008-2010 Max Kellermann \n" + "Copyright (C) 2008-2012 Max Kellermann \n" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" "\n" -- cgit v1.2.3 From 48da345e79a0b690aa7d6d59ba8b50875988243b Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 12 Jun 2012 20:52:04 +0200 Subject: cmdline: don't initalise archive plugins for --version Dump all archive plugins, even those that fail to initialise. --- src/cmdline.c | 1 - 1 file changed, 1 deletion(-) (limited to 'src/cmdline.c') diff --git a/src/cmdline.c b/src/cmdline.c index 10f0a3572..4b44892f3 100644 --- a/src/cmdline.c +++ b/src/cmdline.c @@ -102,7 +102,6 @@ static void version(void) #ifdef ENABLE_ARCHIVE puts("\n" "Supported archives:\n"); - archive_plugin_init_all(); archive_plugin_print_all_suffixes(stdout); #endif -- cgit v1.2.3 From d2d9b45a8189b7771e1b7dfbe7d5a550fcf400b8 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 12 Jun 2012 21:09:40 +0200 Subject: decoder_list: add _for_each() macros --- src/cmdline.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/cmdline.c') diff --git a/src/cmdline.c b/src/cmdline.c index 4b44892f3..a7e1d42fa 100644 --- a/src/cmdline.c +++ b/src/cmdline.c @@ -58,8 +58,7 @@ cmdline_quark(void) static void print_all_decoders(FILE *fp) { - for (unsigned i = 0; decoder_plugins[i] != NULL; ++i) { - const struct decoder_plugin *plugin = decoder_plugins[i]; + decoder_plugins_for_each(plugin) { const char *const*suffixes; fprintf(fp, "[%s]", plugin->name); -- cgit v1.2.3 From d5b9be03938a5081d65adf71b15de0899f7ce103 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 12 Jun 2012 19:59:25 +0200 Subject: cmdline: change --version formatting --- src/cmdline.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/cmdline.c') diff --git a/src/cmdline.c b/src/cmdline.c index a7e1d42fa..b2ed8d0db 100644 --- a/src/cmdline.c +++ b/src/cmdline.c @@ -83,29 +83,29 @@ static void version(void) "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" "\n" - "Supported decoders:\n"); + "* Decoders plugins:\n"); print_all_decoders(stdout); puts("\n" - "Supported outputs:\n"); + "Output plugins:\n"); audio_output_plugin_print_all_types(stdout); #ifdef ENABLE_ENCODER puts("\n" - "Supported encoders:\n"); + "Encoder plugins:\n"); encoder_plugin_print_all_types(stdout); #endif #ifdef ENABLE_ARCHIVE puts("\n" - "Supported archives:\n"); + "Archive plugins:\n"); archive_plugin_print_all_suffixes(stdout); #endif puts("\n" - "Supported protocols:\n"); + "Protocols:\n"); print_supported_uri_schemes_to_fp(stdout); exit(EXIT_SUCCESS); -- cgit v1.2.3 From 5b217420954ad1962b822faa1e2881570f803992 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 12 Jun 2012 19:59:03 +0200 Subject: cmdline: dump list of playlist plugins --- src/cmdline.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/cmdline.c') diff --git a/src/cmdline.c b/src/cmdline.c index b2ed8d0db..b419d746c 100644 --- a/src/cmdline.c +++ b/src/cmdline.c @@ -25,6 +25,8 @@ #include "decoder_list.h" #include "decoder_plugin.h" #include "output_list.h" +#include "playlist_list.h" +#include "playlist_plugin.h" #include "ls.h" #include "mpd_error.h" #include "glib_compat.h" @@ -105,6 +107,11 @@ static void version(void) #endif puts("\n" + "Playlist plugins:"); + playlist_plugins_for_each(plugin) + printf(" %s", plugin->name); + + puts("\n\n" "Protocols:\n"); print_supported_uri_schemes_to_fp(stdout); -- cgit v1.2.3 From eda7410f4c87e29e0c77950963a7b9ccf7069097 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 12 Jun 2012 22:24:42 +0200 Subject: cmdline: dump list of input plugins --- src/cmdline.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/cmdline.c') diff --git a/src/cmdline.c b/src/cmdline.c index b419d746c..c93a34cc6 100644 --- a/src/cmdline.c +++ b/src/cmdline.c @@ -25,6 +25,8 @@ #include "decoder_list.h" #include "decoder_plugin.h" #include "output_list.h" +#include "input_registry.h" +#include "input_plugin.h" #include "playlist_list.h" #include "playlist_plugin.h" #include "ls.h" @@ -107,6 +109,11 @@ static void version(void) #endif puts("\n" + "Input plugins:"); + input_plugins_for_each(plugin) + printf(" %s", plugin->name); + + puts("\n\n" "Playlist plugins:"); playlist_plugins_for_each(plugin) printf(" %s", plugin->name); -- cgit v1.2.3 From ae70875f45c6d7f1bb0f703179035709d909978a Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 12 Jun 2012 22:29:04 +0200 Subject: cmdline: consistent plugin listings --- src/cmdline.c | 62 ++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 28 deletions(-) (limited to 'src/cmdline.c') diff --git a/src/cmdline.c b/src/cmdline.c index c93a34cc6..907b64c10 100644 --- a/src/cmdline.c +++ b/src/cmdline.c @@ -25,6 +25,7 @@ #include "decoder_list.h" #include "decoder_plugin.h" #include "output_list.h" +#include "output_plugin.h" #include "input_registry.h" #include "input_plugin.h" #include "playlist_list.h" @@ -35,10 +36,12 @@ #ifdef ENABLE_ENCODER #include "encoder_list.h" +#include "encoder_plugin.h" #endif #ifdef ENABLE_ARCHIVE #include "archive_list.h" +#include "archive_plugin.h" #endif #include @@ -59,24 +62,6 @@ cmdline_quark(void) return g_quark_from_static_string("cmdline"); } -static void -print_all_decoders(FILE *fp) -{ - decoder_plugins_for_each(plugin) { - const char *const*suffixes; - - fprintf(fp, "[%s]", plugin->name); - - for (suffixes = plugin->suffixes; - suffixes != NULL && *suffixes != NULL; - ++suffixes) { - fprintf(fp, " %s", *suffixes); - } - - fprintf(fp, "\n"); - } -} - G_GNUC_NORETURN static void version(void) { @@ -87,25 +72,46 @@ static void version(void) "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" "\n" - "* Decoders plugins:\n"); + "Decoders plugins:"); - print_all_decoders(stdout); + decoder_plugins_for_each(plugin) { + printf(" [%s]", plugin->name); + + const char *const*suffixes = plugin->suffixes; + if (suffixes != NULL) + for (; *suffixes != NULL; ++suffixes) + printf(" %s", *suffixes); + + puts(""); + } puts("\n" - "Output plugins:\n"); - audio_output_plugin_print_all_types(stdout); + "Output plugins:"); + audio_output_plugins_for_each(plugin) + printf(" %s", plugin->name); + puts(""); #ifdef ENABLE_ENCODER puts("\n" - "Encoder plugins:\n"); - encoder_plugin_print_all_types(stdout); + "Encoder plugins:"); + encoder_plugins_for_each(plugin) + printf(" %s", plugin->name); + puts(""); #endif - #ifdef ENABLE_ARCHIVE puts("\n" - "Archive plugins:\n"); - archive_plugin_print_all_suffixes(stdout); + "Archive plugins:"); + archive_plugins_for_each(plugin) { + printf(" [%s]", plugin->name); + + const char *const*suffixes = plugin->suffixes; + if (suffixes != NULL) + for (; *suffixes != NULL; ++suffixes) + printf(" %s", *suffixes); + + puts(""); + } #endif puts("\n" @@ -119,7 +125,7 @@ static void version(void) printf(" %s", plugin->name); puts("\n\n" - "Protocols:\n"); + "Protocols:"); print_supported_uri_schemes_to_fp(stdout); exit(EXIT_SUCCESS); -- cgit v1.2.3