X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Ftheme.cpp;h=06d147f6686bb07739d7cbb5ee6bafa1ed1f66d5;hb=f81ae3be1aae619fe4ad022f55d95a4a83ace076;hp=937043f7ca72e96ad60bf7a4611857091bf13730;hpb=6e5ded9f44606841fb5e905394cca803c7d7abdf;p=nageru

diff --git a/nageru/theme.cpp b/nageru/theme.cpp
index 937043f..06d147f 100644
--- a/nageru/theme.cpp
+++ b/nageru/theme.cpp
@@ -1,11 +1,15 @@
 #include "theme.h"
 
+#include <algorithm>
+#include <array>
 #include <assert.h>
 #include <bmusb/bmusb.h>
 #include <epoxy/gl.h>
+#include <mutex>
 #include <stdarg.h>
 #include <lauxlib.h>
 #include <lua.hpp>
+#include <math.h>
 #include <movit/blur_effect.h>
 #include <movit/deinterlace_effect.h>
 #include <movit/effect.h>
@@ -28,11 +32,17 @@
 #include <stdlib.h>
 #include <cstddef>
 #include <memory>
-#include <new>
+#include <string>
 #include <utility>
+#include <vector>
 
 #include "audio_mixer.h"
 #include "defs.h"
+#include "input_mapping.h"
+#include "lua.h"
+#include "lualib.h"
+#include "shared/shared_defs.h"
+#include "tweaked_inputs.h"
 #ifdef HAVE_CEF
 #include "cef_capture.h"
 #endif
@@ -1448,6 +1458,15 @@ int Nageru_set_audio_bus_mute(lua_State *L)
 	return 0;
 }
 
+int Nageru_schedule_cut(lua_State *L)
+{
+	if (global_mixer == nullptr) {
+		luaL_error(L, "Cuts can not be scheduled before the theme is done initializing.");
+	}
+	global_mixer->schedule_cut();
+	return 0;
+}
+
 int Nageru_get_audio_bus_eq_level_db(lua_State *L)
 {
 	if (global_audio_mixer == nullptr) {
@@ -1660,6 +1679,9 @@ void Theme::register_globals()
 		{ "get_audio_bus_mute", Nageru_get_audio_bus_mute },
 		{ "set_audio_bus_mute", Nageru_set_audio_bus_mute },
 
+		// Misc.
+		{ "schedule_cut", Nageru_schedule_cut },
+
 		{ nullptr, nullptr }
 	};
 	lua_pushlightuserdata(L, this);
@@ -2074,8 +2096,8 @@ unique_ptr<Theme::MenuEntry> create_theme_menu_entry(lua_State *L, int index)
 	lua_pop(L, 1);
 
 	unsigned flags = 0;
-	if (lua_objlen(L, -1) > 2) {
-		lua_rawgeti(L, -1, 3);
+	if (lua_objlen(L, index) > 2) {
+		lua_rawgeti(L, index, 3);
 		flags = luaL_checknumber(L, -1);
 		lua_pop(L, 1);
 	}