Various adjustments for Trøndisk 2021.

[ultimatescore] / nageru / ultimate.lua

diff --git a/nageru/ultimate.lua b/nageru/ultimate.lua
index ad67ed63931aee7345679fbcebfc2f5e1479797e..16cb5b1497d042c30e21e23eece7df91ba300f86 100644 (file)
--- a/nageru/ultimate.lua
+++ b/nageru/ultimate.lua
@@ -1,6 +1,6 @@
 -- Nageru theme for TFK mini-tournament 2017, based on the default theme.
 
-local futatabi_server = "http://10.42.0.2:9096"
+local futatabi_server = "http://10.42.0.1:9096"
 
 local state = {
        transition_start = -2.0,
@@ -24,7 +24,7 @@ local state = {
        live_signal_num = 0,
        preview_signal_num = 1
 }
-local NUM_CAMERAS = 6
+local NUM_CAMERAS = 7
 
 -- Valid values for live_signal_num and preview_signal_num.
 local INPUT0_SIGNAL_NUM = 0
@@ -33,6 +33,8 @@ local INPUT2_SIGNAL_NUM = 2
 local INPUT3_SIGNAL_NUM = 3
 local INPUT4_SIGNAL_NUM = 4
 local INPUT5_SIGNAL_NUM = 5
+local INPUT6_SIGNAL_NUM = 6
+local COMMENTATOR_SIGNAL_NUM = 4
 local VIDEO_SIGNAL_NUM = NUM_CAMERAS
 local SBS_SIGNAL_NUM = NUM_CAMERAS + 1
 local STATIC_SIGNAL_NUM = NUM_CAMERAS + 2
@@ -296,7 +298,7 @@ function num_channels()
 end
 
 function is_plain_signal(num)
-       return (num >= INPUT0_SIGNAL_NUM and num <= INPUT5_SIGNAL_NUM) or (num == VIDEO_SIGNAL_NUM)
+       return (num >= INPUT0_SIGNAL_NUM and num <= INPUT6_SIGNAL_NUM) or (num == VIDEO_SIGNAL_NUM)
 end
 
 -- Helper function to write e.g. “720p60”. The difference between this
@@ -370,9 +372,11 @@ function channel_name(channel)
        elseif signal_num == INPUT3_SIGNAL_NUM then
                return "Goal R (" .. get_channel_resolution(signal_num) .. ")"
        elseif signal_num == INPUT4_SIGNAL_NUM then
-               return "Ambience (" .. get_channel_resolution(signal_num) .. ")"
-       elseif signal_num == INPUT5_SIGNAL_NUM then
                return "Commentators (" .. get_channel_resolution(signal_num) .. ")"
+       elseif signal_num == INPUT5_SIGNAL_NUM then
+               return "Hall A2 (" .. get_channel_resolution(signal_num) .. ")"
+       elseif signal_num == INPUT6_SIGNAL_NUM then
+               return "Hall A1 (" .. get_channel_resolution(signal_num) .. ")"
        elseif signal_num == VIDEO_SIGNAL_NUM then
                local res = last_resolution[iptv_video:get_signal_num()]
                if (not res) or res.last_subtitle == nil then
@@ -469,12 +473,12 @@ function in_transition(t)
 end
 
 function is_sbs_participating_signal(signal_num)
-       return signal_num == INPUT0_SIGNAL_NUM or signal_num == INPUT4_SIGNAL_NUM
+       return signal_num == INPUT0_SIGNAL_NUM or signal_num == COMMENTATOR_SIGNAL_NUM
 end
 
 function simple_signal_has_overlay(signal_num)
        -- The commentator output has no overlay on it.
-       return signal_num ~= INPUT4_SIGNAL_NUM
+       return signal_num ~= COMMENTATOR_SIGNAL_NUM
 end
 
 -- API ENTRY POINT
@@ -942,7 +946,7 @@ end
 
 function prepare_sbs_scene(state, scene, t, transition_type, src_signal, dst_signal, screen_width, screen_height, input_resolution, hq)
        scene.input0.input:display(0)
-       scene.input1.input:display(5)
+       scene.input1.input:display(COMMENTATOR_SIGNAL_NUM)
 
        -- Both inputs are the same size (true side-by-side).
        local pos0 = pos_from_top_left(1280 - 616 - 16, 186, 616, 347, screen_width, screen_height)
@@ -968,7 +972,7 @@ function prepare_sbs_scene(state, scene, t, transition_type, src_signal, dst_sig
 
                if signal == INPUT0_SIGNAL_NUM then
                        affine_param = find_affine_param(pos0, lerp_pos(pos0, pos_fs, real_t))
-               elseif signal == INPUT4_SIGNAL_NUM then
+               elseif signal == COMMENTATOR_SIGNAL_NUM then
                        affine_param = find_affine_param(pos1, lerp_pos(pos1, pos_fs, real_t))
                end
        end