Support the delete key to remove elements from the playlist.

[nageru] / jpeg_frame_view.h

diff --git a/jpeg_frame_view.h b/jpeg_frame_view.h
index 5d97b074b5d706164ce33542053d86448a97fac4..5ef68d01cb56d50ef7b1677455e2a7fc75fad4a0 100644 (file)
--- a/jpeg_frame_view.h
+++ b/jpeg_frame_view.h
@@ -7,6 +7,7 @@
 #include <stdint.h>
 
 #include <movit/effect_chain.h>
+#include <movit/flat_input.h>
 #include <movit/ycbcr_input.h>
 
 #include <memory>
@@ -14,6 +15,7 @@
 struct JPEGID {
        unsigned stream_idx;
        int64_t pts;
+       bool interpolated;
 };
 struct Frame {
        std::unique_ptr<uint8_t[]> y, cb, cr;
@@ -36,16 +38,18 @@ class JPEGFrameView : public QGLWidget {
 public:
        JPEGFrameView(QWidget *parent);
 
-       void setFrame(unsigned stream_idx, int64_t pts)
-       {
-               this->stream_idx = stream_idx;
-               this->pts = pts;
-               update_frame();
-       }
+       void setFrame(unsigned stream_idx, int64_t pts, bool interpolated);
+       static void insert_interpolated_frame(unsigned stream_idx, int64_t pts, std::shared_ptr<Frame> frame);
 
-       unsigned get_stream_idx() const { return stream_idx; }
+       void mousePressEvent(QMouseEvent *event) override;
+
+       unsigned get_stream_idx() const { return current_stream_idx; }
 
        void setDecodedFrame(std::shared_ptr<Frame> frame);
+       void set_overlay(const std::string &text);  // Blank for none.
+
+signals:
+       void clicked();
 
 protected:
        void initializeGL() override;
@@ -53,15 +57,19 @@ protected:
        void paintGL() override;
 
 private:
-       void update_frame();
-
-       unsigned stream_idx;
-       int64_t pts;
+       // The stream index of the latest frame we displayed.
+       unsigned current_stream_idx;
 
        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;
+       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;
 };
 
 #endif  // !defined(_JPEG_FRAME_VIEW_H)