Fix the wording of a warning.

[nageru] / nageru / theme.h

diff --git a/nageru/theme.h b/nageru/theme.h
index 2fac7963346a2f3034041bd9ed089c8e24650d59..37113b2b954d88a607087ca8e691df1aa082a8fd 100644 (file)
--- a/nageru/theme.h
+++ b/nageru/theme.h
@@ -149,12 +149,15 @@ public:
 #endif
 
        struct MenuEntry {
-               MenuEntry(const std::string &text, lua_State *L, int lua_ref)
-                       : text(text), is_submenu(false), entry{L, lua_ref} {}
+               MenuEntry(const std::string &text, lua_State *L, int lua_ref, unsigned flags)
+                       : text(text), is_submenu(false), entry{L, lua_ref, flags} {}
                MenuEntry(const std::string &text, std::vector<std::unique_ptr<MenuEntry>> submenu)
                        : text(text), is_submenu(true), submenu(std::move(submenu)) {}
                ~MenuEntry();
 
+               static constexpr unsigned CHECKABLE = 1;
+               static constexpr unsigned CHECKED = 2;
+
                std::string text;
                bool is_submenu;
 
@@ -163,6 +166,7 @@ public:
                        struct {
                                lua_State *L;
                                int lua_ref;
+                               unsigned flags;
                        } entry;
 
                        // is_submenu = true.
@@ -179,8 +183,10 @@ public:
                theme_menu_callback = callback;
        }
 
+       std::string format_status_line(const std::string &disk_space_left_text, double file_length_seconds);
+
 private:
-       void register_constants();
+       void register_globals();
        void register_class(const char *class_name, const luaL_Reg *funcs, EffectType effect_type = NO_EFFECT_TYPE);
        int set_theme_menu(lua_State *L);
        Chain get_chain_from_effect_chain(movit::EffectChain *effect_chain, unsigned num, const InputState &input_state);
@@ -191,8 +197,9 @@ private:
        lua_State *L;  // Protected by <m>.
        const InputState *input_state = nullptr;  // Protected by <m>. Only set temporarily, during chain setup.
        movit::ResourcePool *resource_pool;
-       int num_channels;
+       int num_channels = -1;
        unsigned num_cards;
+       bool startup_finished = false;
 
        std::mutex map_m;
        std::map<int, int> signal_to_card_mapping;  // Protected by <map_m>.
@@ -217,9 +224,17 @@ private:
        std::unique_ptr<MenuEntry> theme_menu;
        std::function<void()> theme_menu_callback;
 
+       std::map<unsigned, std::string> channel_names;  // Set using Nageru.set_channel_name(). Protected by <m>.
+       std::map<unsigned, int> channel_signals;  // Set using Nageru.set_channel_signal(). Protected by <m>.
+       std::map<unsigned, bool> channel_supports_wb;  // Set using Nageru.set_supports_wb(). Protected by <m>.
+
        friend class LiveInputWrapper;
        friend class Scene;
        friend int ThemeMenu_set(lua_State *L);
+       friend int Nageru_set_channel_name(lua_State *L);
+       friend int Nageru_set_num_channels(lua_State *L);
+       friend int Nageru_set_channel_signal(lua_State *L);
+       friend int Nageru_set_supports_wb(lua_State *L);
 };
 
 // LiveInputWrapper is a facade on top of an YCbCrInput, exposed to