Skip to content

M
mpd
Commit 00a16b49 authored by Max Kellermann's avatar Max Kellermann Committed by Eric Wong
Browse files
Options

use break instead of quitDecode()+return

The code paths which return from the functions all have to call quitDecode(). If we simply break instead of calling quitDecode() explicitly, this function gets called in the last line of this function anyway. git-svn-id: https://svn.musicpd.org/mpd/trunk@7278 09075e82-0dd4-0310-85a5-a0d7c8717e4f
parent 646260b1
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 6 deletions
src/decode.c
View file @ 00a16b49
......@@ -427,8 +427,7 @@ static void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer *
&decodeWaitedOn, &next);
if (pc->stop) {
dropBufferedAudio();
quitDecode(pc,dc);
return;
break;
}
if (buffering) {
......@@ -453,8 +452,7 @@ static void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer *
ERROR("problems opening audio device "
"while playing \"%s\"\n",
get_song_url(tmp, pc->current_song));
quitDecode(pc,dc);
return;
break;
} else {
player_wakeup_decoder();
}
......@@ -472,8 +470,7 @@ static void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer *
/* the decoder failed */
pc->errored_song = pc->current_song;
pc->error = PLAYER_ERROR_FILE;
quitDecode(pc,dc);
return;
break;
}
else {
/* the decoder is not yet ready; wait
......
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