Skip to content

M
mpd
You need to sign in or sign up before continuing.
Commit af58de65 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

simplified code in the ogg decoder plugin

Return early when the player thread sent us a command. This saves one level of indentation.
parent 940ecf53
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
src/inputPlugins/oggvorbis_plugin.c
View file @ af58de65
...@@ -232,7 +232,9 @@ static int oggvorbis_decode(struct decoder * decoder, InputStream * inStream) ...@@ -232,7 +232,9 @@ static int oggvorbis_decode(struct decoder * decoder, InputStream * inStream)
callbacks.close_func = ogg_close_cb; callbacks.close_func = ogg_close_cb;
callbacks.tell_func = ogg_tell_cb; callbacks.tell_func = ogg_tell_cb;
if ((ret = ov_open_callbacks(&data, &vf, NULL, 0, callbacks)) < 0) { if ((ret = ov_open_callbacks(&data, &vf, NULL, 0, callbacks)) < 0) {
if (decoder_get_command(decoder) != DECODE_COMMAND_STOP) { if (decoder_get_command(decoder) != DECODE_COMMAND_NONE)
return 0;
switch (ret) { switch (ret) {
case OV_EREAD: case OV_EREAD:
errorStr = "read error"; errorStr = "read error";
...@@ -257,8 +259,6 @@ static int oggvorbis_decode(struct decoder * decoder, InputStream * inStream) ...@@ -257,8 +259,6 @@ static int oggvorbis_decode(struct decoder * decoder, InputStream * inStream)
errorStr); errorStr);
return -1; return -1;
} }
return 0;
}
audio_format.bits = 16; audio_format.bits = 16;
while (1) { while (1) {
......
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