From eba66a69bae1aa5c34d39a06761058857a97e01b Mon Sep 17 00:00:00 2001 From: Jared Bruni Date: Fri, 17 Sep 2021 04:30:57 -0700 Subject: [PATCH] updated --- src/image_window.cpp | 4 +--- src/playback_thread.cpp | 11 +++++++++++ src/playback_thread.h | 1 + 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/image_window.cpp b/src/image_window.cpp index 590dec1..c49c5fb 100644 --- a/src/image_window.cpp +++ b/src/image_window.cpp @@ -166,8 +166,6 @@ void ImageWindow::video_Set() { } void ImageWindow::video_Clr() { - if(ac::v_cap.isOpened()) { - ac::v_cap.release(); + if(playback->VideoRelease()) lbl_video->setText("Video closed.."); - } } diff --git a/src/playback_thread.cpp b/src/playback_thread.cpp index f9533ec..817f339 100644 --- a/src/playback_thread.cpp +++ b/src/playback_thread.cpp @@ -29,6 +29,17 @@ Playback::Playback(QObject *parent) : QThread(parent) { filter_map_ex = filter_map; } +bool Playback::VideoRelease() { + bool ret = false; + mutex.lock(); + if(ac::v_cap.isOpened()) { + ac::v_cap.release(); + ret = true; + } + mutex.unlock(); + return ret; +} + void Playback::setCustomCycle(bool b) { _custom_cycle = b; _custom_cycle_index = 0; diff --git a/src/playback_thread.h b/src/playback_thread.h index cf68f55..c921fea 100644 --- a/src/playback_thread.h +++ b/src/playback_thread.h @@ -74,6 +74,7 @@ public: void Play(); void Stop(); void Release(); + bool VideoRelease(); void SetFlip(bool f1, bool f2); void setVideo(cv::VideoCapture cap, cv::VideoWriter writer, bool record, bool record_png); bool setVideoCamera(std::string name, int type, int device, int res, cv::VideoWriter writer, bool record);