diff options
| author | Max Kellermann <max@duempel.org> | 2009-11-03 21:08:48 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-01-10 19:46:23 +0100 |
| commit | b6995ca0113611613d311250eabfc354658d46a7 (patch) | |
| tree | 713bff7fe8b8dcbd48b2ea67f95e3ec9e018104b /src/output_init.c | |
| parent | 715844fd089d3baf17d7080b47434fca8fb60b1d (diff) | |
| download | mpd-b6995ca0113611613d311250eabfc354658d46a7.tar.gz mpd-b6995ca0113611613d311250eabfc354658d46a7.tar.xz mpd-b6995ca0113611613d311250eabfc354658d46a7.zip | |
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/output_init.c')
| -rw-r--r-- | src/output_init.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/output_init.c b/src/output_init.c index f4700dfb2..0f02344fb 100644 --- a/src/output_init.c +++ b/src/output_init.c @@ -127,8 +127,12 @@ audio_output_load_mixer(void *ao, const struct config_param *param, bool audio_output_init(struct audio_output *ao, const struct config_param *param, + struct player_control *pc, GError **error_r) { + assert(ao != NULL); + assert(pc != NULL); + const struct audio_output_plugin *plugin = NULL; GError *error = NULL; @@ -249,6 +253,7 @@ audio_output_init(struct audio_output *ao, const struct config_param *param, ao->command = AO_COMMAND_NONE; ao->mutex = g_mutex_new(); ao->cond = g_cond_new(); + ao->player_control = pc; ao->data = ao_plugin_init(plugin, &ao->config_audio_format, |