Commit 30c05428 authored by Hugo Beauzee-Luyssen's avatar Hugo Beauzee-Luyssen

commented debug. (not removed, i'm felling like I can use them again :D )

parent 830cdcf6
......@@ -85,15 +85,15 @@ void MediaPlayer::callbacks( const libvlc_event_t* ev
switch ( event->type )
{
case libvlc_MediaPlayerPlaying:
qDebug() << "Media player playing";
// qDebug() << "Media player playing";
self->emit playing();
break;
case libvlc_MediaPlayerPaused:
qDebug() << "Media player paused";
// qDebug() << "Media player paused";
self->emit paused();
break;
case libvlc_MediaPlayerStopped:
qDebug() << "Media player stopped";
// qDebug() << "Media player stopped";
self->emit stopped();
break;
case libvlc_MediaPlayerEndReached:
......@@ -153,7 +153,6 @@ qint64 MediaPlayer::getTime()
void MediaPlayer::setTime( qint64 time )
{
qDebug() << "Setting time:" << time;
libvlc_media_player_set_time( m_internalPtr, time, m_ex );
CheckVlcppException( m_ex );
}
......
......@@ -74,7 +74,7 @@ void ClipWorkflow::checkStateChange()
if ( m_requiredState != ClipWorkflow::None )
{
m_state = m_requiredState;
qDebug() << '[' << (void*)this << "] Applying required state change:" << m_state;
// qDebug() << '[' << (void*)this << "] Applying required state change:" << m_state;
m_requiredState = ClipWorkflow::None;
checkSynchronisation( m_state );
}
......@@ -85,7 +85,7 @@ void ClipWorkflow::lock( ClipWorkflow* cw, void** pp_ret, int size )
Q_UNUSED( size );
cw->m_renderLock->lock();
*pp_ret = cw->m_buffer;
qDebug() << '[' << (void*)cw << "] ClipWorkflow::lock";
// qDebug() << '[' << (void*)cw << "] ClipWorkflow::lock";
}
void ClipWorkflow::unlock( ClipWorkflow* cw, void* buffer, int width, int height, int bpp, int size )
......@@ -110,7 +110,7 @@ void ClipWorkflow::unlock( ClipWorkflow* cw, void* buffer, int width, int hei
cw->m_renderWaitCond->wake();
}
cw->emit renderComplete( cw );
qDebug() << "Emmiting render completed";
// qDebug() << "Emmiting render completed";
// qDebug() << "Entering cond wait";
cw->m_waitCond->wait( cw->m_condMutex );
......@@ -122,7 +122,7 @@ void ClipWorkflow::unlock( ClipWorkflow* cw, void* buffer, int width, int hei
}
else
cw->m_stateLock->unlock();
qDebug() << '[' << (void*)cw << "] ClipWorkflow::unlock";
// qDebug() << '[' << (void*)cw << "] ClipWorkflow::unlock";
cw->checkStateChange();
}
......@@ -218,15 +218,15 @@ void ClipWorkflow::startRender( bool startInPausedMode )
{
if ( isReady() == false )
{
qDebug() << "Waiting for clipworkflow to be ready";
// qDebug() << "Waiting for clipworkflow to be ready";
QMutexLocker lock( m_initWaitCond->getMutex() );
m_initWaitCond->waitLocked();
}
qDebug() << "ClipWorkflow is ready";
// qDebug() << "ClipWorkflow is ready";
if ( startInPausedMode == false )
{
m_mediaPlayer->play();
qDebug() << "Setting state: Rendering";
// qDebug() << "Setting state: Rendering";
setState( Rendering );
}
else
......@@ -253,7 +253,7 @@ void ClipWorkflow::stop()
m_mediaPlayer->stop();
Pool<LibVLCpp::MediaPlayer>::getInstance()->release( m_mediaPlayer );
disconnect( m_mediaPlayer, SIGNAL( endReached() ), this, SLOT( clipEndReached() ) );
qDebug() << "Setting media player to NULL";
// qDebug() << "Setting media player to NULL";
m_mediaPlayer = NULL;
setState( Stopped );
QMutexLocker lock( m_requiredStateLock );
......@@ -261,7 +261,7 @@ void ClipWorkflow::stop()
delete m_vlcMedia;
m_initFlag = false;
m_rendering = false;
qDebug() << "Clipworkflow stopped";
// qDebug() << "Clipworkflow stopped";
}
else
qDebug() << "ClipWorkflow has already been stopped";
......@@ -303,7 +303,7 @@ void ClipWorkflow::setState( State state )
{
{
QWriteLocker lock( m_stateLock );
qDebug() << '[' << (void*)this << "] Setting state to" << state;
// qDebug() << '[' << (void*)this << "] Setting state to" << state;
m_state = state;
}
checkSynchronisation( state );
......
......@@ -117,7 +117,7 @@ void TrackWorkflow::renderClip( ClipWorkflow* cw, qint64 currentFrame,
{
cw->getStateLock()->lockForRead();
qDebug() << "Rendering clip" << cw << "state:" << cw->getState();
// qDebug() << "Rendering clip" << cw << "state:" << cw->getState();
if ( cw->getState() == ClipWorkflow::Rendering )
{
//The rendering state meens... whell it means that the frame is
......@@ -144,13 +144,13 @@ void TrackWorkflow::renderClip( ClipWorkflow* cw, qint64 currentFrame,
}
else if ( cw->getState() == ClipWorkflow::Stopped )
{
qDebug() << "Unlocking state lock";
// qDebug() << "Unlocking state lock";
cw->getStateLock()->unlock();
qDebug() << "Initializing";
// qDebug() << "Initializing";
cw->initialize();
qDebug() << "Calling start render";
// qDebug() << "Calling start render";
cw->startRender( m_paused );
qDebug() << "Start render done !";
// qDebug() << "Start render done !";
if ( start != currentFrame ) //Clip was not started as its real begining
{
adjustClipTime( currentFrame, start, cw );
......@@ -316,7 +316,6 @@ bool TrackWorkflow::getOutput( qint64 currentFrame )
// qDebug() << "Start:" << start << "Current Frame:" << currentFrame;
if ( start <= currentFrame && currentFrame <= start + cw->getClip()->getLength() )
{
qDebug() << "Adding a clip to render";
m_nbClipToRender.fetchAndAddAcquire( 1 );
renderClip( cw, currentFrame, start, needRepositioning );
hasRendered = true;
......
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