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)
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;
}
}
public:
LuaRefWithDeleter(mutex *m, lua_State *L, int ref) : m(m), L(L), ref(ref) {}
~LuaRefWithDeleter() {
- unique_lock<mutex> lock(*m);
+ lock_guard<mutex> lock(*m);
luaL_unref(L, LUA_REGISTRYINDEX, ref);
}
int get() const { return ref; }
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);
{ "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 }
};
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<mutex> lock(m);
+ lock_guard<mutex> lock(m);
assert(lua_gettop(L) == 0);
lua_getglobal(L, "get_chain"); /* function to be called */
lua_pushnumber(L, num);
assert(lua_gettop(L) == 0);
chain.setup_chain = [this, funcref, input_state, effect_chain]{
- unique_lock<mutex> lock(m);
+ lock_guard<mutex> lock(m);
assert(this->input_state == nullptr);
this->input_state = &input_state;
string Theme::get_channel_name(unsigned channel)
{
- unique_lock<mutex> lock(m);
+ lock_guard<mutex> lock(m);
lua_getglobal(L, "channel_name");
lua_pushnumber(L, channel);
if (lua_pcall(L, 1, 1, 0) != 0) {
int Theme::get_channel_signal(unsigned channel)
{
- unique_lock<mutex> lock(m);
+ lock_guard<mutex> lock(m);
lua_getglobal(L, "channel_signal");
lua_pushnumber(L, channel);
if (lua_pcall(L, 1, 1, 0) != 0) {
std::string Theme::get_channel_color(unsigned channel)
{
- unique_lock<mutex> lock(m);
+ lock_guard<mutex> lock(m);
lua_getglobal(L, "channel_color");
lua_pushnumber(L, channel);
if (lua_pcall(L, 1, 1, 0) != 0) {
bool Theme::get_supports_set_wb(unsigned channel)
{
- unique_lock<mutex> lock(m);
+ lock_guard<mutex> lock(m);
lua_getglobal(L, "supports_set_wb");
lua_pushnumber(L, channel);
if (lua_pcall(L, 1, 1, 0) != 0) {
void Theme::set_wb(unsigned channel, double r, double g, double b)
{
- unique_lock<mutex> lock(m);
+ lock_guard<mutex> lock(m);
lua_getglobal(L, "set_wb");
lua_pushnumber(L, channel);
lua_pushnumber(L, r);
vector<string> Theme::get_transition_names(float t)
{
- unique_lock<mutex> lock(m);
+ lock_guard<mutex> lock(m);
lua_getglobal(L, "get_transitions");
lua_pushnumber(L, t);
if (lua_pcall(L, 1, 1, 0) != 0) {
return -1 - signal_num;
}
- unique_lock<mutex> lock(map_m);
+ lock_guard<mutex> lock(map_m);
if (signal_to_card_mapping.count(signal_num)) {
return signal_to_card_mapping[signal_num];
}
void Theme::set_signal_mapping(int signal_num, int card_num)
{
- unique_lock<mutex> lock(map_m);
+ lock_guard<mutex> 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<mutex> lock(m);
+ lock_guard<mutex> lock(m);
lua_getglobal(L, "transition_clicked");
lua_pushnumber(L, transition_num);
lua_pushnumber(L, t);
void Theme::channel_clicked(int preview_num)
{
- unique_lock<mutex> lock(m);
+ lock_guard<mutex> lock(m);
lua_getglobal(L, "channel_clicked");
lua_pushnumber(L, preview_num);
void Theme::theme_menu_entry_clicked(int lua_ref)
{
- unique_lock<mutex> lock(m);
+ lock_guard<mutex> 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));