From 28efe16f7330fe4f7dc14215d4d5a1cc02f53da2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=B6rg=20Krause?= Date: Mon, 23 May 2016 21:58:18 +0200 Subject: [PATCH] Fix build without metadata support MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Commit f36352dc4ece27fda24ef736183b8ff5729b8c96 introduced the parameter pipe_timeout for the metadata config. If shairport-sync is now configured without metadata support, the build fails with: ``` shairport.c: In function ‘main’: shairport.c:766:9: error: ‘shairport_cfg {aka struct }’ has no member named ‘metadata_pipe_timeout’ config.metadata_pipe_timeout = 5000; //milliseconds ``` Fix this by opting-out the affected code with CONFIG_METADATA. --- common.c | 2 ++ shairport.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/common.c b/common.c index b4d95839..8a200d32 100644 --- a/common.c +++ b/common.c @@ -513,6 +513,7 @@ uint64_t get_absolute_time_in_fp() { return time_now_fp; } +#ifdef CONFIG_METADATA ssize_t non_blocking_write(int fd, const void *buf, size_t count) { void *ibuf = (void *)buf; size_t bytes_remaining = count; @@ -547,6 +548,7 @@ ssize_t non_blocking_write(int fd, const void *buf, size_t count) { return rc; // return write(fd,buf,count); } +#endif /* from http://coding.debuntu.org/c-implementing-str_replace-replace-all-occurrences-substring#comment-722 */ diff --git a/shairport.c b/shairport.c index 8c80bfec..58c1dc54 100644 --- a/shairport.c +++ b/shairport.c @@ -763,7 +763,9 @@ int main(int argc, char **argv) { //snprintf(config.service_name, 20 + 100, "Shairport Sync on %s", hostname); set_requested_connection_state_to_output(1); // we expect to be able to connect to the output device config.audio_backend_buffer_desired_length = 6615; // 0.15 seconds. +#ifdef CONFIG_METADATA config.metadata_pipe_timeout = 5000; //milliseconds +#endif config.udp_port_base = 6001; config.udp_port_range = 100; -- 2.47.2