oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

mixer_plugin: pass audio_output pointer to mixer_plugin.init()

Browse Source 
This allows the mixer object to access its associated audio output
object.
This commit is contained in:
Max Kellermann
2009-10-21 09:48:41 +02:00
parent b8ccc885c8
commit ac32f36e4e
9 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/output_init.c
View File

@@ -89,7 +89,7 @@ audio_output_mixer_type(const struct config_param *param)
}
static struct mixer *
audio_output_load_mixer(const struct config_param *param,
audio_output_load_mixer(void *ao, const struct config_param *param,
const struct mixer_plugin *plugin,
struct filter *filter_chain,
GError **error_r)
@@ -105,10 +105,10 @@ audio_output_load_mixer(const struct config_param *param,
if (plugin == NULL)
return NULL;
return mixer_new(plugin, param, error_r);
return mixer_new(plugin, ao, param, error_r);
case MIXER_TYPE_SOFTWARE:
mixer = mixer_new(&software_mixer_plugin, NULL, NULL);
mixer = mixer_new(&software_mixer_plugin, NULL, NULL, NULL);
assert(mixer != NULL);
filter_chain_append(filter_chain,
@@ -200,7 +200,8 @@ audio_output_init(struct audio_output *ao, const struct config_param *param,
if (ao->data == NULL)
return false;
ao->mixer = audio_output_load_mixer(param, plugin->mixer_plugin,
ao->mixer = audio_output_load_mixer(ao->data, param,
plugin->mixer_plugin,
ao->filter, &error);
if (ao->mixer == NULL && error != NULL) {
g_warning("Failed to initialize hardware mixer for '%s': %s",