X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Ftheme.cpp;h=ead38fa819e877fceee43ec32cf4aa52a183dc92;hb=d5c507ae2f61367df3bd4b538d119b6aa3794af9;hp=c926dd4591a63180f36c77d3a45afb17cc39b407;hpb=503db38359dad57d06121988943634e3eddc6b54;p=nageru diff --git a/nageru/theme.cpp b/nageru/theme.cpp index c926dd4..ead38fa 100644 --- a/nageru/theme.cpp +++ b/nageru/theme.cpp @@ -72,6 +72,8 @@ struct InputStateInfo { unsigned last_width[MAX_VIDEO_CARDS], last_height[MAX_VIDEO_CARDS]; bool last_interlaced[MAX_VIDEO_CARDS], last_has_signal[MAX_VIDEO_CARDS], last_is_connected[MAX_VIDEO_CARDS]; unsigned last_frame_rate_nom[MAX_VIDEO_CARDS], last_frame_rate_den[MAX_VIDEO_CARDS]; + bool has_last_subtitle[MAX_VIDEO_CARDS]; + std::string last_subtitle[MAX_VIDEO_CARDS]; }; InputStateInfo::InputStateInfo(const InputState &input_state) @@ -93,6 +95,8 @@ InputStateInfo::InputStateInfo(const InputState &input_state) last_is_connected[signal_num] = userdata->last_is_connected; last_frame_rate_nom[signal_num] = userdata->last_frame_rate_nom; last_frame_rate_den[signal_num] = userdata->last_frame_rate_den; + has_last_subtitle[signal_num] = userdata->has_last_subtitle; + last_subtitle[signal_num] = userdata->last_subtitle; } } @@ -100,7 +104,7 @@ class LuaRefWithDeleter { public: LuaRefWithDeleter(mutex *m, lua_State *L, int ref) : m(m), L(L), ref(ref) {} ~LuaRefWithDeleter() { - unique_lock lock(*m); + lock_guard lock(*m); luaL_unref(L, LUA_REGISTRYINDEX, ref); } int get() const { return ref; } @@ -634,6 +638,20 @@ int InputStateInfo_get_frame_rate_den(lua_State* L) return 1; } +int InputStateInfo_get_last_subtitle(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)); + if (!input_state_info->has_last_subtitle[signal_num]) { + lua_pushnil(L); + } else { + lua_pushstring(L, input_state_info->last_subtitle[signal_num].c_str()); + } + return 1; +} + int Effect_set_float(lua_State *L) { assert(lua_gettop(L) == 3); @@ -829,6 +847,7 @@ const luaL_Reg InputStateInfo_funcs[] = { { "get_is_connected", InputStateInfo_get_is_connected }, { "get_frame_rate_nom", InputStateInfo_get_frame_rate_nom }, { "get_frame_rate_den", InputStateInfo_get_frame_rate_den }, + { "get_last_subtitle", InputStateInfo_get_last_subtitle }, { NULL, NULL } }; @@ -1217,11 +1236,11 @@ void Theme::register_class(const char *class_name, const luaL_Reg *funcs) assert(lua_gettop(L) == 0); } -Theme::Chain Theme::get_chain(unsigned num, float t, unsigned width, unsigned height, InputState input_state) +Theme::Chain Theme::get_chain(unsigned num, float t, unsigned width, unsigned height, const InputState &input_state) { Chain chain; - unique_lock lock(m); + lock_guard lock(m); assert(lua_gettop(L) == 0); lua_getglobal(L, "get_chain"); /* function to be called */ lua_pushnumber(L, num); @@ -1252,7 +1271,7 @@ Theme::Chain Theme::get_chain(unsigned num, float t, unsigned width, unsigned he assert(lua_gettop(L) == 0); chain.setup_chain = [this, funcref, input_state, effect_chain]{ - unique_lock lock(m); + lock_guard lock(m); assert(this->input_state == nullptr); this->input_state = &input_state; @@ -1297,7 +1316,7 @@ Theme::Chain Theme::get_chain(unsigned num, float t, unsigned width, unsigned he string Theme::get_channel_name(unsigned channel) { - unique_lock lock(m); + lock_guard lock(m); lua_getglobal(L, "channel_name"); lua_pushnumber(L, channel); if (lua_pcall(L, 1, 1, 0) != 0) { @@ -1318,7 +1337,7 @@ string Theme::get_channel_name(unsigned channel) int Theme::get_channel_signal(unsigned channel) { - unique_lock lock(m); + lock_guard lock(m); lua_getglobal(L, "channel_signal"); lua_pushnumber(L, channel); if (lua_pcall(L, 1, 1, 0) != 0) { @@ -1334,7 +1353,7 @@ int Theme::get_channel_signal(unsigned channel) std::string Theme::get_channel_color(unsigned channel) { - unique_lock lock(m); + lock_guard lock(m); lua_getglobal(L, "channel_color"); lua_pushnumber(L, channel); if (lua_pcall(L, 1, 1, 0) != 0) { @@ -1356,7 +1375,7 @@ std::string Theme::get_channel_color(unsigned channel) bool Theme::get_supports_set_wb(unsigned channel) { - unique_lock lock(m); + lock_guard lock(m); lua_getglobal(L, "supports_set_wb"); lua_pushnumber(L, channel); if (lua_pcall(L, 1, 1, 0) != 0) { @@ -1372,7 +1391,7 @@ bool Theme::get_supports_set_wb(unsigned channel) void Theme::set_wb(unsigned channel, double r, double g, double b) { - unique_lock lock(m); + lock_guard lock(m); lua_getglobal(L, "set_wb"); lua_pushnumber(L, channel); lua_pushnumber(L, r); @@ -1388,7 +1407,7 @@ void Theme::set_wb(unsigned channel, double r, double g, double b) vector Theme::get_transition_names(float t) { - unique_lock lock(m); + lock_guard lock(m); lua_getglobal(L, "get_transitions"); lua_pushnumber(L, t); if (lua_pcall(L, 1, 1, 0) != 0) { @@ -1414,7 +1433,7 @@ int Theme::map_signal(int signal_num) return -1 - signal_num; } - unique_lock lock(map_m); + lock_guard lock(map_m); if (signal_to_card_mapping.count(signal_num)) { return signal_to_card_mapping[signal_num]; } @@ -1444,14 +1463,14 @@ int Theme::map_signal(int signal_num) void Theme::set_signal_mapping(int signal_num, int card_num) { - unique_lock lock(map_m); + lock_guard 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) { - unique_lock lock(m); + lock_guard lock(m); lua_getglobal(L, "transition_clicked"); lua_pushnumber(L, transition_num); lua_pushnumber(L, t); @@ -1465,7 +1484,7 @@ void Theme::transition_clicked(int transition_num, float t) void Theme::channel_clicked(int preview_num) { - unique_lock lock(m); + lock_guard lock(m); lua_getglobal(L, "channel_clicked"); lua_pushnumber(L, preview_num); @@ -1507,7 +1526,7 @@ int Theme::set_theme_menu(lua_State *L) void Theme::theme_menu_entry_clicked(int lua_ref) { - unique_lock lock(m); + lock_guard lock(m); lua_rawgeti(L, LUA_REGISTRYINDEX, lua_ref); if (lua_pcall(L, 0, 0, 0) != 0) { fprintf(stderr, "error running menu callback: %s\n", lua_tostring(L, -1));