shout: removed DISABLED_SHOUT_ENCODER_PLUGIN

Having an array with disabled entries sucks. Removed that DISABLED_SHOUT_ENCODER_PLUGIN macro, and fill the plugin list only with plugins which are actually enabled. This should be done for all plugin types.

shout: removed DISABLED_SHOUT_ENCODER_PLUGIN
5583b6c5 · Max Kellermann · 671b4551 · 5583b6c5 · 5583b6c5 · 5583b6c5
Commit 5583b6c5 authored Oct 09, 2008 by Max Kellermann
4 changed files
--- a/src/audioOutputs/audioOutput_shout.c
+++ b/src/audioOutputs/audioOutput_shout.c
@@ -30,8 +30,12 @@
 static int shout_init_count;
 static const struct shout_encoder_plugin *const shout_encoder_plugins[] = {
+#ifdef HAVE_SHOUT_MP3
 	&shout_mp3_encoder,
+#endif
+#ifdef HAVE_SHOUT_OGG
 	&shout_ogg_encoder,
+#endif
 	NULL
 };

--- a/src/audioOutputs/audioOutput_shout.h
+++ b/src/audioOutputs/audioOutput_shout.h
@@ -28,9 +28,6 @@
 #include <shout/shout.h>
-#define DISABLED_SHOUT_ENCODER_PLUGIN(plugin) \
-	struct shout_encoder_plugin plugin;
 struct shout_data;
 struct shout_encoder_plugin {

--- a/src/audioOutputs/audioOutput_shout_mp3.c
+++ b/src/audioOutputs/audioOutput_shout_mp3.c
@@ -186,8 +186,4 @@ const struct shout_encoder_plugin shout_mp3_encoder = {
 	shout_mp3_encoder_send_metadata,
 };
-#else
-DISABLED_SHOUT_ENCODER_PLUGIN(shout_mp3_encoder);
 #endif
--- a/src/audioOutputs/audioOutput_shout_ogg.c
+++ b/src/audioOutputs/audioOutput_shout_ogg.c
@@ -303,8 +303,4 @@ const struct shout_encoder_plugin shout_ogg_encoder = {
 	shout_ogg_encoder_send_metadata,
 };
-#else
-DISABLED_SHOUT_ENCODER_PLUGIN(shout_ogg_encoder);
 #endif