Make it possible to set channel names imperatively instead of using a callback.

[nageru] / nageru / theme.h

diff --git a/nageru/theme.h b/nageru/theme.h
index 2fac7963346a2f3034041bd9ed089c8e24650d59..794542525e9e84f60f65679b63cab8d6ae85b469 100644 (file)
--- a/nageru/theme.h
+++ b/nageru/theme.h
@@ -180,7 +180,7 @@ public:
        }
 
 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);
@@ -217,9 +217,12 @@ private:
        std::unique_ptr<MenuEntry> theme_menu;
        std::function<void()> theme_menu_callback;
 
+       std::map<unsigned, std::string> channel_names;  // Set using Nageru.set_theme(). 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);
 };
 
 // LiveInputWrapper is a facade on top of an YCbCrInput, exposed to