aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-02-10 08:18:28 +0100
committerMax Kellermann <max@duempel.org>2009-02-10 08:18:28 +0100
commitc2bbf876fb93e2693f284d1852cca5212a1b6191 (patch)
treeea71c5a3cc5293dc97477027b76d6e057914aa14
parent799d1c9dc20c2a6723442614e10808bc5902c9df (diff)
downloadmpd-c2bbf876fb93e2693f284d1852cca5212a1b6191.tar.gz
mpd-c2bbf876fb93e2693f284d1852cca5212a1b6191.tar.xz
mpd-c2bbf876fb93e2693f284d1852cca5212a1b6191.zip
player: added some more assertions
Assertions on pc.command and pc.next_song.
-rw-r--r--src/player_control.c2
-rw-r--r--src/player_thread.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/player_control.c b/src/player_control.c
index 68b438cbc..5d95fb093 100644
--- a/src/player_control.c
+++ b/src/player_control.c
@@ -57,6 +57,8 @@ pc_song_deleted(const struct song *song)
static void player_command(enum player_command cmd)
{
+ assert(pc.command == PLAYER_COMMAND_NONE);
+
pc.command = cmd;
while (pc.command != PLAYER_COMMAND_NONE) {
notify_signal(&pc.notify);
diff --git a/src/player_thread.c b/src/player_thread.c
index f6069b048..b1b08c52d 100644
--- a/src/player_thread.c
+++ b/src/player_thread.c
@@ -526,6 +526,8 @@ static gpointer player_task(G_GNUC_UNUSED gpointer arg)
switch (pc.command) {
case PLAYER_COMMAND_PLAY:
case PLAYER_COMMAND_QUEUE:
+ assert(pc.next_song != NULL);
+
do_play();
break;