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

rewrote playerKill() 

playerKill() was marked as deprecated, but it seems like a good idea
to do proper cleanup in all threads (e.g. for usable valgrind
results).  Introduce the command "EXIT" which makes the player thread
exit cleanly.
This commit is contained in:
Max Kellermann 2008-08-26 08:27:16 +02:00
parent 92d9797b8c
commit ae00330285
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/player.c
View File

@ -76,9 +76,9 @@ void playerWait(void)
playerQueueUnlock();
}
void playerKill(void) /* deprecated */
void playerKill(void)
{
playerPause();
player_command(PLAYER_COMMAND_EXIT);
}
void playerPause(void)

1
src/player.h
View File

@ -32,6 +32,7 @@ enum player_state {
enum player_command {
PLAYER_COMMAND_NONE = 0,
PLAYER_COMMAND_EXIT,
PLAYER_COMMAND_STOP,
PLAYER_COMMAND_PLAY,
PLAYER_COMMAND_PAUSE,

8
src/player_thread.c
View File

@ -127,6 +127,7 @@ static void processDecodeInput(int *pause_r, unsigned int *bbp_r,
case PLAYER_COMMAND_NONE:
case PLAYER_COMMAND_PLAY:
case PLAYER_COMMAND_STOP:
case PLAYER_COMMAND_EXIT:
case PLAYER_COMMAND_CLOSE_AUDIO:
break;
@ -225,6 +226,7 @@ static void decodeParent(void)
processDecodeInput(&do_pause, &bbp, &do_xfade,
&decodeWaitedOn, &next);
if (pc.command == PLAYER_COMMAND_STOP ||
pc.command == PLAYER_COMMAND_EXIT ||
pc.command == PLAYER_COMMAND_CLOSE_AUDIO) {
dropBufferedAudio();
break;
@ -442,6 +444,12 @@ static void * player_task(mpd_unused void *arg)
player_command_finished();
break;
case PLAYER_COMMAND_EXIT:
closeAudioDevice();
player_command_finished();
pthread_exit(NULL);
break;
case PLAYER_COMMAND_LOCK_QUEUE:
pc.queueLockState = PLAYER_QUEUE_LOCKED;
player_command_finished();