X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Ftheme.h;h=794542525e9e84f60f65679b63cab8d6ae85b469;hb=b7398dd7960ddf07f03b9a9ebc669d29141c09d0;hp=1bed9929681fd11a3649b83d14b4de2d78125836;hpb=ca090e45b28fed464008086fbe3db19437c115dd;p=nageru

diff --git a/nageru/theme.h b/nageru/theme.h
index 1bed992..7945425 100644
--- a/nageru/theme.h
+++ b/nageru/theme.h
@@ -149,10 +149,27 @@ 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, std::vector<std::unique_ptr<MenuEntry>> submenu)
+			: text(text), is_submenu(true), submenu(std::move(submenu)) {}
+		~MenuEntry();
+
 		std::string text;
-		int lua_ref;
+		bool is_submenu;
+
+		union {
+			// is_submenu = false.
+			struct {
+				lua_State *L;
+				int lua_ref;
+			} entry;
+
+			// is_submenu = true.
+			std::vector<std::unique_ptr<MenuEntry>> submenu;
+		};
 	};
-	std::vector<MenuEntry> get_theme_menu() { return theme_menu; }  // Can be empty for no menu.
+	MenuEntry *get_theme_menu() { return theme_menu.get(); }  // Can be empty for no menu.
 	void theme_menu_entry_clicked(int lua_ref);
 
 	// Will be invoked every time the theme sets a new menu.
@@ -163,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);
@@ -197,12 +214,15 @@ private:
 		html_signal_connections;
 #endif
 
-	std::vector<MenuEntry> theme_menu;
+	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