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

ClipWorkflow: Merge stop & stopRenderer

parent 1dfaf298
......@@ -119,14 +119,6 @@ ClipWorkflow::clipEndReached()
void
ClipWorkflow::stop()
{
stopRenderer();
m_isRendering = false;
releasePrealocated();
}
void
ClipWorkflow::stopRenderer()
{
QWriteLocker lockState( m_stateLock );
......@@ -141,6 +133,7 @@ ClipWorkflow::stopRenderer()
if ( m_state != Error )
m_state = Stopped;
flushComputedBuffers();
m_isRendering = false;
m_initWaitCond->wakeAll();
m_renderWaitCond->wakeAll();
......
......@@ -149,8 +149,8 @@ class ClipWorkflow : public EffectUser
}
/**
\brief Stop this workflow.
*/
* \brief Stop this workflow.
*/
void stop();
/**
* \brief Set the rendering position
......@@ -191,13 +191,6 @@ class ClipWorkflow : public EffectUser
*/
bool isResyncRequired();
/**
* \brief Stop the renderer part of the ClipWorkflow
*
* IE. just stop the VLC thread, and do not flush anything.
*/
void stopRenderer();
void save( QXmlStreamWriter& project ) const;
virtual qint64 length() const;
virtual Type effectType() const;
......
......@@ -627,7 +627,7 @@ TrackWorkflow::stopFrameComputing()
{
return ;
}
cw->stopRenderer();
cw->stop();
++it;
}
}
......
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