Recognise and use deprecated settings and issue warnings.

audio_alsa.c

@@ -147,36 +147,61 @@ static int init(int argc, char **argv) {
 
  if (config.cfg != NULL) {
 
- if (config_lookup_int(config.cfg, "alsa.audio_backend_buffer_desired_length", &value))
- inform("The setting audio_backend_buffer_desired_length is no longer used and has been "
- "ignored. Use audio_backend_buffer_desired_length_in_seconds instead.");
-
- /* Get the latency offset. */
- if (config_lookup_int(config.cfg, "alsa.audio_backend_latency_offset", &value))
- inform("The setting audio_backend_latency_offset is no longer used and has been ignored. Use "
- "audio_backend_latency_offset_in_seconds instead.");
+ /* Get the desired buffer size setting. */
+ if (config_lookup_int(config.cfg,
+ "alsa.audio_backend_buffer_desired_length", &value)) {
+ if ((value < 0) || (value > 66150)) {
+ inform("The setting alsa.audio_backend_buffer_desired_length is deprecated. "
+ "Use alsa.audio_backend_buffer_desired_length_in_seconds instead.");
+ die("Invalid alsa audio backend buffer desired length \"%d\". It "
+ "should be between 0 and "
+ "66150, default is 6615",
+ value);
+ } else {
+ inform("The setting alsa.audio_backend_buffer_desired_length is deprecated. "
+ "Use alsa.audio_backend_buffer_desired_length_in_seconds instead.");
+ config.audio_backend_buffer_desired_length = 1.0*value/44100;
+ }
+ }
 
  /* Get the desired buffer size setting. */
  if (config_lookup_float(config.cfg, "alsa.audio_backend_buffer_desired_length_in_seconds",
  &dvalue)) {
- if ((dvalue < 0) || (dvalue > 1.5))
+ if ((dvalue < 0) || (dvalue > 1.5)) {
  die("Invalid alsa audio backend buffer desired time \"%f\". It "
  "should be between 0 and "
  "1.5, default is 0.15 seconds",
  dvalue);
- else {
+ } else {
  config.audio_backend_buffer_desired_length = dvalue;
  }
  }
 
+ /* Get the latency offset. */
+ if (config_lookup_int(config.cfg, "alsa.audio_backend_latency_offset",
+ &value)) {
+ if ((value < -66150) || (value > 66150)) {
+ inform("The setting alsa.audio_backend_latency_offset is deprecated. "
+ "Use alsa.audio_backend_latency_offset_in_seconds instead.");
+ die("Invalid alsa audio backend buffer latency offset \"%d\". It "
+ "should be between -66150 and +66150, default is 0",
+ value);
+ } else {
+ inform("The setting alsa.audio_backend_latency_offset is deprecated. "
+ "Use alsa.audio_backend_latency_offset_in_seconds instead.");
+ config.audio_backend_latency_offset = 1.0*value/44100;
+ }
+ }
+
  /* Get the latency offset. */
  if (config_lookup_float(config.cfg, "alsa.audio_backend_latency_offset_in_seconds", &dvalue)) {
- if ((dvalue < -1.0) || (dvalue > 1.5))
+ if ((dvalue < -1.0) || (dvalue > 1.5)) {
  die("Invalid alsa audio backend buffer latency offset time \"%f\". It "
  "should be between -1.0 and +1.5, default is 0 seconds",
  dvalue);
- else
+ } else {
  config.audio_backend_latency_offset = dvalue;
+ }
  }
 
  /* Get the Output Device Name. */

audio_ao.c

@@ -55,25 +55,60 @@ static int init(int argc, char **argv) {
 
  if (config.cfg != NULL) {
  /* Get the desired buffer size setting. */
- if (config_lookup_float(config.cfg, "ao.audio_backend_buffer_desired_length", &dvalue)) {
- if ((dvalue < 0) || (value > 1.5))
- die("Invalid ao audio backend buffer desired length \"%f\". It "
+ if (config_lookup_int(config.cfg,
+ "ao.audio_backend_buffer_desired_length", &value)) {
+ if ((value < 0) || (value > 66150)) {
+ inform("The setting ao.audio_backend_buffer_desired_length is deprecated. "
+ "Use ao.audio_backend_buffer_desired_length_in_seconds instead.");
+ die("Invalid ao audio backend buffer desired length \"%d\". It "
  "should be between 0 and "
- "1.5, default is 1.0 second",
+ "66150, default is 6615",
+ value);
+ } else {
+ inform("The setting ao.audio_backend_buffer_desired_length is deprecated. "
+ "Use ao.audio_backend_buffer_desired_length_in_seconds instead.");
+ config.audio_backend_buffer_desired_length = 1.0*value/44100;
+ }
+ }
+
+ /* Get the desired buffer size setting. */
+ if (config_lookup_float(config.cfg, "ao.audio_backend_buffer_desired_length_in_seconds",
+ &dvalue)) {
+ if ((dvalue < 0) || (dvalue > 1.5)) {
+ die("Invalid ao audio backend buffer desired time \"%f\". It "
+ "should be between 0 and "
+ "1.5, default is 0.15 seconds",
  dvalue);
- else {
+ } else {
  config.audio_backend_buffer_desired_length = dvalue;
  }
  }
 
  /* Get the latency offset. */
- if (config_lookup_float(config.cfg, "ao.audio_backend_latency_offset", &dvalue)) {
- if ((dvalue < -1.0) || (value > 1.5))
- die("Invalid ao audio backend buffer latency offset \"%f\". It "
+ if (config_lookup_int(config.cfg, "ao.audio_backend_latency_offset",
+ &value)) {
+ if ((value < -66150) || (value > 66150)) {
+ inform("The setting ao.audio_backend_latency_offset is deprecated. "
+ "Use ao.audio_backend_latency_offset_in_seconds instead.");
+ die("Invalid ao audio backend buffer latency offset \"%d\". It "
+ "should be between -66150 and +66150, default is 0",
+ value);
+ } else {
+ inform("The setting ao.audio_backend_latency_offset is deprecated. "
+ "Use ao.audio_backend_latency_offset_in_seconds instead.");
+ config.audio_backend_latency_offset = 1.0*value/44100;
+ }
+ }
+
+ /* Get the latency offset. */
+ if (config_lookup_float(config.cfg, "ao.audio_backend_latency_offset_in_seconds", &dvalue)) {
+ if ((dvalue < -1.0) || (dvalue > 1.5)) {
+ die("Invalid ao audio backend buffer latency offset time \"%f\". It "
  "should be between -1.0 and +1.5, default is 0 seconds",
  dvalue);
- else
+ } else {
  config.audio_backend_latency_offset = dvalue;
+ }
  }
  }
 

audio_pipe.c

@@ -85,25 +85,60 @@ static int init(int argc, char **argv) {
  die("Can't use \"pipe\" backend for STDOUT. Use the \"stdout\" backend instead.");
 
  /* Get the desired buffer size setting. */
- if (config_lookup_float(config.cfg, "pipe.audio_backend_buffer_desired_length", &dvalue)) {
- if ((dvalue < 0) || (value > 1.5))
- die("Invalid pipe audio backend buffer desired length \"%f\". It "
+ if (config_lookup_int(config.cfg,
+ "pipe.audio_backend_buffer_desired_length", &value)) {
+ if ((value < 0) || (value > 66150)) {
+ inform("The setting pipe.audio_backend_buffer_desired_length is deprecated. "
+ "Use pipe.audio_backend_buffer_desired_length_in_seconds instead.");
+ die("Invalid pipe audio backend buffer desired length \"%d\". It "
  "should be between 0 and "
- "1.5, default is 1.0 second",
+ "66150, default is 6615",
+ value);
+ } else {
+ inform("The setting pipe.audio_backend_buffer_desired_length is deprecated. "
+ "Use pipe.audio_backend_buffer_desired_length_in_seconds instead.");
+ config.audio_backend_buffer_desired_length = 1.0*value/44100;
+ }
+ }
+
+ /* Get the desired buffer size setting. */
+ if (config_lookup_float(config.cfg, "pipe.audio_backend_buffer_desired_length_in_seconds",
+ &dvalue)) {
+ if ((dvalue < 0) || (dvalue > 1.5)) {
+ die("Invalid pipe audio backend buffer desired time \"%f\". It "
+ "should be between 0 and "
+ "1.5, default is 0.15 seconds",
  dvalue);
- else {
+ } else {
  config.audio_backend_buffer_desired_length = dvalue;
  }
  }
 
  /* Get the latency offset. */
- if (config_lookup_float(config.cfg, "pipe.audio_backend_latency_offset", &dvalue)) {
- if ((dvalue < -1.0) || (value > 1.5))
- die("Invalid pipe audio backend buffer latency offset \"%f\". It "
+ if (config_lookup_int(config.cfg, "pipe.audio_backend_latency_offset",
+ &value)) {
+ if ((value < -66150) || (value > 66150)) {
+ inform("The setting pipe.audio_backend_latency_offset is deprecated. "
+ "Use pipe.audio_backend_latency_offset_in_seconds instead.");
+ die("Invalid pipe audio backend buffer latency offset \"%d\". It "
+ "should be between -66150 and +66150, default is 0",
+ value);
+ } else {
+ inform("The setting pipe.audio_backend_latency_offset is deprecated. "
+ "Use pipe.audio_backend_latency_offset_in_seconds instead.");
+ config.audio_backend_latency_offset = 1.0*value/44100;
+ }
+ }
+
+ /* Get the latency offset. */
+ if (config_lookup_float(config.cfg, "pipe.audio_backend_latency_offset_in_seconds", &dvalue)) {
+ if ((dvalue < -1.0) || (dvalue > 1.5)) {
+ die("Invalid pipe audio backend buffer latency offset time \"%f\". It "
  "should be between -1.0 and +1.5, default is 0 seconds",
  dvalue);
- else
+ } else {
  config.audio_backend_latency_offset = dvalue;
+ }
  }
  }
  if ((pipename == NULL) && (argc != 1))

audio_stdout.c

@@ -56,26 +56,63 @@ static int init(int argc, char **argv) {
 
  if (config.cfg != NULL) {
  /* Get the desired buffer size setting. */
- if (config_lookup_float(config.cfg, "stdout.audio_backend_buffer_desired_length", &dvalue)) {
- if ((dvalue < 0) || (dvalue > 1.5))
- die("Invalid stdout audio backend buffer desired length \"%f\". It "
+ if (config_lookup_int(config.cfg,
+ "stdout.audio_backend_buffer_desired_length", &value)) {
+ if ((value < 0) || (value > 66150)) {
+ inform("The setting audio_backend_buffer_desired_length is deprecated. "
+ "Use audio_backend_buffer_desired_length_in_seconds instead.");
+ die("Invalid stdout audio backend buffer desired length \"%d\". It "
  "should be between 0 and "
- "1.5, default is 1.0 second",
+ "66150, default is 6615",
+ value);
+ } else {
+ inform("The stdout.setting audio_backend_buffer_desired_length is deprecated. "
+ "Use stdout.audio_backend_buffer_desired_length_in_seconds instead.");
+ config.audio_backend_buffer_desired_length = 1.0*value/44100;
+ }
+ }
+
+ /* Get the desired buffer size setting. */
+ if (config_lookup_float(config.cfg, "stdout.audio_backend_buffer_desired_length_in_seconds",
+ &dvalue)) {
+ if ((dvalue < 0) || (dvalue > 1.5)) {
+ die("Invalid stdout audio backend buffer desired time \"%f\". It "
+ "should be between 0 and "
+ "1.5, default is 0.15 seconds",
  dvalue);
- else {
+ } else {
  config.audio_backend_buffer_desired_length = dvalue;
  }
  }
 
  /* Get the latency offset. */
- if (config_lookup_float(config.cfg, "stdout.audio_backend_latency_offset", &dvalue)) {
- if ((dvalue < -1.0) || (value > 1.5))
- die("Invalid stdout audio backend buffer latency offset \"%f\". It "
+ if (config_lookup_int(config.cfg, "stdout.audio_backend_latency_offset",
+ &value)) {
+ if ((value < -66150) || (value > 66150)) {
+ inform("The setting stdout.audio_backend_latency_offset is deprecated. "
+ "Use stdout.audio_backend_latency_offset_in_seconds instead.");
+ die("Invalid stdout audio backend buffer latency offset \"%d\". It "
+ "should be between -66150 and +66150, default is 0",
+ value);
+ } else {
+ inform("The setting stdout.audio_backend_latency_offset is deprecated. "
+ "Use stdout.audio_backend_latency_offset_in_seconds instead.");
+ config.audio_backend_latency_offset = 1.0*value/44100;
+ }
+ }
+
+ /* Get the latency offset. */
+ if (config_lookup_float(config.cfg, "stdout.audio_backend_latency_offset_in_seconds", &dvalue)) {
+ if ((dvalue < -1.0) || (dvalue > 1.5)) {
+ die("Invalid stdout audio backend buffer latency offset time \"%f\". It "
  "should be between -1.0 and +1.5, default is 0 seconds",
  dvalue);
- else
+ } else {
  config.audio_backend_latency_offset = dvalue;
+ }
  }
+
+
  }
  return 0;
 }