From 4b23b78b04068be2af6725a7b32a72dbb20192e5 Mon Sep 17 00:00:00 2001 From: lostjared Date: Tue, 28 Aug 2018 10:00:39 -0700 Subject: [PATCH] changed setFrameIndex to public, unlocked mutex --- src/playback_thread.cpp | 4 +++- src/playback_thread.h | 2 +- src/qtheaders.h | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/playback_thread.cpp b/src/playback_thread.cpp index 47a9db7..1f721d9 100644 --- a/src/playback_thread.cpp +++ b/src/playback_thread.cpp @@ -206,8 +206,8 @@ void Playback::run() { mutex.lock(); if(!capture.read(frame)) { if(repeat_video && mode == MODE_VIDEO) { - setFrameIndex(0); mutex.unlock(); + setFrameIndex(0); emit resetIndex(); continue; } @@ -293,7 +293,9 @@ Playback::~Playback() { } void Playback::setFrameIndex(const long &index) { + mutex.lock(); capture.set(CV_CAP_PROP_POS_FRAMES, index); + mutex.unlock(); } void Playback::enableRepeat(bool re) { diff --git a/src/playback_thread.h b/src/playback_thread.h index 923713c..ecf207f 100644 --- a/src/playback_thread.h +++ b/src/playback_thread.h @@ -39,10 +39,10 @@ private: double alpha; bool flip_frame1, flip_frame2; bool repeat_video; - void setFrameIndex(const long &index); public: Playback(QObject *parent = 0); ~Playback(); + void setFrameIndex(const long &index); void setRGB(int r, int g, int b); void setColorOptions(int b, int g, int s); void setColorMap(int c); diff --git a/src/qtheaders.h b/src/qtheaders.h index 1786390..2596105 100644 --- a/src/qtheaders.h +++ b/src/qtheaders.h @@ -6,7 +6,7 @@ #ifndef _QT_HEADERS__ #define _QT_HEADERS__ -#define ac_version "v1.17.3" +#define ac_version "v1.18.0" #include #include #include