aboutsummaryrefslogtreecommitdiffstats
path: root/src/player.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-08-26 08:27:17 +0200
committerMax Kellermann <max@duempel.org>2008-08-26 08:27:17 +0200
commit113c1c0af5383d356c9e527f8763566aa5a63ea1 (patch)
tree26402349d1917d591f438e891c6dfa8e8d5ac88b /src/player.c
parentb94af79134678f6998988fea902054c5ce5e34ca (diff)
downloadmpd-113c1c0af5383d356c9e527f8763566aa5a63ea1.tar.gz
mpd-113c1c0af5383d356c9e527f8763566aa5a63ea1.tar.xz
mpd-113c1c0af5383d356c9e527f8763566aa5a63ea1.zip
queueSong() cannot fail
All (indirect) callers of queueSong() ensure that the queue state is BLANK, so there is no need to check it in queueSong() again. As a side effect, queueSong() cannot fail anymore, and can return void. Also, playlist_queueError and all its error handling can go away.
Diffstat (limited to '')
-rw-r--r--src/player.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/player.c b/src/player.c
index 2df6b6cd1..84fd163fe 100644
--- a/src/player.c
+++ b/src/player.c
@@ -165,15 +165,12 @@ char *getPlayerErrorStr(void)
return *error ? error : NULL;
}
-int queueSong(Song * song)
+void queueSong(Song * song)
{
- if (pc.queueState == PLAYER_QUEUE_BLANK) {
- set_current_song(song);
- pc.queueState = PLAYER_QUEUE_FULL;
- return 0;
- }
+ assert(pc.queueState == PLAYER_QUEUE_BLANK);
- return -1;
+ set_current_song(song);
+ pc.queueState = PLAYER_QUEUE_FULL;
}
enum player_queue_state getPlayerQueueState(void)