diff options
| author | Eric Wong <normalperson@yhbt.net> | 2007-09-06 00:45:34 +0000 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2007-09-06 00:45:34 +0000 |
| commit | 7024700cc51914c3b93e0fd3747f2c3c99ac484a (patch) | |
| tree | 4ad4d3459128155d2ca172b41522f7c83cd57b6a /src/player.c | |
| parent | fe584bb11c20fbc42055070f27c2a1c62e7e38e3 (diff) | |
| download | mpd-7024700cc51914c3b93e0fd3747f2c3c99ac484a.tar.gz mpd-7024700cc51914c3b93e0fd3747f2c3c99ac484a.tar.xz mpd-7024700cc51914c3b93e0fd3747f2c3c99ac484a.zip | |
return to busy-waiting on pause for now..
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
Diffstat (limited to 'src/player.c')
| -rw-r--r-- | src/player.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/player.c b/src/player.c index 700d37b51..c53a6ae1d 100644 --- a/src/player.c +++ b/src/player.c @@ -194,10 +194,6 @@ int playerWait(int fd) if (pc->wait) return 0; - pid = player_pid; - if (pid > 0) - kill(pid, SIGCONT); - if (playerStop(fd) < 0) return -1; @@ -235,8 +231,6 @@ int playerPlay(int fd, Song * song) } resetPlayerMetadata(); - if (player_pid) - kill(player_pid, SIGCONT); while (player_pid > 0 && pc->play) my_usleep(1000); @@ -249,7 +243,6 @@ int playerStop(int fd) if (player_pid > 0 && pc->state != PLAYER_STATE_STOP) { pc->stop = 1; - kill(player_pid, SIGCONT); while (player_pid > 0 && pc->stop) my_usleep(1000); } @@ -277,8 +270,6 @@ int playerPause(int fd) if (player_pid > 0 && pc->state != PLAYER_STATE_STOP) { pc->pause = 1; - if (player_pid > 0 && pc->state == PLAYER_STATE_PAUSE) - kill(player_pid, SIGCONT); while (player_pid > 0 && pc->pause) my_usleep(1000); } @@ -386,7 +377,6 @@ void playerCloseAudio(void) if (playerStop(STDERR_FILENO) < 0) return; pc->closeAudio = 1; - kill(player_pid, SIGCONT); while (player_pid > 0 && pc->closeAudio) my_usleep(1000); } @@ -432,7 +422,6 @@ void playerQueueLock(void) PlayerControl *pc = &(getPlayerData()->playerControl); if (player_pid > 0 && pc->queueLockState == PLAYER_QUEUE_UNLOCKED) { - kill(player_pid, SIGCONT); pc->lockQueue = 1; while (player_pid > 0 && pc->lockQueue) my_usleep(1000); @@ -444,7 +433,6 @@ void playerQueueUnlock(void) PlayerControl *pc = &(getPlayerData()->playerControl); if (player_pid > 0 && pc->queueLockState == PLAYER_QUEUE_LOCKED) { - kill(player_pid, SIGCONT); pc->unlockQueue = 1; while (player_pid > 0 && pc->unlockQueue) my_usleep(1000); @@ -476,8 +464,6 @@ int playerSeek(int fd, Song * song, float time) resetPlayerMetadata(); pc->seekWhere = time; pc->seek = 1; - if (player_pid) - kill(player_pid, SIGCONT); while (player_pid > 0 && pc->seek) my_usleep(1000); } |