diff options
| author | Max Kellermann <max@duempel.org> | 2012-06-12 23:22:03 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2012-06-12 23:22:03 +0200 |
| commit | 4eb57e1e9a1718ce93eced6bd4fb06d8abb26477 (patch) | |
| tree | 2355c6d77273cf614822f5a144005ab1d353863b /src/output_list.c | |
| parent | d662c4c0cc089a6a493a7463e440f0f7e7959b48 (diff) | |
| parent | 1d52e2cc7727d93e65d557c322b5dd7dc149651c (diff) | |
| download | mpd-4eb57e1e9a1718ce93eced6bd4fb06d8abb26477.tar.gz mpd-4eb57e1e9a1718ce93eced6bd4fb06d8abb26477.tar.xz mpd-4eb57e1e9a1718ce93eced6bd4fb06d8abb26477.zip | |
Merge branch 'v0.16.x'
Conflicts:
src/cmdline.c
src/decoder/wildmidi_decoder_plugin.c
src/gcc.h
src/glib_compat.h
src/input_stream.c
src/output_list.c
src/output_thread.c
valgrind.suppressions
Diffstat (limited to 'src/output_list.c')
| -rw-r--r-- | src/output_list.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/src/output_list.c b/src/output_list.c index ffb0698f1..835c02bba 100644 --- a/src/output_list.c +++ b/src/output_list.c @@ -39,7 +39,7 @@ #include "output/solaris_output_plugin.h" #include "output/winmm_output_plugin.h" -const struct audio_output_plugin *audio_output_plugins[] = { +const struct audio_output_plugin *const audio_output_plugins[] = { #ifdef HAVE_SHOUT &shout_output_plugin, #endif @@ -98,24 +98,9 @@ const struct audio_output_plugin *audio_output_plugins[] = { const struct audio_output_plugin * audio_output_plugin_get(const char *name) { - unsigned int i; - const struct audio_output_plugin *plugin; - - audio_output_plugins_for_each(plugin, i) + audio_output_plugins_for_each(plugin) if (strcmp(plugin->name, name) == 0) return plugin; return NULL; } - -void audio_output_plugin_print_all_types(FILE * fp) -{ - unsigned i; - const struct audio_output_plugin *plugin; - - audio_output_plugins_for_each(plugin, i) - fprintf(fp, "%s ", plugin->name); - - fprintf(fp, "\n"); - fflush(fp); -} |