Small refactoring in JPEGFrameView.

diff --git a/jpeg_frame_view.cpp b/jpeg_frame_view.cpp
index 8e22f629541903fc2b2d20d1399aa18c33ec57fd..88a88dc5edacd555b6cbc87a3b173eaf99b7b837 100644 (file)
--- a/jpeg_frame_view.cpp
+++ b/jpeg_frame_view.cpp
@@ -226,8 +226,10 @@ JPEGFrameView::JPEGFrameView(QWidget *parent)
        : QGLWidget(parent, global_share_widget) {
 }
 
-void JPEGFrameView::update_frame()
+void JPEGFrameView::setFrame(unsigned stream_idx, int64_t pts)
 {
+       current_stream_idx = stream_idx;
+
        unique_lock<mutex> lock(cache_mu);
        pending_decodes.emplace_back(JPEGID{ stream_idx, pts }, this);
        any_pending_decodes.notify_all();

diff --git a/jpeg_frame_view.h b/jpeg_frame_view.h
index 2f31c1b1d88206150935b2d02a147be61ed98f68..567da2dd99c70b83021ecf4c6282debbaabc2c31 100644 (file)
--- a/jpeg_frame_view.h
+++ b/jpeg_frame_view.h
@@ -36,16 +36,11 @@ 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);
 
        void mousePressEvent(QMouseEvent *event) override;
 
-       unsigned get_stream_idx() const { return stream_idx; }
+       unsigned get_stream_idx() const { return current_stream_idx; }
 
        void setDecodedFrame(std::shared_ptr<Frame> frame);
 
@@ -58,10 +53,8 @@ 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.