Fix fading to/from deinterlaced sources.

[nageru] / theme.lua

diff --git a/theme.lua b/theme.lua
index f561613aa88c33fd5dff538bd199122d7c425368..c2014141c3e94a6597dc650d92256c35bf51cc45 100644 (file)
--- a/theme.lua
+++ b/theme.lua
@@ -298,6 +298,21 @@ function channel_name(channel)
        end
 end
 
+-- API ENTRY POINT
+-- Returns, given a channel number, which signal it corresponds to (starting from 0).
+-- Should return -1 if the channel does not correspond to a simple signal.
+-- Called once for each channel, at the start of the program.
+-- Will never be called for live (0) or preview (1).
+function channel_signal(channel)
+       if channel == 2 then
+               return 0
+       elseif channel == 3 then
+               return 1
+       else
+               return -1
+       end
+end
+
 -- API ENTRY POINT
 -- Returns if a given channel supports setting white balance (starting from 2).
 -- Called only once for each channel, at the start of the program.
@@ -522,12 +537,12 @@ function get_chain(num, t, width, height, signals)
                        local input1_scale = needs_scale(signals, fade_dst_signal, width, height)
                        local chain = fade_chains[input0_type][input0_scale][input1_type][input1_scale][true]
                        prepare = function()
-                               if input0_type == "live" then
+                               if input0_type == "live" or input0_type == "livedeint" then
                                        chain.input0.input:connect_signal(fade_src_signal)
                                        set_neutral_color_from_signal(chain.input0.wb_effect, fade_src_signal)
                                end
                                set_scale_parameters_if_needed(chain.input0, width, height)
-                               if input1_type == "live" then
+                               if input1_type == "live" or input1_type == "livedeint" then
                                        chain.input1.input:connect_signal(fade_dst_signal)
                                        set_neutral_color_from_signal(chain.input1.wb_effect, fade_dst_signal)
                                end