From ad15ca7104ca299c87b6ac86441573a00c589fef Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 10 Jan 2013 09:39:23 +0100 Subject: DecoderControl: take ownership of client_cond Don't let the "client" pass its own GCond. This was not used consistently. --- src/PlayerControl.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/PlayerControl.cxx') diff --git a/src/PlayerControl.cxx b/src/PlayerControl.cxx index 1b5ca597e..73230858f 100644 --- a/src/PlayerControl.cxx +++ b/src/PlayerControl.cxx @@ -61,15 +61,15 @@ player_control::~player_control() } void -player_wait_decoder(struct player_control *pc, struct decoder_control *dc) +player_wait_decoder(gcc_unused struct player_control *pc, + struct decoder_control *dc) { assert(pc != NULL); assert(dc != NULL); - assert(dc->client_cond == pc->cond); /* during this function, the decoder lock is held, because we're waiting for the decoder thread */ - g_cond_wait(pc->cond, dc->mutex); + g_cond_wait(dc->client_cond, dc->mutex); } static void -- cgit v1.2.3