Hook over OverlayEffect, and make add_effect() take a variable number of parameters.

[nageru] / theme.cpp

diff --git a/theme.cpp b/theme.cpp
index 31eb23d2e36a67a4c7c14737d18cfb8bd3d1ef41..410ac746c4f713f8b43dc32d0174483b8a682f25 100644 (file)
--- a/theme.cpp
+++ b/theme.cpp
@@ -8,6 +8,9 @@
 #include <movit/effect_chain.h>
 #include <movit/ycbcr_input.h>
 #include <movit/white_balance_effect.h>
+#include <movit/resample_effect.h>
+#include <movit/padding_effect.h>
+#include <movit/overlay_effect.h>
 
 #include "theme.h"
 
@@ -41,6 +44,19 @@ Theme *get_theme_updata(lua_State* L)
        return (Theme *)lua_touserdata(L, lua_upvalueindex(1));
 }
 
+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, "IntegralPaddingEffect") ||
+           luaL_testudata(L, idx, "OverlayEffect")) {
+               return (Effect *)lua_touserdata(L, idx);
+       }
+       fprintf(stderr, "Error: Index #%d was not an Effect type\n", idx);
+       exit(1);
+}
+
 bool checkbool(lua_State* L, int idx)
 {
        luaL_checktype(L, idx, LUA_TBOOLEAN);
@@ -66,15 +82,23 @@ int EffectChain_add_live_input(lua_State* L)
 
 int EffectChain_add_effect(lua_State* L)
 {
-       assert(lua_gettop(L) == 3);
+       assert(lua_gettop(L) >= 2);
        EffectChain *chain = (EffectChain *)luaL_checkudata(L, 1, "EffectChain");
 
-       // FIXME: This needs a lot of work.
-       Effect *effect1 = (Effect *)luaL_checkudata(L, 2, "WhiteBalanceEffect");
-       LiveInputWrapper *effect2 = (LiveInputWrapper *)luaL_checkudata(L, 3, "LiveInputWrapper");
-       chain->add_effect(effect1, effect2->get_input());
+       // TODO: Better error reporting.
+       Effect *effect = get_effect(L, 2);
+       vector<Effect *> inputs;
+       for (int idx = 3; idx <= lua_gettop(L); ++idx) {
+               if (luaL_testudata(L, idx, "LiveInputWrapper")) {
+                       LiveInputWrapper *input = (LiveInputWrapper *)lua_touserdata(L, idx);
+                       inputs.push_back(input->get_input());
+               } else {
+                       inputs.push_back(get_effect(L, idx));
+               }
+       }
+       chain->add_effect(effect, inputs);
 
-       lua_settop(L, 2);       
+       lua_settop(L, 2);  // Return the effect itself.
        return 1;
 }
 
@@ -120,10 +144,34 @@ int WhiteBalanceEffect_new(lua_State* L)
        return wrap_lua_object<WhiteBalanceEffect>(L, "WhiteBalanceEffect");
 }
 
-int WhiteBalanceEffect_set_float(lua_State *L)
+int ResampleEffect_new(lua_State* L)
+{
+       assert(lua_gettop(L) == 0);
+       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 IntegralPaddingEffect_new(lua_State* L)
+{
+       assert(lua_gettop(L) == 0);
+       return wrap_lua_object<IntegralPaddingEffect>(L, "IntegralPaddingEffect");
+}
+
+int OverlayEffect_new(lua_State* L)
+{
+       assert(lua_gettop(L) == 0);
+       return wrap_lua_object<OverlayEffect>(L, "OverlayEffect");
+}
+
+int Effect_set_float(lua_State *L)
 {
        assert(lua_gettop(L) == 3);
-       WhiteBalanceEffect *effect = (WhiteBalanceEffect *)luaL_checkudata(L, 1, "WhiteBalanceEffect");
+       Effect *effect = (Effect *)get_effect(L, 1);
        size_t len;
        const char* cstr = lua_tolstring(L, 2, &len);
        std::string key(cstr, len);
@@ -132,6 +180,18 @@ int WhiteBalanceEffect_set_float(lua_State *L)
        return 0;
 }
 
+int Effect_set_int(lua_State *L)
+{
+       assert(lua_gettop(L) == 3);
+       Effect *effect = (Effect *)get_effect(L, 1);
+       size_t len;
+       const char* cstr = lua_tolstring(L, 2, &len);
+       std::string key(cstr, len);
+       float value = luaL_checknumber(L, 3);
+       (void)effect->set_int(key, value);
+       return 0;
+}
+
 const luaL_Reg EffectChain_funcs[] = {
        { "new", EffectChain_new },
        { "add_live_input", EffectChain_add_live_input },
@@ -147,7 +207,36 @@ const luaL_Reg LiveInputWrapper_funcs[] = {
 
 const luaL_Reg WhiteBalanceEffect_funcs[] = {
        { "new", WhiteBalanceEffect_new },
-       { "set_float", WhiteBalanceEffect_set_float },
+       { "set_float", Effect_set_float },
+       { "set_int", Effect_set_int },
+       { NULL, NULL }
+};
+
+const luaL_Reg ResampleEffect_funcs[] = {
+       { "new", ResampleEffect_new },
+       { "set_float", Effect_set_float },
+       { "set_int", Effect_set_int },
+       { NULL, NULL }
+};
+
+const luaL_Reg PaddingEffect_funcs[] = {
+       { "new", PaddingEffect_new },
+       { "set_float", Effect_set_float },
+       { "set_int", Effect_set_int },
+       { NULL, NULL }
+};
+
+const luaL_Reg IntegralPaddingEffect_funcs[] = {
+       { "new", IntegralPaddingEffect_new },
+       { "set_float", Effect_set_float },
+       { "set_int", Effect_set_int },
+       { NULL, NULL }
+};
+
+const luaL_Reg OverlayEffect_funcs[] = {
+       { "new", OverlayEffect_new },
+       { "set_float", Effect_set_float },
+       { "set_int", Effect_set_int },
        { NULL, NULL }
 };
 
@@ -189,7 +278,11 @@ Theme::Theme(const char *filename, ResourcePool *resource_pool)
        
        register_class("EffectChain", EffectChain_funcs); 
        register_class("LiveInputWrapper", LiveInputWrapper_funcs); 
-       register_class("WhiteBalanceEffect", WhiteBalanceEffect_funcs); 
+       register_class("WhiteBalanceEffect", WhiteBalanceEffect_funcs);
+       register_class("ResampleEffect", ResampleEffect_funcs);
+       register_class("PaddingEffect", PaddingEffect_funcs);
+       register_class("IntegralPaddingEffect", IntegralPaddingEffect_funcs);
+       register_class("OverlayEffect", OverlayEffect_funcs);
 
        // Run script.
        lua_settop(L, 0);