Hook up PaddingEffect.

diff --git a/theme.cpp b/theme.cpp
index 006149dec24a3c3b5fbb49b3b5335d9bcffc8313..cdbe9c8035887e3ca981f8adcafe96d6e63f0df9 100644 (file)
--- a/theme.cpp
+++ b/theme.cpp
@@ -9,6 +9,7 @@
 #include <movit/ycbcr_input.h>
 #include <movit/white_balance_effect.h>
 #include <movit/resample_effect.h>
+#include <movit/padding_effect.h>
 
 #include "theme.h"
 
@@ -45,7 +46,8 @@ Theme *get_theme_updata(lua_State* L)
 Effect *get_effect(lua_State *L, int idx)
 {
        if (luaL_testudata(L, idx, "WhiteBalanceEffect") ||
-           luaL_testudata(L, idx, "ResampleEffect")) {
+           luaL_testudata(L, idx, "ResampleEffect") ||
+           luaL_testudata(L, idx, "PaddingEffect")) {
                return (Effect *)lua_touserdata(L, idx);
        }
        fprintf(stderr, "Error: Index #%d was not an Effect type\n", idx);
@@ -142,6 +144,12 @@ int ResampleEffect_new(lua_State* L)
        return wrap_lua_object<ResampleEffect>(L, "ResampleEffect");
 }
 
+int PaddingEffect_new(lua_State* L)
+{
+       assert(lua_gettop(L) == 0);
+       return wrap_lua_object<PaddingEffect>(L, "PaddingEffect");
+}
+
 int Effect_set_float(lua_State *L)
 {
        assert(lua_gettop(L) == 3);
@@ -193,6 +201,13 @@ const luaL_Reg ResampleEffect_funcs[] = {
        { NULL, NULL }
 };
 
+const luaL_Reg PaddingEffect_funcs[] = {
+       { "new", PaddingEffect_new },
+       { "set_float", Effect_set_float },
+       { "set_int", Effect_set_int },
+       { NULL, NULL }
+};
+
 }  // namespace
 
 LiveInputWrapper::LiveInputWrapper(Theme *theme, EffectChain *chain)
@@ -233,6 +248,7 @@ Theme::Theme(const char *filename, ResourcePool *resource_pool)
        register_class("LiveInputWrapper", LiveInputWrapper_funcs); 
        register_class("WhiteBalanceEffect", WhiteBalanceEffect_funcs);
        register_class("ResampleEffect", ResampleEffect_funcs);
+       register_class("PaddingEffect", PaddingEffect_funcs);
 
        // Run script.
        lua_settop(L, 0);

diff --git a/theme.h b/theme.h
index 473985a22cb3b82ae9e639c994141d64b5a99037..6701ece87db2948487674eb267e233ebfd34e1b0 100644 (file)
--- a/theme.h
+++ b/theme.h
@@ -44,16 +44,6 @@ public:
        LiveInputWrapper(Theme *theme, movit::EffectChain *chain);
 
        void connect_signal(int signal_num);
-#if 0
-       {
-               connected_signal_num = signal_num;
-       }
-
-       int get_connected_signal_num() const {
-               return connected_signal_num;
-       }
-#endif
-
        movit::YCbCrInput *get_input() const
        {
                return input;

diff --git a/theme.lua b/theme.lua
index d7c624a79d674f6bef683c01d42069d8108693a9..2238557d808663227505544c628cfc2867a2b285 100644 (file)
--- a/theme.lua
+++ b/theme.lua
@@ -18,7 +18,12 @@ 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 wb_effect = main_chain:add_effect(WhiteBalanceEffect.new(), resample_effect);
+local padding_effect = main_chain:add_effect(PaddingEffect.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);
+local wb_effect = main_chain:add_effect(WhiteBalanceEffect.new(), padding_effect);
 main_chain:finalize(true);
 -- local input1 = main_chain.add_input(Inputs.create(1));
 -- local resample_effect = main_chain.add_effect(ResampleEffect.new(), input0);