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

player: don't call STOP before CLOSE_AUDIO

Browse Source 
playerWait() stops the player thread (twice!) and closes the output
device.  It should be well enough to just send CLOSE_AUDIO, without
STOP.

This requires a tiny change to the player thread code: make it break
when CLOSE_AUDIO is sent.
This commit is contained in:
Max Kellermann 2008-08-26 08:27:16 +02:00
parent cff923b9d8
commit 92d9797b8c
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/player.c
View File

@ -25,14 +25,6 @@
#include "os_compat.h"
#include "main_notify.h"
static void playerCloseAudio(void);
void playerWait(void)
{
playerStop();
playerCloseAudio();
}
static void set_current_song(Song *song)
{
assert(song != NULL);
@ -76,6 +68,14 @@ void playerStop(void)
playerQueueUnlock();
}
void playerWait(void)
{
player_command(PLAYER_COMMAND_CLOSE_AUDIO);
pc.queueState = PLAYER_QUEUE_BLANK;
playerQueueUnlock();
}
void playerKill(void) /* deprecated */
{
playerPause();
@ -165,12 +165,6 @@ char *getPlayerErrorStr(void)
return *error ? error : NULL;
}
static void playerCloseAudio(void)
{
playerStop();
player_command(PLAYER_COMMAND_CLOSE_AUDIO);
}
int queueSong(Song * song)
{
if (pc.queueState == PLAYER_QUEUE_BLANK) {

3
src/player_thread.c
View File

@ -224,7 +224,8 @@ static void decodeParent(void)
while (1) {
processDecodeInput(&do_pause, &bbp, &do_xfade,
&decodeWaitedOn, &next);
if (pc.command == PLAYER_COMMAND_STOP) {
if (pc.command == PLAYER_COMMAND_STOP ||
pc.command == PLAYER_COMMAND_CLOSE_AUDIO) {
dropBufferedAudio();
break;
}