Commit 7ca64756 authored by Hugo Beauzee-Luyssen's avatar Hugo Beauzee-Luyssen

Removed debug

parent 2cd5097c
...@@ -97,9 +97,7 @@ void ClipWorkflow::unlock( ClipWorkflow* cw ) ...@@ -97,9 +97,7 @@ void ClipWorkflow::unlock( ClipWorkflow* cw )
cw->m_renderWaitCond->wake(); cw->m_renderWaitCond->wake();
cw->emit renderComplete( cw ); cw->emit renderComplete( cw );
qDebug() << "Entering condwait";
cw->m_waitCond->wait( cw->m_condMutex ); cw->m_waitCond->wait( cw->m_condMutex );
qDebug() << "Leaving condwait";
cw->m_stateLock->lockForWrite(); cw->m_stateLock->lockForWrite();
cw->m_state = Rendering; cw->m_state = Rendering;
cw->m_stateLock->unlock(); cw->m_stateLock->unlock();
...@@ -132,7 +130,6 @@ void ClipWorkflow::setVmem() ...@@ -132,7 +130,6 @@ void ClipWorkflow::setVmem()
void ClipWorkflow::initialize() void ClipWorkflow::initialize()
{ {
qDebug() << "Initialize";
setState( Initializing ); setState( Initializing );
m_vlcMedia = new LibVLCpp::Media( m_clip->getParent()->getFileInfo()->absoluteFilePath() ); m_vlcMedia = new LibVLCpp::Media( m_clip->getParent()->getFileInfo()->absoluteFilePath() );
setVmem(); setVmem();
...@@ -142,7 +139,6 @@ void ClipWorkflow::initialize() ...@@ -142,7 +139,6 @@ void ClipWorkflow::initialize()
connect( m_mediaPlayer, SIGNAL( playing() ), this, SLOT( setPositionAfterPlayback() ), Qt::DirectConnection ); connect( m_mediaPlayer, SIGNAL( playing() ), this, SLOT( setPositionAfterPlayback() ), Qt::DirectConnection );
connect( m_mediaPlayer, SIGNAL( endReached() ), this, SLOT( clipEndReached() ), Qt::DirectConnection ); connect( m_mediaPlayer, SIGNAL( endReached() ), this, SLOT( clipEndReached() ), Qt::DirectConnection );
m_mediaPlayer->play(); m_mediaPlayer->play();
qDebug() << "playback required";
} }
void ClipWorkflow::setPositionAfterPlayback() void ClipWorkflow::setPositionAfterPlayback()
...@@ -151,12 +147,10 @@ void ClipWorkflow::setPositionAfterPlayback() ...@@ -151,12 +147,10 @@ void ClipWorkflow::setPositionAfterPlayback()
connect( m_mediaPlayer, SIGNAL( positionChanged() ), this, SLOT( pauseAfterPlaybackStarted() ), Qt::DirectConnection ); connect( m_mediaPlayer, SIGNAL( positionChanged() ), this, SLOT( pauseAfterPlaybackStarted() ), Qt::DirectConnection );
m_mediaPlayer->setPosition( m_clip->getBegin() ); m_mediaPlayer->setPosition( m_clip->getBegin() );
qDebug() << "Set position";
} }
void ClipWorkflow::pauseAfterPlaybackStarted() void ClipWorkflow::pauseAfterPlaybackStarted()
{ {
qDebug() << "pauseAfterPlaybackStarted();";
disconnect( m_mediaPlayer, SIGNAL( positionChanged() ), this, SLOT( pauseAfterPlaybackStarted() ) ); disconnect( m_mediaPlayer, SIGNAL( positionChanged() ), this, SLOT( pauseAfterPlaybackStarted() ) );
//FIXME: it seems that this signal is never connected :o //FIXME: it seems that this signal is never connected :o
disconnect( m_mediaPlayer, SIGNAL( playing() ), this, SLOT( pauseAfterPlaybackStarted() ) ); disconnect( m_mediaPlayer, SIGNAL( playing() ), this, SLOT( pauseAfterPlaybackStarted() ) );
...@@ -167,11 +161,9 @@ void ClipWorkflow::pauseAfterPlaybackStarted() ...@@ -167,11 +161,9 @@ void ClipWorkflow::pauseAfterPlaybackStarted()
void ClipWorkflow::initializedMediaPlayer() void ClipWorkflow::initializedMediaPlayer()
{ {
qDebug() << "initializedMediaPlayer();";
disconnect( m_mediaPlayer, SIGNAL( paused() ), this, SLOT( initializedMediaPlayer() ) ); disconnect( m_mediaPlayer, SIGNAL( paused() ), this, SLOT( initializedMediaPlayer() ) );
connect( m_mediaPlayer, SIGNAL( paused() ), this, SLOT( pausedMediaPlayer() ), Qt::DirectConnection ); connect( m_mediaPlayer, SIGNAL( paused() ), this, SLOT( pausedMediaPlayer() ), Qt::DirectConnection );
setState( Ready ); setState( Ready );
qDebug() << "Ready";
} }
bool ClipWorkflow::isReady() const bool ClipWorkflow::isReady() const
......
...@@ -83,8 +83,9 @@ void* WorkflowRenderer::lock( void* datas ) ...@@ -83,8 +83,9 @@ void* WorkflowRenderer::lock( void* datas )
WorkflowRenderer* self = reinterpret_cast<WorkflowRenderer*>( datas ); WorkflowRenderer* self = reinterpret_cast<WorkflowRenderer*>( datas );
//If renderer is stopping, don't ask for another frame: //If renderer is stopping, don't ask for another frame:
if ( self->m_isRendering == false ) // if ( self->m_isRendering == false )
return self->m_lastFrame; // return self->m_lastFrame;
qDebug() << "WorkflowRenderer::lock()";
void* ret = self->m_mainWorkflow->getSynchroneOutput(); void* ret = self->m_mainWorkflow->getSynchroneOutput();
self->m_lastFrame = static_cast<unsigned char*>( ret ); self->m_lastFrame = static_cast<unsigned char*>( ret );
......
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