[vlmc-devel] ClipWorkflow: Remove pause/unpause required states

[Hugo Beauzée-Luyssen]

vlmc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Tue Mar 15 23:40:49 2016 +0100| [62f6947996fb90ee0c9f6eb9f5d06558f398a5d0] | committer: Hugo Beauzée-Luyssen

ClipWorkflow: Remove pause/unpause required states

> https://code.videolan.org/videolan/vlmc/commit/62f6947996fb90ee0c9f6eb9f5d06558f398a5d0
---

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

diff --git a/src/Workflow/ClipWorkflow.h b/src/Workflow/ClipWorkflow.h
index f0a4339..619763e 100644
--- a/src/Workflow/ClipWorkflow.h
+++ b/src/Workflow/ClipWorkflow.h
@@ -71,18 +71,11 @@ class   ClipWorkflow : public EffectUser
             /// \brief  Used when end is reached, IE no more frame has to be rendered, but the trackworkflow
             ///         may eventually ask for some.
             EndReached,         //3
-            // Here start internal states :
-            /// \brief  This state will be used when an unpause
-            ///         has been required
-            UnpauseRequired,    //4
-            /// \brief  This state will be used when a pause
-            ///         has been required
-            PauseRequired,      //5
             /// \brief  This state will be used when the ISourceRenderer is paused,
             ///         because of a sufficient number of computed buffers
-            Paused,             //6
+            Paused,             //4
             /// \brief  An error was encountered, this ClipWorkflow must not be used anymore.
-            Error               //7
+            Error               //5
         };
 
         /**
diff --git a/src/Workflow/TrackWorkflow.cpp b/src/Workflow/TrackWorkflow.cpp
index 326702c..ba21b21 100644
--- a/src/Workflow/TrackWorkflow.cpp
+++ b/src/Workflow/TrackWorkflow.cpp
@@ -186,9 +186,7 @@ TrackWorkflow::renderClip( ClipWorkflow* cw, qint64 currentFrame,
 
     ClipWorkflow::State state = cw->getState();
     if ( state == ClipWorkflow::Rendering ||
-         state == ClipWorkflow::Paused ||
-         state == ClipWorkflow::PauseRequired ||
-         state == ClipWorkflow::UnpauseRequired )
+         state == ClipWorkflow::Paused )
     {
         if ( cw->isResyncRequired() == true || needRepositioning == true )
             adjustClipTime( currentFrame, start, cw );