1 files changed, 42 insertions, 39 deletions

diff --git a/src/decoder_list.c b/src/decoder_list.c
index a42585e34..2ee4f3ec9 100644
--- a/src/decoder_list.c
+++ b/src/decoder_list.c
@@ -28,9 +28,11 @@
 #include <string.h>
 
 extern const struct decoder_plugin mad_decoder_plugin;
+extern const struct decoder_plugin mpg123_decoder_plugin;
 extern const struct decoder_plugin vorbis_decoder_plugin;
 extern const struct decoder_plugin flac_decoder_plugin;
 extern const struct decoder_plugin oggflac_decoder_plugin;
+extern const struct decoder_plugin sndfile_decoder_plugin;
 extern const struct decoder_plugin audiofile_decoder_plugin;
 extern const struct decoder_plugin mp4ff_decoder_plugin;
 extern const struct decoder_plugin faad_decoder_plugin;
@@ -43,10 +45,13 @@ extern const struct decoder_plugin wildmidi_decoder_plugin;
 extern const struct decoder_plugin fluidsynth_decoder_plugin;
 extern const struct decoder_plugin ffmpeg_decoder_plugin;
 
-static const struct decoder_plugin *const decoder_plugins[] = {
+const struct decoder_plugin *const decoder_plugins[] = {
 #ifdef HAVE_MAD
 	&mad_decoder_plugin,
 #endif
+#ifdef HAVE_MPG123
+	&mpg123_decoder_plugin,
+#endif
 #ifdef ENABLE_VORBIS_DECODER
 	&vorbis_decoder_plugin,
 #endif
@@ -56,6 +61,9 @@ static const struct decoder_plugin *const decoder_plugins[] = {
 #ifdef HAVE_FLAC
 	&flac_decoder_plugin,
 #endif
+#ifdef ENABLE_SNDFILE
+	&sndfile_decoder_plugin,
+#endif
 #ifdef HAVE_AUDIOFILE
 	&audiofile_decoder_plugin,
 #endif
@@ -89,32 +97,48 @@ static const struct decoder_plugin *const decoder_plugins[] = {
 #ifdef HAVE_FFMPEG
 	&ffmpeg_decoder_plugin,
 #endif
+	NULL
 };
 
 enum {
-	num_decoder_plugins = G_N_ELEMENTS(decoder_plugins),
+	num_decoder_plugins = G_N_ELEMENTS(decoder_plugins) - 1,
 };
 
 /** which plugins have been initialized successfully? */
-static bool decoder_plugins_enabled[num_decoder_plugins];
+bool decoder_plugins_enabled[num_decoder_plugins];
 
-const struct decoder_plugin *
-decoder_plugin_from_suffix(const char *suffix, unsigned int next)
+static unsigned
+decoder_plugin_index(const struct decoder_plugin *plugin)
 {
-	static unsigned i = num_decoder_plugins;
+	unsigned i = 0;
+
+	while (decoder_plugins[i] != plugin)
+		++i;
+
+	return i;
+}
 
+static unsigned
+decoder_plugin_next_index(const struct decoder_plugin *plugin)
+{
+	return plugin == 0
+		? 0 /* start with first plugin */
+		: decoder_plugin_index(plugin) + 1;
+}
+
+const struct decoder_plugin *
+decoder_plugin_from_suffix(const char *suffix,
+			   const struct decoder_plugin *plugin)
+{
 	if (suffix == NULL)
 		return NULL;
 
-	if (!next)
-		i = 0;
-	for (; i < num_decoder_plugins; ++i) {
-		const struct decoder_plugin *plugin = decoder_plugins[i];
+	for (unsigned i = decoder_plugin_next_index(plugin);
+	     decoder_plugins[i] != NULL; ++i) {
+		plugin = decoder_plugins[i];
 		if (decoder_plugins_enabled[i] &&
-		    stringFoundInStringArray(plugin->suffixes, suffix)) {
-			++i;
+		    decoder_plugin_supports_suffix(plugin, suffix))
 			return plugin;
-		}
 	}
 
 	return NULL;
@@ -130,10 +154,10 @@ decoder_plugin_from_mime_type(const char *mimeType, unsigned int next)
 
 	if (!next)
 		i = 0;
-	for (; i < num_decoder_plugins; ++i) {
+	for (; decoder_plugins[i] != NULL; ++i) {
 		const struct decoder_plugin *plugin = decoder_plugins[i];
 		if (decoder_plugins_enabled[i] &&
-		    stringFoundInStringArray(plugin->mime_types, mimeType)) {
+		    decoder_plugin_supports_mime_type(plugin, mimeType)) {
 			++i;
 			return plugin;
 		}
@@ -145,7 +169,7 @@ 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; i < num_decoder_plugins; ++i) {
+	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)
@@ -155,27 +179,6 @@ decoder_plugin_from_name(const char *name)
 	return NULL;
 }
 
-void decoder_plugin_print_all_decoders(FILE * fp)
-{
-	for (unsigned i = 0; i < num_decoder_plugins; ++i) {
-		const struct decoder_plugin *plugin = decoder_plugins[i];
-		const char *const*suffixes;
-
-		if (!decoder_plugins_enabled[i])
-			continue;
-
-		fprintf(fp, "[%s]", plugin->name);
-
-		for (suffixes = plugin->suffixes;
-		     suffixes != NULL && *suffixes != NULL;
-		     ++suffixes) {
-			fprintf(fp, " %s", *suffixes);
-		}
-
-		fprintf(fp, "\n");
-	}
-}
-
 /**
  * Find the "decoder" configuration block for the specified plugin.
  *
@@ -203,7 +206,7 @@ decoder_plugin_config(const char *plugin_name)
 
 void decoder_plugin_init_all(void)
 {
-	for (unsigned i = 0; i < num_decoder_plugins; ++i) {
+	for (unsigned i = 0; decoder_plugins[i] != NULL; ++i) {
 		const struct decoder_plugin *plugin = decoder_plugins[i];
 		const struct config_param *param =
 			decoder_plugin_config(plugin->name);
@@ -219,7 +222,7 @@ void decoder_plugin_init_all(void)
 
 void decoder_plugin_deinit_all(void)
 {
-	for (unsigned i = 0; i < num_decoder_plugins; ++i) {
+	for (unsigned i = 0; decoder_plugins[i] != NULL; ++i) {
 		const struct decoder_plugin *plugin = decoder_plugins[i];
 
 		if (decoder_plugins_enabled[i])