Skip to content
Snippets Groups Projects
Verified Commit 4a019249 authored by Ole Binder's avatar Ole Binder
Browse files

Chore: remove unused stream endpoints 

Removed the unused stream endpoints s1,s2,s3,s4 as their implementation is different from s0 and needs to be refactored anyway #71.
parent 89fe763b
No related branches found
No related tags found
1 merge request!16Upgrade liquidsoap to version 2.2.4
Pipeline #7720 failed
Stage: test
Hide whitespace changes
Inline Side-by-side
src/out_stream.liq
+ 177
− 176
View file @ 4a019249
...@@ -44,63 +44,63 @@ s0_name = get_setting("", "stream_0_name", "AURA_ENGINE_STREAM_OUTPUT_NAME") ...@@ -44,63 +44,63 @@ s0_name = get_setting("", "stream_0_name", "AURA_ENGINE_STREAM_OUTPUT_NAME")
s0_channels = s0_channels =
get_setting("", "stream_0_channels", "AURA_ENGINE_STREAM_OUTPUT_CHANNELS") get_setting("", "stream_0_channels", "AURA_ENGINE_STREAM_OUTPUT_CHANNELS")
s1_encoding = list.assoc(default="", "stream_1_encoding", ini) # s1_encoding = list.assoc(default="", "stream_1_encoding", ini)
s1_bitrate = int_of_string(list.assoc(default="", "stream_1_bitrate", ini)) # s1_bitrate = int_of_string(list.assoc(default="", "stream_1_bitrate", ini))
s1_host = list.assoc(default="", "stream_1_host", ini) # s1_host = list.assoc(default="", "stream_1_host", ini)
s1_port = int_of_string(list.assoc(default="", "stream_1_port", ini)) # s1_port = int_of_string(list.assoc(default="", "stream_1_port", ini))
s1_user = list.assoc(default="", "stream_1_user", ini) # s1_user = list.assoc(default="", "stream_1_user", ini)
s1_pass = list.assoc(default="", "stream_1_password", ini) # s1_pass = list.assoc(default="", "stream_1_password", ini)
s1_mount = list.assoc(default="", "stream_1_mountpoint", ini) # s1_mount = list.assoc(default="", "stream_1_mountpoint", ini)
s1_url = list.assoc(default="", "stream_1_url", ini) # s1_url = list.assoc(default="", "stream_1_url", ini)
s1_desc = list.assoc(default="", "stream_1_description", ini) # s1_desc = list.assoc(default="", "stream_1_description", ini)
s1_genre = list.assoc(default="", "stream_1_genre", ini) # s1_genre = list.assoc(default="", "stream_1_genre", ini)
s1_name = list.assoc(default="", "stream_1_name", ini) # s1_name = list.assoc(default="", "stream_1_name", ini)
s1_channels = list.assoc(default="", "stream_1_channels", ini) # s1_channels = list.assoc(default="", "stream_1_channels", ini)
s2_encoding = list.assoc(default="", "stream_2_encoding", ini) # s2_encoding = list.assoc(default="", "stream_2_encoding", ini)
s2_bitrate = int_of_string(list.assoc(default="", "stream_2_bitrate", ini)) # s2_bitrate = int_of_string(list.assoc(default="", "stream_2_bitrate", ini))
s2_host = list.assoc(default="", "stream_2_host", ini) # s2_host = list.assoc(default="", "stream_2_host", ini)
s2_port = int_of_string(list.assoc(default="", "stream_2_port", ini)) # s2_port = int_of_string(list.assoc(default="", "stream_2_port", ini))
s2_user = list.assoc(default="", "stream_2_user", ini) # s2_user = list.assoc(default="", "stream_2_user", ini)
s2_pass = list.assoc(default="", "stream_2_password", ini) # s2_pass = list.assoc(default="", "stream_2_password", ini)
s2_mount = list.assoc(default="", "stream_2_mountpoint", ini) # s2_mount = list.assoc(default="", "stream_2_mountpoint", ini)
s2_url = list.assoc(default="", "stream_2_url", ini) # s2_url = list.assoc(default="", "stream_2_url", ini)
s2_desc = list.assoc(default="", "stream_2_description", ini) # s2_desc = list.assoc(default="", "stream_2_description", ini)
s2_genre = list.assoc(default="", "stream_2_genre", ini) # s2_genre = list.assoc(default="", "stream_2_genre", ini)
s2_name = list.assoc(default="", "stream_2_name", ini) # s2_name = list.assoc(default="", "stream_2_name", ini)
s2_channels = list.assoc(default="", "stream_2_channels", ini) # s2_channels = list.assoc(default="", "stream_2_channels", ini)
s3_encoding = list.assoc(default="", "stream_3_encoding", ini) # s3_encoding = list.assoc(default="", "stream_3_encoding", ini)
s3_bitrate = int_of_string(list.assoc(default="", "stream_3_bitrate", ini)) # s3_bitrate = int_of_string(list.assoc(default="", "stream_3_bitrate", ini))
s3_host = list.assoc(default="", "stream_3_host", ini) # s3_host = list.assoc(default="", "stream_3_host", ini)
s3_port = int_of_string(list.assoc(default="", "stream_3_port", ini)) # s3_port = int_of_string(list.assoc(default="", "stream_3_port", ini))
s3_user = list.assoc(default="", "stream_3_user", ini) # s3_user = list.assoc(default="", "stream_3_user", ini)
s3_pass = list.assoc(default="", "stream_3_password", ini) # s3_pass = list.assoc(default="", "stream_3_password", ini)
s3_mount = list.assoc(default="", "stream_3_mountpoint", ini) # s3_mount = list.assoc(default="", "stream_3_mountpoint", ini)
s3_url = list.assoc(default="", "stream_3_url", ini) # s3_url = list.assoc(default="", "stream_3_url", ini)
s3_desc = list.assoc(default="", "stream_3_description", ini) # s3_desc = list.assoc(default="", "stream_3_description", ini)
s3_genre = list.assoc(default="", "stream_3_genre", ini) # s3_genre = list.assoc(default="", "stream_3_genre", ini)
s3_name = list.assoc(default="", "stream_3_name", ini) # s3_name = list.assoc(default="", "stream_3_name", ini)
s3_channels = list.assoc(default="", "stream_3_channels", ini) # s3_channels = list.assoc(default="", "stream_3_channels", ini)
s4_encoding = list.assoc(default="", "stream_4_encoding", ini) # s4_encoding = list.assoc(default="", "stream_4_encoding", ini)
s4_bitrate = int_of_string(list.assoc(default="", "stream_4_bitrate", ini)) # s4_bitrate = int_of_string(list.assoc(default="", "stream_4_bitrate", ini))
s4_host = list.assoc(default="", "stream_4_host", ini) # s4_host = list.assoc(default="", "stream_4_host", ini)
s4_port = int_of_string(list.assoc(default="", "stream_4_port", ini)) # s4_port = int_of_string(list.assoc(default="", "stream_4_port", ini))
s4_user = list.assoc(default="", "stream_4_user", ini) # s4_user = list.assoc(default="", "stream_4_user", ini)
s4_pass = list.assoc(default="", "stream_4_password", ini) # s4_pass = list.assoc(default="", "stream_4_password", ini)
s4_mount = list.assoc(default="", "stream_4_mountpoint", ini) # s4_mount = list.assoc(default="", "stream_4_mountpoint", ini)
s4_url = list.assoc(default="", "stream_4_url", ini) # s4_url = list.assoc(default="", "stream_4_url", ini)
s4_desc = list.assoc(default="", "stream_4_description", ini) # s4_desc = list.assoc(default="", "stream_4_description", ini)
s4_genre = list.assoc(default="", "stream_4_genre", ini) # s4_genre = list.assoc(default="", "stream_4_genre", ini)
s4_name = list.assoc(default="", "stream_4_name", ini) # s4_name = list.assoc(default="", "stream_4_name", ini)
s4_channels = list.assoc(default="", "stream_4_channels", ini) # s4_channels = list.assoc(default="", "stream_4_channels", ini)
s0_connected = ref('') s0_connected = ref('')
s1_connected = ref('') # s1_connected = ref('')
s2_connected = ref('') # s2_connected = ref('')
s3_connected = ref('') # s3_connected = ref('')
s4_connected = ref('') # s4_connected = ref('')
if if
s0_enable == true s0_enable == true
...@@ -137,130 +137,131 @@ then ...@@ -137,130 +137,131 @@ then
) )
end end
if # if
s1_enable == true # s1_enable == true
then # then
server.register( # server.register(
namespace="out_http_1", # namespace="out_http_1",
"connected", # "connected",
fun (s) -> # fun (s) ->
begin # begin
ignore(s) # ignore(s)
s1_connected() # s1_connected()
end # end
) # )
stream_to_icecast( # stream_to_icecast(
"out_http_1", # "out_http_1",
s1_encoding, # s1_encoding,
s1_bitrate, # s1_bitrate,
s1_host, # s1_host,
s1_port, # s1_port,
s1_pass, # s1_pass,
s1_mount, # s1_mount,
s1_url, # s1_url,
s1_desc, # s1_desc,
s1_genre, # s1_genre,
s1_user, # s1_user,
output_source, # output_source,
"1", # "1",
s1_connected, # s1_connected,
s1_name, # s1_name,
s1_channels # s1_channels
) # )
end # end
if # if
s2_enable == true # s2_enable == true
then # then
server.register( # server.register(
namespace="out_http_2", # namespace="out_http_2",
"connected", # "connected",
fun (s) -> # fun (s) ->
begin # begin
ignore(s) # ignore(s)
s2_connected() # s2_connected()
end # end
) # )
stream_to_icecast( # stream_to_icecast(
"out_http_2", # "out_http_2",
s2_encoding, # s2_encoding,
s2_bitrate, # s2_bitrate,
s2_host, # s2_host,
s2_port, # s2_port,
s2_pass, # s2_pass,
s2_mount, # s2_mount,
s2_url, # s2_url,
s2_desc, # s2_desc,
s2_genre, # s2_genre,
s2_user, # s2_user,
output_source, # output_source,
"2", # "2",
s2_connected, # s2_connected,
s2_name, # s2_name,
s2_channels # s2_channels
) # )
end # end
if # if
s3_enable == true # s3_enable == true
then # then
server.register( # server.register(
namespace="out_http_3", # namespace="out_http_3",
"connected", # "connected",
fun (s) -> # fun (s) ->
begin # begin
ignore(s) # ignore(s)
s3_connected() # s3_connected()
end # end
) # )
stream_to_icecast( # stream_to_icecast(
"out_http_3", # "out_http_3",
s3_encoding, # s3_encoding,
s3_bitrate, # s3_bitrate,
s3_host, # s3_host,
s3_port, # s3_port,
s3_pass, # s3_pass,
s3_mount, # s3_mount,
s3_url, # s3_url,
s3_desc, # s3_desc,
s3_genre, # s3_genre,
s3_user, # s3_user,
output_source, # output_source,
"3", # "3",
s3_connected, # s3_connected,
s3_name, # s3_name,
s3_channels # s3_channels
) # )
end # end
if
s4_enable == true # if
then # s4_enable == true
server.register( # then
namespace="out_http_4", # server.register(
"connected", # namespace="out_http_4",
fun (s) -> # "connected",
begin # fun (s) ->
ignore(s) # begin
s4_connected() # ignore(s)
end # s4_connected()
) # end
stream_to_icecast( # )
"out_http_4", # stream_to_icecast(
s4_encoding, # "out_http_4",
s4_bitrate, # s4_encoding,
s4_host, # s4_bitrate,
s4_port, # s4_host,
s4_pass, # s4_port,
s4_mount, # s4_pass,
s4_url, # s4_mount,
s4_desc, # s4_url,
s4_genre, # s4_desc,
s4_user, # s4_genre,
output_source, # s4_user,
"4", # output_source,
s4_connected, # "4",
s4_name, # s4_connected,
s4_channels # s4_name,
) # s4_channels
end # )
# end
\ No newline at end of file
src/serverfunctions.liq
+ 60
− 60
View file @ 4a019249
...@@ -122,18 +122,18 @@ server.register( ...@@ -122,18 +122,18 @@ server.register(
so = so =
s0_enable s0_enable
? list.add(("out_line_0", ("connected", "#{s0_connected()")), so) : so ? list.add(("out_line_0", ("connected", "#{s0_connected()")), so) : so
so = # so =
s1_enable # s1_enable
? list.add(("out_line_1", ("connected", "#{s1_connected()")), so) : so # ? list.add(("out_line_1", ("connected", "#{s1_connected()")), so) : so
so = # so =
s2_enable # s2_enable
? list.add(("out_line_2", ("connected", "#{s2_connected()")), so) : so # ? list.add(("out_line_2", ("connected", "#{s2_connected()")), so) : so
so = # so =
s3_enable # s3_enable
? list.add(("out_line_3", ("connected", "#{s3_connected()")), so) : so # ? list.add(("out_line_3", ("connected", "#{s3_connected()")), so) : so
so = # so =
s4_enable # s4_enable
? list.add(("out_line_4", ("connected", "#{s4_connected()")), so) : so # ? list.add(("out_line_4", ("connected", "#{s4_connected()")), so) : so
lo = [] lo = []
lo = a0_out != '' ? list.add("out_line_0", lo) : lo lo = a0_out != '' ? list.add("out_line_0", lo) : lo
...@@ -264,57 +264,57 @@ def icy_update(v) = ...@@ -264,57 +264,57 @@ def icy_update(v) =
) )
end end
if # if
s1_enable == true # s1_enable == true
then # then
icy.update_metadata( # icy.update_metadata(
mount=s1_mount, # mount=s1_mount,
user=s1_user, # user=s1_user,
password=s1_pass, # password=s1_pass,
host=s1_host, # host=s1_host,
port=s1_port, # port=s1_port,
meta # meta
) # )
end # end
if # if
s2_enable == true # s2_enable == true
then # then
icy.update_metadata( # icy.update_metadata(
mount=s2_mount, # mount=s2_mount,
user=s2_user, # user=s2_user,
password=s2_pass, # password=s2_pass,
host=s2_host, # host=s2_host,
port=s2_port, # port=s2_port,
meta # meta
) # )
end # end
if # if
s3_enable == true # s3_enable == true
then # then
icy.update_metadata( # icy.update_metadata(
mount=s3_mount, # mount=s3_mount,
user=s3_user, # user=s3_user,
password=s3_pass, # password=s3_pass,
host=s3_host, # host=s3_host,
port=s3_port, # port=s3_port,
meta # meta
) # )
end # end
if # if
s4_enable == true # s4_enable == true
then # then
icy.update_metadata( # icy.update_metadata(
mount=s4_mount, # mount=s4_mount,
user=s4_user, # user=s4_user,
password=s4_pass, # password=s4_pass,
host=s4_host, # host=s4_host,
port=s4_port, # port=s4_port,
meta # meta
) # )
end # end
"OK" "OK"
end end
......
src/settings.liq
+ 5
− 4
View file @ 4a019249
...@@ -343,10 +343,11 @@ log( ...@@ -343,10 +343,11 @@ log(
# OUTPUT STREAM # OUTPUT STREAM
s0_enable = s0_enable =
get_setting("false", "stream_0", "AURA_ENGINE_STREAM_OUTPUT_ENABLE") == "true" get_setting("false", "stream_0", "AURA_ENGINE_STREAM_OUTPUT_ENABLE") == "true"
s1_enable = list.assoc(default="false", "stream_1", ini) == "true"
s2_enable = list.assoc(default="false", "stream_2", ini) == "true" # s1_enable = list.assoc(default="false", "stream_1", ini) == "true"
s3_enable = list.assoc(default="false", "stream_3", ini) == "true" # s2_enable = list.assoc(default="false", "stream_2", ini) == "true"
s4_enable = list.assoc(default="false", "stream_4", ini) == "true" # s3_enable = list.assoc(default="false", "stream_3", ini) == "true"
# s4_enable = list.assoc(default="false", "stream_4", ini) == "true"
log( log(
"\tOutput stream enabled: #{s0_enable}" "\tOutput stream enabled: #{s0_enable}"
) )
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment