Camera changes for Trøndisk.

diff --git a/nageru/ultimate.lua b/nageru/ultimate.lua
index ad67ed63931aee7345679fbcebfc2f5e1479797e..d68e1826517f1e53d61da9a8dd0110139c8b5c98 100644 (file)
--- a/nageru/ultimate.lua
+++ b/nageru/ultimate.lua
@@ -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,7 @@ 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 VIDEO_SIGNAL_NUM = NUM_CAMERAS
 local SBS_SIGNAL_NUM = NUM_CAMERAS + 1
 local STATIC_SIGNAL_NUM = NUM_CAMERAS + 2
@@ -296,7 +297,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 +371,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