diff options
| author | Max Kellermann <max@duempel.org> | 2012-06-12 23:22:03 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2012-06-12 23:22:03 +0200 |
| commit | 4eb57e1e9a1718ce93eced6bd4fb06d8abb26477 (patch) | |
| tree | 2355c6d77273cf614822f5a144005ab1d353863b /src/output_list.h | |
| parent | d662c4c0cc089a6a493a7463e440f0f7e7959b48 (diff) | |
| parent | 1d52e2cc7727d93e65d557c322b5dd7dc149651c (diff) | |
| download | mpd-4eb57e1e9a1718ce93eced6bd4fb06d8abb26477.tar.gz mpd-4eb57e1e9a1718ce93eced6bd4fb06d8abb26477.tar.xz mpd-4eb57e1e9a1718ce93eced6bd4fb06d8abb26477.zip | |
Merge branch 'v0.16.x'
Conflicts:
src/cmdline.c
src/decoder/wildmidi_decoder_plugin.c
src/gcc.h
src/glib_compat.h
src/input_stream.c
src/output_list.c
src/output_thread.c
valgrind.suppressions
Diffstat (limited to 'src/output_list.h')
| -rw-r--r-- | src/output_list.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/output_list.h b/src/output_list.h index 3deb31c00..185ada716 100644 --- a/src/output_list.h +++ b/src/output_list.h @@ -20,16 +20,14 @@ #ifndef MPD_OUTPUT_LIST_H #define MPD_OUTPUT_LIST_H -#include <stdio.h> - -extern const struct audio_output_plugin *audio_output_plugins[]; +extern const struct audio_output_plugin *const audio_output_plugins[]; const struct audio_output_plugin * audio_output_plugin_get(const char *name); -void audio_output_plugin_print_all_types(FILE * fp); - -#define audio_output_plugins_for_each(plugin, i) \ - for (i = 0; (plugin = audio_output_plugins[i]) != NULL; ++i) +#define audio_output_plugins_for_each(plugin) \ + for (const struct audio_output_plugin *plugin, \ + *const*output_plugin_iterator = &audio_output_plugins[0]; \ + (plugin = *output_plugin_iterator) != NULL; ++output_plugin_iterator) #endif |