Commit 5583b6c5 authored by Max Kellermann's avatar Max Kellermann

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.
parent 671b4551
......@@ -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
};
......
......@@ -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 {
......
......@@ -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
......@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment