Commit b174ac50 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

ClipWorkflow: Removing setTime useless parameter

parent 0880b2aa
......@@ -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
......
......@@ -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 );
......
......@@ -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
......
......@@ -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;
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment