Shuffle the signals around a bit.

In particular, move the Futatabi input a bit to the left, so that
we don't hit the overlay on/off as easily.

diff --git a/nageru/ultimate.lua b/nageru/ultimate.lua
index 198ac6457f8a51559a13ea148e44cd7856b199c5..e28d07f6d4793016a07a521c03b12ef6de5bd601 100644 (file)
--- a/nageru/ultimate.lua
+++ b/nageru/ultimate.lua
@@ -33,9 +33,9 @@ local INPUT2_SIGNAL_NUM = 2
 local INPUT3_SIGNAL_NUM = 3
 local INPUT4_SIGNAL_NUM = 4
 local INPUT5_SIGNAL_NUM = 5
-local SBS_SIGNAL_NUM = NUM_CAMERAS
-local STATIC_SIGNAL_NUM = NUM_CAMERAS + 1
-local VIDEO_SIGNAL_NUM = NUM_CAMERAS + 2
+local VIDEO_SIGNAL_NUM = NUM_CAMERAS
+local SBS_SIGNAL_NUM = NUM_CAMERAS + 1
+local STATIC_SIGNAL_NUM = NUM_CAMERAS + 2
 
 -- Preview-only signal showing the current signal with the overlay.
 -- Not valid for live_signal_num!
@@ -335,13 +335,9 @@ 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 "Commentators (" .. get_channel_resolution(signal_num) .. ")"
+               return "Ambience (" .. get_channel_resolution(signal_num) .. ")"
        elseif signal_num == INPUT5_SIGNAL_NUM then
-               return "Laptop (" .. get_channel_resolution(signal_num) .. ")"
-       elseif signal_num == SBS_SIGNAL_NUM then
-               return "Side-by-side"
-       elseif signal_num == STATIC_SIGNAL_NUM then
-               return "Static picture"
+               return "Commentators (" .. 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
@@ -349,6 +345,10 @@ function channel_name(channel)
                else
                        return "Futatabi (" .. get_futatabi_status(res.last_subtitle) .. ")"
                end
+       elseif signal_num == SBS_SIGNAL_NUM then
+               return "Side-by-side"
+       elseif signal_num == STATIC_SIGNAL_NUM then
+               return "Static picture"
        elseif signal_num == OVERLAY_SIGNAL_NUM then
                return "Overlay"
        end
@@ -871,7 +871,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(4)
+       scene.input1.input:display(5)
 
        -- 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)