Skip to content

M
mpd
Commit 71094905 authored by J. Alexander Treuman's avatar J. Alexander Treuman
Browse files
Options

Cleanup some formatting in decode.c.

git-svn-id: https://svn.musicpd.org/mpd/trunk@6480 09075e82-0dd4-0310-85a5-a0d7c8717e4f
parent 4685c782
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 10 deletions
src/decode.c
View file @ 71094905
...@@ -318,9 +318,7 @@ static void decodeStart(PlayerControl * pc, OutputBuffer * cb, ...@@ -318,9 +318,7 @@ static void decodeStart(PlayerControl * pc, OutputBuffer * cb,
cb->acceptMetadata = 1; cb->acceptMetadata = 1;
/* first we try mime types: */ /* first we try mime types: */
while (ret while (ret && (plugin = getInputPluginFromMimeType(inStream.mime, next++))) {
&& (plugin =
getInputPluginFromMimeType(inStream.mime, next++))) {
if (!plugin->streamDecodeFunc) if (!plugin->streamDecodeFunc)
continue; continue;
if (!(plugin->streamTypes & INPUT_PLUGIN_STREAM_URL)) if (!(plugin->streamTypes & INPUT_PLUGIN_STREAM_URL))
...@@ -336,9 +334,7 @@ static void decodeStart(PlayerControl * pc, OutputBuffer * cb, ...@@ -336,9 +334,7 @@ static void decodeStart(PlayerControl * pc, OutputBuffer * cb,
if (plugin == NULL) { if (plugin == NULL) {
char *s = getSuffix(dc->utf8url); char *s = getSuffix(dc->utf8url);
next = 0; next = 0;
while (ret while (ret && (plugin = getInputPluginFromSuffix(s, next++))) {
&& (plugin =
getInputPluginFromSuffix(s, next++))) {
if (!plugin->streamDecodeFunc) if (!plugin->streamDecodeFunc)
continue; continue;
if (!(plugin->streamTypes & if (!(plugin->streamTypes &
...@@ -347,8 +343,7 @@ static void decodeStart(PlayerControl * pc, OutputBuffer * cb, ...@@ -347,8 +343,7 @@ static void decodeStart(PlayerControl * pc, OutputBuffer * cb,
if (plugin->tryDecodeFunc && if (plugin->tryDecodeFunc &&
!plugin->tryDecodeFunc(&inStream)) !plugin->tryDecodeFunc(&inStream))
continue; continue;
ret = ret = plugin->streamDecodeFunc(cb, dc, &inStream);
plugin->streamDecodeFunc(cb, dc, &inStream);
break; break;
} }
} }
...@@ -359,8 +354,7 @@ static void decodeStart(PlayerControl * pc, OutputBuffer * cb, ...@@ -359,8 +354,7 @@ static void decodeStart(PlayerControl * pc, OutputBuffer * cb,
/* we already know our mp3Plugin supports streams, no /* we already know our mp3Plugin supports streams, no
* need to check for stream{Types,DecodeFunc} */ * need to check for stream{Types,DecodeFunc} */
if ((plugin = getInputPluginFromName("mp3"))) if ((plugin = getInputPluginFromName("mp3")))
ret = plugin->streamDecodeFunc(cb, dc, ret = plugin->streamDecodeFunc(cb, dc, &inStream);
&inStream);
} }
} else { } else {
unsigned int next = 0; unsigned int next = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment