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

decoder: moved code to decoder_try_decode()

Browse Source
This commit is contained in:
Max Kellermann 2008-11-02 17:07:39 +01:00
parent 5183d85886
commit 395aa4e847
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/decoder_thread.c
View File

@ -28,6 +28,16 @@
#include "log.h" #include "log.h"
#include "ls.h" #include "ls.h"
static bool
decoder_try_decode(const struct decoder_plugin *plugin,
struct input_stream *input_stream)
{
if (plugin->try_decode == NULL)
return true;
return plugin->try_decode(input_stream);
}
static void decodeStart(void) static void decodeStart(void)
{ {
struct song *song = dc.next_song; struct song *song = dc.next_song;
@ -91,8 +101,7 @@ static void decodeStart(void)
continue; continue;
if (!(plugin->stream_types & INPUT_PLUGIN_STREAM_URL)) if (!(plugin->stream_types & INPUT_PLUGIN_STREAM_URL))
continue; continue;
if (plugin->try_decode != NULL if (!decoder_try_decode(plugin, &inStream))
&& !plugin->try_decode(&inStream))
continue; continue;
ret = plugin->stream_decode(&decoder, &inStream); ret = plugin->stream_decode(&decoder, &inStream);
break; break;
@ -108,8 +117,7 @@ static void decodeStart(void)
if (!(plugin->stream_types & if (!(plugin->stream_types &
INPUT_PLUGIN_STREAM_URL)) INPUT_PLUGIN_STREAM_URL))
continue; continue;
if (plugin->try_decode != NULL && if (!decoder_try_decode(plugin, &inStream))
!plugin->try_decode(&inStream))
continue; continue;
decoder.plugin = plugin; decoder.plugin = plugin;
ret = plugin->stream_decode(&decoder, ret = plugin->stream_decode(&decoder,
@ -136,8 +144,7 @@ static void decodeStart(void)
if (!plugin->stream_types & INPUT_PLUGIN_STREAM_FILE) if (!plugin->stream_types & INPUT_PLUGIN_STREAM_FILE)
continue; continue;
if (plugin->try_decode != NULL && if (!decoder_try_decode(plugin, &inStream))
!plugin->try_decode(&inStream))
continue; continue;
if (plugin->file_decode != NULL) { if (plugin->file_decode != NULL) {