From 7125fdc4f24176997e68e5e6923ca6df685cf159 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 26 Aug 2008 08:27:17 +0200 Subject: assert locked/unlocked in queue lock functions There are no nested queue locks in mpd, thus replace the locked checks in playerQueueLock(), playerQueueUnlock() with assertions. --- src/player.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/player.c b/src/player.c index ba424d1d..6a2c3a08 100644 --- a/src/player.c +++ b/src/player.c @@ -190,14 +190,17 @@ void setQueueState(enum player_queue_state queueState) void playerQueueLock(void) { - if (pc.queueLockState == PLAYER_QUEUE_UNLOCKED) - player_command(PLAYER_COMMAND_LOCK_QUEUE); + assert(pc.queueLockState == PLAYER_QUEUE_UNLOCKED); + player_command(PLAYER_COMMAND_LOCK_QUEUE); + assert(pc.queueLockState == PLAYER_QUEUE_LOCKED); } void playerQueueUnlock(void) { if (pc.queueLockState == PLAYER_QUEUE_LOCKED) player_command(PLAYER_COMMAND_UNLOCK_QUEUE); + + assert(pc.queueLockState == PLAYER_QUEUE_UNLOCKED); } int playerSeek(int fd, Song * song, float seek_time) -- cgit v1.2.3