[filters] Make the preview modal and clean it up, to avoid using stal…

…e handles later on
mean00 · Jan 4, 2017 · d49cac3 · d49cac3
1 parent 0f86c7b
commit d49cac3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 24 deletions.
diff --git a/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp b/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_mainfilter.cpp
@@ -157,12 +157,13 @@ void filtermainWindow::preview(bool b)
      ADM_coreVideoFilter     *filter=ADM_vf_getInstance(itag);
      ADM_assert(filter);
     if (previewDialog)
-            previewDialog->resetVideoStream(filter);
-    else
     {
-        previewDialog = new Ui_seekablePreviewWindow(this, filter, 0);
-        connect(previewDialog, SIGNAL(accepted()), this, SLOT(closePreview()));
+            delete previewDialog;
+            previewDialog=NULL;
     }
+    previewDialog = new Ui_seekablePreviewWindow(this, filter, 0);
+    previewDialog->setModal(true);
+    connect(previewDialog, SIGNAL(accepted()), this, SLOT(closePreview()));
     previewDialog->show();
 }
 /**

diff --git a/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.cpp b/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.cpp
@@ -45,14 +45,6 @@ Ui_seekablePreviewWindow::~Ui_seekablePreviewWindow()
 	delete canvas;
 }
 
-/**
- * 
- * @return 
- */
-bool  Ui_seekablePreviewWindow::nextImage(void)
-{
-    return seekablePreview->nextImage();
-}
 /**
  * 
  * @param videoStream
@@ -61,9 +53,10 @@ void Ui_seekablePreviewWindow::resetVideoStream(ADM_coreVideoFilter *videoStream
 {
 	if (seekablePreview)
 		delete seekablePreview;
-
+        seekablePreview=NULL;
 	if (canvas)
 		delete canvas;
+        canvas=NULL;
 
 	uint32_t canvasWidth = videoStream->getInfo()->width;
 	uint32_t canvasHeight = videoStream->getInfo()->height;
@@ -74,14 +67,6 @@ void Ui_seekablePreviewWindow::resetVideoStream(ADM_coreVideoFilter *videoStream
         seekablePreview->setCookieFunc(setCurrentPtsCallback,this);
 	seekablePreview->sliderChanged();
 }
-/**
- * 
- * @param value
- */
-void Ui_seekablePreviewWindow::sliderChanged(int value)
-{
-	seekablePreview->sliderChanged();
-}
 /**
  * 
  * @return 

diff --git a/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.h b/avidemux/qt4/ADM_userInterfaces/ADM_filters/Q_seekablePreview.h
@@ -40,7 +40,4 @@ class Ui_seekablePreviewWindow : public QDialog
 	uint32_t frameIndex();
         bool     setTime(uint64_t timestamp);
 
-public slots:
-	void sliderChanged(int value);
-        bool nextImage(void);
 };