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)
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;
}
}
{
// Construct the C++ object and put it on the stack.
void *mem = lua_newuserdata(L, sizeof(T));
- new(mem) T(std::forward<Args>(args)...);
+ new(mem) T(forward<Args>(args)...);
+
+ // Look up the metatable named <class_name>, and set it on the new object.
+ luaL_getmetatable(L, class_name);
+ lua_setmetatable(L, -2);
+
+ return 1;
+}
+
+// Like wrap_lua_object, but the object is not owned by Lua; ie. it's not freed
+// by Lua GC. This is typically the case for Effects, which are owned by EffectChain
+// and expected to be destructed by it. The object will be of type T** instead of T*
+// when exposed to Lua.
+//
+// Note that we currently leak if you allocate an Effect in this way and never call
+// add_effect. We should see if there's a way to e.g. set __gc on it at construction time
+// and then release that once add_effect() takes ownership.
+template<class T, class... Args>
+int wrap_lua_object_nonowned(lua_State* L, const char *class_name, Args&&... args)
+{
+ // Construct the pointer ot the C++ object and put it on the stack.
+ T **obj = (T **)lua_newuserdata(L, sizeof(T *));
+ *obj = new T(forward<Args>(args)...);
// Look up the metatable named <class_name>, and set it on the new object.
luaL_getmetatable(L, class_name);
luaL_testudata(L, idx, "ResizeEffect") ||
luaL_testudata(L, idx, "MixEffect") ||
luaL_testudata(L, idx, "ImageInput")) {
- return (Effect *)lua_touserdata(L, idx);
+ return *(Effect **)lua_touserdata(L, idx);
}
luaL_error(L, "Error: Index #%d was not an Effect type\n", idx);
return nullptr;
return lua_toboolean(L, idx);
}
-std::string checkstdstring(lua_State *L, int index)
+string checkstdstring(lua_State *L, int index)
{
size_t len;
const char* cstr = lua_tolstring(L, index, &len);
- return std::string(cstr, len);
+ return string(cstr, len);
}
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_gc(lua_State* L)
+{
+ assert(lua_gettop(L) == 1);
+ EffectChain *chain = (EffectChain *)luaL_checkudata(L, 1, "EffectChain");
+ chain->~EffectChain();
+ return 0;
}
int EffectChain_add_live_input(lua_State* L)
int ImageInput_new(lua_State* L)
{
assert(lua_gettop(L) == 1);
- std::string filename = checkstdstring(L, 1);
- return wrap_lua_object<ImageInput>(L, "ImageInput", filename);
+ string filename = checkstdstring(L, 1);
+ return wrap_lua_object_nonowned<ImageInput>(L, "ImageInput", filename);
}
int WhiteBalanceEffect_new(lua_State* L)
{
assert(lua_gettop(L) == 0);
- return wrap_lua_object<WhiteBalanceEffect>(L, "WhiteBalanceEffect");
+ return wrap_lua_object_nonowned<WhiteBalanceEffect>(L, "WhiteBalanceEffect");
}
int ResampleEffect_new(lua_State* L)
{
assert(lua_gettop(L) == 0);
- return wrap_lua_object<ResampleEffect>(L, "ResampleEffect");
+ return wrap_lua_object_nonowned<ResampleEffect>(L, "ResampleEffect");
}
int PaddingEffect_new(lua_State* L)
{
assert(lua_gettop(L) == 0);
- return wrap_lua_object<PaddingEffect>(L, "PaddingEffect");
+ return wrap_lua_object
_nonowned<PaddingEffect>(L, "PaddingEffect");
}
int IntegralPaddingEffect_new(lua_State* L)
{
assert(lua_gettop(L) == 0);
- return wrap_lua_object<IntegralPaddingEffect>(L, "IntegralPaddingEffect");
+ return wrap_lua_object_nonowned<IntegralPaddingEffect>(L, "IntegralPaddingEffect");
}
int OverlayEffect_new(lua_State* L)
{
assert(lua_gettop(L) == 0);
- return wrap_lua_object<OverlayEffect>(L, "OverlayEffect");
+ return wrap_lua_object_nonowned<OverlayEffect>(L, "OverlayEffect");
}
int ResizeEffect_new(lua_State* L)
{
assert(lua_gettop(L) == 0);
- return wrap_lua_object<ResizeEffect>(L, "ResizeEffect");
+ return wrap_lua_object_nonowned<ResizeEffect>(L, "ResizeEffect");
}
int MixEffect_new(lua_State* L)
{
assert(lua_gettop(L) == 0);
- return wrap_lua_object<MixEffect>(L, "MixEffect");
+ return wrap_lua_object_nonowned<MixEffect>(L, "MixEffect");
}
int InputStateInfo_get_width(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);
Effect *effect = (Effect *)get_effect(L, 1);
- std::string key = checkstdstring(L, 2);
+ string key = checkstdstring(L, 2);
float value = luaL_checknumber(L, 3);
if (!effect->set_float(key, value)) {
luaL_error(L, "Effect refused set_float(\"%s\", %d) (invalid key?)", key.c_str(), int(value));
{
assert(lua_gettop(L) == 3);
Effect *effect = (Effect *)get_effect(L, 1);
- std::string key = checkstdstring(L, 2);
+ string key = checkstdstring(L, 2);
float value = luaL_checknumber(L, 3);
if (!effect->set_int(key, value)) {
luaL_error(L, "Effect refused set_int(\"%s\", %d) (invalid key?)", key.c_str(), int(value));
{
assert(lua_gettop(L) == 5);
Effect *effect = (Effect *)get_effect(L, 1);
- std::string key = checkstdstring(L, 2);
+ string key = checkstdstring(L, 2);
float v[3];
v[0] = luaL_checknumber(L, 3);
v[1] = luaL_checknumber(L, 4);
{
assert(lua_gettop(L) == 6);
Effect *effect = (Effect *)get_effect(L, 1);
- std::string key = checkstdstring(L, 2);
+ string key = checkstdstring(L, 2);
float v[4];
v[0] = luaL_checknumber(L, 3);
v[1] = luaL_checknumber(L, 4);
const luaL_Reg EffectChain_funcs[] = {
{ "new", EffectChain_new },
+ { "__gc", EffectChain_gc },
{ "add_live_input", EffectChain_add_live_input },
{ "add_effect", EffectChain_add_effect },
{ "finalize", EffectChain_finalize },
{ "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 }
};
assert(lua_gettop(L) == 0);
}
+Theme::~Theme()
+{
+ lua_close(L);
+}
+
void Theme::register_class(const char *class_name, const luaL_Reg *funcs)
{
assert(lua_gettop(L) == 0);
return chain;
}
-std::string Theme::get_channel_name(unsigned channel)
+string Theme::get_channel_name(unsigned channel)
{
unique_lock<mutex> lock(m);
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);
}
- std::string ret = lua_tostring(L, -1);
+ string ret = lua_tostring(L, -1);
lua_pop(L, 1);
assert(lua_gettop(L) == 0);
return ret;
assert(lua_gettop(L) == 0);
}
-std::vector<std::string> Theme::get_transition_names(float t)
+vector<string> Theme::get_transition_names(float t)
{
unique_lock<mutex> lock(m);
lua_getglobal(L, "get_transitions");
exit(1);
}
- std::vector<std::string> ret;
+ vector<string> ret;
lua_pushnil(L);
while (lua_next(L, -2) != 0) {
ret.push_back(lua_tostring(L, -1));
projects / nageru / blobdiff