Hook over OverlayEffect, and make add_effect() take a variable number of parameters.

[nageru] / mixer.h

diff --git a/mixer.h b/mixer.h
index 96613f99b2a3d6a0684559e30ce4c8ee244ff891..b4eaad9b0d2a1338d9c099fe5302edeb6f2c4e48 100644 (file)
--- a/mixer.h
+++ b/mixer.h
@@ -32,12 +32,7 @@ public:
        void start();
        void quit();
 
-       enum Source {
-               SOURCE_INPUT1,
-               SOURCE_INPUT2,
-               SOURCE_SBS,
-       };
-       void cut(Source source);
+       void transition_clicked(int transition_num, float t);
 
        enum Output {
                OUTPUT_LIVE = 0,
@@ -92,21 +87,12 @@ private:
        std::unique_ptr<movit::ResourcePool> resource_pool;
        std::unique_ptr<Theme> theme;
        std::unique_ptr<movit::EffectChain> display_chain;
-       std::unique_ptr<movit::EffectChain> preview0_chain;
-       std::unique_ptr<movit::EffectChain> preview1_chain;
        GLuint cbcr_program_num;  // Owned by <resource_pool>.
        std::unique_ptr<H264Encoder> h264_encoder;
 
        // Effects part of <display_chain>. Owned by <display_chain>.
        movit::FlatInput *display_input;
 
-       // Effects part of <preview0_chain>. Owned by <preview0_chain>.
-       movit::YCbCrInput *preview0_input;
-
-       // Effects part of <preview1_chain>. Owned by <preview1_chain>.
-       movit::YCbCrInput *preview1_input;
-
-       Source current_source = SOURCE_INPUT1;
        int frame = 0;
 
        std::mutex bmusb_mutex;