From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Wed, 11 Apr 2018 16:30:17 +0000 (+0200)
Subject: Add an extra laptop input.
X-Git-Url: https://git.sesse.net/?p=ultimatescore;a=commitdiff_plain;h=db25639b7c008663d2d12fa922633f01371230fe

Add an extra laptop input.
---

diff --git a/nageru/ultimate.lua b/nageru/ultimate.lua
index 3f51fd8..36b67b3 100644
--- a/nageru/ultimate.lua
+++ b/nageru/ultimate.lua
@@ -11,7 +11,8 @@ local neutral_colors = {
 	{0.5, 0.5, 0.5},  -- Input 1.
 	{0.5, 0.5, 0.5},  -- Input 2.
 	{0.5, 0.5, 0.5},  -- Input 3.
-	{0.5, 0.5, 0.5}   -- Input 4.
+	{0.5, 0.5, 0.5},  -- Input 4.
+	{0.5, 0.5, 0.5}   -- Input 5.
 }
 
 local overlay_transition_start = -2.0
@@ -22,7 +23,7 @@ local overlay_enabled = false
 
 local live_signal_num = 0
 local preview_signal_num = 1
-local NUM_CAMERAS = 5  -- Remember to update neutral_colors, too.
+local NUM_CAMERAS = 6  -- Remember to update neutral_colors, too.
 
 -- Valid values for live_signal_num and preview_signal_num.
 local INPUT0_SIGNAL_NUM = 0
@@ -30,6 +31,7 @@ local INPUT1_SIGNAL_NUM = 1
 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
 
@@ -349,7 +351,7 @@ function num_channels()
 end
 
 function is_plain_signal(num)
-	return num >= INPUT0_SIGNAL_NUM and num <= INPUT4_SIGNAL_NUM
+	return num >= INPUT0_SIGNAL_NUM and num <= INPUT5_SIGNAL_NUM
 end
 
 -- Helper function to write e.g. “720p60”. The difference between this
@@ -410,6 +412,8 @@ function channel_name(channel)
 		return "Goal R (" .. get_channel_resolution(signal_num) .. ")"
 	elseif signal_num == INPUT4_SIGNAL_NUM then
 		return "Commentators (" .. 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