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

return to busy-waiting on pause for now..

Browse Source 
Until we can fix it properly (or replace it with a cleaner event
system), I don't want this in trunk.  Currently there are
strange pauses when queueing and during shutdown that I can't
seem to figure out right away.

git-svn-id: https://svn.musicpd.org/mpd/trunk@6860 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Eric Wong 2007-09-06 00:45:34 +00:00
parent fe584bb11c
commit 7024700cc5
2 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/decode.c
View File

@ -71,7 +71,6 @@ static void stopDecode(DecoderControl * dc)
{ {
if (decode_pid > 0 && (dc->start || dc->state != DECODE_STATE_STOP)) { if (decode_pid > 0 && (dc->start || dc->state != DECODE_STATE_STOP)) {
dc->stop = 1; dc->stop = 1;
kill(decode_pid, SIGCONT);
while (decode_pid > 0 && dc->stop) while (decode_pid > 0 && dc->stop)
my_usleep(10000); my_usleep(10000);
} }
@ -127,8 +126,7 @@ static int calculateCrossFadeChunks(PlayerControl * pc, AudioFormat * af)
ERROR("problems opening audio device while playing \"%s\"\n", pc->utf8url); \ ERROR("problems opening audio device while playing \"%s\"\n", pc->utf8url); \
quitDecode(pc,dc); \ quitDecode(pc,dc); \
return; \ return; \
} else if (decode_pid > 0) { \ } \
kill(decode_pid, SIGCONT); }\
if (pause) { \ if (pause) { \
dropBufferedAudio(); \ dropBufferedAudio(); \
closeAudioDevice(); \ closeAudioDevice(); \
@ -240,8 +238,6 @@ static int decodeSeek(PlayerControl * pc, DecoderControl * dc,
pc->state = PLAYER_STATE_PAUSE; \ pc->state = PLAYER_STATE_PAUSE; \
} else { \ } else { \
if (openAudioDevice(NULL) >= 0) { \ if (openAudioDevice(NULL) >= 0) { \
if (decode_pid > 0) \
kill(decode_pid, SIGCONT); \
pc->state = PLAYER_STATE_PLAY; \ pc->state = PLAYER_STATE_PLAY; \
} else { \ } else { \
pathcpy_trunc(pc->erroredUrl, pc->utf8url); \ pathcpy_trunc(pc->erroredUrl, pc->utf8url); \
@ -583,11 +579,9 @@ static void decodeParent(PlayerControl * pc, DecoderControl * dc, OutputBuffer *
race conditions and weirdness */ race conditions and weirdness */
end = cb->end; end = cb->end;
if (pause) { if (pause)
if (decode_pid) my_usleep(10000);
kill(decode_pid, SIGSTOP); else if (cb->begin != end && cb->begin != next) {
kill(getpid(), SIGSTOP);
} else if (cb->begin != end && cb->begin != next) {
if (doCrossFade == 1 && next >= 0 && if (doCrossFade == 1 && next >= 0 &&
((next > cb->begin && ((next > cb->begin &&
(fadePosition = next - cb->begin) (fadePosition = next - cb->begin)

14
src/player.c
View File

@ -194,10 +194,6 @@ int playerWait(int fd)
if (pc->wait) if (pc->wait)
return 0; return 0;
pid = player_pid;
if (pid > 0)
kill(pid, SIGCONT);
if (playerStop(fd) < 0) if (playerStop(fd) < 0)
return -1; return -1;
@ -235,8 +231,6 @@ int playerPlay(int fd, Song * song)
} }
resetPlayerMetadata(); resetPlayerMetadata();
if (player_pid)
kill(player_pid, SIGCONT);
while (player_pid > 0 && pc->play) while (player_pid > 0 && pc->play)
my_usleep(1000); my_usleep(1000);
@ -249,7 +243,6 @@ int playerStop(int fd)
if (player_pid > 0 && pc->state != PLAYER_STATE_STOP) { if (player_pid > 0 && pc->state != PLAYER_STATE_STOP) {
pc->stop = 1; pc->stop = 1;
kill(player_pid, SIGCONT);
while (player_pid > 0 && pc->stop) while (player_pid > 0 && pc->stop)
my_usleep(1000); my_usleep(1000);
} }
@ -277,8 +270,6 @@ int playerPause(int fd)
if (player_pid > 0 && pc->state != PLAYER_STATE_STOP) { if (player_pid > 0 && pc->state != PLAYER_STATE_STOP) {
pc->pause = 1; pc->pause = 1;
if (player_pid > 0 && pc->state == PLAYER_STATE_PAUSE)
kill(player_pid, SIGCONT);
while (player_pid > 0 && pc->pause) while (player_pid > 0 && pc->pause)
my_usleep(1000); my_usleep(1000);
} }
@ -386,7 +377,6 @@ void playerCloseAudio(void)
if (playerStop(STDERR_FILENO) < 0) if (playerStop(STDERR_FILENO) < 0)
return; return;
pc->closeAudio = 1; pc->closeAudio = 1;
kill(player_pid, SIGCONT);
while (player_pid > 0 && pc->closeAudio) while (player_pid > 0 && pc->closeAudio)
my_usleep(1000); my_usleep(1000);
} }
@ -432,7 +422,6 @@ void playerQueueLock(void)
PlayerControl *pc = &(getPlayerData()->playerControl); PlayerControl *pc = &(getPlayerData()->playerControl);
if (player_pid > 0 && pc->queueLockState == PLAYER_QUEUE_UNLOCKED) { if (player_pid > 0 && pc->queueLockState == PLAYER_QUEUE_UNLOCKED) {
kill(player_pid, SIGCONT);
pc->lockQueue = 1; pc->lockQueue = 1;
while (player_pid > 0 && pc->lockQueue) while (player_pid > 0 && pc->lockQueue)
my_usleep(1000); my_usleep(1000);
@ -444,7 +433,6 @@ void playerQueueUnlock(void)
PlayerControl *pc = &(getPlayerData()->playerControl); PlayerControl *pc = &(getPlayerData()->playerControl);
if (player_pid > 0 && pc->queueLockState == PLAYER_QUEUE_LOCKED) { if (player_pid > 0 && pc->queueLockState == PLAYER_QUEUE_LOCKED) {
kill(player_pid, SIGCONT);
pc->unlockQueue = 1; pc->unlockQueue = 1;
while (player_pid > 0 && pc->unlockQueue) while (player_pid > 0 && pc->unlockQueue)
my_usleep(1000); my_usleep(1000);
@ -476,8 +464,6 @@ int playerSeek(int fd, Song * song, float time)
resetPlayerMetadata(); resetPlayerMetadata();
pc->seekWhere = time; pc->seekWhere = time;
pc->seek = 1; pc->seek = 1;
if (player_pid)
kill(player_pid, SIGCONT);
while (player_pid > 0 && pc->seek) while (player_pid > 0 && pc->seek)
my_usleep(1000); my_usleep(1000);
} }