If doing preview or queue with the in or out column marked, reuse the current one.

[nageru] / jpeg_frame_view.h

diff --git a/jpeg_frame_view.h b/jpeg_frame_view.h
index 5ef68d01cb56d50ef7b1677455e2a7fc75fad4a0..8b2c93c8d5dbe245b19c4d80d38f108e2247e1c6 100644 (file)
--- a/jpeg_frame_view.h
+++ b/jpeg_frame_view.h
@@ -58,18 +58,21 @@ protected:
 
 private:
        // The stream index of the latest frame we displayed.
-       unsigned current_stream_idx;
+       unsigned current_stream_idx = 0;
 
        std::unique_ptr<movit::EffectChain> chain;
        std::shared_ptr<Frame> current_frame;  // So that we hold on to the pixels.
        movit::YCbCrInput *ycbcr_input;
        movit::YCbCrFormat ycbcr_format;
 
-       static constexpr int overlay_width = 16, overlay_height = 16;
+       static constexpr int overlay_base_width = 16, overlay_base_height = 16;
+       int overlay_width = overlay_base_width, overlay_height = overlay_base_height;
        std::unique_ptr<QImage> overlay_image;  // If nullptr, no overlay.
        std::unique_ptr<movit::EffectChain> overlay_chain;  // Just to get the overlay on screen in the easiest way possible.
        movit::FlatInput *overlay_input;
        bool overlay_input_needs_refresh = false;
+
+       int gl_width, gl_height;
 };
 
 #endif  // !defined(_JPEG_FRAME_VIEW_H)