[vlmc-devel] commit: Fixing ceff83371f05a3bdc411d62ed46ea019ffb0d09e refactoring. ( Hugo Beauzée-Luyssen )

[git at videolan.org]

vlmc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Sat Sep  4 19:00:27 2010 +0200| [e13fcab78b1d9f4e8b7ed7d85f6221551fb9bf00] | committer: Hugo Beauzée-Luyssen 

Fixing ceff83371f05a3bdc411d62ed46ea019ffb0d09e refactoring.

It caused the application to hang on exit.

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=e13fcab78b1d9f4e8b7ed7d85f6221551fb9bf00
---

 src/EffectsEngine/EffectUser.h     |    2 +-
 src/Renderer/WorkflowRenderer.cpp  |    2 --
 src/Renderer/WorkflowRenderer.h    |    4 ----
 src/Workflow/TrackWorkflow.cpp     |    2 --
 src/Workflow/VideoClipWorkflow.cpp |    2 --
 src/Workflow/VideoClipWorkflow.h   |    8 +++-----
 6 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/EffectsEngine/EffectUser.h b/src/EffectsEngine/EffectUser.h
index 4d7ef32..dd24ad0 100644
--- a/src/EffectsEngine/EffectUser.h
+++ b/src/EffectsEngine/EffectUser.h
@@ -48,7 +48,7 @@ class EffectUser : public QObject
 
     protected:
         EffectUser();
-        ~EffectUser();
+        virtual ~EffectUser();
         void                            initFilters();
         void                            initMixers();
 
diff --git a/src/Renderer/WorkflowRenderer.cpp b/src/Renderer/WorkflowRenderer.cpp
index cdda123..24f0d94 100644
--- a/src/Renderer/WorkflowRenderer.cpp
+++ b/src/Renderer/WorkflowRenderer.cpp
@@ -46,8 +46,6 @@ WorkflowRenderer::WorkflowRenderer() :
             m_media( NULL ),
             m_stopping( false ),
             m_outputFps( 0.0f ),
-            m_width( 0 ),
-            m_height( 0 ),
             m_silencedAudioBuffer( NULL ),
             m_esHandler( NULL ),
             m_oldLength( 0 ),
diff --git a/src/Renderer/WorkflowRenderer.h b/src/Renderer/WorkflowRenderer.h
index eb2608a..dfb81d3 100644
--- a/src/Renderer/WorkflowRenderer.h
+++ b/src/Renderer/WorkflowRenderer.h
@@ -261,8 +261,6 @@ class   WorkflowRenderer : public GenericRenderer
          */
         qint64              m_pts;
         qint64              m_audioPts;
-        quint32             m_width;
-        quint32             m_height;
 
     private:
         /**
@@ -279,8 +277,6 @@ class   WorkflowRenderer : public GenericRenderer
          */
         qint64              m_oldLength;
 
-        EffectsEngine::EffectList     m_filters;
-
         quint32             *m_effectFrame;
 
         static const quint8     VideoCookie = '0';
diff --git a/src/Workflow/TrackWorkflow.cpp b/src/Workflow/TrackWorkflow.cpp
index aa83987..1c9ea65 100644
--- a/src/Workflow/TrackWorkflow.cpp
+++ b/src/Workflow/TrackWorkflow.cpp
@@ -50,7 +50,6 @@ TrackWorkflow::TrackWorkflow( Workflow::TrackType type, quint32 trackId  ) :
     m_renderOneFrameMutex = new QMutex;
     m_clipsLock = new QReadWriteLock;
     m_mixerBuffer = new Workflow::Frame;
-    m_effectsLock = new QReadWriteLock;
 }
 
 TrackWorkflow::~TrackWorkflow()
@@ -64,7 +63,6 @@ TrackWorkflow::~TrackWorkflow()
         delete it.value();
         it = m_clips.erase( it );
     }
-    delete m_effectsLock;
     delete m_clipsLock;
     delete m_renderOneFrameMutex;
 }
diff --git a/src/Workflow/VideoClipWorkflow.cpp b/src/Workflow/VideoClipWorkflow.cpp
index bacc3b2..e78cbe7 100644
--- a/src/Workflow/VideoClipWorkflow.cpp
+++ b/src/Workflow/VideoClipWorkflow.cpp
@@ -44,9 +44,7 @@ VideoClipWorkflow::VideoClipWorkflow( ClipHelper *ch ) :
 VideoClipWorkflow::~VideoClipWorkflow()
 {
     stop();
-    qDeleteAll( m_filters );
     delete m_renderedFrameMutex;
-    delete m_effectsLock;
 }
 
 void
diff --git a/src/Workflow/VideoClipWorkflow.h b/src/Workflow/VideoClipWorkflow.h
index d01a2bb..a00a71f 100644
--- a/src/Workflow/VideoClipWorkflow.h
+++ b/src/Workflow/VideoClipWorkflow.h
@@ -59,15 +59,13 @@ class   VideoClipWorkflow : public ClipWorkflow
         QQueue<Workflow::Frame*>    m_computedBuffers;
         QQueue<Workflow::Frame*>    m_availableBuffers;
         static void                 lock( VideoClipWorkflow* clipWorkflow, void** pp_ret,
-                                      int size );
+                                            int size );
         static void                 unlock( VideoClipWorkflow* clipWorkflow, void* buffer,
-                                        int width, int height, int bpp, int size,
-                                        qint64 pts );
-        QReadWriteLock              *m_effectsLock;
+                                            int width, int height, int bpp, int size,
+                                            qint64 pts );
         QMutex                      *m_renderedFrameMutex;
         qint64                      m_renderedFrame;
         Workflow::Frame             *m_lastReturnedBuffer;
-        EffectsEngine::EffectList   m_filters;
 };
 
 #endif // VIDEOCLIPWORKFLOW_H