diff options
| author | Max Kellermann <max@duempel.org> | 2013-01-10 09:39:23 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-01-10 10:01:18 +0100 |
| commit | ad15ca7104ca299c87b6ac86441573a00c589fef (patch) | |
| tree | 2b939699f60a1b929d3948fcd57933b10a6a95f0 /src/PlayerControl.cxx | |
| parent | 53117ac204cd99d9695dc317a78527b43c8e87b7 (diff) | |
| download | mpd-ad15ca7104ca299c87b6ac86441573a00c589fef.tar.gz mpd-ad15ca7104ca299c87b6ac86441573a00c589fef.tar.xz mpd-ad15ca7104ca299c87b6ac86441573a00c589fef.zip | |
DecoderControl: take ownership of client_cond
Don't let the "client" pass its own GCond. This was not used
consistently.
Diffstat (limited to '')
| -rw-r--r-- | src/PlayerControl.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
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 |