From 201931916e233a70d063b2b96c532b7c00c91662 Mon Sep 17 00:00:00 2001 From: Mke Brady Date: Thu, 5 Mar 2015 23:10:00 +0000 Subject: [PATCH] VERY flaky with metadata, metadata thread and queue hooked up but not really house-trained or even fully debugged. --- Makefile.am | 2 +- metadata.c | 334 ---------------------------------------------------- metadata.h | 25 ---- player.h | 1 - rtsp.c | 252 ++++++++++++++++++++++++++++++++++----- shairport.c | 1 - 6 files changed, 226 insertions(+), 389 deletions(-) delete mode 100644 metadata.c delete mode 100644 metadata.h diff --git a/Makefile.am b/Makefile.am index 9eba36dc..eced4e63 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = man bin_PROGRAMS = shairport-sync -shairport_sync_SOURCES = shairport.c metadata.c rtsp.c mdns.c mdns_external.c common.c rtp.c player.c alac.c audio.c audio_dummy.c audio_pipe.c +shairport_sync_SOURCES = shairport.c rtsp.c mdns.c mdns_external.c common.c rtp.c player.c alac.c audio.c audio_dummy.c audio_pipe.c AM_CFLAGS = -Wno-multichar diff --git a/metadata.c b/metadata.c deleted file mode 100644 index 0b509bc7..00000000 --- a/metadata.c +++ /dev/null @@ -1,334 +0,0 @@ -/* - * Metadate structure and utility methods. This file is part of Shairport. - * Copyright (c) Benjamin Maus 2013 - * All rights reserved. - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "config.h" - -#ifdef HAVE_LIBSSL -#include -#endif - -#ifdef HAVE_LIBPOLARSSL -#include -#endif - -#include "common.h" -#include "metadata.h" - - -// including a simple base64 encoder to minimise malloc/free activity - -// From Stack Overflow, with thanks: -// http://stackoverflow.com/questions/342409/how-do-i-base64-encode-decode-in-c -// minor mods to make independent of C99. -// more significant changes make it not malloc memory -// needs to initialise the docoding table first - -// add _so to end of name to avoid confusion with polarssl's implementation - -static char encoding_table[] = {'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', - 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', - 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', - 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', - 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', - 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', - 'w', 'x', 'y', 'z', '0', '1', '2', '3', - '4', '5', '6', '7', '8', '9', '+', '/'}; - -static int mod_table[] = {0, 2, 1}; - -// pass in a pointer to the data, its length, a pointer to the output buffer and a pointer to an int containing its maximum length -// the actual length will be returned. - -char *base64_encode_so(const unsigned char *data, - size_t input_length, - char *encoded_data, - size_t *output_length) { - - size_t calculated_output_length = 4 * ((input_length + 2) / 3); - if (calculated_output_length> *output_length) - return(NULL); - *output_length = calculated_output_length; - - int i,j; - for (i = 0, j = 0; i < input_length;) { - - uint32_t octet_a = i < input_length ? (unsigned char)data[i++] : 0; - uint32_t octet_b = i < input_length ? (unsigned char)data[i++] : 0; - uint32_t octet_c = i < input_length ? (unsigned char)data[i++] : 0; - - uint32_t triple = (octet_a << 0x10) + (octet_b << 0x08) + octet_c; - - encoded_data[j++] = encoding_table[(triple >> 3 * 6) & 0x3F]; - encoded_data[j++] = encoding_table[(triple >> 2 * 6) & 0x3F]; - encoded_data[j++] = encoding_table[(triple >> 1 * 6) & 0x3F]; - encoded_data[j++] = encoding_table[(triple >> 0 * 6) & 0x3F]; - } - - for (i = 0; i < mod_table[input_length % 3]; i++) - encoded_data[*output_length - 1 - i] = '='; - - return encoded_data; -} - -// with thanks! -// - -metadata player_meta; -static int fd = -1; -static int dirty = 0; - -void metadata_set(char** field, const char* value) { - if (*field) { - if (!strcmp(*field, value)) - return; - free(*field); - } - *field = strdup(value); - dirty = 1; -} - -void metadata_create(void) { - if (!config.meta_dir) - return; - - const char fn[] = "shairport_sync_metadata_pipe"; - size_t pl = strlen(config.meta_dir) + 1 + strlen(fn); - - char* path = malloc(pl+1); - snprintf(path, pl+1, "%s/%s", config.meta_dir, fn); - - if (mkfifo(path, 0644) && errno != EEXIST) - die("Could not create metadata FIFO %s", path); - - free(path); -} - -void metadata_open(void) { - if (!config.meta_dir) - return; - - const char fn[] = "shairport_sync_metadata_pipe"; - size_t pl = strlen(config.meta_dir) + 1 + strlen(fn); - - char* path = malloc(pl+1); - snprintf(path, pl+1, "%s/%s", config.meta_dir, fn); - - fd = open(path, O_WRONLY | O_NONBLOCK); - if (fd < 0) - debug(1, "Could not open metadata FIFO %s. Will try again later.", path); - - free(path); -} - -static void metadata_close(void) { - close(fd); - fd = -1; -} - -void metadata_init(void) { - if (!config.meta_dir) - return; - metadata_create(); -} - -static void print_one(const char *name, const char *value) { - int ignore; - ignore = write(fd, name, strlen(name)); - ignore = write(fd, "=", 1); - if (value) - ignore = write(fd, value, strlen(value)); - ignore = write(fd, "\n", 1); -} - -#define write_one(name) \ - print_one(#name, player_meta.name) - -void metadata_write(void) { - int ret; - - // readers may go away and come back - if (fd < 0) - metadata_open(); - if (fd < 0) - return; - - if (!dirty) - return; - - dirty = 0; - - write_one(artist); - write_one(title); - write_one(album); - write_one(artwork); - write_one(genre); - write_one(comment); - - ret = write(fd, "\n", 1); - if (ret < 1) // no reader - metadata_close(); -} - -void metadata_cover_image(const char *buf, int len, const char *ext) { - if (!config.meta_dir) - return; - - if (buf) { - debug(2, "Cover Art set\n"); - } else { - debug(2, "Cover Art cleared\n"); - return; - } - - uint8_t img_md5[16]; - - -#ifdef HAVE_LIBSSL - MD5_CTX ctx; - MD5_Init(&ctx); - MD5_Update(&ctx, buf, len); - MD5_Final(img_md5, &ctx); -#endif - - -#ifdef HAVE_LIBPOLARSSL - md5_context tctx; - md5_starts(&tctx); - md5_update(&tctx, buf, len); - md5_finish(&tctx, img_md5); -#endif - - char img_md5_str[33]; - int i; - for (i = 0; i < 16; i++) - sprintf(&img_md5_str[i*2], "%02x", (uint8_t)img_md5[i]); - - char *dir = config.meta_dir; - char *prefix = "cover-"; - - size_t pl = strlen(dir) + 1 + strlen(prefix) + strlen(img_md5_str) + 1 + strlen(ext); - - char *path = malloc(pl+1); - snprintf(path, pl+1, "%s/%s%s.%s", dir, prefix, img_md5_str, ext); - - int cover_fd = open(path, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP| S_IROTH | S_IWOTH); - - if (cover_fd < 0) { - warn("Could not open file %s for writing cover art", path); - return; - } - - if (write(cover_fd, buf, len) < len) { - warn("writing %s failed\n", path); - free(path); - return; - } - close(cover_fd); - - debug(2, "Cover Art file is \"%s\".\n", path); - metadata_set(&player_meta.artwork, path+strlen(dir)+1); - - free(path); -} - - -// Metadata is not used by shairport-sync. -// Instead we send all metadata to a fifo pipe, so that other apps can listen to the pipe and use the metadata. - -// We use two 4-character codes to identify each piece of data and we send the data itself in base64 form. - -// The first 4-character code, called the "type", is either: -// 'core' for all the regular metadadata coming from iTunes, etc., or -// 'ssnc' (for 'shairport-sync') for all metadata coming from Shairport Sync itself, such as start/end delimiters, etc. - -// For 'core' metadata, the second 4-character code is the 4-character metadata code coming from iTunes etc. -// For 'ssnc' metadata, the second 4-character code is used to distinguish the messages. - -// Cover art is not tagged in the same way as other metadata, it seems, so is sent as an 'ssnc' type metadata message with the code 'PICT' -// The three kinds of 'ssnc' metadata at present are 'strt', 'stop' and 'PICT' for metadata package start, metadata package stop and cover art, respectively. - -// Metadata is sent in two disctinct parts: -// (1) a line with type, code and length information surrounded by XML-type tags and -// (2) the data itself, if any, in base64 form, surrounded by XML-style data tags. - -void metadata_process(uint32_t type,uint32_t code,char *data,uint32_t length) { - debug(2,"Process metadata with type %x, code %x and length %u.",type,code,length); - int ret; - // readers may go away and come back - if (fd < 0) - metadata_open(); - if (fd < 0) - return; - char thestring[1024]; - snprintf(thestring,1024,"%x%x%u\n",type,code,length); - ret = write(fd, thestring, strlen(thestring)); - if (ret < 1) // possibly the pipe is running out of memory because the reader is too slow - debug(1,"Error writing to pipe"); - if (length>0) { - snprintf(thestring,1024,"\n"); - ret = write(fd, thestring, strlen(thestring)); - if (ret < 1) // no reader - debug(1,"Error writing to pipe"); - // here, we write the data in base64 form using our nice base64 encoder - // but, we break it into lines of 76 output characters, except for the last one. - // thus, we send groups of (76/4)*3 = 57 bytes to the encoder at a time - size_t remaining_count = length; - char *remaining_data = data; - size_t towrite_count; - char outbuf[76]; - while ((remaining_count) && (ret>=0)) { - size_t towrite_count = remaining_count; - if (towrite_count>57) - towrite_count = 57; - size_t outbuf_size = 76; // size of output buffer on entry, length of result on exit - if (base64_encode_so(remaining_data, towrite_count, outbuf, &outbuf_size)==NULL) - debug(1,"Error encoding base64 data."); - //debug(1,"Remaining count: %d ret: %d, outbuf_size: %d.",remaining_count,ret,outbuf_size); - ret = write(fd,outbuf,outbuf_size); - if (ret<0) - debug(1,"Error writing base64 data to pipe: \"%s\".",strerror(errno)); - remaining_data+=towrite_count; - remaining_count-=towrite_count; - // ret = write(fd,"\r\n",2); - // if (ret<0) - // debug(1,"Error writing base64 cr/lf to pipe."); - } - snprintf(thestring,1024,"\n"); - ret = write(fd, thestring, strlen(thestring)); - if (ret < 1) // no reader - debug(1,"Error writing to pipe"); - } -} diff --git a/metadata.h b/metadata.h deleted file mode 100644 index a57f356a..00000000 --- a/metadata.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef _METADATA_H -#define _METADATA_H - -#include - -typedef struct { - char *artist; - char *title; - char *album; - char *artwork; - char *comment; - char *genre; -} metadata; - -void metadata_set(char** field, const char* value); -void metadata_open(void); -void metadata_init(void); -void metadata_write(void); -void metadata_cover_image(const char *buf, int len, const char *ext); - -void metadata_process(uint32_t type,uint32_t code,char *data,uint32_t length); - -extern metadata player_meta; - -#endif // _METADATA_H diff --git a/player.h b/player.h index aebfaa58..5188ac07 100644 --- a/player.h +++ b/player.h @@ -2,7 +2,6 @@ #define _PLAYER_H #include "audio.h" -#include "metadata.h" typedef struct { uint8_t aesiv[16], aeskey[16]; diff --git a/rtsp.c b/rtsp.c index f43df200..43addc99 100644 --- a/rtsp.c +++ b/rtsp.c @@ -54,7 +54,6 @@ #include "player.h" #include "rtp.h" #include "mdns.h" -#include "metadata.h" #ifdef AF_INET6 #define INETx_ADDRSTRLEN INET6_ADDRSTRLEN @@ -104,6 +103,30 @@ typedef struct { void * qbase; // base address of actual queue } pc_queue; // producer-consumer queue +typedef struct { + uint32_t referenceCount; // we might start using this... + int nheaders; + char *name[16]; + char *value[16]; + + int contentlength; + char *content; + + // for requests + char method[16]; + + // for responses + int respcode; +} rtsp_message; + +typedef struct { + uint32_t type; + uint32_t code; + char *data; + uint32_t length; + rtsp_message* carrier; +} metadata_package; + pc_queue* pc_queue_create(size_t new_item_size, uint32_t number_of_items) { pc_queue* the_queue = malloc(sizeof(pc_queue)+number_of_items*new_item_size-sizeof(void*)); if (the_queue) { @@ -297,22 +320,6 @@ static char *nextline(char *in, int inbuf) { return out; } -typedef struct { - uint32_t referenceCount; // we might start using this... - int nheaders; - char *name[16]; - char *value[16]; - - int contentlength; - char *content; - - // for requests - char method[16]; - - // for responses - int respcode; -} rtsp_message; - static void msg_retain(rtsp_message * msg) { if (msg) { int rc = pthread_mutex_lock(&reference_counter_lock); @@ -381,9 +388,9 @@ static void msg_free(rtsp_message *msg) { if (msg->content) free(msg->content); free(msg); - } else { - debug(1,"rtsp_message reference count non-zero: %d!",msg->referenceCount); - } + } // else { + // debug(1,"rtsp_message reference count non-zero: %d!",msg->referenceCount); + //} } else { debug(1,"null rtsp_message pointer passed to msg_free()"); } @@ -740,6 +747,8 @@ static void handle_set_parameter_parameter(rtsp_conn_info *conn, } } + + // Metadata is not used by shairport-sync. // Instead we send all metadata to a fifo pipe, so that other apps can listen to the pipe and use the metadata. @@ -756,6 +765,190 @@ static void handle_set_parameter_parameter(rtsp_conn_info *conn, // The three kinds of 'ssnc' metadata at present are 'strt', 'stop' and 'PICT' for metadata package start, metadata package stop and cover art, respectively. +// including a simple base64 encoder to minimise malloc/free activity + +// From Stack Overflow, with thanks: +// http://stackoverflow.com/questions/342409/how-do-i-base64-encode-decode-in-c +// minor mods to make independent of C99. +// more significant changes make it not malloc memory +// needs to initialise the docoding table first + +// add _so to end of name to avoid confusion with polarssl's implementation + +static char encoding_table[] = {'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', + 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', + 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', + 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', + 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', + 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', + 'w', 'x', 'y', 'z', '0', '1', '2', '3', + '4', '5', '6', '7', '8', '9', '+', '/'}; + +static int mod_table[] = {0, 2, 1}; + +// pass in a pointer to the data, its length, a pointer to the output buffer and a pointer to an int containing its maximum length +// the actual length will be returned. + +char *base64_encode_so(const unsigned char *data, + size_t input_length, + char *encoded_data, + size_t *output_length) { + + size_t calculated_output_length = 4 * ((input_length + 2) / 3); + if (calculated_output_length> *output_length) + return(NULL); + *output_length = calculated_output_length; + + int i,j; + for (i = 0, j = 0; i < input_length;) { + + uint32_t octet_a = i < input_length ? (unsigned char)data[i++] : 0; + uint32_t octet_b = i < input_length ? (unsigned char)data[i++] : 0; + uint32_t octet_c = i < input_length ? (unsigned char)data[i++] : 0; + + uint32_t triple = (octet_a << 0x10) + (octet_b << 0x08) + octet_c; + + encoded_data[j++] = encoding_table[(triple >> 3 * 6) & 0x3F]; + encoded_data[j++] = encoding_table[(triple >> 2 * 6) & 0x3F]; + encoded_data[j++] = encoding_table[(triple >> 1 * 6) & 0x3F]; + encoded_data[j++] = encoding_table[(triple >> 0 * 6) & 0x3F]; + } + + for (i = 0; i < mod_table[input_length % 3]; i++) + encoded_data[*output_length - 1 - i] = '='; + + return encoded_data; +} + +// with thanks! +// + +static int fd = -1; +static int dirty = 0; +static pc_queue *metadata_queue; +static pthread_t metadata_thread; + +void metadata_create(void) { + if (!config.meta_dir) + return; + + const char fn[] = "shairport_sync_metadata_pipe"; + size_t pl = strlen(config.meta_dir) + 1 + strlen(fn); + + char* path = malloc(pl+1); + snprintf(path, pl+1, "%s/%s", config.meta_dir, fn); + + if (mkfifo(path, 0644) && errno != EEXIST) + die("Could not create metadata FIFO %s", path); + + free(path); +} + +void metadata_open(void) { + if (!config.meta_dir) + return; + + const char fn[] = "shairport_sync_metadata_pipe"; + size_t pl = strlen(config.meta_dir) + 1 + strlen(fn); + + char* path = malloc(pl+1); + snprintf(path, pl+1, "%s/%s", config.meta_dir, fn); + + fd = open(path, O_WRONLY); + if (fd < 0) + debug(1, "Could not open metadata FIFO %s. Will try again later.", path); + + free(path); +} + +static void metadata_close(void) { + close(fd); + fd = -1; +} + +void metadata_process(uint32_t type,uint32_t code,char *data,uint32_t length) { + debug(2,"Process metadata with type %x, code %x and length %u.",type,code,length); + int ret; + // readers may go away and come back + if (fd < 0) + metadata_open(); + if (fd < 0) + return; + char thestring[1024]; + snprintf(thestring,1024,"%x%x%u\n",type,code,length); + ret = write(fd, thestring, strlen(thestring)); + if (ret < 1) // possibly the pipe is running out of memory because the reader is too slow + debug(1,"Error writing to pipe"); + if (length>0) { + snprintf(thestring,1024,"\n"); + ret = write(fd, thestring, strlen(thestring)); + if (ret < 1) // no reader + debug(1,"Error writing to pipe"); + // here, we write the data in base64 form using our nice base64 encoder + // but, we break it into lines of 76 output characters, except for the last one. + // thus, we send groups of (76/4)*3 = 57 bytes to the encoder at a time + size_t remaining_count = length; + char *remaining_data = data; + size_t towrite_count; + char outbuf[76]; + while ((remaining_count) && (ret>=0)) { + size_t towrite_count = remaining_count; + if (towrite_count>57) + towrite_count = 57; + size_t outbuf_size = 76; // size of output buffer on entry, length of result on exit + if (base64_encode_so(remaining_data, towrite_count, outbuf, &outbuf_size)==NULL) + debug(1,"Error encoding base64 data."); + //debug(1,"Remaining count: %d ret: %d, outbuf_size: %d.",remaining_count,ret,outbuf_size); + ret = write(fd,outbuf,outbuf_size); + if (ret<0) + debug(1,"Error writing base64 data to pipe: \"%s\".",strerror(errno)); + remaining_data+=towrite_count; + remaining_count-=towrite_count; + // ret = write(fd,"\r\n",2); + // if (ret<0) + // debug(1,"Error writing base64 cr/lf to pipe."); + } + snprintf(thestring,1024,"\n"); + ret = write(fd, thestring, strlen(thestring)); + if (ret < 1) // no reader + debug(1,"Error writing to pipe"); + } +} + +void* metadata_thread_function(void *ignore) { + metadata_create(); + metadata_package pack; + while (1) { + pc_queue_get_item(metadata_queue, &pack); + metadata_process(pack.type,pack.code,pack.data,pack.length); + if (pack.carrier) + msg_free(pack.carrier); // release the message + } + pthread_exit(NULL); +} + +void metadata_init(void) { + // create a pc_queue for passing information to a threaded metadata handler + metadata_queue = pc_queue_create(sizeof(metadata_package),20); + if (metadata_queue==NULL) + debug(1,"Can't create a queue for metadata"); + int ret = pthread_create(&metadata_thread, NULL, metadata_thread_function, metadata_queue); + if (ret) + debug(1,"Failed to create metadata thread!"); +} + +void send_metadata(uint32_t type,uint32_t code,char *data,uint32_t length, rtsp_message* carrier) { + metadata_package pack; + pack.type = type; + pack.code = code; + pack.data = data; + pack.length = length; + if (carrier) + msg_retain(carrier); + pack.carrier = carrier; + pc_queue_add_item(metadata_queue,&pack); +} + static void handle_set_parameter_metadata(rtsp_conn_info *conn, rtsp_message *req, rtsp_message *resp) { @@ -767,7 +960,12 @@ static void handle_set_parameter_metadata(rtsp_conn_info *conn, // inform the listener that a set of metadata is starting // this doesn't include the cover art though... - metadata_process('ssnc','strt',NULL,0); + // parameters: type, code, pointer to data or NULL, length of data, the rtsp_message or NULL + // the rtsp_message is sent for 'core' messages, because it contains the data and must not be + // freed until the data has been read. So, it is passed to send_metadata to be retained, + // sent to the thread where metadata is processed and released (and probably freed) + + send_metadata('ssnc','strt',NULL,0,NULL); while (off < cl) { // pick up the metadata tag as an unsigned longint @@ -780,19 +978,19 @@ static void handle_set_parameter_metadata(rtsp_conn_info *conn, // pass the data over if (vl==0) - metadata_process('core',itag,NULL,0); + send_metadata('core',itag,NULL,0,NULL); else - metadata_process('core',itag,(char *)(cp+off),vl); + send_metadata('core',itag,(char *)(cp+off),vl,req); // move on to the next item off += vl; } // inform the listener that a set of metadata is ending - metadata_process('ssnc','stop',NULL,0); + send_metadata('ssnc','stop',NULL,0,NULL); // send the user some shairport-originated metadata // send the name of the player, e.g. "Joe's iPhone" or "iTunes" - metadata_process('ssnc','sndr',sender_name,strlen(sender_name)); + send_metadata('ssnc','sndr',sender_name,strlen(sender_name),NULL); } static void handle_set_parameter(rtsp_conn_info *conn, @@ -812,7 +1010,7 @@ static void handle_set_parameter(rtsp_conn_info *conn, debug(1, "received image in SET_PARAMETER request\n"); // note: the image/type tag isn't reliable, so it's not being sent // -- best look at the first few bytes of the image - metadata_process('ssnc','PICT',req->content,req->contentlength); + send_metadata('ssnc','PICT',req->content,req->contentlength,req); } else if (!strncmp(ct, "text/parameters", 15)) { debug(2, "received parameters in SET_PARAMETER request\n"); handle_set_parameter_parameter(conn, req, resp); @@ -1151,7 +1349,7 @@ static void *rtsp_conversation_thread_func(void *pconn) { respond: msg_write_response(conn->fd, resp); - msg_free(req); // we may change this to use reference counting! + msg_free(req); msg_free(resp); } else { if (reply!=rtsp_read_request_response_shutdown_requested) diff --git a/shairport.c b/shairport.c index 8aaa22b6..f0fc8539 100644 --- a/shairport.c +++ b/shairport.c @@ -51,7 +51,6 @@ #include "rtsp.h" #include "rtp.h" #include "mdns.h" -#include "metadata.h" #include #include