diff options
| author | Max Kellermann <max@duempel.org> | 2009-10-21 09:48:41 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-10-21 09:48:41 +0200 |
| commit | ac32f36e4e1489664e7c202319978b6a9a15ed40 (patch) | |
| tree | c57ac0a4cc582bbf66727b1e1f2059373923a4da /src/mixer | |
| parent | b8ccc885c883a24265cd49de385b61d368a1b66f (diff) | |
| download | mpd-ac32f36e4e1489664e7c202319978b6a9a15ed40.tar.gz mpd-ac32f36e4e1489664e7c202319978b6a9a15ed40.tar.xz mpd-ac32f36e4e1489664e7c202319978b6a9a15ed40.zip | |
mixer_plugin: pass audio_output pointer to mixer_plugin.init()
This allows the mixer object to access its associated audio output
object.
Diffstat (limited to 'src/mixer')
| -rw-r--r-- | src/mixer/alsa_mixer_plugin.c | 2 | ||||
| -rw-r--r-- | src/mixer/oss_mixer_plugin.c | 3 | ||||
| -rw-r--r-- | src/mixer/pulse_mixer_plugin.c | 2 | ||||
| -rw-r--r-- | src/mixer/software_mixer_plugin.c | 3 |
4 files changed, 6 insertions, 4 deletions
diff --git a/src/mixer/alsa_mixer_plugin.c b/src/mixer/alsa_mixer_plugin.c index 0f23bc03f..baf12030c 100644 --- a/src/mixer/alsa_mixer_plugin.c +++ b/src/mixer/alsa_mixer_plugin.c @@ -52,7 +52,7 @@ alsa_mixer_quark(void) } static struct mixer * -alsa_mixer_init(const struct config_param *param, +alsa_mixer_init(G_GNUC_UNUSED void *ao, const struct config_param *param, G_GNUC_UNUSED GError **error_r) { struct alsa_mixer *am = g_new(struct alsa_mixer, 1); diff --git a/src/mixer/oss_mixer_plugin.c b/src/mixer/oss_mixer_plugin.c index 3b97e38f5..4e169bbc4 100644 --- a/src/mixer/oss_mixer_plugin.c +++ b/src/mixer/oss_mixer_plugin.c @@ -74,7 +74,8 @@ oss_find_mixer(const char *name) } static struct mixer * -oss_mixer_init(const struct config_param *param, GError **error_r) +oss_mixer_init(G_GNUC_UNUSED void *ao, const struct config_param *param, + GError **error_r) { struct oss_mixer *om = g_new(struct oss_mixer, 1); diff --git a/src/mixer/pulse_mixer_plugin.c b/src/mixer/pulse_mixer_plugin.c index 3399d5baa..ecc0fc75b 100644 --- a/src/mixer/pulse_mixer_plugin.c +++ b/src/mixer/pulse_mixer_plugin.c @@ -212,7 +212,7 @@ context_state_cb(pa_context *context, void *userdata) static struct mixer * -pulse_mixer_init(const struct config_param *param, +pulse_mixer_init(G_GNUC_UNUSED void *ao, const struct config_param *param, G_GNUC_UNUSED GError **error_r) { struct pulse_mixer *pm = g_new(struct pulse_mixer,1); diff --git a/src/mixer/software_mixer_plugin.c b/src/mixer/software_mixer_plugin.c index e81d265cb..2fcacd46d 100644 --- a/src/mixer/software_mixer_plugin.c +++ b/src/mixer/software_mixer_plugin.c @@ -37,7 +37,8 @@ struct software_mixer { }; static struct mixer * -software_mixer_init(G_GNUC_UNUSED const struct config_param *param, +software_mixer_init(G_GNUC_UNUSED void *ao, + G_GNUC_UNUSED const struct config_param *param, G_GNUC_UNUSED GError **error_r) { struct software_mixer *sm = g_new(struct software_mixer, 1); |