This commit is contained in:
Jared Bruni
2021-09-17 05:12:19 -07:00
parent 5ffddf8fc4
commit d050853108
3 changed files with 10 additions and 3 deletions

View File

@@ -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) { bool AC_MainWindow::checkAdd(QString str) {
std::string val = str.toStdString(); std::string val = str.toStdString();
@@ -647,8 +647,7 @@ void AC_MainWindow::clear_subfilter() {
} }
void AC_MainWindow::clear_img() { void AC_MainWindow::clear_img() {
blend_set = false; playback->clearImage();
blend_image.release();
Log(tr("Cleared Image\n")); Log(tr("Cleared Image\n"));
} }

View File

@@ -253,6 +253,13 @@ void Playback::reset_filters() {
mutex.unlock(); mutex.unlock();
} }
void Playback::clearImage() {
mutex.lock();
blend_set = false;
blend_image.release();
mutex.unlock();
}
void Playback::SetFlip(bool f1, bool f2) { void Playback::SetFlip(bool f1, bool f2) {
flip_frame1 = f1; flip_frame1 = f1;
flip_frame2 = f2; flip_frame2 = f2;

View File

@@ -71,6 +71,7 @@ public:
void setWaitColorLevel(int c, int l); void setWaitColorLevel(int c, int l);
void setColorMap(int c); void setColorMap(int c);
void setPngPath(std::string path); void setPngPath(std::string path);
void clearImage();
void Play(); void Play();
void Stop(); void Stop();
void Release(); void Release();