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

decoder_thread: added local variable "dc" in decoder_run_file()

Browse Source 
Simplify the expressions.
This commit is contained in:
Max Kellermann 2009-11-07 15:24:38 +01:00
parent 41f3f12709
commit f2184db1cd
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/decoder_thread.c
View File

@ -210,39 +210,40 @@ decoder_run_stream(struct decoder *decoder, const char *uri)
static bool static bool
decoder_run_file(struct decoder *decoder, const char *path_fs) decoder_run_file(struct decoder *decoder, const char *path_fs)
{ {
struct decoder_control *dc = decoder->dc;
const char *suffix = uri_get_suffix(path_fs); const char *suffix = uri_get_suffix(path_fs);
const struct decoder_plugin *plugin = NULL; const struct decoder_plugin *plugin = NULL;
if (suffix == NULL) if (suffix == NULL)
return false; return false;
decoder_unlock(decoder->dc); decoder_unlock(dc);
while ((plugin = decoder_plugin_from_suffix(suffix, plugin)) != NULL) { while ((plugin = decoder_plugin_from_suffix(suffix, plugin)) != NULL) {
if (plugin->file_decode != NULL) { if (plugin->file_decode != NULL) {
decoder_lock(decoder->dc); decoder_lock(dc);
if (decoder_file_decode(plugin, decoder, path_fs)) if (decoder_file_decode(plugin, decoder, path_fs))
return true; return true;
decoder_unlock(decoder->dc); decoder_unlock(dc);
} else if (plugin->stream_decode != NULL) { } else if (plugin->stream_decode != NULL) {
struct input_stream input_stream; struct input_stream input_stream;
if (!input_stream_open(&input_stream, path_fs)) if (!input_stream_open(&input_stream, path_fs))
continue; continue;
decoder_lock(decoder->dc); decoder_lock(dc);
if (decoder_stream_decode(plugin, decoder, if (decoder_stream_decode(plugin, decoder,
&input_stream)) &input_stream))
return true; return true;
decoder_unlock(decoder->dc); decoder_unlock(dc);
} }
} }
decoder_lock(decoder->dc); decoder_lock(dc);
return false; return false;
} }