diff options
author | Max Kellermann <max@duempel.org> | 2008-08-26 08:27:04 +0200 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2008-08-26 08:27:04 +0200 |
commit | 8d3942e0c3b4108e8968e914da75bf7c6c43f408 (patch) | |
tree | 69d7eba9eb5f0273a61698169088e0ee70cdb297 /src/outputBuffer.c | |
parent | 180d78a8e631cb4d48ef468709099a8c43d7ef51 (diff) | |
download | mpd-8d3942e0c3b4108e8968e914da75bf7c6c43f408.tar.gz mpd-8d3942e0c3b4108e8968e914da75bf7c6c43f408.tar.xz mpd-8d3942e0c3b4108e8968e914da75bf7c6c43f408.zip |
merged start, stop, seek into DecoderControl.command
Much of the existing code queries all three variables sequentially.
Since only one of them can be set at a time, this can be optimized and
unified by merging all of them into one enum variable. Later, the
"command" checks can be expressed in a "switch" statement.
Diffstat (limited to 'src/outputBuffer.c')
-rw-r--r-- | src/outputBuffer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/outputBuffer.c b/src/outputBuffer.c index b0cfc00df..3b280e3a7 100644 --- a/src/outputBuffer.c +++ b/src/outputBuffer.c @@ -171,15 +171,15 @@ static int tailChunk(InputStream * inStream, /* all chunks are full of decoded data; wait for the player to free one */ - if (dc.stop) + if (dc.command == DECODE_COMMAND_STOP) return OUTPUT_BUFFER_DC_STOP; - if (dc.seek) { + if (dc.command == DECODE_COMMAND_SEEK) { if (seekable) { return OUTPUT_BUFFER_DC_SEEK; } else { dc.seekError = 1; - dc.seek = 0; + dc.command = DECODE_COMMAND_NONE; decoder_wakeup_player(); } } |