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

better method for computing total time played

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@1317 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes 2004-06-03 12:34:25 +00:00
parent c453f7dc52
commit 710ec5695b
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/decode.c
View File

@ -127,6 +127,9 @@ int calculateCrossFadeChunks(PlayerControl * pc, AudioFormat * af) {
pc->sampleRate = dc->audioFormat.sampleRate; \ pc->sampleRate = dc->audioFormat.sampleRate; \
pc->bits = dc->audioFormat.bits; \ pc->bits = dc->audioFormat.bits; \
pc->channels = dc->audioFormat.channels; \ pc->channels = dc->audioFormat.channels; \
sizeToTime = 8.0/cb->audioFormat.bits/ \
cb->audioFormat.channels/ \
cb->audioFormat.sampleRate; \
} \ } \
else if(dc->state!=DECODE_STATE_START || *decode_pid <= 0) { \ else if(dc->state!=DECODE_STATE_START || *decode_pid <= 0) { \
strncpy(pc->erroredUrl, pc->utf8url, MAXPATHLEN); \ strncpy(pc->erroredUrl, pc->utf8url, MAXPATHLEN); \
@ -198,7 +201,6 @@ int decodeSeek(PlayerControl * pc, DecoderControl * dc, OutputBuffer * cb,
while(*decode_pid>0 && dc->seek) my_usleep(10000); while(*decode_pid>0 && dc->seek) my_usleep(10000);
if(!dc->seekError) { if(!dc->seekError) {
pc->elapsedTime = dc->seekWhere; pc->elapsedTime = dc->seekWhere;
pc->beginTime = pc->elapsedTime;
ret = 0; ret = 0;
} }
} }
@ -240,7 +242,6 @@ int decodeSeek(PlayerControl * pc, DecoderControl * dc, OutputBuffer * cb,
if(pause) closeAudioDevice(); \ if(pause) closeAudioDevice(); \
} \ } \
if(pc->seek) { \ if(pc->seek) { \
pc->totalPlayTime+= pc->elapsedTime-pc->beginTime; \
if(decodeSeek(pc,dc,cb,&decodeWaitedOn) == 0) { \ if(decodeSeek(pc,dc,cb,&decodeWaitedOn) == 0) { \
doCrossFade = 0; \ doCrossFade = 0; \
nextChunk = -1; \ nextChunk = -1; \
@ -248,7 +249,6 @@ int decodeSeek(PlayerControl * pc, DecoderControl * dc, OutputBuffer * cb,
} \ } \
} \ } \
if(pc->stop) { \ if(pc->stop) { \
pc->totalPlayTime+= pc->elapsedTime-pc->beginTime; \
quitDecode(pc,dc); \ quitDecode(pc,dc); \
return; \ return; \
} }
@ -410,6 +410,7 @@ void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer * cb) {
int test; int test;
int decodeWaitedOn = 0; int decodeWaitedOn = 0;
char silence[CHUNK_SIZE]; char silence[CHUNK_SIZE];
double sizeToTime = 0.0;
memset(silence,0,CHUNK_SIZE); memset(silence,0,CHUNK_SIZE);
@ -417,7 +418,6 @@ void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer * cb) {
pc->state = PLAYER_STATE_PLAY; pc->state = PLAYER_STATE_PLAY;
pc->play = 0; pc->play = 0;
pc->beginTime = pc->elapsedTime;
kill(getppid(),SIGUSR1); kill(getppid(),SIGUSR1);
while(*decode_pid>0 && !cb->wrap && cb->end-cb->begin<bbp && while(*decode_pid>0 && !cb->wrap && cb->end-cb->begin<bbp &&
@ -517,6 +517,7 @@ void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer * cb) {
{ {
quit = 1; quit = 1;
} }
pc->totalPlayTime+= sizeToTime*cb->chunkSize[cb->begin];
cb->begin++; cb->begin++;
if(cb->begin>=buffered_chunks) { if(cb->begin>=buffered_chunks) {
cb->begin = 0; cb->begin = 0;
@ -524,8 +525,6 @@ void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer * cb) {
} }
} }
else if(cb->next==cb->begin) { else if(cb->next==cb->begin) {
pc->totalPlayTime+= pc->elapsedTime-
pc->beginTime;
if(doCrossFade==1 && nextChunk>=0) { if(doCrossFade==1 && nextChunk>=0) {
nextChunk = cb->begin+crossFadeChunks; nextChunk = cb->begin+crossFadeChunks;
test = cb->end; test = cb->end;
@ -563,7 +562,6 @@ void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer * cb) {
pc->queueState = PLAYER_QUEUE_EMPTY; pc->queueState = PLAYER_QUEUE_EMPTY;
kill(getppid(),SIGUSR1); kill(getppid(),SIGUSR1);
} }
pc->beginTime = cb->times[cb->begin];
} }
else if(*decode_pid<=0 || else if(*decode_pid<=0 ||
(dc->state==DECODE_STATE_STOP && !dc->start)) (dc->state==DECODE_STATE_STOP && !dc->start))
@ -576,7 +574,6 @@ void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer * cb) {
} }
} }
pc->totalPlayTime+= pc->elapsedTime-pc->beginTime; \
quitDecode(pc,dc); quitDecode(pc,dc);
} }

6
src/player.c
View File

@ -442,11 +442,7 @@ int getPlayerSoftwareVolume() {
double getPlayerTotalPlayTime() { double getPlayerTotalPlayTime() {
PlayerControl * pc = &(getPlayerData()->playerControl); PlayerControl * pc = &(getPlayerData()->playerControl);
if(pc->state==PLAYER_STATE_STOP) { return pc->totalPlayTime;
return pc->totalPlayTime;
}
return pc->totalPlayTime+pc->elapsedTime-pc->beginTime;
} }
unsigned int getPlayerSampleRate() { unsigned int getPlayerSampleRate() {

1
src/player.h
View File

@ -66,7 +66,6 @@ typedef struct _PlayerControl {
volatile mpd_sint8 bits; volatile mpd_sint8 bits;
volatile mpd_sint8 channels; volatile mpd_sint8 channels;
volatile mpd_uint32 sampleRate; volatile mpd_uint32 sampleRate;
volatile float beginTime;
volatile float totalTime; volatile float totalTime;
volatile float elapsedTime; volatile float elapsedTime;
volatile float fileTime; volatile float fileTime;