oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

shout: removed DISABLED_SHOUT_ENCODER_PLUGIN

Browse Source 
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.
This commit is contained in:
Max Kellermann 2008-10-09 15:18:21 +02:00
parent 671b455133
commit 5583b6c5e1
4 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/audioOutputs/audioOutput_shout.c
View File

@ -30,8 +30,12 @@
static int shout_init_count; static int shout_init_count;
static const struct shout_encoder_plugin *const shout_encoder_plugins[] = { static const struct shout_encoder_plugin *const shout_encoder_plugins[] = {
#ifdef HAVE_SHOUT_MP3
&shout_mp3_encoder, &shout_mp3_encoder,
#endif
#ifdef HAVE_SHOUT_OGG
&shout_ogg_encoder, &shout_ogg_encoder,
#endif
NULL NULL
}; };

3
src/audioOutputs/audioOutput_shout.h
View File

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

4
src/audioOutputs/audioOutput_shout_mp3.c
View File

@ -186,8 +186,4 @@ const struct shout_encoder_plugin shout_mp3_encoder = {
shout_mp3_encoder_send_metadata, shout_mp3_encoder_send_metadata,
}; };
#else
DISABLED_SHOUT_ENCODER_PLUGIN(shout_mp3_encoder);
#endif #endif

4
src/audioOutputs/audioOutput_shout_ogg.c
View File

@ -303,8 +303,4 @@ const struct shout_encoder_plugin shout_ogg_encoder = {
shout_ogg_encoder_send_metadata, shout_ogg_encoder_send_metadata,
}; };
#else
DISABLED_SHOUT_ENCODER_PLUGIN(shout_ogg_encoder);
#endif #endif