Fix a crash when trying to load/save files and CEF is active.

[nageru] / theme.h

diff --git a/theme.h b/theme.h
index f7897c77f9bf6b16ae3e5927af9b4c212ae21cc4..bbef35ef350d1513afc92aa8216836b13b36b937 100644 (file)
--- a/theme.h
+++ b/theme.h
@@ -9,6 +9,7 @@
 #include <map>
 #include <mutex>
 #include <string>
+#include <unordered_map>
 #include <vector>
 
 #include "bmusb/bmusb.h"
@@ -82,31 +83,38 @@ public:
        }
 #endif
 
-       void register_video_signal_connection(LiveInputWrapper *live_input, FFmpegCapture *capture)
+       void register_video_signal_connection(movit::EffectChain *chain, LiveInputWrapper *live_input, FFmpegCapture *capture)
        {
-               video_signal_connections.emplace_back(live_input, capture);
-       }
-
-       std::vector<std::pair<LiveInputWrapper *, FFmpegCapture *>> get_video_signal_connections() const
-       {
-               return video_signal_connections;
+               video_signal_connections[chain].emplace_back(VideoSignalConnection { live_input, capture });
        }
 
 #ifdef HAVE_CEF
-       void register_html_signal_connection(LiveInputWrapper *live_input, CEFCapture *capture)
+       void register_html_signal_connection(movit::EffectChain *chain, LiveInputWrapper *live_input, CEFCapture *capture)
        {
-               html_signal_connections.emplace_back(live_input, capture);
+               html_signal_connections[chain].emplace_back(CEFSignalConnection { live_input, capture });
        }
+#endif
+
+       struct MenuEntry {
+               std::string text;
+               int lua_ref;
+       };
+       std::vector<MenuEntry> get_theme_menu() { return theme_menu; }  // Can be empty for no menu.
+       void theme_menu_entry_clicked(int lua_ref);
 
-       std::vector<std::pair<LiveInputWrapper *, CEFCapture *>> get_html_signal_connections() const
+       // Will be invoked every time the theme sets a new menu.
+       // Is not invoked for a menu that exists at the time of the callback.
+       void set_theme_menu_callback(std::function<void()> callback)
        {
-               return html_signal_connections;
+               theme_menu_callback = callback;
        }
-#endif
 
 private:
        void register_constants();
        void register_class(const char *class_name, const luaL_Reg *funcs);
+       int set_theme_menu(lua_State *L);
+
+       std::string theme_path;
 
        std::mutex m;
        lua_State *L;  // Protected by <m>.
@@ -119,13 +127,27 @@ private:
        std::map<int, int> signal_to_card_mapping;  // Protected by <map_m>.
 
        std::vector<FFmpegCapture *> video_inputs;
-       std::vector<std::pair<LiveInputWrapper *, FFmpegCapture *>> video_signal_connections;
+       struct VideoSignalConnection {
+               LiveInputWrapper *wrapper;
+               FFmpegCapture *source;
+       };
+       std::unordered_map<movit::EffectChain *, std::vector<VideoSignalConnection>>
+                video_signal_connections;
 #ifdef HAVE_CEF
        std::vector<CEFCapture *> html_inputs;
-       std::vector<std::pair<LiveInputWrapper *, CEFCapture *>> html_signal_connections;
+       struct CEFSignalConnection {
+               LiveInputWrapper *wrapper;
+               CEFCapture *source;
+       };
+       std::unordered_map<movit::EffectChain *, std::vector<CEFSignalConnection>>
+               html_signal_connections;
 #endif
 
+       std::vector<MenuEntry> theme_menu;
+       std::function<void()> theme_menu_callback;
+
        friend class LiveInputWrapper;
+       friend int ThemeMenu_set(lua_State *L);
 };
 
 // LiveInputWrapper is a facade on top of an YCbCrInput, exposed to