From 58a13cf800c04e0d2792394063b8a22384814667 Mon Sep 17 00:00:00 2001 From: Mike Brady Date: Tue, 2 Jun 2015 13:18:07 +0000 Subject: [PATCH] Modify latency and buffer size limits, fix a few dying message bugs. --- audio_alsa.c | 7 +++---- audio_pipe.c | 10 ++++------ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/audio_alsa.c b/audio_alsa.c index 02af8d86..97531b46 100644 --- a/audio_alsa.c +++ b/audio_alsa.c @@ -107,7 +107,7 @@ static int init(int argc, char **argv) { /* Get the desired buffer size setting. */ if (config_lookup_int(config.cfg, "alsa.audio_backend_buffer_desired_length", &value)) { if ((value < 0) || (value > 66150)) - die("Invalid alsa audio backend buffer desired length \"%sd\". It should be between 0 and " + die("Invalid alsa audio backend buffer desired length \"%d\". It should be between 0 and " "66150, default is 6615", value); else @@ -116,9 +116,8 @@ static int init(int argc, char **argv) { /* Get the latency offset. */ if (config_lookup_int(config.cfg, "alsa.audio_backend_latency_offset", &value)) { - if ((value < -22050) || (value > 22050)) - die("Invalid alsa audio backend buffer latency offset \"%sd\". It should be between -22050 " - "and +22050, default is 0", + if ((value < -66150) || (value > 66150)) + die("Invalid alsa audio backend buffer latency offset \"%d\". It should be between -66150 and +66150, default is 0", value); else config.audio_backend_latency_offset = value; diff --git a/audio_pipe.c b/audio_pipe.c index b1e5e09c..fe109d65 100644 --- a/audio_pipe.c +++ b/audio_pipe.c @@ -68,9 +68,8 @@ static int init(int argc, char **argv) { /* Get the desired buffer size setting. */ if (config_lookup_int(config.cfg, "pipe.audio_backend_buffer_desired_length", &value)) { - if ((value < 0) || (value > 66150)) - die("Invalid pipe audio backend buffer desired length \"%sd\". It should be between 0 and " - "66150, default is 44100", + if ((value < 0) || (value > 132300)) + die("Invalid pipe audio backend buffer desired length \"%d\". It should be between 0 and 132300, default is 44100", value); else config.audio_backend_buffer_desired_length = value; @@ -78,9 +77,8 @@ static int init(int argc, char **argv) { /* Get the latency offset. */ if (config_lookup_int(config.cfg, "pipe.audio_backend_latency_offset", &value)) { - if ((value < -22050) || (value > 22050)) - die("Invalid pipe audio backend buffer latency offset \"%sd\". It should be between -22050 " - "and +22050, default is 0", + if ((value < -66150) || (value > 66150)) + die("Invalid pipe audio backend buffer latency offset \"%d\". It should be between -66150 and +66150, default is 0", value); else config.audio_backend_latency_offset = value; -- 2.47.3