From: Mike Brady Date: Sun, 20 Oct 2019 21:04:29 +0000 (+0100) Subject: Fix a small conditional compilation flag error X-Git-Tag: 3.3.3~2^2~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41de3e5c39d0fb6006137f24a07772c6865871db;p=thirdparty%2Fshairport-sync.git Fix a small conditional compilation flag error --- diff --git a/shairport.c b/shairport.c index 4726682d..8657e801 100644 --- a/shairport.c +++ b/shairport.c @@ -836,6 +836,20 @@ int parse_options(int argc, char **argv) { config.metadata_pipename = (char *)str; } + if (config_lookup_string(config.cfg, "metadata.socket_address", &str)) { + config.metadata_sockaddr = (char *)str; + } + if (config_lookup_int(config.cfg, "metadata.socket_port", &value)) { + config.metadata_sockport = value; + } + config.metadata_sockmsglength = 500; + if (config_lookup_int(config.cfg, "metadata.socket_msglength", &value)) { + config.metadata_sockmsglength = value < 500 ? 500 : value > 65000 ? 65000 : value; + } + +#endif + +#ifdef CONFIG_METADATA_HUB if (config_lookup_string(config.cfg, "metadata.cover_art_cache_directory", &str)) { config.cover_art_cache_dir = (char *)str; } @@ -849,17 +863,6 @@ int parse_options(int argc, char **argv) { die("Invalid metadata retain_cover_art option choice \"%s\". It should be \"yes\" or " "\"no\""); } - if (config_lookup_string(config.cfg, "metadata.socket_address", &str)) { - config.metadata_sockaddr = (char *)str; - } - if (config_lookup_int(config.cfg, "metadata.socket_port", &value)) { - config.metadata_sockport = value; - } - config.metadata_sockmsglength = 500; - if (config_lookup_int(config.cfg, "metadata.socket_msglength", &value)) { - config.metadata_sockmsglength = value < 500 ? 500 : value > 65000 ? 65000 : value; - } - #endif if (config_lookup_string(config.cfg, "sessioncontrol.run_this_before_play_begins", &str)) {