Skip to content

M
mpd
Commit f10d9996 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

decoder/mad: simplify if/else chain

parent 58ec9d3a
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 8 deletions
src/decoder/plugins/MadDecoderPlugin.cxx
View file @ f10d9996
...@@ -432,10 +432,10 @@ MadDecoder::DecodeNextFrameHeader(Tag **tag) ...@@ -432,10 +432,10 @@ MadDecoder::DecodeNextFrameHeader(Tag **tag)
return DECODE_CONT; return DECODE_CONT;
} }
} }
if (MAD_RECOVERABLE(stream.error)) {
if (MAD_RECOVERABLE(stream.error))
return DECODE_SKIP; return DECODE_SKIP;
} else { else if (stream.error == MAD_ERROR_BUFLEN)
if (stream.error == MAD_ERROR_BUFLEN)
return DECODE_CONT; return DECODE_CONT;
else { else {
FormatWarning(mad_domain, FormatWarning(mad_domain,
...@@ -444,7 +444,6 @@ MadDecoder::DecodeNextFrameHeader(Tag **tag) ...@@ -444,7 +444,6 @@ MadDecoder::DecodeNextFrameHeader(Tag **tag)
return DECODE_BREAK; return DECODE_BREAK;
} }
} }
}
enum mad_layer new_layer = frame.header.layer; enum mad_layer new_layer = frame.header.layer;
if (layer == (mad_layer)0) { if (layer == (mad_layer)0) {
...@@ -479,10 +478,10 @@ MadDecoder::DecodeNextFrame() ...@@ -479,10 +478,10 @@ MadDecoder::DecodeNextFrame()
return DECODE_CONT; return DECODE_CONT;
} }
} }
if (MAD_RECOVERABLE(stream.error)) {
if (MAD_RECOVERABLE(stream.error))
return DECODE_SKIP; return DECODE_SKIP;
} else { else if (stream.error == MAD_ERROR_BUFLEN)
if (stream.error == MAD_ERROR_BUFLEN)
return DECODE_CONT; return DECODE_CONT;
else { else {
FormatWarning(mad_domain, FormatWarning(mad_domain,
...@@ -491,7 +490,6 @@ MadDecoder::DecodeNextFrame() ...@@ -491,7 +490,6 @@ MadDecoder::DecodeNextFrame()
return DECODE_BREAK; return DECODE_BREAK;
} }
} }
}
return DECODE_OK; return DECODE_OK;
} }
......
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