From 50b7597e280a4554d6125ad6122407ddc1802a90 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Thu, 16 Aug 2012 23:49:37 -0400 Subject: [PATCH] CC-4242: MP3 streams have the artist name duplicated -fixed --- python_apps/pypo/liquidsoap_scripts/ls_lib.liq | 6 +++--- python_apps/pypo/liquidsoap_scripts/ls_script.liq | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/python_apps/pypo/liquidsoap_scripts/ls_lib.liq b/python_apps/pypo/liquidsoap_scripts/ls_lib.liq index 172ba77b1..c0b757611 100644 --- a/python_apps/pypo/liquidsoap_scripts/ls_lib.liq +++ b/python_apps/pypo/liquidsoap_scripts/ls_lib.liq @@ -16,11 +16,11 @@ end def append_title(m) = log("Using stream_format #{!stream_metadata_type}") if !stream_metadata_type == 1 then - [("artist","#{!show_name} - #{m['artist']}")] + [("title", "#{!show_name} - #{m['artist']}")] elsif !stream_metadata_type == 2 then - [("artist",!station_name), ("title", !show_name)] + [("title", "#{!station_name} - #{!show_name}")] else - [] + [("title", "#{m['artist']} - #{m['title']}")] end end diff --git a/python_apps/pypo/liquidsoap_scripts/ls_script.liq b/python_apps/pypo/liquidsoap_scripts/ls_script.liq index ddc7ae1a1..9a141c738 100644 --- a/python_apps/pypo/liquidsoap_scripts/ls_script.liq +++ b/python_apps/pypo/liquidsoap_scripts/ls_script.liq @@ -43,7 +43,7 @@ web_stream = mksafe(input.harbor("test-harbor", port=8999, password="hackme")) web_stream = on_metadata(notify_stream, web_stream) queue = on_metadata(notify, queue) -queue = map_metadata(append_title, queue) +queue = map_metadata(update=false, append_title, queue) # the crossfade function controls fade in/out queue = crossfade(queue)