aboutsummaryrefslogtreecommitdiff
path: root/src/decoder_control.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-11-03 21:08:48 +0100
committerMax Kellermann <max@duempel.org>2011-01-10 19:46:23 +0100
commitb6995ca0113611613d311250eabfc354658d46a7 (patch)
tree713bff7fe8b8dcbd48b2ea67f95e3ec9e018104b /src/decoder_control.c
parent715844fd089d3baf17d7080b47434fca8fb60b1d (diff)
player_control: removed the global variable "pc"
Allocate a player_control object where needed, and pass it around. Each "client" object is associated with a "player_control" instance. This prepares multi-player support.
Diffstat (limited to 'src/decoder_control.c')
-rw-r--r--src/decoder_control.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/decoder_control.c b/src/decoder_control.c
index a5e6e4ad..6cc2849c 100644
--- a/src/decoder_control.c
+++ b/src/decoder_control.c
@@ -28,8 +28,9 @@
#define G_LOG_DOMAIN "decoder_control"
void
-dc_init(struct decoder_control *dc)
+dc_init(struct decoder_control *dc, struct player_control *pc)
{
+ dc->player_control = pc;
dc->thread = NULL;
dc->mutex = g_mutex_new();
@@ -62,7 +63,7 @@ static void
dc_command_wait_locked(struct decoder_control *dc)
{
while (dc->command != DECODE_COMMAND_NONE)
- player_wait_decoder(dc);
+ player_wait_decoder(dc->player_control, dc);
}
void