Redo get_width/get_height to not work on a LiveInputWrapper, since we do not really...

[nageru] / theme.h

diff --git a/theme.h b/theme.h
index b17dbbd00de85764d866a02f22db8562636855b3..b60df1490190059fb0a0900ed543aab6fa0b7266 100644 (file)
--- a/theme.h
+++ b/theme.h
@@ -1,18 +1,29 @@
 #ifndef _THEME_H
 #define _THEME_H 1
 
-#include <stdio.h>
-#include <lua.h>
+#include <epoxy/gl.h>
 #include <lauxlib.h>
-
+#include <lua.h>
+#include <movit/effect_chain.h>
+#include <movit/ycbcr_input.h>
+#include <stdbool.h>
+#include <stdio.h>
 #include <functional>
 #include <mutex>
+#include <set>
+#include <string>
 #include <utility>
+#include <vector>
 
-#include <movit/effect_chain.h>
-#include <movit/ycbcr_input.h>
+#include "defs.h"
+#include "input_state.h"
+#include "ref_counted_frame.h"
 
-#define MAX_CARDS 16
+namespace movit {
+class ResourcePool;
+struct ImageFormat;
+struct YCbCrFormat;
+}  // namespace movit
 
 class NonBouncingYCbCrInput : public movit::YCbCrInput {
 public:
@@ -29,14 +40,21 @@ class Theme {
 public:
        Theme(const char *filename, movit::ResourcePool *resource_pool, unsigned num_cards);
 
-       std::pair<movit::EffectChain *, std::function<void()>>
-       get_chain(unsigned num, float t, unsigned width, unsigned height);
+       struct Chain {
+               movit::EffectChain *chain;
+               std::function<void()> setup_chain;
 
-       void set_input_textures(int signal_num, GLuint tex_y, GLuint tex_cbcr) {
-               input_textures[signal_num].tex_y = tex_y;
-               input_textures[signal_num].tex_cbcr = tex_cbcr;
-       }
-       int get_num_channels() { return num_channels; }
+               // May have duplicates.
+               std::vector<RefCountedFrame> input_frames;
+       };
+
+       Chain get_chain(unsigned num, float t, unsigned width, unsigned height, InputState input_state);
+
+       int get_num_channels() const { return num_channels; }
+       int map_signal(int signal_num);
+       std::string get_channel_name(unsigned channel);
+       bool get_supports_set_wb(unsigned channel);
+       void set_wb(unsigned channel, double r, double g, double b);
 
        std::vector<std::string> get_transition_names(float t);
 
@@ -48,13 +66,14 @@ private:
        void register_class(const char *class_name, const luaL_Reg *funcs);
 
        std::mutex m;
-       lua_State *L;
+       lua_State *L;  // Protected by <m>.
+       const InputState *input_state;  // Protected by <m>. Only set temporarily, during chain setup.
        movit::ResourcePool *resource_pool;
-       struct {
-               GLuint tex_y = 0, tex_cbcr = 0;
-       } input_textures[MAX_CARDS];
        int num_channels;
        unsigned num_cards;
+       std::set<int> signals_warned_about;
+
+       friend class LiveInputWrapper;
 };
 
 class LiveInputWrapper {
@@ -70,7 +89,6 @@ public:
 private:
        Theme *theme;  // Not owned by us.
        movit::YCbCrInput *input;  // Owned by the chain.
-       int connected_signal_num = 0;
 };
 
 #endif  // !defined(_THEME_H)