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

removed the "queue" parameter from syncPlaylistWithQueue()

Browse Source 
There is only one caller which passes "true", so we can move the
queueNextSongInPlaylist() invocation there.
This commit is contained in:
Max Kellermann 2008-08-26 08:27:18 +02:00
parent a9f0d85115
commit 7d3429a6d8
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/playlist.c
View File

@ -505,7 +505,7 @@ static void queueNextSongInPlaylist(void)
} }
} }
static void syncPlaylistWithQueue(int queue) static void syncPlaylistWithQueue(void)
{ {
switch (getPlayerQueueState()) { switch (getPlayerQueueState()) {
case PLAYER_QUEUE_EMPTY: case PLAYER_QUEUE_EMPTY:
@ -515,11 +515,6 @@ static void syncPlaylistWithQueue(int queue)
playlist.current = playlist.queued; playlist.current = playlist.queued;
} }
playlist.queued = -1; playlist.queued = -1;
/* intentionally no break here */
case PLAYER_QUEUE_BLANK:
if (queue)
queueNextSongInPlaylist();
break; break;
case PLAYER_QUEUE_DECODE: case PLAYER_QUEUE_DECODE:
@ -532,6 +527,7 @@ static void syncPlaylistWithQueue(int queue)
case PLAYER_QUEUE_FULL: case PLAYER_QUEUE_FULL:
case PLAYER_QUEUE_PLAY: case PLAYER_QUEUE_PLAY:
case PLAYER_QUEUE_STOP: case PLAYER_QUEUE_STOP:
case PLAYER_QUEUE_BLANK:
break; break;
} }
} }
@ -541,7 +537,7 @@ static void clearPlayerQueue(void)
if (getPlayerQueueState() == PLAYER_QUEUE_PLAY || if (getPlayerQueueState() == PLAYER_QUEUE_PLAY ||
getPlayerQueueState() == PLAYER_QUEUE_FULL) { getPlayerQueueState() == PLAYER_QUEUE_FULL) {
playerQueueLock(); playerQueueLock();
syncPlaylistWithQueue(0); syncPlaylistWithQueue();
} }
playlist.queued = -1; playlist.queued = -1;
@ -937,8 +933,11 @@ void syncPlayerAndPlaylist(void)
if (getPlayerState() == PLAYER_STATE_STOP) if (getPlayerState() == PLAYER_STATE_STOP)
playPlaylistIfPlayerStopped(); playPlaylistIfPlayerStopped();
else else {
syncPlaylistWithQueue(1); syncPlaylistWithQueue();
if (getPlayerQueueState() == PLAYER_QUEUE_BLANK)
queueNextSongInPlaylist();
}
syncCurrentPlayerDecodeMetadata(); syncCurrentPlayerDecodeMetadata();
} }
@ -950,7 +949,7 @@ static void currentSongInPlaylist(void)
playlist_stopOnError = 0; playlist_stopOnError = 0;
syncPlaylistWithQueue(0); syncPlaylistWithQueue();
if (playlist.current >= 0 && playlist.current < playlist.length) if (playlist.current >= 0 && playlist.current < playlist.length)
playPlaylistOrderNumber(playlist.current); playPlaylistOrderNumber(playlist.current);
@ -963,7 +962,7 @@ void nextSongInPlaylist(void)
if (playlist_state != PLAYLIST_STATE_PLAY) if (playlist_state != PLAYLIST_STATE_PLAY)
return; return;
syncPlaylistWithQueue(0); syncPlaylistWithQueue();
playlist_stopOnError = 0; playlist_stopOnError = 0;
@ -1223,7 +1222,7 @@ void previousSongInPlaylist(void)
if (playlist_state != PLAYLIST_STATE_PLAY) if (playlist_state != PLAYLIST_STATE_PLAY)
return; return;
syncPlaylistWithQueue(0); syncPlaylistWithQueue();
if (diff && getPlayerElapsedTime() > PLAYLIST_PREV_UNLESS_ELAPSED) { if (diff && getPlayerElapsedTime() > PLAYLIST_PREV_UNLESS_ELAPSED) {
playPlaylistOrderNumber(playlist.current); playPlaylistOrderNumber(playlist.current);