diff --git a/src/main_window.cpp b/src/main_window.cpp index 54feabd..a0f6097 100644 --- a/src/main_window.cpp +++ b/src/main_window.cpp @@ -186,7 +186,7 @@ AC_MainWindow::AC_MainWindow(QWidget *parent) : QMainWindow(parent) { } -const char *ex[] = { "MovementTrails", "Zoom", "AcidShuffleMedian", "MatrixColorBlur", "AlphaBlendArrayExpand", "Zoom", "ImageXorSmooth", "SketchFilter", "SlideSub", "Histogram", "Desktop","MultiVideo","Solo", "Bars", "BilateralFilter", "BilateralFilterFade", "BoxFilter", "CurrentDesktopRect", "HorizontalTrailsInter", "IntertwineAlpha", "IntertwineAlphaBlend", "IntertwineVideo640", "RandomAlphaBlendFilter", "RandomOrigFrame", "RectangleGlitch", "SquareSwap64x32", "VideoColorMap", 0}; +const char *ex[] = { "Zoom", "AcidShuffleMedian", "MatrixColorBlur", "AlphaBlendArrayExpand", "Zoom", "ImageXorSmooth", "SketchFilter", "SlideSub", "Histogram", "Desktop","MultiVideo","Solo", "Bars", "BilateralFilter", "BilateralFilterFade", "BoxFilter", "CurrentDesktopRect", "HorizontalTrailsInter", "IntertwineAlpha", "IntertwineAlphaBlend", "IntertwineVideo640", "RandomAlphaBlendFilter", "RandomOrigFrame", "RectangleGlitch", "SquareSwap64x32", "VideoColorMap", 0}; bool AC_MainWindow::checkAdd(QString str) { std::string val = str.toStdString(); @@ -647,8 +647,7 @@ void AC_MainWindow::clear_subfilter() { } void AC_MainWindow::clear_img() { - blend_set = false; - blend_image.release(); + playback->clearImage(); Log(tr("Cleared Image\n")); } diff --git a/src/playback_thread.cpp b/src/playback_thread.cpp index 817f339..26da3e7 100644 --- a/src/playback_thread.cpp +++ b/src/playback_thread.cpp @@ -253,6 +253,13 @@ void Playback::reset_filters() { mutex.unlock(); } +void Playback::clearImage() { + mutex.lock(); + blend_set = false; + blend_image.release(); + mutex.unlock(); +} + void Playback::SetFlip(bool f1, bool f2) { flip_frame1 = f1; flip_frame2 = f2; diff --git a/src/playback_thread.h b/src/playback_thread.h index c921fea..53e8f29 100644 --- a/src/playback_thread.h +++ b/src/playback_thread.h @@ -71,6 +71,7 @@ public: void setWaitColorLevel(int c, int l); void setColorMap(int c); void setPngPath(std::string path); + void clearImage(); void Play(); void Stop(); void Release();