Skip to content

M
mpd
Commit 7d3429a6 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

removed the "queue" parameter from syncPlaylistWithQueue()

There is only one caller which passes "true", so we can move the queueNextSongInPlaylist() invocation there.
parent a9f0d851
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 12 deletions
src/playlist.c
View file @ 7d3429a6
......@@ -505,7 +505,7 @@ static void queueNextSongInPlaylist(void)
}
}
static void syncPlaylistWithQueue(int queue)
static void syncPlaylistWithQueue(void)
{
switch (getPlayerQueueState()) {
case PLAYER_QUEUE_EMPTY:
......@@ -515,11 +515,6 @@ static void syncPlaylistWithQueue(int queue)
playlist.current = playlist.queued;
}
playlist.queued = -1;
/* intentionally no break here */
case PLAYER_QUEUE_BLANK:
if (queue)
queueNextSongInPlaylist();
break;
case PLAYER_QUEUE_DECODE:
......@@ -532,6 +527,7 @@ static void syncPlaylistWithQueue(int queue)
case PLAYER_QUEUE_FULL:
case PLAYER_QUEUE_PLAY:
case PLAYER_QUEUE_STOP:
case PLAYER_QUEUE_BLANK:
break;
}
}
......@@ -541,7 +537,7 @@ static void clearPlayerQueue(void)
if (getPlayerQueueState() == PLAYER_QUEUE_PLAY ||
getPlayerQueueState() == PLAYER_QUEUE_FULL) {
playerQueueLock();
syncPlaylistWithQueue(0);
syncPlaylistWithQueue();
}
playlist.queued = -1;
......@@ -937,8 +933,11 @@ void syncPlayerAndPlaylist(void)
if (getPlayerState() == PLAYER_STATE_STOP)
playPlaylistIfPlayerStopped();
else
syncPlaylistWithQueue(1);
else {
syncPlaylistWithQueue();
if (getPlayerQueueState() == PLAYER_QUEUE_BLANK)
queueNextSongInPlaylist();
}
syncCurrentPlayerDecodeMetadata();
}
......@@ -950,7 +949,7 @@ static void currentSongInPlaylist(void)
playlist_stopOnError = 0;
syncPlaylistWithQueue(0);
syncPlaylistWithQueue();
if (playlist.current >= 0 && playlist.current < playlist.length)
playPlaylistOrderNumber(playlist.current);
......@@ -963,7 +962,7 @@ void nextSongInPlaylist(void)
if (playlist_state != PLAYLIST_STATE_PLAY)
return;
syncPlaylistWithQueue(0);
syncPlaylistWithQueue();
playlist_stopOnError = 0;
......@@ -1223,7 +1222,7 @@ void previousSongInPlaylist(void)
if (playlist_state != PLAYLIST_STATE_PLAY)
return;
syncPlaylistWithQueue(0);
syncPlaylistWithQueue();
if (diff && getPlayerElapsedTime() > PLAYLIST_PREV_UNLESS_ELAPSED) {
playPlaylistOrderNumber(playlist.current);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment