Make Theme::register_class() private.

[nageru] / theme.cpp

diff --git a/theme.cpp b/theme.cpp
index 50adca52c770c856792c2fcb0fdb78aad2b4255c..4843b0cd3fff65519d2eaea3243c9eb69dd64271 100644 (file)
--- a/theme.cpp
+++ b/theme.cpp
@@ -57,8 +57,8 @@ Effect *get_effect(lua_State *L, int idx)
            luaL_testudata(L, idx, "MixEffect")) {
                return (Effect *)lua_touserdata(L, idx);
        }
-       fprintf(stderr, "Error: Index #%d was not an Effect type\n", idx);
-       exit(1);
+       luaL_error(L, "Error: Index #%d was not an Effect type\n", idx);
+       return nullptr;
 }
 
 bool checkbool(lua_State* L, int idx)
@@ -78,10 +78,11 @@ int EffectChain_new(lua_State* L)
 
 int EffectChain_add_live_input(lua_State* L)
 {
-       assert(lua_gettop(L) == 1);
+       assert(lua_gettop(L) == 2);
        Theme *theme = get_theme_updata(L);
        EffectChain *chain = (EffectChain *)luaL_checkudata(L, 1, "EffectChain");
-       return wrap_lua_object<LiveInputWrapper>(L, "LiveInputWrapper", theme, chain);
+       bool override_bounce = checkbool(L, 2);
+       return wrap_lua_object<LiveInputWrapper>(L, "LiveInputWrapper", theme, chain, override_bounce);
 }
 
 int EffectChain_add_effect(lua_State* L)
@@ -201,7 +202,9 @@ int Effect_set_float(lua_State *L)
        const char* cstr = lua_tolstring(L, 2, &len);
        std::string key(cstr, len);
        float value = luaL_checknumber(L, 3);
-       (void)effect->set_float(key, value);
+       if (!effect->set_float(key, value)) {
+               luaL_error(L, "Effect refused set_float(\"%s\", %d) (invalid key?)", cstr, int(value));
+       }
        return 0;
 }
 
@@ -213,7 +216,9 @@ int Effect_set_int(lua_State *L)
        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);
+       if (!effect->set_int(key, value)) {
+               luaL_error(L, "Effect refused set_int(\"%s\", %d) (invalid key?)", cstr, int(value));
+       }
        return 0;
 }
 
@@ -229,7 +234,10 @@ int Effect_set_vec4(lua_State *L)
        v[1] = luaL_checknumber(L, 4);
        v[2] = luaL_checknumber(L, 5);
        v[3] = luaL_checknumber(L, 6);
-       (void)effect->set_vec4(key, v);
+       if (!effect->set_vec4(key, v)) {
+               luaL_error(L, "Effect refused set_vec4(\"%s\", %f, %f, %f, %f) (invalid key?)", cstr,
+                       v[0], v[1], v[2], v[3]);
+       }
        return 0;
 }
 
@@ -304,7 +312,7 @@ const luaL_Reg MixEffect_funcs[] = {
 
 }  // namespace
 
-LiveInputWrapper::LiveInputWrapper(Theme *theme, EffectChain *chain)
+LiveInputWrapper::LiveInputWrapper(Theme *theme, EffectChain *chain, bool override_bounce)
        : theme(theme)
 {
        ImageFormat inout_format;
@@ -321,7 +329,11 @@ LiveInputWrapper::LiveInputWrapper(Theme *theme, EffectChain *chain)
        input_ycbcr_format.luma_coefficients = YCBCR_REC_601;
        input_ycbcr_format.full_range = false;
 
-       input = new YCbCrInput(inout_format, input_ycbcr_format, WIDTH, HEIGHT, YCBCR_INPUT_SPLIT_Y_AND_CBCR);
+       if (override_bounce) {
+               input = new NonBouncingYCbCrInput(inout_format, input_ycbcr_format, WIDTH, HEIGHT, YCBCR_INPUT_SPLIT_Y_AND_CBCR);
+       } else {
+               input = new YCbCrInput(inout_format, input_ycbcr_format, WIDTH, HEIGHT, YCBCR_INPUT_SPLIT_Y_AND_CBCR);
+       }
        chain->add_input(input);
 }
 
@@ -336,8 +348,6 @@ Theme::Theme(const char *filename, ResourcePool *resource_pool)
        L = luaL_newstate();
         luaL_openlibs(L);
 
-       printf("constructing, this=%p\n", this);
-       
        register_class("EffectChain", EffectChain_funcs); 
        register_class("LiveInputWrapper", LiveInputWrapper_funcs); 
        register_class("WhiteBalanceEffect", WhiteBalanceEffect_funcs);