Fix a Clang 19 warning.

[nageru] / nageru / theme.h

diff --git a/nageru/theme.h b/nageru/theme.h
index 8a0a92af7361d1cb50de5a1e9ee9f802f48c172c..2c6021e4e103be0fddbebeb4145c24ddca37f3b4 100644 (file)
--- a/nageru/theme.h
+++ b/nageru/theme.h
@@ -5,23 +5,26 @@
 #include <movit/effect.h>
 #include <movit/flat_input.h>
 #include <movit/ycbcr_input.h>
-#include <stdbool.h>
+#include <array>
 #include <functional>
 #include <map>
+#include <memory>
 #include <mutex>
 #include <string>
 #include <unordered_map>
+#include <utility>
 #include <vector>
 
 #include "bmusb/bmusb.h"
-#include "defs.h"
 #include "ref_counted_frame.h"
+#include "shared/shared_defs.h"
 #include "tweaked_inputs.h"
 
 class Scene;
 class CEFCapture;
 class FFmpegCapture;
 class LiveInputWrapper;
+class QSurface;
 struct InputState;
 
 namespace movit {
@@ -87,7 +90,7 @@ struct InputStateInfo {
 
 class Theme {
 public:
-       Theme(const std::string &filename, const std::vector<std::string> &search_dirs, movit::ResourcePool *resource_pool);
+       Theme(const std::string &filename, const std::vector<std::string> &search_dirs, movit::ResourcePool *resource_pool, QSurface *surface);
        ~Theme();
 
        struct Chain {
@@ -242,6 +245,11 @@ private:
        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>.
 
+       // Used to construct OpenGL contexts for VideoInputs. Needs to be available
+       // during the entire lifetime of Theme, since they may be created basically
+       // at any time.
+       const QSurface *surface;
+
        friend class LiveInputWrapper;
        friend class Scene;
        friend int ThemeMenu_set(lua_State *L);
@@ -249,6 +257,7 @@ private:
        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);
+       friend int VideoInput_new(lua_State* L);
 };
 
 // LiveInputWrapper is a facade on top of an YCbCrInput, exposed to