From f866db055d6d01d1e9358a6e63eac43f48fd35c5 Mon Sep 17 00:00:00 2001 From: Jared Bruni Date: Sat, 4 Sep 2021 15:56:47 -0700 Subject: [PATCH] use copy of draw_strings --- src/playback_thread.cpp | 9 +++++---- src/playback_thread.h | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/playback_thread.cpp b/src/playback_thread.cpp index 0b5a34c..5416be3 100644 --- a/src/playback_thread.cpp +++ b/src/playback_thread.cpp @@ -25,6 +25,7 @@ Playback::Playback(QObject *parent) : QThread(parent) { _custom_cycle = false; _custom_cycle_index = 0; fps_delay = 60; + draw_strings = ac::draw_strings; } void Playback::setCustomCycle(bool b) { @@ -326,15 +327,15 @@ void Playback::drawFilter(cv::Mat &frame, FilterValue &f) { if(f.index == 0) { if(single_mode == true && - ac::draw_strings[f.filter].find("SubFilter") != std::string::npos) + draw_strings[f.filter].find("SubFilter") != std::string::npos) return; - if(single_mode == false && ac::draw_strings[f.filter].find("SubFilter") != std::string::npos && f.subfilter == -1) + if(single_mode == false && draw_strings[f.filter].find("SubFilter") != std::string::npos && f.subfilter == -1) return; - if(ac::getMaxAllocated() < 1080 && ac::draw_strings[f.filter].find("Intertwine") != std::string::npos) + if(ac::getMaxAllocated() < 1080 && draw_strings[f.filter].find("Intertwine") != std::string::npos) return; - if(ac::getMaxAllocated() < 1080 && ac::draw_strings[f.filter].find("inOrder") != std::string::npos) + if(ac::getMaxAllocated() < 1080 && draw_strings[f.filter].find("inOrder") != std::string::npos) return; ac::setSubFilter(f.subfilter); diff --git a/src/playback_thread.h b/src/playback_thread.h index a2b25c3..7712f32 100644 --- a/src/playback_thread.h +++ b/src/playback_thread.h @@ -52,6 +52,7 @@ private: std::atomic _custom_cycle; std::atomic _custom_cycle_index; std::atomic fps_delay; + std::vector draw_strings; public: Playback(QObject *parent = 0); ~Playback();