struct sockaddr_storage remote_saddr;
socklen_t remote_saddr_len;
+ /* MUTEX LOCKED VARIABLES START */
/* These variables only edited mutex locked */
int running;
int joined;
+
float volume;
+ int volume_changed;
+ unsigned char *metadata;
+ int metadata_len;
+ unsigned char *coverart;
+ int coverart_len;
+
int flush;
thread_handle_t thread;
mutex_handle_t run_mutex;
+ /* MUTEX LOCKED VARIABLES END */
/* Remote control and timing ports */
unsigned short control_rport;
free(original);
return -1;
}
+ if (strstr(current, ":")) {
+ /* FIXME: iTunes sends IP4 even with an IPv6 address, does it mean something */
+ family = AF_INET6;
+ }
ret = netutils_parse_address(family, current,
&raop_rtp->remote_saddr,
sizeof(raop_rtp->remote_saddr));
raop_rtp_t *
raop_rtp_init(logger_t *logger, raop_callbacks_t *callbacks, const char *remote,
- const char *fmtp, const unsigned char *aeskey, const unsigned char *aesiv)
+ const char *rtpmap, const char *fmtp,
+ const unsigned char *aeskey, const unsigned char *aesiv)
{
raop_rtp_t *raop_rtp;
assert(logger);
assert(callbacks);
assert(remote);
+ assert(rtpmap);
assert(fmtp);
raop_rtp = calloc(1, sizeof(raop_rtp_t));
}
raop_rtp->logger = logger;
memcpy(&raop_rtp->callbacks, callbacks, sizeof(raop_callbacks_t));
- raop_rtp->buffer = raop_buffer_init(fmtp, aeskey, aesiv);
+ raop_rtp->buffer = raop_buffer_init(rtpmap, fmtp, aeskey, aesiv);
if (!raop_rtp->buffer) {
free(raop_rtp);
return NULL;
MUTEX_DESTROY(raop_rtp->run_mutex);
raop_buffer_destroy(raop_rtp->buffer);
+ free(raop_rtp->metadata);
+ free(raop_rtp->coverart);
free(raop_rtp);
}
}
addr = (struct sockaddr *)&raop_rtp->control_saddr;
addrlen = raop_rtp->control_saddr_len;
- logger_log(raop_rtp->logger, LOGGER_DEBUG, "Got resend request %d %d\n", seqnum, count);
+ logger_log(raop_rtp->logger, LOGGER_DEBUG, "Got resend request %d %d", seqnum, count);
ourseqnum = raop_rtp->control_seqnum++;
/* Fill the request buffer */
ret = sendto(raop_rtp->csock, (const char *)packet, sizeof(packet), 0, addr, addrlen);
if (ret == -1) {
- logger_log(raop_rtp->logger, LOGGER_WARNING, "Resend failed: %d\n", SOCKET_GET_ERROR());
+ logger_log(raop_rtp->logger, LOGGER_WARNING, "Resend failed: %d", SOCKET_GET_ERROR());
+ }
+
+ return 0;
+}
+
+static int
+raop_rtp_process_events(raop_rtp_t *raop_rtp, void *cb_data)
+{
+ int flush;
+ float volume;
+ int volume_changed;
+ unsigned char *metadata;
+ int metadata_len;
+ unsigned char *coverart;
+ int coverart_len;
+
+ assert(raop_rtp);
+
+ MUTEX_LOCK(raop_rtp->run_mutex);
+ if (!raop_rtp->running) {
+ MUTEX_UNLOCK(raop_rtp->run_mutex);
+ return 1;
}
+ /* Read the volume level */
+ volume = raop_rtp->volume;
+ volume_changed = raop_rtp->volume_changed;
+ raop_rtp->volume_changed = 0;
+
+ /* Read the flush value */
+ flush = raop_rtp->flush;
+ raop_rtp->flush = NO_FLUSH;
+
+ /* Read the metadata */
+ metadata = raop_rtp->metadata;
+ metadata_len = raop_rtp->metadata_len;
+ raop_rtp->metadata = NULL;
+ raop_rtp->metadata_len = 0;
+
+ /* Read the coverart */
+ coverart = raop_rtp->coverart;
+ coverart_len = raop_rtp->coverart_len;
+ raop_rtp->coverart = NULL;
+ raop_rtp->coverart_len = 0;
+ MUTEX_UNLOCK(raop_rtp->run_mutex);
+
+ /* Call set_volume callback if changed */
+ if (volume_changed) {
+ if (raop_rtp->callbacks.audio_set_volume) {
+ raop_rtp->callbacks.audio_set_volume(raop_rtp->callbacks.cls, cb_data, volume);
+ }
+ }
+
+ /* Handle flush if requested */
+ if (flush != NO_FLUSH) {
+ raop_buffer_flush(raop_rtp->buffer, flush);
+ if (raop_rtp->callbacks.audio_flush) {
+ raop_rtp->callbacks.audio_flush(raop_rtp->callbacks.cls, cb_data);
+ }
+ }
+ if (metadata != NULL) {
+ if (raop_rtp->callbacks.audio_set_metadata) {
+ raop_rtp->callbacks.audio_set_metadata(raop_rtp->callbacks.cls, cb_data, metadata, metadata_len);
+ }
+ free(metadata);
+ metadata = NULL;
+ }
+ if (coverart != NULL) {
+ if (raop_rtp->callbacks.audio_set_coverart) {
+ raop_rtp->callbacks.audio_set_coverart(raop_rtp->callbacks.cls, cb_data, coverart, coverart_len);
+ }
+ free(coverart);
+ coverart = NULL;
+ }
return 0;
}
unsigned int packetlen;
struct sockaddr_storage saddr;
socklen_t saddrlen;
- float volume = 0.0;
const ALACSpecificConfig *config;
void *cb_data = NULL;
assert(raop_rtp);
config = raop_buffer_get_config(raop_rtp->buffer);
- raop_rtp->callbacks.audio_init(raop_rtp->callbacks.cls, &cb_data,
+ cb_data = raop_rtp->callbacks.audio_init(raop_rtp->callbacks.cls,
config->bitDepth,
config->numChannels,
config->sampleRate);
while(1) {
- int volume_changed;
- int flush;
-
fd_set rfds;
struct timeval tv;
int nfds, ret;
- MUTEX_LOCK(raop_rtp->run_mutex);
- if (!raop_rtp->running) {
- MUTEX_UNLOCK(raop_rtp->run_mutex);
+ /* Check if we are still running and process callbacks */
+ if (raop_rtp_process_events(raop_rtp, cb_data)) {
break;
}
- /* Read the volume level */
- volume_changed = (volume != raop_rtp->volume);
- volume = raop_rtp->volume;
-
- /* Read the flush value */
- flush = raop_rtp->flush;
- raop_rtp->flush = NO_FLUSH;
- MUTEX_UNLOCK(raop_rtp->run_mutex);
-
- /* Call set_volume callback if changed */
- if (volume_changed) {
- raop_rtp->callbacks.audio_set_volume(raop_rtp->callbacks.cls, cb_data, volume);
- }
- if (flush != NO_FLUSH) {
- raop_buffer_flush(raop_rtp->buffer, flush);
- raop_rtp->callbacks.audio_flush(raop_rtp->callbacks.cls, cb_data);
- }
/* Set timeout value to 5ms */
tv.tv_sec = 0;
if (packetlen >= 12) {
char type = packet[1] & ~0x80;
- logger_log(raop_rtp->logger, LOGGER_DEBUG, "Got control packet of type 0x%02x\n", type);
+ logger_log(raop_rtp->logger, LOGGER_DEBUG, "Got control packet of type 0x%02x", type);
if (type == 0x56) {
/* Handle resent data packet */
int ret = raop_buffer_queue(raop_rtp->buffer, packet+4, packetlen-4, 1);
}
}
} else if (FD_ISSET(raop_rtp->tsock, &rfds)) {
- logger_log(raop_rtp->logger, LOGGER_INFO, "Would have timing packet in queue\n");
+ logger_log(raop_rtp->logger, LOGGER_INFO, "Would have timing packet in queue");
} else if (FD_ISSET(raop_rtp->dsock, &rfds)) {
saddrlen = sizeof(saddr);
packetlen = recvfrom(raop_rtp->dsock, (char *)packet, sizeof(packet), 0,
}
}
}
- logger_log(raop_rtp->logger, LOGGER_INFO, "Exiting thread\n");
+ logger_log(raop_rtp->logger, LOGGER_INFO, "Exiting UDP RAOP thread");
raop_rtp->callbacks.audio_destroy(raop_rtp->callbacks.cls, cb_data);
return 0;
int stream_fd = -1;
unsigned char packet[RAOP_PACKET_LEN];
unsigned int packetlen = 0;
- float volume = 0.0;
const ALACSpecificConfig *config;
void *cb_data = NULL;
assert(raop_rtp);
config = raop_buffer_get_config(raop_rtp->buffer);
- raop_rtp->callbacks.audio_init(raop_rtp->callbacks.cls, &cb_data,
+ cb_data = raop_rtp->callbacks.audio_init(raop_rtp->callbacks.cls,
config->bitDepth,
config->numChannels,
config->sampleRate);
while (1) {
- int volume_changed;
-
fd_set rfds;
struct timeval tv;
int nfds, ret;
- MUTEX_LOCK(raop_rtp->run_mutex);
- if (!raop_rtp->running) {
- MUTEX_UNLOCK(raop_rtp->run_mutex);
+ /* Check if we are still running and process callbacks */
+ if (raop_rtp_process_events(raop_rtp, cb_data)) {
break;
}
- volume_changed = (volume != raop_rtp->volume);
- volume = raop_rtp->volume;
- MUTEX_UNLOCK(raop_rtp->run_mutex);
-
- /* Call set_volume callback if changed */
- if (volume_changed) {
- raop_rtp->callbacks.audio_set_volume(raop_rtp->callbacks.cls, cb_data, volume);
- }
/* Set timeout value to 5ms */
tv.tv_sec = 0;
continue;
} else if (ret == -1) {
/* FIXME: Error happened */
- logger_log(raop_rtp->logger, LOGGER_INFO, "Error in select\n");
+ logger_log(raop_rtp->logger, LOGGER_INFO, "Error in select");
break;
}
if (stream_fd == -1 && FD_ISSET(raop_rtp->dsock, &rfds)) {
struct sockaddr_storage saddr;
socklen_t saddrlen;
- logger_log(raop_rtp->logger, LOGGER_INFO, "Accepting client\n");
+ logger_log(raop_rtp->logger, LOGGER_INFO, "Accepting client");
saddrlen = sizeof(saddr);
stream_fd = accept(raop_rtp->dsock, (struct sockaddr *)&saddr, &saddrlen);
if (stream_fd == -1) {
/* FIXME: Error happened */
- logger_log(raop_rtp->logger, LOGGER_INFO, "Error in accept %d %s\n", errno, strerror(errno));
+ logger_log(raop_rtp->logger, LOGGER_INFO, "Error in accept %d %s", errno, strerror(errno));
break;
}
}
ret = recv(stream_fd, (char *)(packet+packetlen), sizeof(packet)-packetlen, 0);
if (ret == 0) {
/* TCP socket closed */
- logger_log(raop_rtp->logger, LOGGER_INFO, "TCP socket closed\n");
+ logger_log(raop_rtp->logger, LOGGER_INFO, "TCP socket closed");
break;
} else if (ret == -1) {
/* FIXME: Error happened */
- logger_log(raop_rtp->logger, LOGGER_INFO, "Error in recv\n");
+ logger_log(raop_rtp->logger, LOGGER_INFO, "Error in recv");
break;
}
packetlen += ret;
rtplen = (packet[2] << 8) | packet[3];
if (rtplen > sizeof(packet)) {
/* FIXME: Too long packet */
- logger_log(raop_rtp->logger, LOGGER_INFO, "Error, packet too long %d\n", rtplen);
+ logger_log(raop_rtp->logger, LOGGER_INFO, "Error, packet too long %d", rtplen);
break;
}
if (packetlen < 4+rtplen) {
closesocket(stream_fd);
}
- logger_log(raop_rtp->logger, LOGGER_INFO, "Exiting thread\n");
+ logger_log(raop_rtp->logger, LOGGER_INFO, "Exiting TCP RAOP thread");
raop_rtp->callbacks.audio_destroy(raop_rtp->callbacks.cls, cb_data);
return 0;
use_ipv6 = 1;
}
if (raop_rtp_init_sockets(raop_rtp, use_ipv6, use_udp) < 0) {
- logger_log(raop_rtp->logger, LOGGER_INFO, "Initializing sockets failed\n");
+ logger_log(raop_rtp->logger, LOGGER_INFO, "Initializing sockets failed");
MUTEX_UNLOCK(raop_rtp->run_mutex);
return;
}
/* Set volume in thread instead */
MUTEX_LOCK(raop_rtp->run_mutex);
raop_rtp->volume = volume;
+ raop_rtp->volume_changed = 1;
+ MUTEX_UNLOCK(raop_rtp->run_mutex);
+}
+
+void
+raop_rtp_set_metadata(raop_rtp_t *raop_rtp, const char *data, int datalen)
+{
+ unsigned char *metadata;
+
+ assert(raop_rtp);
+
+ if (datalen <= 0) {
+ return;
+ }
+ metadata = malloc(datalen);
+ assert(metadata);
+ memcpy(metadata, data, datalen);
+
+ /* Set metadata in thread instead */
+ MUTEX_LOCK(raop_rtp->run_mutex);
+ raop_rtp->metadata = metadata;
+ raop_rtp->metadata_len = datalen;
+ MUTEX_UNLOCK(raop_rtp->run_mutex);
+}
+
+void
+raop_rtp_set_coverart(raop_rtp_t *raop_rtp, const char *data, int datalen)
+{
+ unsigned char *coverart;
+
+ assert(raop_rtp);
+
+ if (datalen <= 0) {
+ return;
+ }
+ coverart = malloc(datalen);
+ assert(coverart);
+ memcpy(coverart, data, datalen);
+
+ /* Set coverart in thread instead */
+ MUTEX_LOCK(raop_rtp->run_mutex);
+ raop_rtp->coverart = coverart;
+ raop_rtp->coverart_len = datalen;
MUTEX_UNLOCK(raop_rtp->run_mutex);
}
repositories / deb_shairplay.git / blobdiff