Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x

Browse source
This commit is contained in:
Naomi 2013-06-12 17:30:19 -04:00
commit 26e0e85786
3 changed files with 30 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

22
python_apps/pypo/liquidsoap_scripts/fdkaac.liq
View file

@ -1,24 +1,24 @@
if bitrate == 24 then if bitrate == 24 then
ignore(output_stereo(%fdkaac(bitrate = 24), !source)) ignore(output_stereo(%fdkaac(bitrate = 24, aot="mpeg4_he_aac_v2"), !source))
elsif bitrate == 32 then elsif bitrate == 32 then
ignore(output_stereo(%fdkaac(bitrate = 32), !source)) ignore(output_stereo(%fdkaac(bitrate = 32, aot="mpeg4_he_aac_v2"), !source))
elsif bitrate == 48 then elsif bitrate == 48 then
ignore(output_stereo(%fdkaac(bitrate = 48), !source)) ignore(output_stereo(%fdkaac(bitrate = 48, aot="mpeg4_he_aac_v2"), !source))
elsif bitrate == 64 then elsif bitrate == 64 then
ignore(output_stereo(%fdkaac(bitrate = 64), !source)) ignore(output_stereo(%fdkaac(bitrate = 64, aot="mpeg4_he_aac_v2"), !source))
elsif bitrate == 96 then elsif bitrate == 96 then
ignore(output_stereo(%fdkaac(bitrate = 96), !source)) ignore(output_stereo(%fdkaac(bitrate = 96, aot="mpeg4_he_aac_v2"), !source))
elsif bitrate == 128 then elsif bitrate == 128 then
ignore(output_stereo(%fdkaac(bitrate = 128), !source)) ignore(output_stereo(%fdkaac(bitrate = 128, aot="mpeg4_he_aac_v2"), !source))
elsif bitrate == 160 then elsif bitrate == 160 then
ignore(output_stereo(%fdkaac(bitrate = 160), !source)) ignore(output_stereo(%fdkaac(bitrate = 160, aot="mpeg4_he_aac_v2"), !source))
elsif bitrate == 192 then elsif bitrate == 192 then
ignore(output_stereo(%fdkaac(bitrate = 192), !source)) ignore(output_stereo(%fdkaac(bitrate = 192, aot="mpeg4_he_aac_v2"), !source))
elsif bitrate == 224 then elsif bitrate == 224 then
ignore(output_stereo(%fdkaac(bitrate = 224), !source)) ignore(output_stereo(%fdkaac(bitrate = 224, aot="mpeg4_he_aac_v2"), !source))
elsif bitrate == 256 then elsif bitrate == 256 then
ignore(output_stereo(%fdkaac(bitrate = 256), !source)) ignore(output_stereo(%fdkaac(bitrate = 256, aot="mpeg4_he_aac_v2"), !source))
elsif bitrate == 320 then elsif bitrate == 320 then
ignore(output_stereo(%fdkaac(bitrate = 320), !source)) ignore(output_stereo(%fdkaac(bitrate = 320, aot="mpeg4_he_aac_v2"), !source))
end end

26
python_apps/pypo/liquidsoap_scripts/ls_lib.liq
View file

@ -5,7 +5,8 @@ def notify(m)
end end
def notify_queue(m) def notify_queue(m)
queue_metadata := m f = !dynamic_metadata_callback
ignore(f(m))
notify(m) notify(m)
end end
@ -22,17 +23,20 @@ end
# A function applied to each metadata chunk # A function applied to each metadata chunk
def append_title(m) = def append_title(m) =
log("Using stream_format #{!stream_metadata_type}") log("Using stream_format #{!stream_metadata_type}")
if !stream_metadata_type == 1 then
[("title", "#{!show_name} - #{m['artist']} - #{m['title']}")]
elsif !stream_metadata_type == 2 then
[("title", "#{!station_name} - #{!show_name}")]
else
[("title", "#{m['artist']} - #{m['title']}")]
end
end
def queue_metadata_callback(m) = if list.mem_assoc("mapped", m) then
!queue_metadata #protection against applying this function twice. It shouldn't be happening
#and bug file with Liquidsoap.
m
else
if !stream_metadata_type == 1 then
[("title", "#{!show_name} - #{m['artist']} - #{m['title']}"), ("mapped", "true")]
elsif !stream_metadata_type == 2 then
[("title", "#{!station_name} - #{!show_name}"), ("mapped", "true")]
else
[("title", "#{m['artist']} - #{m['title']}"), ("mapped", "true")]
end
end
end end
def crossfade_airtime(s) def crossfade_airtime(s)

6
python_apps/pypo/liquidsoap_scripts/ls_script.liq
View file

@ -24,7 +24,7 @@ default_dj_fade = ref 0.
station_name = ref '' station_name = ref ''
show_name = ref '' show_name = ref ''
queue_metadata = ref [] dynamic_metadata_callback = ref fun (s) -> begin () end
s1_connected = ref '' s1_connected = ref ''
s2_connected = ref '' s2_connected = ref ''
@ -72,7 +72,9 @@ create_source()
queue = add(!sources, normalize=false) queue = add(!sources, normalize=false)
queue = map_metadata(update=false, queue_metadata_callback, queue) pair = insert_metadata(queue)
dynamic_metadata_callback := fst(pair)
queue = snd(pair)
output.dummy(fallible=true, queue) output.dummy(fallible=true, queue)