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/input_stream.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/input_stream.c')
| -rw-r--r-- | src/input_stream.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/input_stream.c b/src/input_stream.c index 60a1559ba..e445dca6c 100644 --- a/src/input_stream.c +++ b/src/input_stream.c @@ -42,13 +42,9 @@ input_stream_open(const char *url, assert(mutex != NULL); assert(error_r == NULL || *error_r == NULL); - for (unsigned i = 0; input_plugins[i] != NULL; ++i) { - const struct input_plugin *plugin = input_plugins[i]; + input_plugins_for_each_enabled(plugin) { struct input_stream *is; - if (!input_plugins_enabled[i]) - continue; - is = plugin->open(url, mutex, cond, &error); if (is != NULL) { assert(is->plugin != NULL); |