Remove a debug printf.

[nageru] / theme.cpp

diff --git a/theme.cpp b/theme.cpp
index d75ac86e2c9a266a7231959b7db83b26a783fc70..c1a25bab8171c06ae0fded9f563b0186fc8cab0a 100644 (file)
--- a/theme.cpp
+++ b/theme.cpp
@@ -12,6 +12,7 @@
 #include <movit/padding_effect.h>
 #include <movit/overlay_effect.h>
 #include <movit/resize_effect.h>
+#include <movit/mix_effect.h>
 
 #include "theme.h"
 
@@ -52,11 +53,12 @@ Effect *get_effect(lua_State *L, int idx)
            luaL_testudata(L, idx, "PaddingEffect") ||
            luaL_testudata(L, idx, "IntegralPaddingEffect") ||
            luaL_testudata(L, idx, "OverlayEffect") ||
-           luaL_testudata(L, idx, "ResizeEffect")) {
+           luaL_testudata(L, idx, "ResizeEffect") ||
+           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)
@@ -127,7 +129,7 @@ int EffectChain_finalize(lua_State* L)
                YCbCrFormat output_ycbcr_format;
                output_ycbcr_format.chroma_subsampling_x = 1;
                output_ycbcr_format.chroma_subsampling_y = 1;
-               output_ycbcr_format.luma_coefficients = YCBCR_REC_601;
+               output_ycbcr_format.luma_coefficients = YCBCR_REC_709;
                output_ycbcr_format.full_range = false;
 
                chain->add_ycbcr_output(inout_format, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED, output_ycbcr_format, YCBCR_OUTPUT_SPLIT_Y_AND_CBCR);
@@ -185,6 +187,12 @@ int ResizeEffect_new(lua_State* L)
        return wrap_lua_object<ResizeEffect>(L, "ResizeEffect");
 }
 
+int MixEffect_new(lua_State* L)
+{
+       assert(lua_gettop(L) == 0);
+       return wrap_lua_object<MixEffect>(L, "MixEffect");
+}
+
 int Effect_set_float(lua_State *L)
 {
        assert(lua_gettop(L) == 3);
@@ -193,7 +201,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;
 }
 
@@ -205,7 +215,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;
 }
 
@@ -221,7 +233,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;
 }
 
@@ -286,6 +301,14 @@ const luaL_Reg ResizeEffect_funcs[] = {
        { NULL, NULL }
 };
 
+const luaL_Reg MixEffect_funcs[] = {
+       { "new", MixEffect_new },
+       { "set_float", Effect_set_float },
+       { "set_int", Effect_set_int },
+       { "set_vec4", Effect_set_vec4 },
+       { NULL, NULL }
+};
+
 }  // namespace
 
 LiveInputWrapper::LiveInputWrapper(Theme *theme, EffectChain *chain)
@@ -320,8 +343,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);
@@ -330,6 +351,7 @@ Theme::Theme(const char *filename, ResourcePool *resource_pool)
        register_class("IntegralPaddingEffect", IntegralPaddingEffect_funcs);
        register_class("OverlayEffect", OverlayEffect_funcs);
        register_class("ResizeEffect", ResizeEffect_funcs);
+       register_class("MixEffect", MixEffect_funcs);
 
        // Run script.
        lua_settop(L, 0);
@@ -396,6 +418,25 @@ Theme::get_chain(unsigned num, float t, unsigned width, unsigned height)
        });
 }
 
+std::vector<std::string> Theme::get_transition_names(float t)
+{
+       unique_lock<mutex> lock(m);
+       lua_getglobal(L, "get_transitions");
+       lua_pushnumber(L, t);
+       if (lua_pcall(L, 1, 1, 0) != 0) {
+               fprintf(stderr, "error running function `get_transitions': %s\n", lua_tostring(L, -1));
+               exit(1);
+       }
+
+       std::vector<std::string> ret;
+       lua_pushnil(L);
+       while (lua_next(L, -2) != 0) {
+               ret.push_back(lua_tostring(L, -1));
+               lua_pop(L, 1);
+       }
+       return ret;
+}      
+
 void Theme::connect_signal(YCbCrInput *input, int signal_num)
 {
        input->set_texture_num(0, input_textures[signal_num].tex_y);
@@ -414,3 +455,15 @@ void Theme::transition_clicked(int transition_num, float t)
                exit(1);
        }
 }
+
+void Theme::channel_clicked(int preview_num)
+{
+       unique_lock<mutex> lock(m);
+       lua_getglobal(L, "channel_clicked");
+       lua_pushnumber(L, preview_num);
+
+       if (lua_pcall(L, 1, 0, 0) != 0) {
+               fprintf(stderr, "error running function `channel_clicked': %s\n", lua_tostring(L, -1));
+               exit(1);
+       }
+}