Bring back the Trøndisk branding.

[ultimatescore] / nageru / ultimate.lua

diff --git a/nageru/ultimate.lua b/nageru/ultimate.lua
index 63087374033ea701ea42cdc0d7ebcf8514237aa2..277c333056096aafb258ae8aa9afabfeba39262c 100644 (file)
--- a/nageru/ultimate.lua
+++ b/nageru/ultimate.lua
@@ -1,4 +1,4 @@
--- Nageru theme for ultimate productions, based on the default theme.
+-- Nageru theme for TFK mini-tournament 2017, based on the default theme.
 
 local state = {
        transition_start = -2.0,
@@ -39,7 +39,7 @@ local SBS_SIGNAL_NUM = NUM_CAMERAS
 local STATIC_SIGNAL_NUM = NUM_CAMERAS + 1
 local VIDEO_SIGNAL_NUM = NUM_CAMERAS + 2
 
-state.neutral_colors[VIDEO_SIGNAL_NUM - INPUT0_SIGNAL_NUM + 1] = {0.5, 0.5, 0.5};
+state.neutral_colors[VIDEO_SIGNAL_NUM - INPUT0_SIGNAL_NUM + 1] = {0.5, 0.5, 0.5}
 
 -- Preview-only signal showing the current signal with the overlay.
 -- Not valid for live_signal_num!
@@ -274,7 +274,7 @@ end)
 function make_simple_chain(input_deint, input_video, input_scale, has_overlay, hq)
        local chain = EffectChain.new(16, 9)
 
-       local input;
+       local input
        if input_video then
                input = chain:add_video_input(iptv_video, false)
        else
@@ -820,7 +820,7 @@ function get_chain(num, t, width, height, signals)
                        -- Transition in or out of SBS.
                        local chain = get_sbs_chain(state_copy, signals)
                        local prepare = function()
-                               prepare_sbs_chain(state_copy, chain, calc_zoom_progress(t), state_copy.transition_type, state_copy.transition_src_signal, state.transition_dst_signal, width, height, input_resolution)
+                               prepare_sbs_chain(state_copy, chain, calc_zoom_progress(t), state_copy.transition_type, state_copy.transition_src_signal, state_copy.transition_dst_signal, width, height, input_resolution)
                                prepare_overlay_live(state_copy, chain, t, 1.0)
                        end
                        return chain.chain, prepare
@@ -837,7 +837,7 @@ function get_chain(num, t, width, height, signals)
                elseif is_plain_signal(state.live_signal_num) then
                        local input_type = get_input_type(signals, state.live_signal_num)
                        local input_scale = needs_scale(signals, state.live_signal_num, width, height)
-                       local overlay_really_enabled = state_copy.overlay_enabled and simple_signal_has_overlay(state.live_signal_num)
+                       local overlay_really_enabled = state.overlay_enabled and simple_signal_has_overlay(state.live_signal_num)
                        local chain = simple_chains[input_type][input_scale][overlay_really_enabled][true]
                        local prepare = function()
                                if input_type ~= "video" then