[vlmc-devel] commit: Removed commented code/debug (Hugo Beauzee-Luyssen )
git at videolan.org
git at videolan.org
Wed Mar 17 21:12:09 CET 2010
vlmc | branch: master | Hugo Beauzee-Luyssen <beauze.h at gmail.com> | Wed Mar 17 20:15:43 2010 +0100| [f75beaafefbbdbf74a6fc971c3aede6060fd7486] | committer: Hugo Beauzee-Luyssen
Removed commented code/debug
> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=f75beaafefbbdbf74a6fc971c3aede6060fd7486
---
src/Workflow/ClipWorkflow.cpp | 14 --------------
src/Workflow/TrackWorkflow.cpp | 2 --
2 files changed, 0 insertions(+), 16 deletions(-)
diff --git a/src/Workflow/ClipWorkflow.cpp b/src/Workflow/ClipWorkflow.cpp
index 6802f8b..54979d3 100644
--- a/src/Workflow/ClipWorkflow.cpp
+++ b/src/Workflow/ClipWorkflow.cpp
@@ -61,10 +61,8 @@ ClipWorkflow::~ClipWorkflow()
void ClipWorkflow::initialize()
{
-// qDebug() << "Setting state to initializing";
setState( ClipWorkflow::Initializing );
-// qDebug() << "State is Initializing.";
m_vlcMedia = new LibVLCpp::Media( m_clip->getMedia()->mrl() );
m_currentPts = -1;
m_previousPts = -1;
@@ -139,8 +137,6 @@ void ClipWorkflow::stop()
flushComputedBuffers();
releasePrealocated();
}
- else
- qDebug() << "ClipWorkflow has already been stopped";
}
void
@@ -151,7 +147,6 @@ ClipWorkflow::setTime( qint64 time )
QWriteLocker lock( m_stateLock );
if ( m_state == ClipWorkflow::Paused )
{
-// qDebug() << "Unpausing media player after set time";
m_mediaPlayer->pause();
m_state = ClipWorkflow::UnpauseRequired;
}
@@ -166,7 +161,6 @@ bool ClipWorkflow::isRendering() const
void ClipWorkflow::setState( State state )
{
QWriteLocker lock( m_stateLock );
-// qDebug() << '[' << (void*)this << "] Setting state to" << state;
m_state = state;
}
@@ -205,13 +199,10 @@ void ClipWorkflow::postGetOutput()
QWriteLocker lock( m_stateLock );
if ( m_state == ClipWorkflow::Paused )
{
-// qWarning() << "Unpausing media player. type:" << debugType;
m_state = ClipWorkflow::UnpauseRequired;
// This will act like an "unpause";
m_mediaPlayer->pause();
}
-// else
-// qCritical() << "Running out of computed buffers ! debugType:" << debugType;
}
}
@@ -221,7 +212,6 @@ void ClipWorkflow::commonUnlock()
//no one is available : we would spawn a new buffer, thus modifying the number of available buffers
if ( getNbComputedBuffers() >= getMaxComputedBuffers() )
{
-// qWarning() << "Pausing clip workflow. Type:" << debugType;
setState( ClipWorkflow::PauseRequired );
m_mediaPlayer->pause();
}
@@ -245,18 +235,14 @@ void ClipWorkflow::computePtsDiff( qint64 pts )
void ClipWorkflow::mediaPlayerPaused()
{
-// qWarning() << "\n\nMedia player paused, waiting for buffers to be consumed.Type:" << debugType;
setState( ClipWorkflow::Paused );
m_beginPausePts = mdate();
-// qDebug() << "got pause pts:" << m_beginPausePts;
}
void ClipWorkflow::mediaPlayerUnpaused()
{
-// qWarning() << "Media player unpaused. Go back to rendering. Type:" << debugType;
setState( ClipWorkflow::Rendering );
m_pauseDuration = mdate() - m_beginPausePts;
-// qDebug() << "pause duration:" << m_pauseDuration;
}
void ClipWorkflow::resyncClipWorkflow()
diff --git a/src/Workflow/TrackWorkflow.cpp b/src/Workflow/TrackWorkflow.cpp
index 901aae3..1b6b70d 100644
--- a/src/Workflow/TrackWorkflow.cpp
+++ b/src/Workflow/TrackWorkflow.cpp
@@ -138,7 +138,6 @@ TrackWorkflow::renderClip( ClipWorkflow* cw, qint64 currentFrame,
ClipWorkflow::Pop : ClipWorkflow::Get );
cw->getStateLock()->lockForRead();
-// qDebug() << "TrackWorkflow::renderClip. currentFrame:" << currentFrame << "trackType:" << m_trackType;
if ( cw->getState() == ClipWorkflow::Rendering ||
cw->getState() == ClipWorkflow::Paused ||
cw->getState() == ClipWorkflow::PauseRequired ||
@@ -288,7 +287,6 @@ TrackWorkflow::getOutput( qint64 currentFrame, qint64 subFrame, bool paused )
qint64 start = it.key();
ClipWorkflow* cw = it.value();
//Is the clip supposed to render now ?
-// qDebug() << "Start:" << start << "Current Frame:" << currentFrame;
if ( start <= currentFrame && currentFrame <= start + cw->getClip()->length() )
{
if ( ret != NULL )
More information about the Vlmc-devel
mailing list