oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'v0.16.x'

Browse Source 
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
This commit is contained in:
Max Kellermann
2012-06-12 23:22:03 +02:00
parent d662c4c0cc 1d52e2cc77
commit 4eb57e1e9a
25 changed files with 239 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/input_stream.c
View File

@@ -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);