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

mixer: merged methods "init" and "configure"

Browse Source 
Both methods are always called together.  There is no point in having
them separate.  This simplifies the code, because the old configure()
method could be called more than once, and had to free old
allocations.
This commit is contained in:
Max Kellermann
2009-01-25 17:38:12 +01:00
parent db2058a265
commit dc575106c2
4 changed files with 20 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mixer_api.c
View File

@@ -21,14 +21,6 @@
#include "mixer_api.h"
void mixer_init(struct mixer *mixer, const struct mixer_plugin *plugin)
{
assert(plugin != NULL);
assert(mixer != NULL);
mixer->plugin = plugin;
mixer->data = mixer->plugin->init();
}
void mixer_finish(struct mixer *mixer)
{
assert(mixer != NULL && mixer->plugin != NULL);
@@ -40,11 +32,13 @@ void mixer_finish(struct mixer *mixer)
struct mixer *
mixer_new(const struct mixer_plugin *plugin, const struct config_param *param)
{
struct mixer *mixer = g_new(struct mixer, 1);
struct mixer *mixer;
mixer_init(mixer, plugin);
plugin->configure(mixer->data, param);
assert(plugin != NULL);
mixer = g_new(struct mixer, 1);
mixer->plugin = plugin;
mixer->data = mixer->plugin->init(param);
return mixer;
}