When doing a cut, do the shutdown in a separate thread.

[nageru] / theme.cpp

diff --git a/theme.cpp b/theme.cpp
index 35b777e76d79c6ea3afe309e57b0ae5333be9b2e..1d0cd2d643db006a4fae075f8aed7c817e5e176f 100644 (file)
--- a/theme.cpp
+++ b/theme.cpp
@@ -11,6 +11,7 @@
 #include <movit/padding_effect.h>
 #include <movit/resample_effect.h>
 #include <movit/resize_effect.h>
+#include <movit/multiply_effect.h>
 #include <movit/util.h>
 #include <movit/white_balance_effect.h>
 #include <movit/ycbcr.h>
@@ -135,6 +136,7 @@ Effect *get_effect(lua_State *L, int idx)
            luaL_testudata(L, idx, "IntegralPaddingEffect") ||
            luaL_testudata(L, idx, "OverlayEffect") ||
            luaL_testudata(L, idx, "ResizeEffect") ||
+           luaL_testudata(L, idx, "MultiplyEffect") ||
            luaL_testudata(L, idx, "MixEffect") ||
            luaL_testudata(L, idx, "ImageInput")) {
                return *(Effect **)lua_touserdata(L, idx);
@@ -325,6 +327,12 @@ int ResizeEffect_new(lua_State* L)
        return wrap_lua_object_nonowned<ResizeEffect>(L, "ResizeEffect");
 }
 
+int MultiplyEffect_new(lua_State* L)
+{
+       assert(lua_gettop(L) == 0);
+       return wrap_lua_object_nonowned<MultiplyEffect>(L, "MultiplyEffect");
+}
+
 int MixEffect_new(lua_State* L)
 {
        assert(lua_gettop(L) == 0);
@@ -525,6 +533,15 @@ const luaL_Reg ResizeEffect_funcs[] = {
        { NULL, NULL }
 };
 
+const luaL_Reg MultiplyEffect_funcs[] = {
+       { "new", MultiplyEffect_new },
+       { "set_float", Effect_set_float },
+       { "set_int", Effect_set_int },
+       { "set_vec3", Effect_set_vec3 },
+       { "set_vec4", Effect_set_vec4 },
+       { NULL, NULL }
+};
+
 const luaL_Reg MixEffect_funcs[] = {
        { "new", MixEffect_new },
        { "set_float", Effect_set_float },
@@ -692,6 +709,7 @@ Theme::Theme(const char *filename, ResourcePool *resource_pool, unsigned num_car
        register_class("IntegralPaddingEffect", IntegralPaddingEffect_funcs);
        register_class("OverlayEffect", OverlayEffect_funcs);
        register_class("ResizeEffect", ResizeEffect_funcs);
+       register_class("MultiplyEffect", MultiplyEffect_funcs);
        register_class("MixEffect", MixEffect_funcs);
        register_class("InputStateInfo", InputStateInfo_funcs);
 
@@ -743,7 +761,12 @@ Theme::Chain Theme::get_chain(unsigned num, float t, unsigned width, unsigned he
                exit(1);
        }
 
-       chain.chain = (EffectChain *)luaL_checkudata(L, -2, "EffectChain");
+       chain.chain = (EffectChain *)luaL_testudata(L, -2, "EffectChain");
+       if (chain.chain == nullptr) {
+               fprintf(stderr, "get_chain() for chain number %d did not return an EffectChain\n",
+                       num);
+               exit(1);
+       }
        if (!lua_isfunction(L, -1)) {
                fprintf(stderr, "Argument #-1 should be a function\n");
                exit(1);
@@ -810,6 +833,22 @@ int Theme::get_channel_signal(unsigned channel)
        return ret;
 }
 
+std::string Theme::get_channel_color(unsigned channel)
+{
+       unique_lock<mutex> lock(m);
+       lua_getglobal(L, "channel_color");
+       lua_pushnumber(L, channel);
+       if (lua_pcall(L, 1, 1, 0) != 0) {
+               fprintf(stderr, "error running function `channel_color': %s\n", lua_tostring(L, -1));
+               exit(1);
+       }
+
+       std::string ret = checkstdstring(L, -1);
+       lua_pop(L, 1);
+       assert(lua_gettop(L) == 0);
+       return ret;
+}
+
 bool Theme::get_supports_set_wb(unsigned channel)
 {
        unique_lock<mutex> lock(m);