Move the handling of human-readable input resolution printing into C++; every theme...

[nageru] / nageru / theme.cpp

diff --git a/nageru/theme.cpp b/nageru/theme.cpp
index d31a4b948f42384c3d554d6a8069ab54b0e5b5d6..8050003b2025459651d20a99dea5f4d120347da3 100644 (file)
--- a/nageru/theme.cpp
+++ b/nageru/theme.cpp
@@ -700,6 +700,69 @@ int InputStateInfo_get_last_subtitle(lua_State* L)
        return 1;
 }
 
+namespace {
+
+// Helper function to write e.g. “60” or “59.94”.
+string format_frame_rate(int nom, int den)
+{
+       char buf[256];
+       if (nom % den == 0) {
+               snprintf(buf, sizeof(buf), "%d", nom / den);
+       } else {
+               snprintf(buf, sizeof(buf), "%.2f", double(nom) / den);
+       }
+       return buf;
+}
+
+// Helper function to write e.g. “720p60”.
+string get_human_readable_resolution(const InputStateInfo *input_state_info, int signal_num)
+{
+       char buf[256];
+       if (input_state_info->last_interlaced[signal_num]) {
+               snprintf(buf, sizeof(buf), "%di", input_state_info->last_height[signal_num] * 2);
+
+               // Show field rate instead of frame rate; really for cosmetics only
+               // (and actually contrary to EBU recommendations, although in line
+               // with typical user expectations).
+               return buf + format_frame_rate(input_state_info->last_frame_rate_nom[signal_num] * 2,
+                       input_state_info->last_frame_rate_den[signal_num]);
+       } else {
+               snprintf(buf, sizeof(buf), "%dp", input_state_info->last_height[signal_num]);
+               return buf + format_frame_rate(input_state_info->last_frame_rate_nom[signal_num],
+                       input_state_info->last_frame_rate_den[signal_num]);
+       }
+}
+
+} // namespace
+
+int InputStateInfo_get_human_readable_resolution(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));
+
+       string str;
+       if (!input_state_info->last_is_connected[signal_num]) {
+               str = "disconnected";
+       } else if (input_state_info->last_height[signal_num]) {
+               str = "no signal";
+       } else if (!input_state_info->last_has_signal[signal_num]) {
+               if (input_state_info->last_height[signal_num]) {
+                       // Special mode for the USB3 cards.
+                       str = "no signal";
+               } else {
+                       str = get_human_readable_resolution(input_state_info, signal_num) + ", no signal";
+               }
+       } else {
+               str = get_human_readable_resolution(input_state_info, signal_num);
+       }
+
+       lua_pushstring(L, str.c_str());
+       return 1;
+}
+
+
 int EffectBlueprint_set_int(lua_State *L)
 {
        assert(lua_gettop(L) == 3);
@@ -921,6 +984,7 @@ const luaL_Reg InputStateInfo_funcs[] = {
        { "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 },
+       { "get_human_readable_resolution", InputStateInfo_get_human_readable_resolution },
        { NULL, NULL }
 };
 
@@ -1266,6 +1330,7 @@ Theme::Theme(const string &filename, const vector<string> &search_dirs, Resource
 
 Theme::~Theme()
 {
+       theme_menu.reset();
        lua_close(L);
 }
 
@@ -1597,25 +1662,73 @@ void Theme::channel_clicked(int preview_num)
        assert(lua_gettop(L) == 0);
 }
 
-int Theme::set_theme_menu(lua_State *L)
+template <class T>
+void destroy(T &ref)
 {
-       for (const Theme::MenuEntry &entry : theme_menu) {
-               luaL_unref(L, LUA_REGISTRYINDEX, entry.lua_ref);
+       ref.~T();
+}
+
+Theme::MenuEntry::~MenuEntry()
+{
+       if (is_submenu) {
+               luaL_unref(entry.L, LUA_REGISTRYINDEX, entry.lua_ref);
+       } else {
+               destroy(submenu);
        }
-       theme_menu.clear();
+}
 
-       int num_elements = lua_gettop(L);
-       for (int i = 1; i <= num_elements; ++i) {
-               lua_rawgeti(L, i, 1);
-               const string text = checkstdstring(L, -1);
-               lua_pop(L, 1);
+namespace {
 
-               lua_rawgeti(L, i, 2);
+vector<unique_ptr<Theme::MenuEntry>> create_recursive_theme_menu(lua_State *L);
+
+unique_ptr<Theme::MenuEntry> create_theme_menu_entry(lua_State *L, int index)
+{
+       unique_ptr<Theme::MenuEntry> entry;
+
+       lua_rawgeti(L, index, 1);
+       const string text = checkstdstring(L, -1);
+       lua_pop(L, 1);
+
+       lua_rawgeti(L, index, 2);
+       if (lua_istable(L, -1)) {
+               vector<unique_ptr<Theme::MenuEntry>> submenu = create_recursive_theme_menu(L);
+               entry.reset(new Theme::MenuEntry{ text, move(submenu) });
+               lua_pop(L, 1);
+       } else {
                luaL_checktype(L, -1, LUA_TFUNCTION);
                int ref = luaL_ref(L, LUA_REGISTRYINDEX);
+               entry.reset(new Theme::MenuEntry{ text, L, ref });
+       }
+       return entry;
+}
 
-               theme_menu.push_back(MenuEntry{ text, ref });
+vector<unique_ptr<Theme::MenuEntry>> create_recursive_theme_menu(lua_State *L)
+{
+       vector<unique_ptr<Theme::MenuEntry>> menu;
+       size_t num_elements = lua_objlen(L, -1);
+       for (size_t i = 1; i <= num_elements; ++i) {
+               lua_rawgeti(L, -1, i);
+               menu.emplace_back(create_theme_menu_entry(L, -1));
+               lua_pop(L, 1);
        }
+       return menu;
+}
+
+}  // namespace
+
+int Theme::set_theme_menu(lua_State *L)
+{
+       theme_menu.reset();
+
+       vector<unique_ptr<MenuEntry>> root_menu;
+       int num_elements = lua_gettop(L);
+       for (int i = 1; i <= num_elements; ++i) {
+               root_menu.emplace_back(create_theme_menu_entry(L, i));
+       }
+       fprintf(stderr, "now creating a new one\n");
+       theme_menu.reset(new MenuEntry("", move(root_menu)));
+       fprintf(stderr, "DONE reset\n");
+
        lua_pop(L, num_elements);
        assert(lua_gettop(L) == 0);