Add support for RGBA frame types.

[nageru] / theme.h

diff --git a/theme.h b/theme.h
index 20d736738a89d94718c9344e624bdc253e4b3db6..2a8b9d68b12afc44910a7d03059e44fe97a6b4f7 100644 (file)
--- a/theme.h
+++ b/theme.h
@@ -1,25 +1,24 @@
 #ifndef _THEME_H
 #define _THEME_H 1
 
-#include <epoxy/gl.h>
 #include <lua.hpp>
-#include <movit/effect_chain.h>
-#include <movit/deinterlace_effect.h>
+#include <movit/flat_input.h>
 #include <movit/ycbcr_input.h>
 #include <stdbool.h>
-#include <stdio.h>
 #include <functional>
+#include <map>
 #include <mutex>
-#include <set>
 #include <string>
-#include <utility>
 #include <vector>
 
-#include "defs.h"
-#include "input_state.h"
+#include "bmusb/bmusb.h"
 #include "ref_counted_frame.h"
 
+struct InputState;
+
 namespace movit {
+class Effect;
+class EffectChain;
 class ResourcePool;
 struct ImageFormat;
 struct YCbCrFormat;
@@ -38,7 +37,7 @@ public:
 
 class Theme {
 public:
-       Theme(const char *filename, movit::ResourcePool *resource_pool, unsigned num_cards);
+       Theme(const std::string &filename, const std::vector<std::string> &search_dirs, movit::ResourcePool *resource_pool, unsigned num_cards);
        ~Theme();
 
        struct Chain {
@@ -58,10 +57,10 @@ public:
        int get_channel_signal(unsigned channel);
        bool get_supports_set_wb(unsigned channel);
        void set_wb(unsigned channel, double r, double g, double b);
+       std::string get_channel_color(unsigned channel);
 
        std::vector<std::string> get_transition_names(float t);
 
-       void connect_signal(movit::YCbCrInput *input, int signal_num);
        void transition_clicked(int transition_num, float t);
        void channel_clicked(int preview_num);
 
@@ -83,23 +82,33 @@ private:
        friend class LiveInputWrapper;
 };
 
+// LiveInputWrapper is a facade on top of an YCbCrInput, exposed to
+// the Lua code. It contains a function (connect_signal()) intended
+// to be called during chain setup, that picks out the current frame
+// (in the form of a set of textures) from the input state given by
+// the mixer, and communicates that state over to the actual YCbCrInput.
 class LiveInputWrapper {
 public:
-       LiveInputWrapper(Theme *theme, movit::EffectChain *chain, bool override_bounce, bool deinterlace);
+       // Note: <override_bounce> is irrelevant for PixelFormat_8BitRGBA.
+       LiveInputWrapper(Theme *theme, movit::EffectChain *chain, bmusb::PixelFormat pixel_format, bool override_bounce, bool deinterlace);
 
        void connect_signal(int signal_num);
        movit::Effect *get_effect() const
        {
                if (deinterlace) {
                        return deinterlace_effect;
+               } else if (pixel_format == bmusb::PixelFormat_8BitRGBA) {
+                       return rgba_inputs[0];
                } else {
-                       return inputs[0];
+                       return ycbcr_inputs[0];
                }
        }
 
 private:
        Theme *theme;  // Not owned by us.
-       std::vector<movit::YCbCrInput *> inputs;  // Multiple ones if deinterlacing. Owned by the chain.
+       bmusb::PixelFormat pixel_format;
+       std::vector<movit::YCbCrInput *> ycbcr_inputs;  // Multiple ones if deinterlacing. Owned by the chain.
+       std::vector<movit::FlatInput *> rgba_inputs;  // Multiple ones if deinterlacing. Owned by the chain.
        movit::Effect *deinterlace_effect = nullptr;  // Owned by the chain.
        bool deinterlace;
 };