Show the current resolution next to the inputs.

[nageru] / theme.cpp

diff --git a/theme.cpp b/theme.cpp
index 166dcb577dfa0bd6de2ef45378b99b01c527bede..023b02a4650927de1dd457e638c0b67994fb7209 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)
@@ -700,7 +701,7 @@ std::string Theme::get_channel_name(unsigned channel)
        lua_getglobal(L, "channel_name");
        lua_pushnumber(L, channel);
        if (lua_pcall(L, 1, 1, 0) != 0) {
-               fprintf(stderr, "error running function `channel_nam': %s\n", lua_tostring(L, -1));
+               fprintf(stderr, "error running function `channel_name': %s\n", lua_tostring(L, -1));
                exit(1);
        }