Enable the video grid display for simple video mode, too.

[nageru] / theme.h

diff --git a/theme.h b/theme.h
index 51107d6a5e088e3f6806c3785b6d1d8e1fdad85a..e1c3ed1baa0baa0820705a6c4428ea8d95d9c2d0 100644 (file)
--- a/theme.h
+++ b/theme.h
@@ -34,7 +34,8 @@ public:
                movit::EffectChain *chain;
                std::function<void()> setup_chain;
 
-               // May have duplicates.
+               // FRAME_HISTORY frames for each input, in order. Will contain duplicates
+               // for non-interlaced inputs.
                std::vector<RefCountedFrame> input_frames;
        };
 
@@ -78,11 +79,12 @@ public:
        }
 
 private:
+       void register_constants();
        void register_class(const char *class_name, const luaL_Reg *funcs);
 
        std::mutex m;
        lua_State *L;  // Protected by <m>.
-       const InputState *input_state;  // Protected by <m>. Only set temporarily, during chain setup.
+       const InputState *input_state = nullptr;  // Protected by <m>. Only set temporarily, during chain setup.
        movit::ResourcePool *resource_pool;
        int num_channels;
        unsigned num_cards;
@@ -106,8 +108,8 @@ public:
        // Note: <override_bounce> is irrelevant for PixelFormat_8BitBGRA.
        LiveInputWrapper(Theme *theme, movit::EffectChain *chain, bmusb::PixelFormat pixel_format, bool override_bounce, bool deinterlace);
 
-       void connect_signal(int signal_num);
-       void connect_signal_raw(int signal_num);
+       void connect_signal(int signal_num);  // Must be called with the theme's <m> lock held, since it accesses theme->input_state.
+       void connect_signal_raw(int signal_num, const InputState &input_state);
        movit::Effect *get_effect() const
        {
                if (deinterlace) {
@@ -122,6 +124,7 @@ public:
 private:
        Theme *theme;  // Not owned by us.
        bmusb::PixelFormat pixel_format;
+       movit::YCbCrFormat input_ycbcr_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.