Make automatic latency selection default. Warn of deprecation of static latencies

2015-10-01 08:21:21 +01:00
parent 43c63f04a2
commit 440b592f64
3 changed files with 77 additions and 32 deletions
@@ -19,17 +19,6 @@ general =
 //  ignore_volume_control = "no"; // set this to "yes" if you want the volume to be at 100% no matter what the source's volume control is set to.
 };

-// Latencies for different sources. These have been estimated from listening tests.
-// It's probably better to compensate for a delay in the output device using the alsa "audio_backend_latency_offset" setting -- see below.
-latencies =
-{
-//  use_negotiated_latencies = "no"; // set this to "yes" to negotiate latencies with the client, and ignore the static settings listed below 
-//	default = 88200; // used for unrecognised sources and for iTunes up to and including iTunes 9.X.
-//	itunes = 99400; // used for iTunes 10 or later
-//	airplay = 88200;
-//	forkedDaapd = 99400;
-};
-
 // How to deal with metadata, including artwork
 metadata =
 {
@@ -76,3 +65,17 @@ stdout =
 //  audio_backend_latency_offset = 0; // Set this offset to compensate for a fixed delay in the audio back end. E.g. if the output device delays by 100 ms, set this to -4410.
 //  audio_backend_buffer_desired_length = 44100; // Having started to send audio at the right time, send all subsequent audio this many frames ahead of time, creating a buffer this size.
 };
+
+// The following static latency settings are deprecated -- do not use them for new installations. Shairport Sync now sets latencies automatically.
+// To compensate for a delay in the output device using the alsa/stdio/pipe "audio_backend_latency_offset" setting.
+
+// Static latencies for different sources. These have been estimated from listening tests.
+latencies =
+{
+//	default = 88200; // used for unrecognised sources and for iTunes up to and including iTunes 9.X.
+//	itunes = 99400; // used for iTunes 10 or later
+//	airplay = 88200;
+//	forkedDaapd = 99400;
+};
+
+