Commit 2d015b4a authored by Hugo Beauzee-Luyssen's avatar Hugo Beauzee-Luyssen

Removed debug texts

parent a9c842be
......@@ -75,7 +75,7 @@ void ClipWorkflow::checkStateChange()
QWriteLocker lock2( m_stateLock );
if ( m_requiredState != ClipWorkflow::None )
{
qDebug() << "Changed state from" << m_state << "to state" << m_requiredState;
// qDebug() << "Changed state from" << m_state << "to state" << m_requiredState;
m_state = m_requiredState;
m_requiredState = ClipWorkflow::None;
checkSynchronisation( m_state );
......@@ -122,9 +122,9 @@ void ClipWorkflow::unlock( ClipWorkflow* cw )
// qDebug() << "Clip render completed";
cw->emit renderComplete( cw );
qDebug() << "\t\tEntering condwait";
// qDebug() << "\t\tEntering condwait";
cw->m_waitCond->wait( cw->m_condMutex );
qDebug() << "\t\tLeaved condwait";
// qDebug() << "\t\tLeaved condwait";
cw->m_stateLock->lockForWrite();
cw->m_state = Rendering;
// {
......@@ -138,11 +138,11 @@ void ClipWorkflow::unlock( ClipWorkflow* cw )
QMutexLocker lock( cw->m_condMutex );
cw->m_stateLock->unlock();
qDebug() << "Entering forced pause condwait";
// qDebug() << "Entering forced pause condwait";
cw->setState( ClipWorkflow::ThreadPaused );
cw->m_pausedThreadCondWait->wake();
cw->m_waitCond->wait( cw->m_condMutex );
qDebug() << "Leaving forced pause condwait";
// qDebug() << "Leaving forced pause condwait";
cw->setState( ClipWorkflow::Paused );
}
else
......@@ -309,7 +309,7 @@ void ClipWorkflow::setState( State state )
{
{
QWriteLocker lock( m_stateLock );
qDebug() << "Changing from state" << m_state << "to state" << state;
// qDebug() << "Changing from state" << m_state << "to state" << state;
m_state = state;
}
checkSynchronisation( state );
......
......@@ -153,7 +153,6 @@ void MainWorkflow::pause()
m_tracks[i]->pause();
}
}
qDebug() << "All tracks are paused";
}
void MainWorkflow::nextFrame()
......@@ -276,11 +275,11 @@ void MainWorkflow::activateOneFrameOnly()
void MainWorkflow::trackPaused()
{
qDebug() << "Track pausing finished...";
// qDebug() << "Track pausing finished...";
m_nbTracksToPause.fetchAndAddAcquire( -1 );
if ( m_nbTracksToPause <= 0 )
{
qDebug() << "\t\t...MainWorkflow is paused";
// qDebug() << "\t\t...MainWorkflow is paused";
emit mainWorkflowPaused();
}
}
......
......@@ -381,9 +381,9 @@ void TrackWorkflow::pauseClipWorkflow( ClipWorkflow* cw )
else if ( cw->getState() == ClipWorkflow::Rendering )
{
cw->getStateLock()->unlock();
qDebug() << "Waiting for complete render";
// qDebug() << "Waiting for complete render";
cw->waitForCompleteRender();
qDebug() << "Render has been completed... continue pausing";
// qDebug() << "Render has been completed... continue pausing";
QMutexLocker lock( cw->getSleepMutex() );
cw->queryStateChange( ClipWorkflow::Pausing );
cw->wake();
......@@ -404,9 +404,9 @@ void TrackWorkflow::pauseClipWorkflow( ClipWorkflow* cw )
}
else
cw->getStateLock()->unlock();
qDebug() << "Wait for pausedthread state";
// qDebug() << "Wait for pausedthread state";
cw->waitForPausedThread();
qDebug() << "Ok thread is paused";
// qDebug() << "Ok thread is paused";
}
void TrackWorkflow::pause()
......@@ -423,7 +423,7 @@ void TrackWorkflow::pause()
ClipWorkflow* cw = it.value();
cw->getStateLock()->lockForRead();
qDebug() << "Pausing a clip in state" << cw->getState();
// qDebug() << "Pausing a clip in state" << cw->getState();
if ( cw->getState() == ClipWorkflow::Stopped )
{
cw->getStateLock()->unlock();
......@@ -444,7 +444,6 @@ void TrackWorkflow::pause()
}
}
m_paused = !m_paused;
qDebug() << "m_paused ==" << m_paused;
if ( m_paused == true )
emit trackPaused();
}
......
......@@ -89,19 +89,19 @@ void* WorkflowRenderer::lock( void* datas )
//If renderer is stopping, don't ask for another frame:
if ( self->m_isRendering == false )
{
qDebug() << "WorkflowRenderer doesn't render anymore (stopping state)";
// qDebug() << "WorkflowRenderer doesn't render anymore (stopping state)";
return self->m_lastFrame;
}
//If a pause was asked, don't try to start a new render... it could (and would) dead lock...
if ( self->m_pauseAsked == true )
{
qDebug() << "WorkflowRenderer is pausing, returning last frame";
// qDebug() << "WorkflowRenderer is pausing, returning last frame";
return self->m_lastFrame;
}
//If we're not playing, then where in a paused media player.
if ( self->m_pausedMediaPlayer == true )
{
qDebug() << "Returning last frame, since media player is paused";
// qDebug() << "Returning last frame, since media player is paused";
return self->m_lastFrame;
}
if ( self->m_oneFrameOnly < 2 )
......@@ -111,17 +111,17 @@ void* WorkflowRenderer::lock( void* datas )
// ret = self->m_mainWorkflow->getOutput();
// else
// {
qDebug() << "Asking synchrone frame";
// qDebug() << "Asking synchrone frame";
ret = self->m_mainWorkflow->getSynchroneOutput();
qDebug() << "Got it";
// qDebug() << "Got it";
// }
self->m_lastFrame = static_cast<unsigned char*>( ret );
qDebug() << "Returning new frame";
// qDebug() << "Returning new frame";
return ret;
}
else
{
qDebug() << "Returning last frame, due to m_oneFrameOnly flag (" << self->m_oneFrameOnly << ")";
// qDebug() << "Returning last frame, due to m_oneFrameOnly flag (" << self->m_oneFrameOnly << ")";
return self->m_lastFrame;
}
}
......@@ -133,9 +133,9 @@ void WorkflowRenderer::unlock( void* datas )
// qDebug() << "Workflowrenderer::unlock. m_oneFrameOnly ==" << self->m_oneFrameOnly;
if ( self->m_oneFrameOnly == 1 )
{
qDebug() << "Pausing back";
// qDebug() << "Pausing back";
self->togglePlayPause( true );
qDebug() << "Switching m_oneFrameOnly flag to 2";
// qDebug() << "Switching m_oneFrameOnly flag to 2";
self->m_oneFrameOnly = 2;
}
self->m_framePlayed = true;
......@@ -197,7 +197,7 @@ void WorkflowRenderer::setPosition( float newPos )
void WorkflowRenderer::frameByFrameAfterPaused()
{
qDebug() << "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<";
// qDebug() << "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<";
m_oneFrameOnly = 1;
m_mainWorkflow->activateOneFrameOnly();
......@@ -249,7 +249,7 @@ void WorkflowRenderer::pauseMainWorkflow()
void WorkflowRenderer::mainWorkflowPaused()
{
qDebug() << "Mainworkflow is now paused";
// qDebug() << "Mainworkflow is now paused";
m_paused = true;
m_pauseAsked = false;
emit paused();
......@@ -315,7 +315,7 @@ void WorkflowRenderer::__videoPaused()
{
m_oneFrameOnly = 0;
}
qDebug() << "Pausing main workflow";
// qDebug() << "Pausing main workflow";
pauseMainWorkflow();
}
......
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