From: Mike Brady <mikebrady@eircom.net>
Date: Thu, 28 Feb 2019 14:48:41 +0000 (+0000)
Subject: bring the active state timeout to 1 second and tidy up a few debug messages.
X-Git-Tag: 3.3RC0~5^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41b584bd4314a119ac8cb9b8b8fe7eb9a8f0088e;p=thirdparty%2Fshairport-sync.git

bring the active state timeout to 1 second and tidy up a few debug messages.
---

diff --git a/audio_alsa.c b/audio_alsa.c
index 2312d839..a8449af6 100644
--- a/audio_alsa.c
+++ b/audio_alsa.c
@@ -1002,7 +1002,7 @@ static int init(int argc, char **argv) {
       }
     }
 
-    debug(1, "alsa: disable_standby_mode is %d.", config.disable_standby_mode);
+    debug(1, "alsa: disable_standby_mode is \"%s\".", config.disable_standby_mode == disable_standby_off ? "never" : config.disable_standby_mode == disable_standby_always ? "always" : "while_active");
   }
 
   optind = 1; // optind=0 is equivalent to optind=1 plus special behaviour
@@ -1552,7 +1552,7 @@ void *alsa_buffer_monitor_thread_code(__attribute__((unused)) void *arg) {
   int okb = -1;
   while (1) {
     if (okb != config.keep_dac_busy) {
-      debug(1,"keep_dac_busy is now %d",config.keep_dac_busy);
+      debug(1,"keep_dac_busy is now \"%s\"",config.keep_dac_busy == 0 ? "no" : "yes");
       okb = config.keep_dac_busy;
     }
     if ((config.keep_dac_busy != 0) && (alsa_device_initialised == 0)) {
diff --git a/scripts/shairport-sync.conf b/scripts/shairport-sync.conf
index c5d83eb5..2108e2d1 100644
--- a/scripts/shairport-sync.conf
+++ b/scripts/shairport-sync.conf
@@ -59,7 +59,7 @@ sessioncontrol =
 //	"active" state starts when play begins and ends when the active_state_timeout has elapsed after play ends, unless another play session starts before the timeout has fully elapsed.
 //	run_this_before_entering_active_state = "/full/path/to/application and args"; // make sure the application has executable permission. If it's a script, include the shebang (#!/bin/...) on the first line
 //	run_this_after_exiting_active_state = "/full/path/to/application and args"; // make sure the application has executable permission. If it's a script, include the shebang (#!/bin/...) on the first line
-//	active_state_timeout = 10; // wait for this number of seconds after play ends before leaving the active state, unless another play session begins.
+//	active_state_timeout = 1; // wait for this number of seconds after play ends before leaving the active state, unless another play session begins.
 
 //	run_this_if_an_unfixable_error_is_detected = "/full/path/to/application and args"; // if a problem occurs that can't be cleared by Shairport Sync itself, hook a program on here to deal with it. An error code-string is passed as the last argument.
 //	  Many of these "unfixable" problems are caused by malfunctioning output devices, and sometimes it is necessary to restart the whole device to clear the problem.
diff --git a/shairport.c b/shairport.c
index 3a0502ca..47f82702 100644
--- a/shairport.c
+++ b/shairport.c
@@ -342,7 +342,7 @@ int parse_options(int argc, char **argv) {
                                  // nothing else comes in first.
   config.fixedLatencyOffset = 11025; // this sounds like it works properly.
   config.diagnostic_drop_packet_fraction = 0.0;
-  config.active_state_timeout = 10.0;
+  config.active_state_timeout = 1.0;
   config.volume_range_hw_priority =
       0; // if combining software and hardware volume control, give the software priority
 // i.e. when reducing volume, reduce the sw first before reducing the software.