Use the new texture bounce override instead of relying on a patched Movit.

[nageru] / theme.h

diff --git a/theme.h b/theme.h
index f58681d080666dfe8fb3861512dc44b4de9bdd68..80b01badf3f1a1c0b0a38f37e15f9270f4ee84d8 100644 (file)
--- a/theme.h
+++ b/theme.h
@@ -12,6 +12,17 @@
 #include <movit/effect_chain.h>
 #include <movit/ycbcr_input.h>
 
+class NonBouncingYCbCrInput : public movit::YCbCrInput {
+public:
+       NonBouncingYCbCrInput(const movit::ImageFormat &image_format,
+                             const movit::YCbCrFormat &ycbcr_format,
+                             unsigned width, unsigned height,
+                             movit::YCbCrInputSplitting ycbcr_input_splitting = movit::YCBCR_INPUT_PLANAR)
+           : movit::YCbCrInput(image_format, ycbcr_format, width, height, ycbcr_input_splitting) {}
+
+       bool override_disable_bounce() const override { return true; }
+};
+
 class Theme {
 public:
        Theme(const char *filename, movit::ResourcePool *resource_pool);
@@ -24,9 +35,13 @@ public:
                input_textures[signal_num].tex_y = tex_y;
                input_textures[signal_num].tex_cbcr = tex_cbcr;
        }
+       int get_num_channels() { return num_channels; }
+
+       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);
 
 private:
        std::mutex m;
@@ -35,23 +50,14 @@ private:
        struct {
                GLuint tex_y = 0, tex_cbcr = 0;
        } input_textures[16];  // FIXME
+       int num_channels;
 };
 
 class LiveInputWrapper {
 public:
-       LiveInputWrapper(Theme *theme, movit::EffectChain *chain);
+       LiveInputWrapper(Theme *theme, movit::EffectChain *chain, bool override_bounce);
 
        void connect_signal(int signal_num);
-#if 0
-       {
-               connected_signal_num = signal_num;
-       }
-
-       int get_connected_signal_num() const {
-               return connected_signal_num;
-       }
-#endif
-
        movit::YCbCrInput *get_input() const
        {
                return input;