diff --git a/src/main_window.cpp b/src/main_window.cpp index 7ed2481..2cab9a4 100644 --- a/src/main_window.cpp +++ b/src/main_window.cpp @@ -1501,6 +1501,8 @@ void AC_MainWindow::setFade() { playback->setFadeFilter(fc); } +std::mutex mutex_lock_; + void AC_MainWindow::frameInc() { frame_index++; QString frame_string; diff --git a/src/playback_thread.cpp b/src/playback_thread.cpp index 8b99d2a..459f31a 100644 --- a/src/playback_thread.cpp +++ b/src/playback_thread.cpp @@ -70,7 +70,11 @@ bool Playback::setVideoCamera(std::string name, int type, int device, int res, c device_num = device; mutex.lock(); //#if defined(__linux__) || defined(__APPLE__) +#ifdef _WIN32 + capture.open(cv::CAP_DSHOW+device); +#else capture.open(device); +#endif if(!capture.isOpened()) { mutex.unlock(); return false;