[vlmc-devel] commit: ClipWorkflow: Removing setTime useless parameter ( =?UTF-8?Q?Hugo=20Beauz=C3=A9e=2DLuyssen?==?UTF-8?Q?=20?=)

[git at videolan.org]

vlmc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Wed Nov 24 18:21:43 2010 +0100| [b174ac5011009425be06235a8206311598cdc06f] | committer: Hugo Beauzée-Luyssen 

ClipWorkflow: Removing setTime useless parameter

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

 src/Workflow/AudioClipWorkflow.cpp |    1 +
 src/Workflow/ClipWorkflow.cpp      |    4 ++--
 src/Workflow/ClipWorkflow.h        |    2 +-
 src/Workflow/ImageClipWorkflow.h   |    2 +-
 src/Workflow/TrackWorkflow.cpp     |    2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Workflow/AudioClipWorkflow.cpp b/src/Workflow/AudioClipWorkflow.cpp
index 4c6e80d..7c41d3e 100644
--- a/src/Workflow/AudioClipWorkflow.cpp
+++ b/src/Workflow/AudioClipWorkflow.cpp
@@ -126,6 +126,7 @@ AudioClipWorkflow::initVlcOutput()
     m_vlcMedia->addOption( ":sout-transcode-samplerate=48000" );
     m_vlcMedia->addOption( ":sout-transcode-channels=2" );
     m_vlcMedia->addOption( ":no-sout-transcode-hurry-up" );
+    m_vlcMedia->addOption( ":sout-transcode-audio-sync");
     if ( m_fullSpeedRender == false )
         m_vlcMedia->addOption( ":sout-smem-time-sync" );
     else
diff --git a/src/Workflow/ClipWorkflow.cpp b/src/Workflow/ClipWorkflow.cpp
index 552bbcf..4748e13 100644
--- a/src/Workflow/ClipWorkflow.cpp
+++ b/src/Workflow/ClipWorkflow.cpp
@@ -151,8 +151,8 @@ ClipWorkflow::stopRenderer()
 }
 
 void
-ClipWorkflow::setTime( qint64 time, qint64 ) //Ignore the frame parameter for generic clip workflow.
-{                                            //the VideoClipWorkflow reimplementation will handle it.
+ClipWorkflow::setTime( qint64 time )
+{
     m_mediaPlayer->setTime( time );
     resyncClipWorkflow();
     QWriteLocker    lock( m_stateLock );
diff --git a/src/Workflow/ClipWorkflow.h b/src/Workflow/ClipWorkflow.h
index 85e98d7..fd523f2 100644
--- a/src/Workflow/ClipWorkflow.h
+++ b/src/Workflow/ClipWorkflow.h
@@ -153,7 +153,7 @@ class   ClipWorkflow : public EffectUser
          *  \param  time    The position in millisecond
          *  \param  frame   The new current frame.
          */
-        virtual void            setTime( qint64 time, qint64 frame );
+        virtual void            setTime( qint64 time );
 
         /**
          *  This method must be used to change the state of the ClipWorkflow
diff --git a/src/Workflow/ImageClipWorkflow.h b/src/Workflow/ImageClipWorkflow.h
index daa5d09..acd1c98 100644
--- a/src/Workflow/ImageClipWorkflow.h
+++ b/src/Workflow/ImageClipWorkflow.h
@@ -39,7 +39,7 @@ class   ImageClipWorkflow : public ClipWorkflow
         /**
          *  \brief      Deactivate time seeking in an ImageClipWorkflow
          */
-        virtual void            setTime( qint64 , qint64 ){}
+        virtual void            setTime( qint64 ){}
     protected:
         virtual void            initVlcOutput();
         virtual quint32         getNbComputedBuffers() const;
diff --git a/src/Workflow/TrackWorkflow.cpp b/src/Workflow/TrackWorkflow.cpp
index d213eb1..e80d13d 100644
--- a/src/Workflow/TrackWorkflow.cpp
+++ b/src/Workflow/TrackWorkflow.cpp
@@ -521,7 +521,7 @@ TrackWorkflow::adjustClipTime( qint64 currentFrame, qint64 start, ClipWorkflow*
     qint64  nbMs = ( currentFrame - start ) / cw->clip()->getMedia()->fps() * 1000;
     qint64  beginInMs = cw->getClipHelper()->begin() / cw->clip()->getMedia()->fps() * 1000;
     qint64  startFrame = beginInMs + nbMs;
-    cw->setTime( startFrame, currentFrame );
+    cw->setTime( startFrame );
 }
 
 void