[vlmc-devel] ClipWorkflow: Merge stop & stopRenderer

[Hugo Beauzée-Luyssen]

vlmc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Sun Feb 16 23:55:52 2014 +0200| [4b2bc5e9d8a13a1f8d9262dcb5cd64e1cf6727f9] | committer: Hugo Beauzée-Luyssen

ClipWorkflow: Merge stop & stopRenderer

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

 src/Workflow/ClipWorkflow.cpp  |    9 +--------
 src/Workflow/ClipWorkflow.h    |   11 ++---------
 src/Workflow/TrackWorkflow.cpp |    2 +-
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/src/Workflow/ClipWorkflow.cpp b/src/Workflow/ClipWorkflow.cpp
index 64f1b7c..ff0ecbe 100644
--- a/src/Workflow/ClipWorkflow.cpp
+++ b/src/Workflow/ClipWorkflow.cpp
@@ -120,14 +120,6 @@ ClipWorkflow::clipEndReached()
 void
 ClipWorkflow::stop()
 {
-    stopRenderer();
-    m_isRendering = false;
-    releasePrealocated();
-}
-
-void
-ClipWorkflow::stopRenderer()
-{
     QWriteLocker    lockState( m_stateLock );
 
     //Let's make sure the ClipWorkflow isn't beeing stopped from another thread.
@@ -141,6 +133,7 @@ ClipWorkflow::stopRenderer()
         if ( m_state != Error )
             m_state = Stopped;
         flushComputedBuffers();
+        m_isRendering = false;
 
         m_initWaitCond->wakeAll();
         m_renderWaitCond->wakeAll();
diff --git a/src/Workflow/ClipWorkflow.h b/src/Workflow/ClipWorkflow.h
index ac98dc2..392077f 100644
--- a/src/Workflow/ClipWorkflow.h
+++ b/src/Workflow/ClipWorkflow.h
@@ -149,8 +149,8 @@ class   ClipWorkflow : public EffectUser
         }
 
         /**
-            \brief  Stop this workflow.
-        */
+         *  \brief  Stop this workflow.
+         */
         void                    stop();
         /**
          *  \brief  Set the rendering position
@@ -191,13 +191,6 @@ class   ClipWorkflow : public EffectUser
          */
         bool                    isResyncRequired();
 
-        /**
-         *  \brief              Stop the renderer part of the ClipWorkflow
-         *
-         *  IE. just stop the VLC thread, and do not flush anything.
-         */
-        void                    stopRenderer();
-
         void                    save( QXmlStreamWriter& project ) const;
         virtual qint64          length() const;
         virtual Type            effectType() const;
diff --git a/src/Workflow/TrackWorkflow.cpp b/src/Workflow/TrackWorkflow.cpp
index 5bc9bf7..875aa0f 100644
--- a/src/Workflow/TrackWorkflow.cpp
+++ b/src/Workflow/TrackWorkflow.cpp
@@ -627,7 +627,7 @@ TrackWorkflow::stopFrameComputing()
         {
             return ;
         }
-        cw->stopRenderer();
+        cw->stop();
         ++it;
     }
 }