fix seeking more than once when paused, by returning immediatly on dc->seek
in sendToOutputBuffer git-svn-id: https://svn.musicpd.org/mpd/trunk@1216 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
parent
82f6f5b7a3
commit
e93229bf49
@ -74,7 +74,8 @@ int sendDataToOutputBuffer(OutputBuffer * cb, InputStream * inStream,
|
|||||||
|
|
||||||
while(datalen) {
|
while(datalen) {
|
||||||
if(currentChunk != cb->end) {
|
if(currentChunk != cb->end) {
|
||||||
while(cb->begin==cb->end && cb->wrap && !dc->stop)
|
while(cb->begin==cb->end && cb->wrap && !dc->stop &&
|
||||||
|
!dc->seek)
|
||||||
{
|
{
|
||||||
if(!inStream ||
|
if(!inStream ||
|
||||||
bufferInputStream(inStream) <= 0)
|
bufferInputStream(inStream) <= 0)
|
||||||
@ -83,6 +84,7 @@ int sendDataToOutputBuffer(OutputBuffer * cb, InputStream * inStream,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(dc->stop) return OUTPUT_BUFFER_DC_STOP;
|
if(dc->stop) return OUTPUT_BUFFER_DC_STOP;
|
||||||
|
if(dc->seek) return OUTPUT_BUFFER_DC_SEEK;
|
||||||
|
|
||||||
currentChunk = cb->end;
|
currentChunk = cb->end;
|
||||||
cb->chunkSize[currentChunk] = 0;
|
cb->chunkSize[currentChunk] = 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user