diff --git a/modules/liquidsoap/engine.liq b/modules/liquidsoap/engine.liq index e6e396ec43e6083ee1abed889c5a991e65b2827f..7bce48d7670e7d13378da45df886b46ea35af73b 100644 --- a/modules/liquidsoap/engine.liq +++ b/modules/liquidsoap/engine.liq @@ -1,52 +1,49 @@ #!/usr/bin/liquidsoap -# TELNET SETTINGS -set("server.telnet", true) -set("server.telnet.bind_addr", "0.0.0.0") -set("server.telnet.port", 1234) - icecast_vorbis_metadata = false %include "library.liq" %include "settings.liq" -%include "fallback.liq" - +# %include "fallback.liq" -################# -# create sources -################# +################## +# create sources # +################## -#input_fs = single(id="fs", "/var/audio/fallback/output.flac") input_fs = request.queue(id="fs") input_http = input.http(id="http", "http://stream.fro.at/fro-128.ogg") +%include "in_alsa.liq" + input_alsa = input.alsa(id="live", device="hw:0", bufferize = false) # fill the mixer mixer = mix(id="mixer", [input_fs, input_http, input_alsa]) # output source with station_fallback -output_source = fallback(track_sensitive=false, [mixer, timeslot_fallback, show_fallback, station_fallback]) +output_source = mixer # fallback(track_sensitive=false, [mixer, timeslot_fallback, show_fallback, station_fallback]) -################# -# create outputs -################# +################## +# create outputs # +################## -# alsa output -output.alsa(id="lineout", device="hw:0", bufferize = false, output_source) +# create alsa output +%include "out_alsa.liq" -clock.unify([output_source, mixer, show_fallback, timeslot_fallback, station_fallback]) +# unify clock +clock.unify([output_source, mixer]) #, show_fallback, timeslot_fallback, station_fallback]) # recording output %include "recorder.liq" set_recorder_output() # stream output -%include "stream2.liq" - -%include "serverfunctions.liq" - -system('#{list.assoc("install_dir", ini)}/guru.py --init-player -q') - +# %include "out_stream.liq" +# enable socket functions +# %include "serverfunctions.liq" +######################## +# start initialization # +######################## +system('#{list.assoc("install_dir", ini)}/guru.py --init-player -q') diff --git a/modules/liquidsoap/library.liq b/modules/liquidsoap/library.liq index 12baa1649ed029a71428dba7d21ba2d0fad6669a..00cc38819b84ba517cfa7a4dcf42b730c47575ef 100644 --- a/modules/liquidsoap/library.liq +++ b/modules/liquidsoap/library.liq @@ -2,6 +2,7 @@ def stream_to_icecast(encoding, bitrate, host, port, pass, mount_point, url, description, genre, user, stream, streamnumber, connected, name, channels) = source = ref stream + def on_error(msg) connected := "false" log(msg) diff --git a/modules/liquidsoap/settings.liq b/modules/liquidsoap/settings.liq index ec5158cc350e25e5b0a2a7669bdb6ac81addf7c6..7c7190b674871d7d7241b7ecd44a63882cf8b7ee 100644 --- a/modules/liquidsoap/settings.liq +++ b/modules/liquidsoap/settings.liq @@ -2,6 +2,11 @@ %include "readini.liq" ini = read_ini("/etc/aura/engine.ini") +# TELNET SETTINGS +set("server.telnet", true) +set("server.telnet.bind_addr", "0.0.0.0") +set("server.telnet.port", 1234) + # LOG FILE SETTINGS set("log.file.path", "./<script>.log") @@ -10,13 +15,16 @@ set("server.socket", true) set("server.socket.path", "./<script>.sock") # SOUND CARD SETTINGS -#input_device_0 = list.assoc("input_device[0]", ini) -#input_device_1 = list.assoc("input_device[1]", ini) -#input_device_2 = list.assoc("input_device[2]", ini) -#output_device_0 = list.assoc("output_device[0]", ini) - -#ignore(input_device_0) -#ignore(output_device_0) +a0_out = list.assoc("output_device_0", ini) +a1_out = list.assoc("output_device_1", ini) +a2_out = list.assoc("output_device_2", ini) +a3_out = list.assoc("output_device_3", ini) +a4_out = list.assoc("output_device_4", ini) +#a0_in = list.assoc("input_device_0", ini) +#a1_in = list.assoc("input_device_1", ini) +#a2_in = list.assoc("input_device_2", ini) +#a3_in = list.assoc("input_device_3", ini) +#a4_in = list.assoc("input_device_4", ini) # ALSA / pulse settings use_alsa = list.assoc("use_alsa", ini) == "y"