diff options
| author | Max Kellermann <max@duempel.org> | 2009-01-25 17:38:12 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-01-25 17:38:12 +0100 |
| commit | dc575106c296435940482cc2655804c71ee2d934 (patch) | |
| tree | 4c5a455e28a224fdab697c4b00f34305b2e67281 /src/mixer_api.h | |
| parent | db2058a26580681911aed09b427472ccde0176dd (diff) | |
| download | mpd-dc575106c296435940482cc2655804c71ee2d934.tar.gz mpd-dc575106c296435940482cc2655804c71ee2d934.tar.xz mpd-dc575106c296435940482cc2655804c71ee2d934.zip | |
mixer: merged methods "init" and "configure"
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.
Diffstat (limited to 'src/mixer_api.h')
| -rw-r--r-- | src/mixer_api.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/mixer_api.h b/src/mixer_api.h index cc0d8327f..50a9cb165 100644 --- a/src/mixer_api.h +++ b/src/mixer_api.h @@ -31,11 +31,10 @@ extern const struct mixer_plugin oss_mixer; struct mixer_data; struct mixer_plugin { - - /** - * Allocate and initialize mixer data + /** + * Alocates and configures a mixer device. */ - struct mixer_data *(*init)(void); + struct mixer_data *(*init)(const struct config_param *param); /** * Finish and free mixer data @@ -43,12 +42,6 @@ struct mixer_plugin { void (*finish)(struct mixer_data *data); /** - * Setup and configure mixer - */ - void (*configure)(struct mixer_data *data, - const struct config_param *param); - - /** * Open mixer device */ bool (*open)(struct mixer_data *data); @@ -69,7 +62,6 @@ struct mixer { struct mixer_data *data; }; -void mixer_init(struct mixer *mixer, const struct mixer_plugin *plugin); void mixer_finish(struct mixer *mixer); struct mixer * |