]> git.sesse.net Git - nageru/blobdiff - nageru/theme.cpp
Fix HTTP tally for the last two channels.
[nageru] / nageru / theme.cpp
index d28f5b2501030b0911b342a4124b95b1538e98c2..ed99e5f346e9c8eb54b1c9670f4709f0c0dbe093 100644 (file)
@@ -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<mutex> lock(*m);
+               lock_guard<mutex> lock(*m);
                luaL_unref(L, LUA_REGISTRYINDEX, ref);
        }
        int get() const { return ref; }
@@ -451,7 +455,7 @@ int HTMLInput_new(lua_State* L)
 #else
        fprintf(stderr, "This version of Nageru has been compiled without CEF support.\n");
        fprintf(stderr, "HTMLInput is not available.\n");
-       exit(1);
+       abort();
 #endif
 }
 
@@ -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 }
 };
 
@@ -1060,7 +1079,7 @@ int call_num_channels(lua_State *L)
 
        if (lua_pcall(L, 0, 1, 0) != 0) {
                fprintf(stderr, "error running function `num_channels': %s\n", lua_tostring(L, -1));
-               exit(1);
+               abort();
        }
 
        int num_channels = luaL_checknumber(L, 1);
@@ -1123,7 +1142,7 @@ Theme::Theme(const string &filename, const vector<string> &search_dirs, Resource
                for (const string &error : errors) {
                        fprintf(stderr, "%s\n", error.c_str());
                }
-               exit(1);
+               abort();
        }
        assert(lua_gettop(L) == 0);
 
@@ -1164,7 +1183,7 @@ Theme::Theme(const string &filename, const vector<string> &search_dirs, Resource
        luaL_unref(L, LUA_REGISTRYINDEX, theme_code_ref);
        if (lua_pcall(L, 0, 0, 0)) {
                fprintf(stderr, "Error when running %s: %s\n", path.c_str(), lua_tostring(L, -1));
-               exit(1);
+               abort();
        }
        assert(lua_gettop(L) == 0);
 
@@ -1221,7 +1240,7 @@ Theme::Chain Theme::get_chain(unsigned num, float t, unsigned width, unsigned he
 {
        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);
@@ -1232,19 +1251,19 @@ Theme::Chain Theme::get_chain(unsigned num, float t, unsigned width, unsigned he
 
        if (lua_pcall(L, 5, 2, 0) != 0) {
                fprintf(stderr, "error running function `get_chain': %s\n", lua_tostring(L, -1));
-               exit(1);
+               abort();
        }
 
        EffectChain *effect_chain = (EffectChain *)luaL_testudata(L, -2, "EffectChain");
        if (effect_chain == nullptr) {
                fprintf(stderr, "get_chain() for chain number %d did not return an EffectChain\n",
                        num);
-               exit(1);
+               abort();
        }
        chain.chain = effect_chain;
        if (!lua_isfunction(L, -1)) {
                fprintf(stderr, "Argument #-1 should be a function\n");
-               exit(1);
+               abort();
        }
        lua_pushvalue(L, -1);
        shared_ptr<LuaRefWithDeleter> funcref(new LuaRefWithDeleter(&m, L, luaL_ref(L, LUA_REGISTRYINDEX)));
@@ -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<mutex> lock(m);
+               lock_guard<mutex> lock(m);
 
                assert(this->input_state == nullptr);
                this->input_state = &input_state;
@@ -1261,7 +1280,7 @@ Theme::Chain Theme::get_chain(unsigned num, float t, unsigned width, unsigned he
                lua_rawgeti(L, LUA_REGISTRYINDEX, funcref->get());
                if (lua_pcall(L, 0, 0, 0) != 0) {
                        fprintf(stderr, "error running chain setup callback: %s\n", lua_tostring(L, -1));
-                       exit(1);
+                       abort();
        }
                assert(lua_gettop(L) == 0);
 
@@ -1297,17 +1316,17 @@ Theme::Chain Theme::get_chain(unsigned num, float t, unsigned width, unsigned he
 
 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) {
                fprintf(stderr, "error running function `channel_name': %s\n", lua_tostring(L, -1));
-               exit(1);
+               abort();
        }
        const char *ret = lua_tostring(L, -1);
        if (ret == nullptr) {
                fprintf(stderr, "function `channel_name' returned nil for channel %d\n", channel);
-               exit(1);
+               abort();
        }
 
        string retstr = ret;
@@ -1318,12 +1337,12 @@ string Theme::get_channel_name(unsigned channel)
 
 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) {
                fprintf(stderr, "error running function `channel_signal': %s\n", lua_tostring(L, -1));
-               exit(1);
+               abort();
        }
 
        int ret = luaL_checknumber(L, 1);
@@ -1334,18 +1353,18 @@ int Theme::get_channel_signal(unsigned channel)
 
 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) {
                fprintf(stderr, "error running function `channel_color': %s\n", lua_tostring(L, -1));
-               exit(1);
+               abort();
        }
 
        const char *ret = lua_tostring(L, -1);
        if (ret == nullptr) {
                fprintf(stderr, "function `channel_color' returned nil for channel %d\n", channel);
-               exit(1);
+               abort();
        }
 
        string retstr = ret;
@@ -1356,12 +1375,12 @@ std::string Theme::get_channel_color(unsigned channel)
 
 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) {
                fprintf(stderr, "error running function `supports_set_wb': %s\n", lua_tostring(L, -1));
-               exit(1);
+               abort();
        }
 
        bool ret = checkbool(L, -1);
@@ -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<mutex> lock(m);
+       lock_guard<mutex> lock(m);
        lua_getglobal(L, "set_wb");
        lua_pushnumber(L, channel);
        lua_pushnumber(L, r);
@@ -1380,7 +1399,7 @@ void Theme::set_wb(unsigned channel, double r, double g, double b)
        lua_pushnumber(L, b);
        if (lua_pcall(L, 4, 0, 0) != 0) {
                fprintf(stderr, "error running function `set_wb': %s\n", lua_tostring(L, -1));
-               exit(1);
+               abort();
        }
 
        assert(lua_gettop(L) == 0);
@@ -1388,12 +1407,12 @@ void Theme::set_wb(unsigned channel, double r, double g, double b)
 
 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) {
                fprintf(stderr, "error running function `get_transitions': %s\n", lua_tostring(L, -1));
-               exit(1);
+               abort();
        }
 
        vector<string> ret;
@@ -1414,7 +1433,7 @@ int Theme::map_signal(int signal_num)
                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];
        }
@@ -1444,34 +1463,34 @@ int Theme::map_signal(int 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);
 
        if (lua_pcall(L, 2, 0, 0) != 0) {
                fprintf(stderr, "error running function `transition_clicked': %s\n", lua_tostring(L, -1));
-               exit(1);
+               abort();
        }
        assert(lua_gettop(L) == 0);
 }
 
 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);
 
        if (lua_pcall(L, 1, 0, 0) != 0) {
                fprintf(stderr, "error running function `channel_clicked': %s\n", lua_tostring(L, -1));
-               exit(1);
+               abort();
        }
        assert(lua_gettop(L) == 0);
 }
@@ -1507,10 +1526,10 @@ int Theme::set_theme_menu(lua_State *L)
 
 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));
-               exit(1);
+               abort();
        }
 }