X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=theme.cpp;h=defdca171b54448bba2ddce336260ca3e2a95dbe;hb=5c560f35dea9f3aa5f13c42f4a0112a4d05f2152;hp=62e3640f509f2844df951df5db2b4e7476a8af1d;hpb=196392c483a9cbf7fd7b572d9242aa283031453f;p=nageru

diff --git a/theme.cpp b/theme.cpp
index 62e3640..defdca1 100644
--- a/theme.cpp
+++ b/theme.cpp
@@ -37,6 +37,29 @@ extern Mixer *global_mixer;
 
 namespace {
 
+// Contains basically the same data as InputState, but does not hold on to
+// a reference to the frames. This is important so that we can release them
+// without having to wait for Lua's GC.
+struct InputStateInfo {
+	InputStateInfo(const InputState& input_state);
+
+	unsigned last_width[MAX_CARDS], last_height[MAX_CARDS];
+};
+
+InputStateInfo::InputStateInfo(const InputState &input_state)
+{
+	for (unsigned signal_num = 0; signal_num < MAX_CARDS; ++signal_num) {
+		BufferedFrame frame = input_state.buffered_frames[signal_num][0];
+		if (frame.frame == nullptr) {
+			last_width[signal_num] = last_height[signal_num] = 0;
+			continue;
+		}
+		const PBOFrameAllocator::Userdata *userdata = (const PBOFrameAllocator::Userdata *)frame.frame->userdata;
+		last_width[signal_num] = userdata->last_width[frame.field_number];
+		last_height[signal_num] = userdata->last_height[frame.field_number];
+	}
+}
+
 class LuaRefWithDeleter {
 public:
 	LuaRefWithDeleter(mutex *m, lua_State *L, int ref) : m(m), L(L), ref(ref) {}
@@ -90,6 +113,15 @@ Effect *get_effect(lua_State *L, int idx)
 	return nullptr;
 }
 
+InputStateInfo *get_input_state_info(lua_State *L, int idx)
+{
+	if (luaL_testudata(L, idx, "InputStateInfo")) {
+		return (InputStateInfo *)lua_touserdata(L, idx);
+	}
+	luaL_error(L, "Error: Index #%d was not InputStateInfo\n", idx);
+	return nullptr;
+}
+
 bool checkbool(lua_State* L, int idx)
 {
 	luaL_checktype(L, idx, LUA_TBOOLEAN);
@@ -259,6 +291,26 @@ int MixEffect_new(lua_State* L)
 	return wrap_lua_object<MixEffect>(L, "MixEffect");
 }
 
+int InputStateInfo_get_width(lua_State* L)
+{
+	assert(lua_gettop(L) == 2);
+	InputStateInfo *input_state_info = get_input_state_info(L, 1);
+	Theme *theme = get_theme_updata(L);
+	int signal_num = theme->map_signal(luaL_checknumber(L, 2));
+	lua_pushnumber(L, input_state_info->last_width[signal_num]);
+	return 1;
+}
+
+int InputStateInfo_get_height(lua_State* L)
+{
+	assert(lua_gettop(L) == 2);
+	InputStateInfo *input_state_info = get_input_state_info(L, 1);
+	Theme *theme = get_theme_updata(L);
+	int signal_num = theme->map_signal(luaL_checknumber(L, 2));
+	lua_pushnumber(L, input_state_info->last_height[signal_num]);
+	return 1;
+}
+
 int Effect_set_float(lua_State *L)
 {
 	assert(lua_gettop(L) == 3);
@@ -401,6 +453,12 @@ const luaL_Reg MixEffect_funcs[] = {
 	{ NULL, NULL }
 };
 
+const luaL_Reg InputStateInfo_funcs[] = {
+	{ "get_width", InputStateInfo_get_width },
+	{ "get_height", InputStateInfo_get_height },
+	{ NULL, NULL }
+};
+
 }  // namespace
 
 LiveInputWrapper::LiveInputWrapper(Theme *theme, EffectChain *chain, bool override_bounce)
@@ -443,6 +501,7 @@ LiveInputWrapper::LiveInputWrapper(Theme *theme, EffectChain *chain, bool overri
 void LiveInputWrapper::connect_signal(int signal_num)
 {
 	if (global_mixer == nullptr) {
+		// No data yet.
 		return;
 	}
 
@@ -473,6 +532,7 @@ Theme::Theme(const char *filename, ResourcePool *resource_pool, unsigned num_car
 	register_class("OverlayEffect", OverlayEffect_funcs);
 	register_class("ResizeEffect", ResizeEffect_funcs);
 	register_class("MixEffect", MixEffect_funcs);
+	register_class("InputStateInfo", InputStateInfo_funcs);
 
 	// Run script.
 	lua_settop(L, 0);
@@ -499,12 +559,12 @@ Theme::Theme(const char *filename, ResourcePool *resource_pool, unsigned num_car
 void Theme::register_class(const char *class_name, const luaL_Reg *funcs)
 {
 	assert(lua_gettop(L) == 0);
-	luaL_newmetatable(L, class_name);
+	luaL_newmetatable(L, class_name);  // mt = {}
 	lua_pushlightuserdata(L, this);
-	luaL_setfuncs(L, funcs, 1);
+	luaL_setfuncs(L, funcs, 1);        // for (name,f in funcs) { mt[name] = f, with upvalue {theme} }
 	lua_pushvalue(L, -1);
-	lua_setfield(L, -2, "__index");
-	lua_setglobal(L, class_name);
+	lua_setfield(L, -2, "__index");    // mt.__index = mt
+	lua_setglobal(L, class_name);      // ClassName = mt
 	assert(lua_gettop(L) == 0);
 }
 
@@ -519,8 +579,9 @@ Theme::Chain Theme::get_chain(unsigned num, float t, unsigned width, unsigned he
 	lua_pushnumber(L, t);
 	lua_pushnumber(L, width);
 	lua_pushnumber(L, height);
+	wrap_lua_object<InputStateInfo>(L, "InputStateInfo", input_state);
 
-	if (lua_pcall(L, 4, 2, 0) != 0) {
+	if (lua_pcall(L, 5, 2, 0) != 0) {
 		fprintf(stderr, "error running function `get_chain': %s\n", lua_tostring(L, -1));
 		exit(1);
 	}