From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Wed, 16 Oct 2019 21:08:17 +0000 (+0200)
Subject: Fix display of Futatabi video.
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=37bfa25c22128f431b10da8c25e7081b5ea1f6a7;p=ultimatescore

Fix display of Futatabi video.
---

diff --git a/nageru/ultimate.lua b/nageru/ultimate.lua
index 6053440..c0c8be1 100644
--- a/nageru/ultimate.lua
+++ b/nageru/ultimate.lua
@@ -771,7 +771,11 @@ function get_scene(num, t, width, height, signals)
 			local overlay_really_enabled = state.overlay_enabled and simple_signal_has_overlay(state.live_signal_num)
 			if state.stinger_in_progress then
 				stinger_scene.overlay.overlay_effect:enable_if(overlay_really_enabled)
-				stinger_scene.input:display(state.live_signal_num)
+				if state.live_signal_num == VIDEO_SIGNAL_NUM then
+					stinger_scene.input:display(iptv_video)
+				else
+					stinger_scene.input:display(state.live_signal_num)
+				end
 				set_scale_parameters_if_needed(stinger_scene, signals, state.live_signal_num, width, height, true)
 				set_neutral_color_from_signal(state, stinger_scene.wb_effect, state.live_signal_num)
 
@@ -798,7 +802,11 @@ function get_scene(num, t, width, height, signals)
 				return stinger_scene.scene
 			else
 				simple_scene.overlay.overlay_effect:enable_if(overlay_really_enabled)
-				simple_scene.input:display(state.live_signal_num)
+				if state.live_signal_num == VIDEO_SIGNAL_NUM then
+					simple_scene.input:display(iptv_video)
+				else
+					simple_scene.input:display(state.live_signal_num)
+				end
 				set_scale_parameters_if_needed(simple_scene, signals, state.live_signal_num, width, height, true)
 				set_neutral_color_from_signal(state, simple_scene.wb_effect, state.live_signal_num)
 				prepare_overlay_live(state, simple_scene, t, 1.0)
@@ -832,7 +840,11 @@ function get_scene(num, t, width, height, signals)
 	if is_plain_signal(num - 2) then
 		local signal_num = num - 2
 		simple_scene.overlay.overlay_effect:enable_if(show_overlay)
-		simple_scene.input:display(signal_num)
+		if signal_num == VIDEO_SIGNAL_NUM then
+			simple_scene.input:display(iptv_video)
+		else
+			simple_scene.input:display(signal_num)
+		end
 		set_scale_parameters_if_needed(simple_scene, signals, signal_num, width, height, false)
 		set_neutral_color_from_signal(state, simple_scene.wb_effect, signal_num)
 		prepare_overlay_static(simple_scene, t)