]> git.sesse.net Git - nageru/commitdiff
Use the shared resource pool everywhere.
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Thu, 24 Dec 2015 12:51:38 +0000 (13:51 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Thu, 24 Dec 2015 12:51:38 +0000 (13:51 +0100)
theme.cpp
theme.h

index 166dcb577dfa0bd6de2ef45378b99b01c527bede..c832d29bcf9a19af4e1269690b355cd876ad6e53 100644 (file)
--- a/theme.cpp
+++ b/theme.cpp
@@ -142,10 +142,11 @@ std::string checkstdstring(lua_State *L, int index)
 int EffectChain_new(lua_State* L)
 {
        assert(lua_gettop(L) == 2);
+       Theme *theme = get_theme_updata(L);
        int aspect_w = luaL_checknumber(L, 1);
        int aspect_h = luaL_checknumber(L, 2);
 
-       return wrap_lua_object<EffectChain>(L, "EffectChain", aspect_w, aspect_h);
+       return wrap_lua_object<EffectChain>(L, "EffectChain", aspect_w, aspect_h, theme->get_resource_pool());
 }
 
 int EffectChain_add_live_input(lua_State* L)
diff --git a/theme.h b/theme.h
index a3bc8ea16844439f1d25bf988238701d87448e64..1f4f429eec72387f44b4f3f26f56dca0a543c9a3 100644 (file)
--- a/theme.h
+++ b/theme.h
@@ -63,6 +63,8 @@ public:
        void transition_clicked(int transition_num, float t);
        void channel_clicked(int preview_num);
 
+       movit::ResourcePool *get_resource_pool() const { return resource_pool; }
+
 private:
        void register_class(const char *class_name, const luaL_Reg *funcs);