diff --git a/audio_pa.c b/audio_pa.c index 8dd38b8b..860edc04 100644 --- a/audio_pa.c +++ b/audio_pa.c @@ -147,7 +147,6 @@ static int init(__attribute__((unused)) int argc, __attribute__((unused)) char * } static void deinit(void) { - // debug(1, "pa deinit start"); pa_threaded_mainloop_stop(mainloop); pa_threaded_mainloop_free(mainloop); // debug(1, "pa deinit done"); @@ -296,7 +295,7 @@ static void stop(void) { audio_umb = audio_lmb + audio_size; audio_occupancy = 0; - // debug(1, "finish with stream"); + // debug(1,"pa stop"); pa_stream_disconnect(stream); } diff --git a/rtp.c b/rtp.c index a1ba6794..35a74ecd 100644 --- a/rtp.c +++ b/rtp.c @@ -1,7 +1,7 @@ /* * Apple RTP protocol handler. This file is part of Shairport. * Copyright (c) James Laird 2013 - * Copyright (c) Mike Brady 2014 -- 2018 + * Copyright (c) Mike Brady 2014 -- 2019 * All rights reserved. * * Permission is hereby granted, free of charge, to any person diff --git a/rtsp.c b/rtsp.c index 5b6748f1..8de83de3 100644 --- a/rtsp.c +++ b/rtsp.c @@ -1443,6 +1443,7 @@ void *metadata_thread_function(__attribute__((unused)) void *ignore) { #ifdef CONFIG_METADATA_HUB metadata_hub_process_metadata(pack.type, pack.code, pack.data, pack.length); #endif + #ifdef CONFIG_MQTT if (config.mqtt_enabled) { mqtt_process_metadata(pack.type, pack.code, pack.data, pack.length); @@ -1749,20 +1750,10 @@ static void handle_announce(rtsp_conn_info *conn, rtsp_message *req, rtsp_messag char *pmaxlatency = NULL; char *cp = req->content; int cp_left = req->contentlength; - if (cp_left > 1024) { - debug(1, "Error -- RTSP conversation thread %d ANNOUNCE content length is strange, at %d.", - conn->connection_number, cp_left); - goto out; - } char *next; while (cp_left && cp) { next = nextline(cp, cp_left); cp_left -= next - cp; - if (cp_left < 0) { - debug(1, "Error -- RTSP conversation thread %d ANNOUNCE content remaining is negative.", - conn->connection_number); - goto out; - } if (!strncmp(cp, "o=iTunes", 7)) pssid = cp + 8; diff --git a/scripts/shairport-sync.conf b/scripts/shairport-sync.conf index 9d4edcda..806e2743 100644 --- a/scripts/shairport-sync.conf +++ b/scripts/shairport-sync.conf @@ -86,7 +86,7 @@ alsa = // use_mmap_if_available = "yes"; // Use this optional advanced setting to control whether MMAP-based output is used to communicate with the DAC. Default is "yes" // use_hardware_mute_if_available = "no"; // Use this optional advanced setting to control whether the hardware in the DAC is used for muting. Default is "no", for compatibility with other audio players. // maximum_stall_time = 0.200; // Use this optional advanced setting to control how long to wait for data to be consumed by the output device before considering it an error. It should never approach 200 ms. -// disable_standby_mode = "never"; // Some DACs make small "popping" noises when they go in and out of standby mode. Settings can be: "always", "while_active" or "never". Default is "never", but only for backwards compatibility. You can use "yes" instead of "always" and "no instead of "never". +// disable_standby_mode = "never"; // Some DACs make small "popping" noises when they go in and out of standby mode. This prevents entry to standby mode. Settings can be: "always", "while_active" or "never". Default is "never", but only for backwards compatibility. You can use "yes" instead of "always" and "no instead of "never". }; // Parameters for the "sndio" audio back end. All are optional. diff --git a/shairport-sync.spec b/shairport-sync.spec index a9a3d8ca..9d4f83c7 100644 --- a/shairport-sync.spec +++ b/shairport-sync.spec @@ -1,5 +1,5 @@ Name: shairport-sync -Version: 3.2 +Version: 3.2.2 Release: 1%{?dist} Summary: AirTunes emulator. Multi-Room with Audio Synchronisation # MIT licensed except for tinysvcmdns under BSD, @@ -67,6 +67,10 @@ getent passwd %{name} &> /dev/null || useradd --system -c "%{name} User" \ %license LICENSES %changelog +* Sun Oct 14 2018 Mike Brady 3.1.7