diff options
| author | Max Kellermann <max@duempel.org> | 2009-10-31 17:02:12 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-10-31 17:02:12 +0100 |
| commit | 25a806a347ce420126eb75d82c5fb875eb0a5e0d (patch) | |
| tree | 0d39bed8c073a720acd42f17b04dbee91b0a8c01 /src/decoder_thread.c | |
| parent | 73cff374fd94a1c16e0201fcda020396c0f41962 (diff) | |
player_control: protect command, state, error with a mutex
Use GMutex/GCond instead of the notify library. Manually lock the
player_control object before accessing the protected attributes. Use
the GCond object to notify the player thread and the main thread.
Diffstat (limited to 'src/decoder_thread.c')
| -rw-r--r-- | src/decoder_thread.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/decoder_thread.c b/src/decoder_thread.c index 846b1235..712e4d20 100644 --- a/src/decoder_thread.c +++ b/src/decoder_thread.c @@ -112,9 +112,7 @@ static void decoder_run_song(const struct song *song, const char *uri) dc.state = DECODE_STATE_START; dc.command = DECODE_COMMAND_NONE; - decoder_unlock(); - notify_signal(&pc.notify); - decoder_lock(); + player_signal(); /* wait for the input stream to become ready; its metadata will be available then */ @@ -294,17 +292,13 @@ static gpointer decoder_task(G_GNUC_UNUSED gpointer arg) dc.command = DECODE_COMMAND_NONE; - decoder_unlock(); - notify_signal(&pc.notify); - decoder_lock(); + player_signal(); break; case DECODE_COMMAND_STOP: dc.command = DECODE_COMMAND_NONE; - decoder_unlock(); - notify_signal(&pc.notify); - decoder_lock(); + player_signal(); break; case DECODE_COMMAND_NONE: |