Change to NM color theme again.

[ultimatescore] / nageru / ultimate.lua

diff --git a/nageru/ultimate.lua b/nageru/ultimate.lua
index 57436cfc0dc50502f60d6b38763809e8177dc05d..34462f2b82219f455537ead2b8cfe97ec34f2465 100644 (file)
--- a/nageru/ultimate.lua
+++ b/nageru/ultimate.lua
@@ -1,5 +1,7 @@
 -- Nageru theme for TFK mini-tournament 2017, based on the default theme.
 
+local futatabi_server = "http://gruessi.trd.sesse.net:9096"
+
 local state = {
        transition_start = -2.0,
        transition_end = -1.0,
@@ -27,6 +29,7 @@ local state = {
        stinger_frame = 0,
        stinger_src_signal = 0,
        stinger_dst_signal = 0,
+       stinger_save_overlay = false,
 
        live_signal_num = 0,
        preview_signal_num = 1
@@ -66,7 +69,7 @@ cef_input:execute_javascript_async("play()")
 
 local bg_video = VideoInput.new(cef_path .. "/flow-720.mp4", Nageru.VIDEO_FORMAT_YCBCR)
 -- local iptv_video = VideoInput.new("http://10.34.129.69:9060/1/v.flv", Nageru.VIDEO_FORMAT_YCBCR)
-local iptv_video = VideoInput.new("http://home.samfundet.no/~sesse/videostuff", Nageru.VIDEO_FORMAT_YCBCR)
+local iptv_video = VideoInput.new(futatabi_server, Nageru.VIDEO_FORMAT_YCBCR)
 
 function reload_cef()
        cef_input:reload()
@@ -461,6 +464,20 @@ function get_channel_resolution_raw(res)
        end
 end
 
+function get_futatabi_status(str)
+       local num_fields = 0
+       local fields = {}
+       for word in string.gmatch(str, '([^;]+)') do
+               table.insert(fields, word)
+               num_fields = num_fields + 1
+       end
+       if num_fields >= 4 then
+               return fields[4]
+       else
+               return "???"
+       end
+end
+
 -- API ENTRY POINT
 -- Returns the name for each additional channel (starting from 2).
 -- Called at the start of the program, and then each frame for live
@@ -484,7 +501,12 @@ function channel_name(channel)
        elseif signal_num == STATIC_SIGNAL_NUM then
                return "Static picture"
        elseif signal_num == VIDEO_SIGNAL_NUM then
-               return "IPTV input"
+               local res = last_resolution[iptv_video:get_signal_num()]
+               if (not res) or res.last_subtitle == nil then
+                       return "IPTV"
+               else
+                       return "IPTV (" .. get_futatabi_status(res.last_subtitle) .. ")"
+               end
        elseif signal_num == OVERLAY_SIGNAL_NUM then
                return "Overlay"
        end
@@ -707,7 +729,6 @@ function transition_clicked(num, t)
                                return
                        end
 
-                       io.write("Inserting stinger from " .. state.live_signal_num .. " to " .. state.live_signal_num .. "\n")
                        state.stinger_in_progress = true
                        state.stinger_frame = 0
                        state.stinger_src_signal = state.live_signal_num
@@ -796,6 +817,31 @@ function get_sbs_chain(state, signals)
        return sbs_chains[input0_type][state.overlay_enabled][input1_type][true]
 end
 
+function fetch_input_resolution(signals, signal_num)
+       local res = {
+               width = signals:get_width(signal_num),
+               height = signals:get_height(signal_num),
+               interlaced = signals:get_interlaced(signal_num),
+               has_signal = signals:get_has_signal(signal_num),
+               is_connected = signals:get_is_connected(signal_num),
+               frame_rate_nom = signals:get_frame_rate_nom(signal_num),
+               frame_rate_den = signals:get_frame_rate_den(signal_num),
+               last_subtitle = signals:get_last_subtitle(signal_num)
+       }
+
+       if res.interlaced then
+               -- Convert height from frame height to field height.
+               -- (Needed for e.g. place_rectangle.)
+               res.height = res.height * 2
+
+               -- Show field rate instead of frame rate; really for cosmetics only
+               -- (and actually contrary to EBU recommendations, although in line
+               -- with typical user expectations).
+               res.frame_rate_nom = res.frame_rate_nom * 2
+       end
+       return res
+end
+
 local last_rate = 0.0
 
 -- API ENTRY POINT
@@ -825,29 +871,9 @@ local last_rate = 0.0
 function get_chain(num, t, width, height, signals)
        local input_resolution = {}
        for signal_num=0,(NUM_CAMERAS-1) do
-               local res = {
-                       width = signals:get_width(signal_num),
-                       height = signals:get_height(signal_num),
-                       interlaced = signals:get_interlaced(signal_num),
-                       has_signal = signals:get_has_signal(signal_num),
-                       is_connected = signals:get_is_connected(signal_num),
-                       frame_rate_nom = signals:get_frame_rate_nom(signal_num),
-                       frame_rate_den = signals:get_frame_rate_den(signal_num)
-               }
-
-               if res.interlaced then
-                       -- Convert height from frame height to field height.
-                       -- (Needed for e.g. place_rectangle.)
-                       res.height = res.height * 2
-
-                       -- Show field rate instead of frame rate; really for cosmetics only
-                       -- (and actually contrary to EBU recommendations, although in line
-                       -- with typical user expectations).
-                       res.frame_rate_nom = res.frame_rate_nom * 2
-               end
-
-               input_resolution[signal_num] = res
+               input_resolution[signal_num] = fetch_input_resolution(signals, signal_num)
        end
+       input_resolution[iptv_video:get_signal_num()] = fetch_input_resolution(signals, iptv_video:get_signal_num())
        last_resolution = input_resolution
 
        -- Make a (semi-shallow) copy of the current state, so that the returned prepare function
@@ -908,6 +934,15 @@ function get_chain(num, t, width, height, signals)
                                        state.stinger_in_progress = false
                                        state.preview_signal_num = state.stinger_src_signal
                                        state.live_signal_num = state.stinger_dst_signal
+
+                                       if state.stinger_dst_signal == VIDEO_SIGNAL_NUM then
+                                               -- Turn off the overlay when playing video.
+                                               state.stinger_save_overlay = state.overlay_enabled
+                                               state.overlay_enabled = false
+                                       else
+                                               -- Restore the state.
+                                               state.overlay_enabled = state.stinger_save_overlay
+                                       end
                                end
                        else
                                chain = simple_chains[input_type][input_scale][overlay_really_enabled][true]