[vlmc-devel] Workflow: Remove now unused fps parameter

[Hugo Beauzée-Luyssen]

vlmc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Sun Mar 27 12:19:18 2016 +0200| [edc05db533953befa267681f320dbc7cfa52fd09] | committer: Hugo Beauzée-Luyssen

Workflow: Remove now unused fps parameter

> https://code.videolan.org/videolan/vlmc/commit/edc05db533953befa267681f320dbc7cfa52fd09
---

 src/Renderer/WorkflowFileRenderer.cpp | 2 +-
 src/Renderer/WorkflowRenderer.cpp     | 2 +-
 src/Workflow/MainWorkflow.cpp         | 4 ++--
 src/Workflow/MainWorkflow.h           | 2 +-
 src/Workflow/TrackHandler.cpp         | 4 ++--
 src/Workflow/TrackHandler.h           | 2 +-
 src/Workflow/TrackWorkflow.cpp        | 3 +--
 src/Workflow/TrackWorkflow.h          | 4 +---
 8 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/Renderer/WorkflowFileRenderer.cpp b/src/Renderer/WorkflowFileRenderer.cpp
index 97ba3f1..e36e959 100644
--- a/src/Renderer/WorkflowFileRenderer.cpp
+++ b/src/Renderer/WorkflowFileRenderer.cpp
@@ -60,7 +60,7 @@ WorkflowFileRenderer::run( const QString& outputFileName, quint32 width,
     m_audioPts = 0;
 
     m_mainWorkflow->setFullSpeedRender( true );
-    m_mainWorkflow->startRender( width, height, fps );
+    m_mainWorkflow->startRender( width, height );
     //Waiting for renderers to preload some frames:
     SleepS( 1 );
     m_sourceRenderer->start();
diff --git a/src/Renderer/WorkflowRenderer.cpp b/src/Renderer/WorkflowRenderer.cpp
index 902e996..e21c704 100644
--- a/src/Renderer/WorkflowRenderer.cpp
+++ b/src/Renderer/WorkflowRenderer.cpp
@@ -217,7 +217,7 @@ WorkflowRenderer::startPreview()
     setupRenderer( m_width, m_height, m_outputFps );
 
     m_mainWorkflow->setFullSpeedRender( false );
-    m_mainWorkflow->startRender( m_width, m_height, m_outputFps );
+    m_mainWorkflow->startRender( m_width, m_height );
     m_isRendering = true;
     m_paused = false;
     m_stopping = false;
diff --git a/src/Workflow/MainWorkflow.cpp b/src/Workflow/MainWorkflow.cpp
index da9e47a..b2f7e32 100644
--- a/src/Workflow/MainWorkflow.cpp
+++ b/src/Workflow/MainWorkflow.cpp
@@ -91,7 +91,7 @@ MainWorkflow::computeLength()
 }
 
 void
-MainWorkflow::startRender( quint32 width, quint32 height, double fps )
+MainWorkflow::startRender( quint32 width, quint32 height )
 {
     //Reinit the effects in case the width/height has change
     m_renderStarted = true;
@@ -102,7 +102,7 @@ MainWorkflow::startRender( quint32 width, quint32 height, double fps )
     m_blackOutput = new Workflow::Frame( m_width, m_height );
     memset( m_blackOutput->buffer(), 0, m_blackOutput->size() );
     for ( unsigned int i = 0; i < Workflow::NbTrackType; ++i )
-        m_tracks[i]->startRender( width, height, fps );
+        m_tracks[i]->startRender( width, height );
     computeLength();
 }
 
diff --git a/src/Workflow/MainWorkflow.h b/src/Workflow/MainWorkflow.h
index babf2f1..b6fc04c 100644
--- a/src/Workflow/MainWorkflow.h
+++ b/src/Workflow/MainWorkflow.h
@@ -68,7 +68,7 @@ class   MainWorkflow : public QObject, public ILoadSave
          *  \param      height  The height to use with this render session.
          *  This will basically activate all the tracks, newLengthso they can render.
          */
-        void                    startRender( quint32 width, quint32 height, double fps );
+        void                    startRender( quint32 width, quint32 height );
         /**
          *  \brief      Gets a frame from the workflow
          *
diff --git a/src/Workflow/TrackHandler.cpp b/src/Workflow/TrackHandler.cpp
index fb1cc0a..cc8e5c5 100644
--- a/src/Workflow/TrackHandler.cpp
+++ b/src/Workflow/TrackHandler.cpp
@@ -49,7 +49,7 @@ TrackHandler::~TrackHandler()
 }
 
 void
-TrackHandler::startRender( quint32 width, quint32 height, double fps )
+TrackHandler::startRender( quint32 width, quint32 height )
 {
     m_endReached = false;
     if ( m_length == 0 )
@@ -58,7 +58,7 @@ TrackHandler::startRender( quint32 width, quint32 height, double fps )
     {
         for ( unsigned int i = 0; i < m_trackCount; ++i )
         {
-            m_tracks[i]->initRender( width, height, fps );
+            m_tracks[i]->initRender( width, height );
         }
     }
 }
diff --git a/src/Workflow/TrackHandler.h b/src/Workflow/TrackHandler.h
index 3dacfca..251b089 100644
--- a/src/Workflow/TrackHandler.h
+++ b/src/Workflow/TrackHandler.h
@@ -43,7 +43,7 @@ class   TrackHandler : public QObject
          */
         unsigned int            getTrackCount() const;
         qint64                  getLength() const;
-        void                    startRender( quint32 width, quint32 height, double fps );
+        void                    startRender( quint32 width, quint32 height );
         /**
          *  \param      currentFrame    The current rendering frame (ie the video frame, in all case)
          *  \param      subFrame        The type-dependent frame. IE, for a video track,
diff --git a/src/Workflow/TrackWorkflow.cpp b/src/Workflow/TrackWorkflow.cpp
index 05a98c4..cd3ad52 100644
--- a/src/Workflow/TrackWorkflow.cpp
+++ b/src/Workflow/TrackWorkflow.cpp
@@ -574,12 +574,11 @@ TrackWorkflow::unmuteClip( const QUuid &uuid )
 }
 
 void
-TrackWorkflow::initRender( quint32 width, quint32 height, double fps )
+TrackWorkflow::initRender( quint32 width, quint32 height )
 {
     QReadLocker     lock( m_clipsLock );
 
     m_mixerBuffer->resize( width, height );
-    m_fps = fps;
     m_width = width;
     m_height = height;
     m_isRendering = true;
diff --git a/src/Workflow/TrackWorkflow.h b/src/Workflow/TrackWorkflow.h
index ec2e59a..4584f32 100644
--- a/src/Workflow/TrackWorkflow.h
+++ b/src/Workflow/TrackWorkflow.h
@@ -88,8 +88,7 @@ class   TrackWorkflow : public EffectUser
         void                                    muteClip( const QUuid& uuid );
         void                                    unmuteClip( const QUuid& uuid );
 
-        void                                    initRender( quint32 width, quint32 height,
-                                                            double fps );
+        void                                    initRender(quint32 width, quint32 height);
 
         bool                                    contains( const QUuid& uuid ) const;
 
@@ -129,7 +128,6 @@ class   TrackWorkflow : public EffectUser
         const Workflow::TrackType               m_trackType;
         qint64                                  m_lastFrame;
         Workflow::Frame                         *m_mixerBuffer;
-        double                                  m_fps;
         const quint32                           m_trackId;
 
     private slots: