Fix a threading issue, where we would call into the Qt thread from the video thread.

[pkanalytics] / video_widget.cpp

diff --git a/video_widget.cpp b/video_widget.cpp
index 0a7ff43eb7b2f4f77637e2553b9717e73e3653da..126e874aa53b1591e6b53d984a26cfd63a25ad1e 100644 (file)
--- a/video_widget.cpp
+++ b/video_widget.cpp
@@ -30,6 +30,8 @@ extern "C" {
 #include <vector>
 #include <unordered_set>
 
+#include "post_to_main_thread.h"
+
 #include <QOpenGLFunctions>
 #include <QWheelEvent>
 #include <QMouseEvent>
@@ -497,7 +499,11 @@ void VideoWidget::wheelEvent(QWheelEvent *event)
 
 void VideoWidget::mousePressEvent(QMouseEvent *e)
 {
-       if (e->button() == Qt::LeftButton) {
+       if (e->button() == Qt::BackButton) {
+               emit mouse_back_clicked();
+       } else if (e->button() == Qt::ForwardButton) {
+               emit mouse_forward_clicked();
+       } else if (e->button() == Qt::LeftButton) {
                dragging = true;
                last_drag_x = e->position().x();
                last_drag_y = e->position().y();
@@ -942,7 +948,9 @@ void VideoWidget::store_pts(int64_t pts)
 {
        last_pts = pts;
        last_position = lrint(pts * double(video_timebase.num) / double(video_timebase.den) * 1000);
-       emit position_changed(last_position);
+       post_to_main_thread([this, last_position{last_position.load()}] {
+               emit position_changed(last_position);
+       });
 }
 
 // Taken from Movit (see the comment there for explanation)