From be753fb53d95859204a478c4359c9653eb33511e Mon Sep 17 00:00:00 2001 From: Warren Dukes Date: Thu, 18 Mar 2004 18:35:23 +0000 Subject: [PATCH] make all sleeps at least 1 ms git-svn-id: https://svn.musicpd.org/mpd/trunk@279 09075e82-0dd4-0310-85a5-a0d7c8717e4f --- src/decode.c | 8 ++++---- src/player.c | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/decode.c b/src/decode.c index 8cc1bf071..4a9ed21ae 100644 --- a/src/decode.c +++ b/src/decode.c @@ -78,7 +78,7 @@ void stopDecode(DecoderControl * dc) { (dc->start || dc->state==DECODE_STATE_DECODE)) { dc->stop = 1; - while(decode_pid && *decode_pid>0 && dc->stop) usleep(10); + while(decode_pid && *decode_pid>0 && dc->stop) usleep(1000); } } @@ -111,7 +111,7 @@ int calculateCrossFadeChunks(PlayerControl * pc, AudioFormat * af) { int waitOnDecode(PlayerControl * pc, AudioFormat * af, DecoderControl * dc, Buffer * cb) { - while(decode_pid && *decode_pid>0 && dc->start) usleep(10); + while(decode_pid && *decode_pid>0 && dc->start) usleep(1000); if(dc->start || dc->error!=DECODE_ERROR_NOERROR) { strncpy(pc->erroredFile,pc->file,MAXPATHLEN); @@ -162,7 +162,7 @@ void decodeSeek(PlayerControl * pc, AudioFormat * af, DecoderControl * dc, dc->seek = 1; pc->elapsedTime = dc->seekWhere; pc->bitRate = 0; - while(*decode_pid>0 && dc->seek) usleep(10); + while(*decode_pid>0 && dc->seek) usleep(1000); } } pc->seek = 0; @@ -443,7 +443,7 @@ void decode() { quitDecode(pc,dc); return; } - usleep(10); + usleep(1000); } if(pc->queueState!=PLAYER_QUEUE_PLAY) { quit = 1; diff --git a/src/player.c b/src/player.c index 084edd1b5..fc906d1eb 100644 --- a/src/player.c +++ b/src/player.c @@ -194,7 +194,7 @@ int playerPlay(FILE * fp, char * utf8file) { return -1; } - while(player_pid>0 && pc->play) usleep(10); + while(player_pid>0 && pc->play) usleep(1000); return 0; } @@ -204,7 +204,7 @@ int playerStop(FILE * fp) { if(player_pid>0 && pc->state!=PLAYER_STATE_STOP) { pc->stop = 1; - while(player_pid>0 && pc->stop) usleep(10); + while(player_pid>0 && pc->stop) usleep(1000); } pc->queueState = PLAYER_QUEUE_BLANK; @@ -230,7 +230,7 @@ int playerPause(FILE * fp) { if(player_pid>0 && pc->state!=PLAYER_STATE_STOP) { pc->pause = 1; - while(player_pid>0 && pc->pause) usleep(10); + while(player_pid>0 && pc->pause) usleep(1000); } return 0; @@ -361,7 +361,7 @@ void playerQueueLock() { if(player_pid>0 && pc->queueLockState==PLAYER_QUEUE_UNLOCKED) { pc->lockQueue = 1; - while(player_pid>0 && pc->lockQueue) usleep(10); + while(player_pid>0 && pc->lockQueue) usleep(1000); } } @@ -371,7 +371,7 @@ void playerQueueUnlock() { if(player_pid>0 && pc->queueLockState==PLAYER_QUEUE_LOCKED) { pc->unlockQueue = 1; - while(player_pid>0 && pc->unlockQueue) usleep(10); + while(player_pid>0 && pc->unlockQueue) usleep(1000); } } @@ -394,7 +394,7 @@ int playerSeek(FILE * fp, char * utf8file, float time) { if(pc->error==PLAYER_ERROR_NOERROR) { pc->seekWhere = time; pc->seek = 1; - while(player_pid>0 && pc->seek) usleep(10); + while(player_pid>0 && pc->seek) usleep(1000); } return 0;