X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=theme.cpp;h=aefc081e97847d9349079fcc502d1e9161f1cd90;hb=f006b5b162841dbc764fb620025b87a3272ac79a;hp=c832d29bcf9a19af4e1269690b355cd876ad6e53;hpb=c996b8ab73e27736a1807a3cc6df329c9fc46d4c;p=nageru diff --git a/theme.cpp b/theme.cpp index c832d29..aefc081 100644 --- a/theme.cpp +++ b/theme.cpp @@ -2,8 +2,7 @@ #include #include -#include -#include +#include #include #include #include @@ -45,7 +44,8 @@ struct InputStateInfo { InputStateInfo(const InputState& input_state); unsigned last_width[MAX_CARDS], last_height[MAX_CARDS]; - bool last_interlaced[MAX_CARDS]; + bool last_interlaced[MAX_CARDS], last_has_signal[MAX_CARDS]; + unsigned last_frame_rate_nom[MAX_CARDS], last_frame_rate_den[MAX_CARDS]; }; InputStateInfo::InputStateInfo(const InputState &input_state) @@ -55,12 +55,16 @@ InputStateInfo::InputStateInfo(const InputState &input_state) if (frame.frame == nullptr) { last_width[signal_num] = last_height[signal_num] = 0; last_interlaced[signal_num] = false; + last_has_signal[signal_num] = false; continue; } const PBOFrameAllocator::Userdata *userdata = (const PBOFrameAllocator::Userdata *)frame.frame->userdata; 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_has_signal[signal_num] = userdata->last_has_signal; + last_frame_rate_nom[signal_num] = userdata->last_frame_rate_nom; + last_frame_rate_den[signal_num] = userdata->last_frame_rate_den; } } @@ -86,7 +90,29 @@ int wrap_lua_object(lua_State* L, const char *class_name, Args&&... args) { // Construct the C++ object and put it on the stack. void *mem = lua_newuserdata(L, sizeof(T)); - new(mem) T(std::forward(args)...); + new(mem) T(forward(args)...); + + // Look up the metatable named , 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 +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)...); // Look up the metatable named , and set it on the new object. luaL_getmetatable(L, class_name); @@ -111,7 +137,7 @@ Effect *get_effect(lua_State *L, int idx) 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; @@ -132,11 +158,11 @@ bool checkbool(lua_State* L, int idx) 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) @@ -149,6 +175,14 @@ int EffectChain_new(lua_State* L) return wrap_lua_object(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) { assert(lua_gettop(L) == 3); @@ -251,50 +285,50 @@ int LiveInputWrapper_connect_signal(lua_State* L) int ImageInput_new(lua_State* L) { assert(lua_gettop(L) == 1); - std::string filename = checkstdstring(L, 1); - return wrap_lua_object(L, "ImageInput", filename); + string filename = checkstdstring(L, 1); + return wrap_lua_object_nonowned(L, "ImageInput", filename); } int WhiteBalanceEffect_new(lua_State* L) { assert(lua_gettop(L) == 0); - return wrap_lua_object(L, "WhiteBalanceEffect"); + return wrap_lua_object_nonowned(L, "WhiteBalanceEffect"); } int ResampleEffect_new(lua_State* L) { assert(lua_gettop(L) == 0); - return wrap_lua_object(L, "ResampleEffect"); + return wrap_lua_object_nonowned(L, "ResampleEffect"); } int PaddingEffect_new(lua_State* L) { assert(lua_gettop(L) == 0); - return wrap_lua_object(L, "PaddingEffect"); + return wrap_lua_object_nonowned(L, "PaddingEffect"); } int IntegralPaddingEffect_new(lua_State* L) { assert(lua_gettop(L) == 0); - return wrap_lua_object(L, "IntegralPaddingEffect"); + return wrap_lua_object_nonowned(L, "IntegralPaddingEffect"); } int OverlayEffect_new(lua_State* L) { assert(lua_gettop(L) == 0); - return wrap_lua_object(L, "OverlayEffect"); + return wrap_lua_object_nonowned(L, "OverlayEffect"); } int ResizeEffect_new(lua_State* L) { assert(lua_gettop(L) == 0); - return wrap_lua_object(L, "ResizeEffect"); + return wrap_lua_object_nonowned(L, "ResizeEffect"); } int MixEffect_new(lua_State* L) { assert(lua_gettop(L) == 0); - return wrap_lua_object(L, "MixEffect"); + return wrap_lua_object_nonowned(L, "MixEffect"); } int InputStateInfo_get_width(lua_State* L) @@ -327,11 +361,41 @@ int InputStateInfo_get_interlaced(lua_State* L) return 1; } +int InputStateInfo_get_has_signal(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_pushboolean(L, input_state_info->last_has_signal[signal_num]); + 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)); @@ -343,7 +407,7 @@ int Effect_set_int(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_int(key, value)) { luaL_error(L, "Effect refused set_int(\"%s\", %d) (invalid key?)", key.c_str(), int(value)); @@ -355,7 +419,7 @@ int Effect_set_vec3(lua_State *L) { 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); @@ -371,7 +435,7 @@ int Effect_set_vec4(lua_State *L) { 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); @@ -386,6 +450,7 @@ int Effect_set_vec4(lua_State *L) 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 }, @@ -473,6 +538,9 @@ const luaL_Reg InputStateInfo_funcs[] = { { "get_width", InputStateInfo_get_width }, { "get_height", InputStateInfo_get_height }, { "get_interlaced", InputStateInfo_get_interlaced }, + { "get_has_signal", InputStateInfo_get_has_signal }, + { "get_frame_rate_nom", InputStateInfo_get_frame_rate_nom }, + { "get_frame_rate_den", InputStateInfo_get_frame_rate_den }, { NULL, NULL } }; @@ -590,6 +658,25 @@ void LiveInputWrapper::connect_signal(int signal_num) } } +namespace { + +int call_num_channels(lua_State *L) +{ + lua_getglobal(L, "num_channels"); + + if (lua_pcall(L, 0, 1, 0) != 0) { + fprintf(stderr, "error running function `num_channels': %s\n", lua_tostring(L, -1)); + exit(1); + } + + int num_channels = luaL_checknumber(L, 1); + lua_pop(L, 1); + assert(lua_gettop(L) == 0); + return num_channels; +} + +} // namespace + Theme::Theme(const char *filename, ResourcePool *resource_pool, unsigned num_cards) : resource_pool(resource_pool), num_cards(num_cards) { @@ -618,16 +705,12 @@ Theme::Theme(const char *filename, ResourcePool *resource_pool, unsigned num_car assert(lua_gettop(L) == 0); // Ask it for the number of channels. - lua_getglobal(L, "num_channels"); - - if (lua_pcall(L, 0, 1, 0) != 0) { - fprintf(stderr, "error running function `num_channels': %s\n", lua_tostring(L, -1)); - exit(1); - } + num_channels = call_num_channels(L); +} - num_channels = luaL_checknumber(L, 1); - lua_pop(L, 1); - assert(lua_gettop(L) == 0); +Theme::~Theme() +{ + lua_close(L); } void Theme::register_class(const char *class_name, const luaL_Reg *funcs) @@ -695,17 +778,49 @@ Theme::Chain Theme::get_chain(unsigned num, float t, unsigned width, unsigned he return chain; } -std::string Theme::get_channel_name(unsigned channel) +string Theme::get_channel_name(unsigned channel) { unique_lock 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; +} + +int Theme::get_channel_signal(unsigned channel) +{ + unique_lock lock(m); + lua_getglobal(L, "channel_signal"); + lua_pushnumber(L, channel); + if (lua_pcall(L, 1, 1, 0) != 0) { + fprintf(stderr, "error running function `channel_signal': %s\n", lua_tostring(L, -1)); + exit(1); + } + + int ret = luaL_checknumber(L, 1); + lua_pop(L, 1); + assert(lua_gettop(L) == 0); + return ret; +} + +std::string Theme::get_channel_color(unsigned channel) +{ + unique_lock lock(m); + lua_getglobal(L, "channel_color"); + lua_pushnumber(L, channel); + if (lua_pcall(L, 1, 1, 0) != 0) { + fprintf(stderr, "error running function `channel_color': %s\n", lua_tostring(L, -1)); + exit(1); + } + + std::string ret = checkstdstring(L, -1); lua_pop(L, 1); assert(lua_gettop(L) == 0); return ret; @@ -743,7 +858,7 @@ void Theme::set_wb(unsigned channel, double r, double g, double b) assert(lua_gettop(L) == 0); } -std::vector Theme::get_transition_names(float t) +vector Theme::get_transition_names(float t) { unique_lock lock(m); lua_getglobal(L, "get_transitions"); @@ -753,7 +868,7 @@ std::vector Theme::get_transition_names(float t) exit(1); } - std::vector ret; + vector ret; lua_pushnil(L); while (lua_next(L, -2) != 0) { ret.push_back(lua_tostring(L, -1)); @@ -766,14 +881,23 @@ std::vector Theme::get_transition_names(float t) int Theme::map_signal(int signal_num) { + unique_lock lock(map_m); + if (signal_to_card_mapping.count(signal_num)) { + return signal_to_card_mapping[signal_num]; + } if (signal_num >= int(num_cards)) { - if (signals_warned_about.insert(signal_num).second) { - fprintf(stderr, "WARNING: Theme asked for input %d, but we only have %u card(s).\n", signal_num, num_cards); - fprintf(stderr, "Mapping to card %d instead.\n", signal_num % num_cards); - } - signal_num %= num_cards; + fprintf(stderr, "WARNING: Theme asked for input %d, but we only have %u card(s).\n", signal_num, num_cards); + fprintf(stderr, "Mapping to card %d instead.\n", signal_num % num_cards); } - return signal_num; + signal_to_card_mapping[signal_num] = signal_num % num_cards; + return signal_num % num_cards; +} + +void Theme::set_signal_mapping(int signal_num, int card_num) +{ + unique_lock lock(map_m); + assert(card_num < int(num_cards)); + signal_to_card_mapping[signal_num] = card_num; } void Theme::transition_clicked(int transition_num, float t)