More theme cleaning.

[nageru] / nageru / theme.lua

diff --git a/nageru/theme.lua b/nageru/theme.lua
index 6137cae6c0705fd39fb6c6631f0a9c7b38fb7838..011dc4f84c79c1636ffd6a46de2816eadaa1f50b 100644 (file)
--- a/nageru/theme.lua
+++ b/nageru/theme.lua
@@ -132,10 +132,6 @@ Nageru.set_supports_wb(3, true)
 Nageru.set_channel_name(SBS_SIGNAL_NUM + 2, "Side-by-side")
 Nageru.set_channel_name(STATIC_SIGNAL_NUM + 2, "Static picture")
 
-function is_plain_signal(num)
-       return num == INPUT0_SIGNAL_NUM or num == INPUT1_SIGNAL_NUM
-end
-
 -- API ENTRY POINT
 -- Called every frame. Returns the color (if any) to paint around the given
 -- channel. Returns a CSS color (typically to mark live and preview signals);
@@ -158,6 +154,10 @@ function channel_color(channel)
        return "transparent"
 end
 
+function is_plain_signal(num)
+       return num == INPUT0_SIGNAL_NUM or num == INPUT1_SIGNAL_NUM
+end
+
 function channel_involved_in(channel, signal_num)
        if is_plain_signal(signal_num) then
                return channel == (signal_num + 2)
@@ -358,24 +358,12 @@ function get_scene(num, t, width, height, signals)
                local res = {
                        width = signals:get_width(signal_num),
                        height = signals:get_height(signal_num),
-                       interlaced = signals:get_interlaced(signal_num),
-                       is_connected = signals:get_is_connected(signal_num),
-                       has_signal = signals:get_has_signal(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
+               if signals:get_interlaced(signal_num) 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
 
                local text_res = signals:get_human_readable_resolution(signal_num)