X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fultimate.lua;h=3efaa633d0fa873176fb281f5a27621f96faaeb4;hb=HEAD;hp=d68e1826517f1e53d61da9a8dd0110139c8b5c98;hpb=b19ea4d9a7c5e004d7f2c7b8d39ce02700cb7033;p=ultimatescore

diff --git a/nageru/ultimate.lua b/nageru/ultimate.lua
index d68e182..16cb5b1 100644
--- 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,
@@ -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