From 8695b9423233e9e8ad18ed7b4d56a020254fbdd6 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 25 Jan 2009 17:37:59 +0100 Subject: mixer: removed mixer_configure(), configure mixer in mixer_new() Allocate the mixer object when it is configured. Merged mixer_configure() into mixer_new(). mixer_new() was quite useless anyway. --- src/mixer_api.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/mixer_api.c') diff --git a/src/mixer_api.c b/src/mixer_api.c index cd216415a..b0fea9a7a 100644 --- a/src/mixer_api.c +++ b/src/mixer_api.c @@ -38,11 +38,13 @@ void mixer_finish(struct mixer *mixer) } struct mixer * -mixer_new(const struct mixer_plugin *plugin) +mixer_new(const struct mixer_plugin *plugin, const struct config_param *param) { struct mixer *mixer = g_new(struct mixer, 1); mixer_init(mixer, plugin); + plugin->configure(mixer->data, param); + return mixer; } @@ -53,12 +55,6 @@ mixer_free(struct mixer *mixer) g_free(mixer); } -void mixer_configure(struct mixer *mixer, const struct config_param *param) -{ - assert(mixer != NULL && mixer->plugin != NULL); - mixer->plugin->configure(mixer->data, param); -} - bool mixer_open(struct mixer *mixer) { assert(mixer != NULL && mixer->plugin != NULL); -- cgit v1.2.3