Commit a082e08e authored by Hugo Beauzee-Luyssen's avatar Hugo Beauzee-Luyssen
Browse files

An empty zone in the timeline returns a black screen now (it was returning the...

An empty zone in the timeline returns a black screen now (it was returning the last renderer picture until now...)
parent 66610b1a
......@@ -293,16 +293,12 @@ void MainWorkflow::tracksRenderCompleted( unsigned int trackId )
//therefore, m_nbTracksToRender will be equal to -1
if ( m_nbTracksToRender <= 0 )
{
// qDebug() << "MainWorkflow render is completed. Acquiring synchronization lock";
//Just a synchronisation barriere
{
QMutexLocker lock( m_synchroneRenderWaitConditionMutex );
}
// qDebug() << "Waking synchronisation threads";
m_synchroneRenderWaitCondition->wakeAll();
}
// else
// qDebug() << m_nbTracksToRender << "tracks left to render";
}
unsigned char* MainWorkflow::getSynchroneOutput()
......
......@@ -330,6 +330,8 @@ bool TrackWorkflow::getOutput( qint64 currentFrame )
{
m_oneFrameOnly = 0;
}
if ( hasRendered == false )
clipWorkflowRenderCompleted( NULL );
return hasRendered;
}
......@@ -480,7 +482,6 @@ void TrackWorkflow::clipWorkflowRenderCompleted( ClipWorkflow* cw )
{
if ( cw != NULL )
{
qDebug() << "Track is asking a ClipWorkflow output";
m_synchroneRenderBuffer = cw->getOutput();
}
else
......
......@@ -138,7 +138,6 @@ void ClipRenderer::mediaUnloaded( const QUuid& uuid )
if ( m_selectedMedia != NULL && m_selectedMedia->getUuid() == uuid )
{
m_mediaPlayer->stop();
qDebug() << "Media unloaded";
m_clipLoaded = false;
m_selectedMedia = NULL;
m_isRendering = false;
......
Supports Markdown
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