aboutsummaryrefslogtreecommitdiffstats
path: root/src/output_init.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-03-26 18:23:23 +0100
committerMax Kellermann <max@duempel.org>2009-03-26 18:23:23 +0100
commit66a2c5669e1fcd709a00bd4de8ddfb0d3a0c2a58 (patch)
treec138f37dfc13af01df8606ed7a8f882964a32f27 /src/output_init.c
parent209c8a540c80faffb6b04ac6e7fed64a03c679ac (diff)
downloadmpd-66a2c5669e1fcd709a00bd4de8ddfb0d3a0c2a58.tar.gz
mpd-66a2c5669e1fcd709a00bd4de8ddfb0d3a0c2a58.tar.xz
mpd-66a2c5669e1fcd709a00bd4de8ddfb0d3a0c2a58.zip
output_plugin: replaced output_plugin.get_mixer() with mixer_plugin
The mixer core library is now responsible for creating and managing the mixer object. This removes duplicated code from the output plugins.
Diffstat (limited to '')
-rw-r--r--src/output_init.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/output_init.c b/src/output_init.c
index f837ba8b8..8ec1e0145 100644
--- a/src/output_init.c
+++ b/src/output_init.c
@@ -22,6 +22,7 @@
#include "output_internal.h"
#include "output_list.h"
#include "audio_parser.h"
+#include "mixer_control.h"
#include <glib.h>
@@ -134,5 +135,10 @@ audio_output_init(struct audio_output *ao, const struct config_param *param,
if (ao->data == NULL)
return false;
+ if (plugin->mixer_plugin != NULL)
+ ao->mixer = mixer_new(plugin->mixer_plugin, param);
+ else
+ ao->mixer = NULL;
+
return true;
}