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

TrackHandler: Fix bug when restarting the render.

parent 38ae1abb
......@@ -107,7 +107,7 @@ TrackHandler::getOutput( qint64 currentFrame, qint64 subFrame, bool paused )
for ( int i = m_trackCount - 1; i >= 0; --i )
{
if ( m_tracks[i].activated() == false || m_tracks[i]->hasFrameToRender( currentFrame ) )
if ( m_tracks[i].activated() == false || m_tracks[i]->hasNoMoreFrameToRender( currentFrame ) )
continue ;
validTrack = true;
Workflow::OutputBuffer *ret = m_tracks[i]->getOutput( currentFrame, subFrame, paused );
......@@ -272,10 +272,5 @@ void
TrackHandler::stopFrameComputing()
{
for ( unsigned int i = 0; i < m_trackCount; ++i )
{
//First stop the frame computing
m_tracks[i]->stopFrameComputing();
//then deactivate the track to avoid the generation to be resumed.
m_tracks[i].deactivate();
}
}
......@@ -234,7 +234,7 @@ TrackWorkflow::stopClipWorkflow( ClipWorkflow* cw )
}
bool
TrackWorkflow::hasFrameToRender( qint64 currentFrame ) const
TrackWorkflow::hasNoMoreFrameToRender( qint64 currentFrame ) const
{
if ( m_clips.size() == 0 )
return true;
......
......@@ -90,7 +90,7 @@ class TrackWorkflow : public QObject
bool contains( const QUuid& uuid ) const;
void stopFrameComputing();
bool hasFrameToRender( qint64 currentFrame ) const;
bool hasNoMoreFrameToRender( qint64 currentFrame ) const;
private:
void computeLength();
......
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