From 2a06e2dafaf9889ad111300e09e922b0dacfdbda Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 26 Aug 2008 08:27:17 +0200 Subject: use switch/case in syncPlaylistWithQueue() --- src/playlist.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'src/playlist.c') diff --git a/src/playlist.c b/src/playlist.c index e5aad2ed..3108ba9f 100644 --- a/src/playlist.c +++ b/src/playlist.c @@ -507,22 +507,32 @@ static void queueNextSongInPlaylist(void) static void syncPlaylistWithQueue(int queue) { - if (queue && getPlayerQueueState() == PLAYER_QUEUE_BLANK) { - queueNextSongInPlaylist(); - } 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) { + switch (getPlayerQueueState()) { + case PLAYER_QUEUE_EMPTY: setQueueState(PLAYER_QUEUE_BLANK); if (playlist.queued >= 0) { DEBUG("playlist: now playing queued song\n"); playlist.current = playlist.queued; } playlist.queued = -1; + /* intentionally no break here */ + + case PLAYER_QUEUE_BLANK: if (queue) 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; } } -- cgit v1.2.3