Commit 2a06e2da authored by Max Kellermann's avatar Max Kellermann

use switch/case in syncPlaylistWithQueue()

parent 110cef6f
...@@ -507,22 +507,32 @@ static void queueNextSongInPlaylist(void) ...@@ -507,22 +507,32 @@ static void queueNextSongInPlaylist(void)
static void syncPlaylistWithQueue(int queue) static void syncPlaylistWithQueue(int queue)
{ {
if (queue && getPlayerQueueState() == PLAYER_QUEUE_BLANK) { switch (getPlayerQueueState()) {
queueNextSongInPlaylist(); case PLAYER_QUEUE_EMPTY:
} else if (getPlayerQueueState() == PLAYER_QUEUE_DECODE) {
if (playlist.queued != -1)
setQueueState(PLAYER_QUEUE_PLAY);
else
setQueueState(PLAYER_QUEUE_STOP);
} else if (getPlayerQueueState() == PLAYER_QUEUE_EMPTY) {
setQueueState(PLAYER_QUEUE_BLANK); setQueueState(PLAYER_QUEUE_BLANK);
if (playlist.queued >= 0) { if (playlist.queued >= 0) {
DEBUG("playlist: now playing queued song\n"); DEBUG("playlist: now playing queued song\n");
playlist.current = playlist.queued; playlist.current = playlist.queued;
} }
playlist.queued = -1; playlist.queued = -1;
/* intentionally no break here */
case PLAYER_QUEUE_BLANK:
if (queue) if (queue)
queueNextSongInPlaylist(); queueNextSongInPlaylist();
break;
case PLAYER_QUEUE_DECODE:
if (playlist.queued != -1)
setQueueState(PLAYER_QUEUE_PLAY);
else
setQueueState(PLAYER_QUEUE_STOP);
break;
case PLAYER_QUEUE_FULL:
case PLAYER_QUEUE_PLAY:
case PLAYER_QUEUE_STOP:
break;
} }
} }
......
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