Initial implementation of moving the theming logic to Lua. Still lots to do.

[nageru] / mixer.h

diff --git a/mixer.h b/mixer.h
index 03aab6d3f785d86e520f4aca5478c55c97450639..96613f99b2a3d6a0684559e30ce4c8ee244ff891 100644 (file)
--- a/mixer.h
+++ b/mixer.h
@@ -14,6 +14,7 @@
 #include "pbo_frame_allocator.h"
 #include "ref_counted_frame.h"
 #include "ref_counted_gl_sync.h"
+#include "theme.h"
 
 #define NUM_CARDS 2
 
@@ -89,18 +90,13 @@ private:
 
        QSurface *mixer_surface, *h264_encoder_surface;
        std::unique_ptr<movit::ResourcePool> resource_pool;
-       std::unique_ptr<movit::EffectChain> chain;
+       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 <chain>. Owned by <chain>.
-       movit::YCbCrInput *input[NUM_CARDS];
-       movit::Effect *resample_effect, *resample2_effect;
-       movit::Effect *padding_effect, *padding2_effect;
-
        // Effects part of <display_chain>. Owned by <display_chain>.
        movit::FlatInput *display_input;