[vlmc-devel] ClipWorkflow: Simplify destruction

[Hugo Beauzée-Luyssen]

vlmc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Mon Mar 14 21:40:58 2016 +0100| [33171b62a0fb7d844dec72b1ab8f6a265d23db07] | committer: Hugo Beauzée-Luyssen

ClipWorkflow: Simplify destruction

> https://code.videolan.org/videolan/vlmc/commit/33171b62a0fb7d844dec72b1ab8f6a265d23db07
---

 src/Workflow/AudioClipWorkflow.cpp | 5 -----
 src/Workflow/AudioClipWorkflow.h   | 1 -
 src/Workflow/ClipWorkflow.cpp      | 1 +
 src/Workflow/VideoClipWorkflow.cpp | 5 -----
 src/Workflow/VideoClipWorkflow.h   | 1 -
 5 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/Workflow/AudioClipWorkflow.cpp b/src/Workflow/AudioClipWorkflow.cpp
index c33ac0f..6622560 100644
--- a/src/Workflow/AudioClipWorkflow.cpp
+++ b/src/Workflow/AudioClipWorkflow.cpp
@@ -36,11 +36,6 @@ AudioClipWorkflow::AudioClipWorkflow( ClipHelper *ch ) :
     m_ptsOffset = 0;
 }
 
-AudioClipWorkflow::~AudioClipWorkflow()
-{
-    stop();
-}
-
 void
 AudioClipWorkflow::preallocate()
 {
diff --git a/src/Workflow/AudioClipWorkflow.h b/src/Workflow/AudioClipWorkflow.h
index f0c3bcc..fc76924 100644
--- a/src/Workflow/AudioClipWorkflow.h
+++ b/src/Workflow/AudioClipWorkflow.h
@@ -39,7 +39,6 @@ class   AudioClipWorkflow : public ClipWorkflow
 
     public:
         AudioClipWorkflow( ClipHelper* ch );
-        ~AudioClipWorkflow();
         virtual Workflow::OutputBuffer  *getOutput( ClipWorkflow::GetMode mode, qint64 currentFrame );
     protected:
         virtual quint32             getNbComputedBuffers() const;
diff --git a/src/Workflow/ClipWorkflow.cpp b/src/Workflow/ClipWorkflow.cpp
index 0e3ed35..79519bc 100644
--- a/src/Workflow/ClipWorkflow.cpp
+++ b/src/Workflow/ClipWorkflow.cpp
@@ -52,6 +52,7 @@ ClipWorkflow::ClipWorkflow( ClipHelper* ch )
 
 ClipWorkflow::~ClipWorkflow()
 {
+    stop();
     delete m_eventWatcher;
     delete m_renderWaitCond;
     delete m_renderLock;
diff --git a/src/Workflow/VideoClipWorkflow.cpp b/src/Workflow/VideoClipWorkflow.cpp
index 64727fd..8675975 100644
--- a/src/Workflow/VideoClipWorkflow.cpp
+++ b/src/Workflow/VideoClipWorkflow.cpp
@@ -45,11 +45,6 @@ VideoClipWorkflow::VideoClipWorkflow( ClipHelper *ch ) :
     m_effectsLock = new QReadWriteLock();
 }
 
-VideoClipWorkflow::~VideoClipWorkflow()
-{
-    stop();
-}
-
 void
 VideoClipWorkflow::releasePrealocated()
 {
diff --git a/src/Workflow/VideoClipWorkflow.h b/src/Workflow/VideoClipWorkflow.h
index 0102d44..c47bf43 100644
--- a/src/Workflow/VideoClipWorkflow.h
+++ b/src/Workflow/VideoClipWorkflow.h
@@ -36,7 +36,6 @@ class   VideoClipWorkflow : public ClipWorkflow
 
     public:
         VideoClipWorkflow( ClipHelper* ch );
-        ~VideoClipWorkflow();
         virtual Workflow::OutputBuffer  *getOutput( ClipWorkflow::GetMode mode, qint64 currentFrame );
 
         static const quint32    nbBuffers = 3 * 30; //3 seconds with an average fps of 30