]> git.sesse.net Git - ultimatescore/commitdiff
Turn off the overlay when in stinger mode.
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Fri, 19 Oct 2018 19:46:52 +0000 (21:46 +0200)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Fri, 19 Oct 2018 19:46:52 +0000 (21:46 +0200)
nageru/ultimate.lua

index 57436cfc0dc50502f60d6b38763809e8177dc05d..8b266ed6679e845096611bdb94453759934e2b63 100644 (file)
@@ -27,6 +27,7 @@ local state = {
        stinger_frame = 0,
        stinger_src_signal = 0,
        stinger_dst_signal = 0,
+       stinger_save_overlay = false,
 
        live_signal_num = 0,
        preview_signal_num = 1
@@ -707,7 +708,6 @@ function transition_clicked(num, t)
                                return
                        end
 
-                       io.write("Inserting stinger from " .. state.live_signal_num .. " to " .. state.live_signal_num .. "\n")
                        state.stinger_in_progress = true
                        state.stinger_frame = 0
                        state.stinger_src_signal = state.live_signal_num
@@ -908,6 +908,15 @@ function get_chain(num, t, width, height, signals)
                                        state.stinger_in_progress = false
                                        state.preview_signal_num = state.stinger_src_signal
                                        state.live_signal_num = state.stinger_dst_signal
+
+                                       if state.stinger_dst_signal == VIDEO_SIGNAL_NUM then
+                                               -- Turn off the overlay when playing video.
+                                               state.stinger_save_overlay = state.overlay_enabled
+                                               state.overlay_enabled = false
+                                       else
+                                               -- Restore the state.
+                                               state.overlay_enabled = state.stinger_save_overlay
+                                       end
                                end
                        else
                                chain = simple_chains[input_type][input_scale][overlay_really_enabled][true]