Update bmusb.

[nageru] / theme.cpp

diff --git a/theme.cpp b/theme.cpp
index 166dcb577dfa0bd6de2ef45378b99b01c527bede..7bfe6cf57f555cece42fe9d34a1337a9bae11d38 100644 (file)
--- a/theme.cpp
+++ b/theme.cpp
@@ -46,6 +46,7 @@ struct InputStateInfo {
 
        unsigned last_width[MAX_CARDS], last_height[MAX_CARDS];
        bool last_interlaced[MAX_CARDS];
+       unsigned last_frame_rate_nom[MAX_CARDS], last_frame_rate_den[MAX_CARDS];
 };
 
 InputStateInfo::InputStateInfo(const InputState &input_state)
@@ -61,6 +62,8 @@ InputStateInfo::InputStateInfo(const InputState &input_state)
                last_width[signal_num] = userdata->last_width[frame.field_number];
                last_height[signal_num] = userdata->last_height[frame.field_number];
                last_interlaced[signal_num] = userdata->last_interlaced;
+               last_frame_rate_nom[signal_num] = userdata->last_frame_rate_nom;
+               last_frame_rate_den[signal_num] = userdata->last_frame_rate_den;
        }
 }
 
@@ -142,10 +145,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)
@@ -326,6 +330,26 @@ int InputStateInfo_get_interlaced(lua_State* L)
        return 1;
 }
 
+int InputStateInfo_get_frame_rate_nom(lua_State* L)
+{
+       assert(lua_gettop(L) == 2);
+       InputStateInfo *input_state_info = get_input_state_info(L, 1);
+       Theme *theme = get_theme_updata(L);
+       int signal_num = theme->map_signal(luaL_checknumber(L, 2));
+       lua_pushnumber(L, input_state_info->last_frame_rate_nom[signal_num]);
+       return 1;
+}
+
+int InputStateInfo_get_frame_rate_den(lua_State* L)
+{
+       assert(lua_gettop(L) == 2);
+       InputStateInfo *input_state_info = get_input_state_info(L, 1);
+       Theme *theme = get_theme_updata(L);
+       int signal_num = theme->map_signal(luaL_checknumber(L, 2));
+       lua_pushnumber(L, input_state_info->last_frame_rate_den[signal_num]);
+       return 1;
+}
+
 int Effect_set_float(lua_State *L)
 {
        assert(lua_gettop(L) == 3);
@@ -472,6 +496,8 @@ const luaL_Reg InputStateInfo_funcs[] = {
        { "get_width", InputStateInfo_get_width },
        { "get_height", InputStateInfo_get_height },
        { "get_interlaced", InputStateInfo_get_interlaced },
+       { "get_frame_rate_nom", InputStateInfo_get_frame_rate_nom },
+       { "get_frame_rate_den", InputStateInfo_get_frame_rate_den },
        { NULL, NULL }
 };
 
@@ -700,7 +726,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);
        }