aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ. Alexander Treuman <jat@spatialrift.net>2007-06-04 18:55:46 +0000
committerJ. Alexander Treuman <jat@spatialrift.net>2007-06-04 18:55:46 +0000
commit71094905e30d0e63ca1bb281e1621299e3b0e110 (patch)
treefb97d688b96322535db0cc1d8424a9307bb8fc20
parent4685c782c41f65a864aa9976663f7cc1309aeae1 (diff)
downloadmpd-71094905e30d0e63ca1bb281e1621299e3b0e110.tar.gz
mpd-71094905e30d0e63ca1bb281e1621299e3b0e110.tar.xz
mpd-71094905e30d0e63ca1bb281e1621299e3b0e110.zip
Cleanup some formatting in decode.c.
git-svn-id: https://svn.musicpd.org/mpd/trunk@6480 09075e82-0dd4-0310-85a5-a0d7c8717e4f
-rw-r--r--src/decode.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/decode.c b/src/decode.c
index 82eba19b9..8ed5776f9 100644
--- a/src/decode.c
+++ b/src/decode.c
@@ -318,9 +318,7 @@ static void decodeStart(PlayerControl * pc, OutputBuffer * cb,
cb->acceptMetadata = 1;
/* first we try mime types: */
- while (ret
- && (plugin =
- getInputPluginFromMimeType(inStream.mime, next++))) {
+ while (ret && (plugin = getInputPluginFromMimeType(inStream.mime, next++))) {
if (!plugin->streamDecodeFunc)
continue;
if (!(plugin->streamTypes & INPUT_PLUGIN_STREAM_URL))
@@ -336,9 +334,7 @@ static void decodeStart(PlayerControl * pc, OutputBuffer * cb,
if (plugin == NULL) {
char *s = getSuffix(dc->utf8url);
next = 0;
- while (ret
- && (plugin =
- getInputPluginFromSuffix(s, next++))) {
+ while (ret && (plugin = getInputPluginFromSuffix(s, next++))) {
if (!plugin->streamDecodeFunc)
continue;
if (!(plugin->streamTypes &
@@ -347,8 +343,7 @@ static void decodeStart(PlayerControl * pc, OutputBuffer * cb,
if (plugin->tryDecodeFunc &&
!plugin->tryDecodeFunc(&inStream))
continue;
- ret =
- plugin->streamDecodeFunc(cb, dc, &inStream);
+ ret = plugin->streamDecodeFunc(cb, dc, &inStream);
break;
}
}
@@ -359,8 +354,7 @@ static void decodeStart(PlayerControl * pc, OutputBuffer * cb,
/* we already know our mp3Plugin supports streams, no
* need to check for stream{Types,DecodeFunc} */
if ((plugin = getInputPluginFromName("mp3")))
- ret = plugin->streamDecodeFunc(cb, dc,
- &inStream);
+ ret = plugin->streamDecodeFunc(cb, dc, &inStream);
}
} else {
unsigned int next = 0;