[vlmc-devel] EffetUser: applyFilters: Remove now unused time parameter

[Hugo Beauzée-Luyssen]

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

EffetUser: applyFilters: Remove now unused time parameter

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

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

diff --git a/src/EffectsEngine/EffectUser.cpp b/src/EffectsEngine/EffectUser.cpp
index 55553d9..2dbafee 100644
--- a/src/EffectsEngine/EffectUser.cpp
+++ b/src/EffectsEngine/EffectUser.cpp
@@ -74,8 +74,7 @@ EffectUser::addEffect( EffectHelper *effectHelper )
 }
 
 quint32*
-EffectUser::applyFilters( const Workflow::Frame* frame,
-                             qint64 currentFrame, double time )
+EffectUser::applyFilters( const Workflow::Frame* frame, qint64 currentFrame )
 {
     QReadLocker     lock( m_effectsLock );
 
diff --git a/src/EffectsEngine/EffectUser.h b/src/EffectsEngine/EffectUser.h
index f4e6b8b..1f78c85 100644
--- a/src/EffectsEngine/EffectUser.h
+++ b/src/EffectsEngine/EffectUser.h
@@ -69,8 +69,7 @@ class EffectUser : public QObject
         void                            initMixers();
 
         //Filters:
-        quint32                         *applyFilters( const Workflow::Frame *frame,
-                                                       qint64 currentFrame, double time );
+        quint32                         *applyFilters( const Workflow::Frame *frame, qint64 currentFrame);
         //Mixers methods:
         EffectHelper                    *getMixer( qint64 currentFrame );
 
diff --git a/src/Renderer/WorkflowRenderer.cpp b/src/Renderer/WorkflowRenderer.cpp
index b52a3b1..902e996 100644
--- a/src/Renderer/WorkflowRenderer.cpp
+++ b/src/Renderer/WorkflowRenderer.cpp
@@ -143,8 +143,7 @@ WorkflowRenderer::lockVideo( void* data, int64_t *pts, size_t *bufferSize, const
         //this is a bit hackish though... (especially regarding the "no frame computed" detection)
         ptsDiff = 1000000 / handler->fps;
     }
-    m_effectFrame = applyFilters( ret, m_mainWorkflow->getCurrentFrame(),
-                                      m_mainWorkflow->getCurrentFrame() * 1000.0 / handler->fps );
+    m_effectFrame = applyFilters( ret, m_mainWorkflow->getCurrentFrame() );
     m_pts = *pts = ptsDiff + m_pts;
     if ( m_effectFrame != NULL )
         *buffer = m_effectFrame;
diff --git a/src/Workflow/ImageClipWorkflow.cpp b/src/Workflow/ImageClipWorkflow.cpp
index c944f69..db8619d 100644
--- a/src/Workflow/ImageClipWorkflow.cpp
+++ b/src/Workflow/ImageClipWorkflow.cpp
@@ -77,8 +77,7 @@ ImageClipWorkflow::getOutput( ClipWorkflow::GetMode, qint64 currentFrame )
 {
     QMutexLocker    lock( m_renderLock );
 
-    quint32 *buff = applyFilters( m_buffer, currentFrame,
-                                    currentFrame * 1000.0 / clip()->getMedia()->source()->fps() );
+    quint32 *buff = applyFilters( m_buffer, currentFrame );
     if ( buff != NULL )
     {
         m_effectFrame->setBuffer( buff );
diff --git a/src/Workflow/TrackWorkflow.cpp b/src/Workflow/TrackWorkflow.cpp
index 7993501..05a98c4 100644
--- a/src/Workflow/TrackWorkflow.cpp
+++ b/src/Workflow/TrackWorkflow.cpp
@@ -345,7 +345,7 @@ TrackWorkflow::getOutput( qint64 currentFrame, qint64 subFrame, bool paused )
             ret = frames[0];
         //Now handle filters :
         quint32     *newFrame = applyFilters( ret != NULL ? static_cast<const Workflow::Frame*>( ret ) : Core::getInstance()->workflow()->blackOutput(),
-                                                currentFrame, currentFrame * 1000.0 / m_fps );
+                                                currentFrame );
         if ( newFrame != NULL )
         {
             if ( ret != NULL )
diff --git a/src/Workflow/VideoClipWorkflow.cpp b/src/Workflow/VideoClipWorkflow.cpp
index 53569d4..7b93eea 100644
--- a/src/Workflow/VideoClipWorkflow.cpp
+++ b/src/Workflow/VideoClipWorkflow.cpp
@@ -113,8 +113,7 @@ VideoClipWorkflow::getOutput( ClipWorkflow::GetMode mode, qint64 currentFrame )
     else
         buff = m_computedBuffers.head();
 
-    quint32     *newFrame = applyFilters( buff, currentFrame,
-                                 currentFrame * 1000.0 / clip()->getMedia()->source()->fps() );
+    quint32     *newFrame = applyFilters( buff, currentFrame );
     if ( newFrame != NULL )
         buff->setBuffer( newFrame );