X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=theme.lua;h=709797c4878b1a64fc616e41f384a7433774dc7d;hb=f65089f8f99aa42e2dec6396a13e797aaafde903;hp=e6338087fbaf2ab00ae9b8aec3d8886f530bf60d;hpb=3cafda5de945dd02d321634abd61aa1e261f2384;p=nageru

diff --git a/theme.lua b/theme.lua
index e633808..709797c 100644
--- a/theme.lua
+++ b/theme.lua
@@ -33,55 +33,47 @@ local STATIC_SIGNAL_NUM = 3
 -- to the next.
 local FADE_SIGNAL_NUM = 4
 
--- The main live chain.
-function make_sbs_chain(input0_deint, input1_deint, hq)
-	local chain = EffectChain.new(16, 9)
-	local input0 = chain:add_live_input(not input0_deint, input0_deint)  -- Override bounce only if not deinterlacing.
-	input0:connect_signal(0)
-	local input0_wb_effect = chain:add_effect(WhiteBalanceEffect.new())
-	local input1 = chain:add_live_input(not input1_deint, input1_deint)
-	input1:connect_signal(1)
-	local input1_wb_effect = chain:add_effect(WhiteBalanceEffect.new())
+function make_sbs_input(chain, signal, deint, hq)
+	local input = chain:add_live_input(not deint, deint)  -- Override bounce only if not deinterlacing.
+	input:connect_signal(signal)
+	local wb_effect = chain:add_effect(WhiteBalanceEffect.new())
 
 	local resample_effect = nil
 	local resize_effect = nil
 	if (hq) then
-		resample_effect = chain:add_effect(ResampleEffect.new(), input0_wb_effect)
+		resample_effect = chain:add_effect(ResampleEffect.new())
 	else
-		resize_effect = chain:add_effect(ResizeEffect.new(), input0_wb_effect)
+		resize_effect = chain:add_effect(ResizeEffect.new())
 	end
 
 	local padding_effect = chain:add_effect(IntegralPaddingEffect.new())
-	padding_effect:set_vec4("border_color", 0.0, 0.0, 0.0, 1.0)
 
-	local resample2_effect = nil
-	local resize2_effect = nil
-	if (hq) then
-		resample2_effect = chain:add_effect(ResampleEffect.new(), input1_wb_effect)
-	else
-		resize2_effect = chain:add_effect(ResizeEffect.new(), input1_wb_effect)
-	end
-	local padding2_effect = chain:add_effect(IntegralPaddingEffect.new())
+	return {
+		input = input,
+		wb_effect = wb_effect,
+		resample_effect = resample_effect,
+		resize_effect = resize_effect,
+		padding_effect = padding_effect
+	}
+end
+
+-- The main live chain.
+function make_sbs_chain(input0_deint, input1_deint, hq)
+	local chain = EffectChain.new(16, 9)
+
+	local input0 = make_sbs_input(chain, INPUT0_SIGNAL_NUM, input0_deint, hq)
+	local input1 = make_sbs_input(chain, INPUT1_SIGNAL_NUM, input1_deint, hq)
 
-	chain:add_effect(OverlayEffect.new(), padding_effect, padding2_effect)
+	input0.padding_effect:set_vec4("border_color", 0.0, 0.0, 0.0, 1.0)
+	input1.padding_effect:set_vec4("border_color", 0.0, 0.0, 0.0, 0.0)
+
+	chain:add_effect(OverlayEffect.new(), input0.padding_effect, input1.padding_effect)
 	chain:finalize(hq)
 
 	return {
 		chain = chain,
-		input0 = {
-			input = input0,
-			wb_effect = input0_wb_effect,
-			resample_effect = resample_effect,
-			resize_effect = resize_effect,
-			padding_effect = padding_effect
-		},
-		input1 = {
-			input = input1,
-			wb_effect = input1_wb_effect,
-			resample_effect = resample2_effect,
-			resize_effect = resize2_effect,
-			padding_effect = padding2_effect
-		}
+		input0 = input0,
+		input1 = input1
 	}
 end
 
@@ -98,47 +90,41 @@ for input0_type, input0_deint in pairs({live = false, livedeint = true}) do
 	end
 end
 
+function make_fade_input(chain, signal, live, deint)
+	local input, wb_effect, last
+	if live then
+		input = chain:add_live_input(false, deint)
+		wb_effect = chain:add_effect(WhiteBalanceEffect.new())
+		input:connect_signal(signal)
+		last = wb_effect
+	else
+		input = chain:add_effect(ImageInput.new("bg.jpeg"))
+		last = input
+	end
+
+	return {
+		input = input,
+		wb_effect = wb_effect,
+		last = last
+	}
+end
+
 -- A chain to fade between two inputs, of which either can be a picture
 -- or a live input. In practice only used live, but we still support the
 -- hq parameter.
 function make_fade_chain(input0_live, input0_deint, input1_live, input1_deint, hq)
 	local chain = EffectChain.new(16, 9)
 
-	local input0, wb0_effect, input0_last, input1, wb1_effect, input1_last
-
-	if input0_live then
-		input0 = chain:add_live_input(false, input0_deint)
-		wb0_effect = chain:add_effect(WhiteBalanceEffect.new())
-		input0:connect_signal(0)
-		input0_last = wb0_effect
-	else
-		input0 = chain:add_effect(ImageInput.new("bg.jpeg"))
-		input0_last = input0
-	end
-
-	if input1_live then
-		input1 = chain:add_live_input(false, input1_deint)
-		wb1_effect = chain:add_effect(WhiteBalanceEffect.new())
-		input1:connect_signal(1)
-		input1_last = wb1_effect
-	else
-		input1 = chain:add_effect(ImageInput.new("bg.jpeg"))
-		input1_last = input1
-	end
+	local input0 = make_fade_input(chain, INPUT0_SIGNAL_NUM, input0_live, input0_deint)
+	local input1 = make_fade_input(chain, INPUT1_SIGNAL_NUM, input1_live, input1_deint)
 
-	local mix_effect = chain:add_effect(MixEffect.new(), input0_last, input1_last)
+	local mix_effect = chain:add_effect(MixEffect.new(), input0.last, input1.last)
 	chain:finalize(hq)
 
 	return {
 		chain = chain,
-		input0 = {
-			input = input0,
-			wb_effect = wb0_effect
-		},
-		input1 = {
-			input = input1,
-			wb_effect = wb1_effect
-		},
+		input0 = input0,
+		input1 = input1,
 		mix_effect = mix_effect
 	}
 end