From 8c532bb8c755e55fbb789408629054d3b8139212 Mon Sep 17 00:00:00 2001 From: David Trattnig <david.trattnig@o94.at> Date: Wed, 6 Nov 2019 21:07:31 +0100 Subject: [PATCH] Consolidate test sources. --- {modules/liquidsoap => testing}/lqstest.liq | 0 .../test_alsa_mixer.liq | 8 ++-- testing/test_alsa_settings.liq | 48 +++++++++++++++++++ 3 files changed, 52 insertions(+), 4 deletions(-) rename {modules/liquidsoap => testing}/lqstest.liq (100%) rename modules/liquidsoap/alsa_settings_tester.liq => testing/test_alsa_mixer.liq (84%) create mode 100644 testing/test_alsa_settings.liq diff --git a/modules/liquidsoap/lqstest.liq b/testing/lqstest.liq similarity index 100% rename from modules/liquidsoap/lqstest.liq rename to testing/lqstest.liq diff --git a/modules/liquidsoap/alsa_settings_tester.liq b/testing/test_alsa_mixer.liq similarity index 84% rename from modules/liquidsoap/alsa_settings_tester.liq rename to testing/test_alsa_mixer.liq index a3a4ee23..8a913448 100644 --- a/modules/liquidsoap/alsa_settings_tester.liq +++ b/testing/test_alsa_mixer.liq @@ -39,10 +39,10 @@ set("alsa.buffer_length", 25) set("alsa.periods", 0) # assertion error when setting periods other than 0 => alsa default input_linein = input.alsa(id="linein", bufferize = false) -input_fs = single(id="fs", "/var/audio/fallback/output.flac") -input_http = input.http(id="http", "http://stream.fro.at/fro-128.ogg") +#input_fs = single(id="fs", "/var/audio/fallback/output.flac") +#input_http = input.http(id="http", "http://stream.fro.at/fro-128.ogg") -mixer = mix(id="mixer", [input_fs, input_http, input_linein]) +#mixer = mix(id="mixer", [input_fs, input_http, input_linein]) -output.alsa(id="lineout", bufferize = false, mixer) +#output.alsa(id="lineout", bufferize = false, mixer) diff --git a/testing/test_alsa_settings.liq b/testing/test_alsa_settings.liq new file mode 100644 index 00000000..f1a44907 --- /dev/null +++ b/testing/test_alsa_settings.liq @@ -0,0 +1,48 @@ +# +# engine +# +# Playout Daemon for autoradio project +# +# +# Copyright (C) 2017-2018 David Trattnig <david@subsquare.at> +# +# This file is part of engine. +# +# engine is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# any later version. +# +# engine is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with engine. If not, see <http://www.gnu.org/licenses/>. +# + +set("log.file.path", "./<script>.log") + +set("server.telnet", true) +set("server.telnet.bind_addr", "0.0.0.0") +set("server.telnet.port", 1234) + +set("frame.duration", 0.30) +set("alsa.alsa_buffer", 8192) +set("alsa.buffer_length", 25) +set("alsa.periods", 0) # assertion error when setting periods other than 0 => alsa default + +#input_linein = input.alsa(id="linein", bufferize = false) + +audio1 = single(id="fs1", "./sources/1.flac") +audio2 = single(id="fs2", "./sources/2.flac") + +#input_http = input.http(id="http", "http://stream.fro.at/fro-128.ogg") + +#mixer = mix(id="mixer", [audio1, audio2]) +#mixer = mix(id="mixer", [input_fs, input_http, input_linein]) + +mixed = add([audio1, audio2]) +output.alsa(id="lineout", bufferize = false, mixed) + -- GitLab