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

simplify several dc->command checks

Browse Source 
Since we have merged dc->stop, dc->seek into one variable, we don't
have to check both conditions at a time; we can replace "!stop &&
!seek" with "none".
This commit is contained in:
Max Kellermann 2008-08-26 08:27:06 +02:00
parent 0d8b551c5a
commit ee3bbb5028
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/inputPlugins/mp3_plugin.c
View File

@ -983,19 +983,15 @@ static int mp3Read(mp3DecodeData * data, struct decoder *decoder,
decodeNextFrameHeader(data, NULL, decodeNextFrameHeader(data, NULL,
replayGainInfo)) == DECODE_CONT replayGainInfo)) == DECODE_CONT
&& dc.command != DECODE_COMMAND_STOP) ; && dc.command != DECODE_COMMAND_STOP) ;
if (ret == DECODE_BREAK || if (ret == DECODE_BREAK || dc.command != DECODE_COMMAND_NONE)
dc.command == DECODE_COMMAND_STOP ||
dc.command == DECODE_COMMAND_SEEK)
break; break;
else if (ret == DECODE_SKIP) else if (ret == DECODE_SKIP)
skip = 1; skip = 1;
if (!data->muteFrame) { if (!data->muteFrame) {
while ((ret = decodeNextFrame(data)) == DECODE_CONT && while ((ret = decodeNextFrame(data)) == DECODE_CONT &&
dc.command != DECODE_COMMAND_STOP && dc.command == DECODE_COMMAND_NONE) ;
dc.command != DECODE_COMMAND_SEEK) ;
if (ret == DECODE_BREAK || if (ret == DECODE_BREAK ||
dc.command == DECODE_COMMAND_STOP || dc.command != DECODE_COMMAND_NONE)
dc.command == DECODE_COMMAND_SEEK)
break; break;
} }
if (!skip && ret == DECODE_OK) if (!skip && ret == DECODE_OK)