diff options
| author | Max Kellermann <max@duempel.org> | 2008-10-09 15:18:21 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2008-10-09 15:18:21 +0200 |
| commit | 5583b6c5e1c09fdb408ee425f0bf7f030d51452e (patch) | |
| tree | 59bc6b14ec38c3bb8f76f5f44e058d0c1352fe3b /src | |
| parent | 671b455133546abbff3f5e4ceb2d43359a912a5e (diff) | |
| download | mpd-5583b6c5e1c09fdb408ee425f0bf7f030d51452e.tar.gz mpd-5583b6c5e1c09fdb408ee425f0bf7f030d51452e.tar.xz mpd-5583b6c5e1c09fdb408ee425f0bf7f030d51452e.zip | |
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.
Diffstat (limited to '')
| -rw-r--r-- | src/audioOutputs/audioOutput_shout.c | 4 | ||||
| -rw-r--r-- | src/audioOutputs/audioOutput_shout.h | 3 | ||||
| -rw-r--r-- | src/audioOutputs/audioOutput_shout_mp3.c | 4 | ||||
| -rw-r--r-- | src/audioOutputs/audioOutput_shout_ogg.c | 4 |
4 files changed, 4 insertions, 11 deletions
diff --git a/src/audioOutputs/audioOutput_shout.c b/src/audioOutputs/audioOutput_shout.c index 181091d59..b9deef295 100644 --- 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 }; diff --git a/src/audioOutputs/audioOutput_shout.h b/src/audioOutputs/audioOutput_shout.h index bd525fd6d..2cfe68f29 100644 --- 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 { diff --git a/src/audioOutputs/audioOutput_shout_mp3.c b/src/audioOutputs/audioOutput_shout_mp3.c index d1fe87884..c54632b15 100644 --- 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 diff --git a/src/audioOutputs/audioOutput_shout_ogg.c b/src/audioOutputs/audioOutput_shout_ogg.c index d0303b3bb..14747c324 100644 --- 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 |