aboutsummaryrefslogtreecommitdiffstats
path: root/src/mixer_api.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-01-25 17:37:59 +0100
committerMax Kellermann <max@duempel.org>2009-01-25 17:37:59 +0100
commit8695b9423233e9e8ad18ed7b4d56a020254fbdd6 (patch)
treed8053ae96ef50e9ab69499b5e8a2702364974cfa /src/mixer_api.c
parent763dd8c1dd4de451663474bafd13068eb6017bbb (diff)
downloadmpd-8695b9423233e9e8ad18ed7b4d56a020254fbdd6.tar.gz
mpd-8695b9423233e9e8ad18ed7b4d56a020254fbdd6.tar.xz
mpd-8695b9423233e9e8ad18ed7b4d56a020254fbdd6.zip
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.
Diffstat (limited to 'src/mixer_api.c')
-rw-r--r--src/mixer_api.c10
1 files changed, 3 insertions, 7 deletions
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);