From 504939ad5793c39a9f430fe5bd230d8425555a77 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sun, 24 Oct 2021 01:15:11 +0200 Subject: [PATCH] Fix commentator SBS. --- nageru/ultimate.lua | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nageru/ultimate.lua b/nageru/ultimate.lua index d68e182..31dc87a 100644 --- 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 -- 2.39.2