From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Wed, 7 Oct 2015 23:04:16 +0000 (+0200)
Subject: Hook up IntegralPaddingEffect.
X-Git-Tag: 1.0.0~276
X-Git-Url: https://git.sesse.net/?p=nageru;a=commitdiff_plain;h=03c9fd45ea3cdef9abde113b4840d8f7ed0d33d1

Hook up IntegralPaddingEffect.
---

diff --git a/theme.cpp b/theme.cpp
index cdbe9c8..8828906 100644
--- a/theme.cpp
+++ b/theme.cpp
@@ -47,7 +47,8 @@ Effect *get_effect(lua_State *L, int idx)
 {
 	if (luaL_testudata(L, idx, "WhiteBalanceEffect") ||
 	    luaL_testudata(L, idx, "ResampleEffect") ||
-	    luaL_testudata(L, idx, "PaddingEffect")) {
+	    luaL_testudata(L, idx, "PaddingEffect") ||
+	    luaL_testudata(L, idx, "IntegralPaddingEffect")) {
 		return (Effect *)lua_touserdata(L, idx);
 	}
 	fprintf(stderr, "Error: Index #%d was not an Effect type\n", idx);
@@ -150,6 +151,12 @@ int PaddingEffect_new(lua_State* L)
 	return wrap_lua_object<PaddingEffect>(L, "PaddingEffect");
 }
 
+int IntegralPaddingEffect_new(lua_State* L)
+{
+	assert(lua_gettop(L) == 0);
+	return wrap_lua_object<IntegralPaddingEffect>(L, "IntegralPaddingEffect");
+}
+
 int Effect_set_float(lua_State *L)
 {
 	assert(lua_gettop(L) == 3);
@@ -208,6 +215,13 @@ const luaL_Reg PaddingEffect_funcs[] = {
 	{ NULL, NULL }
 };
 
+const luaL_Reg IntegralPaddingEffect_funcs[] = {
+	{ "new", IntegralPaddingEffect_new },
+	{ "set_float", Effect_set_float },
+	{ "set_int", Effect_set_int },
+	{ NULL, NULL }
+};
+
 }  // namespace
 
 LiveInputWrapper::LiveInputWrapper(Theme *theme, EffectChain *chain)
@@ -249,6 +263,7 @@ Theme::Theme(const char *filename, ResourcePool *resource_pool)
 	register_class("WhiteBalanceEffect", WhiteBalanceEffect_funcs);
 	register_class("ResampleEffect", ResampleEffect_funcs);
 	register_class("PaddingEffect", PaddingEffect_funcs);
+	register_class("IntegralPaddingEffect", IntegralPaddingEffect_funcs);
 
 	// Run script.
 	lua_settop(L, 0);
diff --git a/theme.lua b/theme.lua
index 2238557..020fc8c 100644
--- a/theme.lua
+++ b/theme.lua
@@ -18,11 +18,11 @@ input0:connect_signal(0);
 local resample_effect = main_chain:add_effect(ResampleEffect.new(), input0);
 resample_effect:set_int("width", 320);
 resample_effect:set_int("height", 180);
-local padding_effect = main_chain:add_effect(PaddingEffect.new(), resample_effect);
+local padding_effect = main_chain:add_effect(IntegralPaddingEffect.new(), resample_effect);
 padding_effect:set_int("width", 1280);
 padding_effect:set_int("height", 720);
-padding_effect:set_float("left", 30.0);
-padding_effect:set_float("top", 60.0);
+padding_effect:set_int("left", 30);
+padding_effect:set_int("top", 60);
 local wb_effect = main_chain:add_effect(WhiteBalanceEffect.new(), padding_effect);
 main_chain:finalize(true);
 -- local input1 = main_chain.add_input(Inputs.create(1));