4 files changed, 17 insertions, 14 deletions
diff --git a/src/decoder/wildmidi_decoder_plugin.c b/src/decoder/wildmidi_decoder_plugin.c
index a2224940d..2cdb30a9c 100644
--- a/src/decoder/wildmidi_decoder_plugin.c
+++ b/src/decoder/wildmidi_decoder_plugin.c
@@ -20,6 +20,7 @@
 #include "config.h"
 #include "decoder_api.h"
 #include "tag_handler.h"
+#include "glib_compat.h"
 
 #include <glib.h>
 
diff --git a/src/decoder_list.c b/src/decoder_list.c
index 2029b3e62..e9e29c691 100644
--- a/src/decoder_list.c
+++ b/src/decoder_list.c
@@ -178,12 +178,9 @@ decoder_plugin_from_mime_type(const char *mimeType, unsigned int next)
 const struct decoder_plugin *
 decoder_plugin_from_name(const char *name)
 {
-	for (unsigned i = 0; decoder_plugins[i] != NULL; ++i) {
-		const struct decoder_plugin *plugin = decoder_plugins[i];
-		if (decoder_plugins_enabled[i] &&
-		    strcmp(plugin->name, name) == 0)
+	decoder_plugins_for_each_enabled(plugin)
+		if (strcmp(plugin->name, name) == 0)
 			return plugin;
-	}
 
 	return NULL;
 }
@@ -231,10 +228,6 @@ void decoder_plugin_init_all(void)
 
 void decoder_plugin_deinit_all(void)
 {
-	for (unsigned i = 0; decoder_plugins[i] != NULL; ++i) {
-		const struct decoder_plugin *plugin = decoder_plugins[i];
-
-		if (decoder_plugins_enabled[i])
-			decoder_plugin_finish(plugin);
-	}
+	decoder_plugins_for_each_enabled(plugin)
+		decoder_plugin_finish(plugin);
 }
diff --git a/src/decoder_list.h b/src/decoder_list.h
index d259cb195..d0a6ade7e 100644
--- a/src/decoder_list.h
+++ b/src/decoder_list.h
@@ -27,6 +27,16 @@ struct decoder_plugin;
 extern const struct decoder_plugin *const decoder_plugins[];
 extern bool decoder_plugins_enabled[];
 
+#define decoder_plugins_for_each(plugin) \
+	for (const struct decoder_plugin *plugin, \
+		*const*decoder_plugin_iterator = &decoder_plugins[0]; \
+		(plugin = *decoder_plugin_iterator) != NULL; \
+		++decoder_plugin_iterator)
+
+#define decoder_plugins_for_each_enabled(plugin) \
+	decoder_plugins_for_each(plugin) \
+		if (decoder_plugins_enabled[decoder_plugin_iterator - decoder_plugins])
+
 /* interface for using plugins */
 
 /**
diff --git a/src/decoder_print.c b/src/decoder_print.c
index 72c40ac75..e14477ed8 100644
--- a/src/decoder_print.c
+++ b/src/decoder_print.c
@@ -48,7 +48,6 @@ decoder_plugin_print(struct client *client,
 void
 decoder_list_print(struct client *client)
 {
-	for (unsigned i = 0; decoder_plugins[i] != NULL; ++i)
-		if (decoder_plugins_enabled[i])
-			decoder_plugin_print(client, decoder_plugins[i]);
+	decoder_plugins_for_each_enabled(plugin)
+		decoder_plugin_print(client, plugin);
 }