Commit 036f9c8d authored by Hugo Beauzee-Luyssen's avatar Hugo Beauzee-Luyssen

ClipWorkflow: Removing preGetOutput.

parent fb9b810f
......@@ -82,7 +82,7 @@ AudioClipWorkflow::getOutput( ClipWorkflow::GetMode mode )
{
QMutexLocker lock( m_renderLock );
if ( preGetOutput() == false )
if ( getNbComputedBuffers() == 0 )
return NULL;
if ( isEndReached() == true )
return NULL;
......
......@@ -172,14 +172,6 @@ LibVLCpp::MediaPlayer* ClipWorkflow::getMediaPlayer()
return m_mediaPlayer;
}
bool ClipWorkflow::preGetOutput()
{
//Computed buffer mutex is already locked by underlying clipworkflow getoutput method
if ( getNbComputedBuffers() == 0 )
return false;
return true;
}
void ClipWorkflow::postGetOutput()
{
//If we're running out of computed buffers, refill our stack.
......
......@@ -97,7 +97,6 @@ class ClipWorkflow : public QObject
* of the rendering process advancement.
*/
virtual void* getOutput( ClipWorkflow::GetMode mode ) = 0;
bool preGetOutput();
void postGetOutput();
virtual void initVlcOutput() = 0;
void initialize();
......
......@@ -114,7 +114,7 @@ VideoClipWorkflow::getOutput( ClipWorkflow::GetMode mode )
if ( isEndReached() == true )
return NULL;
if ( preGetOutput() == false )
if ( getNbComputedBuffers() == 0 )
m_renderWaitCond->wait( m_renderLock );
::StackedBuffer<LightVideoFrame*>* buff;
if ( mode == ClipWorkflow::Pop )
......
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