uninstall filters in target dtor and ~Filter

Bearzeng · Oct 12, 2014 · 6bdc79f · 6bdc79f
1 parent d2c3745
commit 6bdc79f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/AVPlayer.cpp b/src/AVPlayer.cpp
@@ -151,6 +151,10 @@ AVPlayer::AVPlayer(QObject *parent) :
 AVPlayer::~AVPlayer()
 {
     stop();
+    QList<Filter*> filters(FilterManager::instance().videoFilters(this));
+    foreach (Filter *f, filters) {
+        uninstallFilter(f);
+    }
     if (_audio) {
         delete _audio;
         _audio = 0;

diff --git a/src/QtAV/Filter.h b/src/QtAV/Filter.h
@@ -50,7 +50,6 @@ class Q_AV_EXPORT Filter : public QObject
     Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enableChanged)
 public:
     Filter(QObject* parent = 0);
-    // Does nothing. uninstall() manually please
     virtual ~Filter();
     //isEnabled() then setContext
     //TODO: parameter FrameContext

diff --git a/src/filter/Filter.cpp b/src/filter/Filter.cpp
@@ -64,7 +64,7 @@ Filter::Filter(FilterPrivate &d, QObject *parent)
 
 Filter::~Filter()
 {
-    //uninstall();
+    uninstall();
 }
 
 void Filter::setEnabled(bool enabled)