oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

get rid of seekError in DecoderControl

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@1101 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes 2004-05-20 00:16:24 +00:00
parent 70d4397366
commit 05cbc476f5
4 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/aac_decode.c
View File

@ -364,10 +364,7 @@ int aac_decode(OutputBuffer * cb, DecoderControl * dc) {
sendDataToOutputBuffer(cb,dc,sampleBuffer,sampleBufferLen, sendDataToOutputBuffer(cb,dc,sampleBuffer,sampleBufferLen,
time,bitRate); time,bitRate);
if(dc->seek) { if(dc->seek) dc->seek = 0;
dc->seekError = 1;
dc->seek = 0;
}
else if(dc->stop) { else if(dc->stop) {
eof = 1; eof = 1;
break; break;

11
src/decode.c
View File

@ -179,15 +179,11 @@ int decodeSeek(PlayerControl * pc, DecoderControl * dc, OutputBuffer * cb,
pc->totalTime-0.1 : pc->totalTime-0.1 :
pc->seekWhere; pc->seekWhere;
dc->seekWhere = 0 > dc->seekWhere ? 0 : dc->seekWhere; dc->seekWhere = 0 > dc->seekWhere ? 0 : dc->seekWhere;
dc->seekError = 0;
dc->seekChunk = -1; dc->seekChunk = -1;
dc->seek = 1; dc->seek = 1;
/*pc->bitRate = 0;*/ pc->elapsedTime = dc->seekWhere;
/*while(*decode_pid>0 && dc->seek) my_usleep(1000);*/ pc->beginTime = pc->elapsedTime;
/*if(!dc->seekError) {*/ ret = 0;
ret = 0;
pc->elapsedTime = dc->seekWhere;
/*}*/
} }
} }
pc->seek = 0; pc->seek = 0;
@ -228,7 +224,6 @@ int decodeSeek(PlayerControl * pc, DecoderControl * dc, OutputBuffer * cb,
if(pc->seek) { \ if(pc->seek) { \
pc->totalPlayTime+= pc->elapsedTime-pc->beginTime; \ pc->totalPlayTime+= pc->elapsedTime-pc->beginTime; \
if(decodeSeek(pc,dc,cb,&decodeWaitedOn) == 0) { \ if(decodeSeek(pc,dc,cb,&decodeWaitedOn) == 0) { \
pc->beginTime = pc->elapsedTime; \
doCrossFade = 0; \ doCrossFade = 0; \
nextChunk = -1; \ nextChunk = -1; \
bbp = 0; \ bbp = 0; \

1
src/decode.h
View File

@ -52,7 +52,6 @@ typedef struct _DecoderControl {
volatile mpd_uint16 error; volatile mpd_uint16 error;
volatile mpd_sint8 seek; volatile mpd_sint8 seek;
volatile mpd_sint16 seekChunk; volatile mpd_sint16 seekChunk;
volatile mpd_sint8 seekError;
volatile mpd_sint8 cycleLogFiles; volatile mpd_sint8 cycleLogFiles;
volatile double seekWhere; volatile double seekWhere;
char file[MAXPATHLEN+1]; char file[MAXPATHLEN+1];

1
src/mp3_decode.c
View File

@ -522,7 +522,6 @@ int mp3Read(mp3DecodeData * data, OutputBuffer * cb, DecoderControl * dc) {
data->currentFrame = i; data->currentFrame = i;
data->muteFrame = 0; data->muteFrame = 0;
} }
else dc->seekError = 1;
dc->seek = 0; dc->seek = 0;
} }
} }