diff options
| author | Max Kellermann <max@duempel.org> | 2008-09-24 07:20:55 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2008-09-24 07:20:55 +0200 |
| commit | acc4a0ba2dd0be3f28c4ca009e08d1cc1bbc534a (patch) | |
| tree | 7d4ea0359c85f67d0366fb58ae80c8aa35f3a473 /src/output_init.c | |
| parent | 63fb1efb5cd6665b73ced155ba89a5c7f094d9ab (diff) | |
| download | mpd-acc4a0ba2dd0be3f28c4ca009e08d1cc1bbc534a.tar.gz mpd-acc4a0ba2dd0be3f28c4ca009e08d1cc1bbc534a.tar.xz mpd-acc4a0ba2dd0be3f28c4ca009e08d1cc1bbc534a.zip | |
output: make "struct audio_output" opaque for output plugins
We have eliminated direct accesses to the audio_output struct from
the all output plugins. Make it opaque for them, and move its real
declaration to output_internal.h, similar to decoder_internal.h.
Pass the opaque structure to plugin.init() only, which will return the
plugin's data pointer on success, and NULL on failure. This data
pointer will be passed to all other methods instead of the
audio_output struct.
Diffstat (limited to 'src/output_init.c')
| -rw-r--r-- | src/output_init.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/output_init.c b/src/output_init.c index 25883cee1..6274daa81 100644 --- a/src/output_init.c +++ b/src/output_init.c @@ -18,6 +18,7 @@ #include "output_control.h" #include "output_api.h" +#include "output_internal.h" #include "output_list.h" #include "log.h" #include "audio.h" @@ -102,7 +103,8 @@ int audio_output_init(struct audio_output *ao, ConfigParam * param) notify_init(&ao->notify); ao->command = AO_COMMAND_NONE; - if (plugin->init(ao, format ? &ao->reqAudioFormat : NULL, param) != 0) + ao->data = plugin->init(ao, format ? &ao->reqAudioFormat : NULL, param); + if (ao->data == NULL) return 0; return 1; |