Fix commentator SBS.

diff --git a/nageru/ultimate.lua b/nageru/ultimate.lua
index d68e1826517f1e53d61da9a8dd0110139c8b5c98..31dc87a0981c6db578bb2083c20eb60bbcc81f12 100644 (file)
--- a/nageru/ultimate.lua
+++ b/nageru/ultimate.lua
@@ -34,6 +34,7 @@ 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
@@ -472,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
@@ -945,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)
@@ -971,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