From: Steinar H. Gunderson Date: Thu, 24 Dec 2015 12:51:38 +0000 (+0100) Subject: Use the shared resource pool everywhere. X-Git-Tag: 1.0.0~63 X-Git-Url: https://git.sesse.net/?p=nageru;a=commitdiff_plain;h=c996b8ab73e27736a1807a3cc6df329c9fc46d4c Use the shared resource pool everywhere. --- diff --git a/theme.cpp b/theme.cpp index 166dcb5..c832d29 100644 --- 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(L, "EffectChain", aspect_w, aspect_h); + return wrap_lua_object(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 a3bc8ea..1f4f429 100644 --- 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);