Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
VideoLAN
VLMC
Commits
b49ba061
Commit
b49ba061
authored
Jul 14, 2009
by
Hugo Beauzee-Luyssen
Browse files
Revert "More debug for next/previous step on project render."
This reverts commit
295c52c5
.
parent
295c52c5
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/Workflow/ClipWorkflow.cpp
View file @
b49ba061
...
...
@@ -87,7 +87,7 @@ void ClipWorkflow::lock( ClipWorkflow* cw, void** pp_ret )
// else
// {
*
pp_ret
=
cw
->
m_buffer
;
qDebug
()
<<
"Clip workflow locking"
;
//
qDebug() << "Clip workflow locking";
// }
}
...
...
@@ -101,10 +101,10 @@ void ClipWorkflow::unlock( ClipWorkflow* cw )
cw
->
m_stateLock
->
unlock
();
QMutexLocker
lock
(
cw
->
m_condMutex
);
qDebug
()
<<
"Entering condwait"
;
//
qDebug() << "Entering condwait";
cw
->
m_waitCond
->
wait
(
cw
->
m_condMutex
);
qDebug
()
<<
"Leaved condwait"
;
//
qDebug() << "Leaved condwait";
cw
->
m_stateLock
->
lockForWrite
();
cw
->
m_state
=
Rendering
;
// {
...
...
src/Workflow/MainWorkflow.cpp
View file @
b49ba061
...
...
@@ -99,7 +99,6 @@ unsigned char* MainWorkflow::getOutput()
qDebug
()
<<
"Returning last frame"
;
return
m_lastRenderedFrame
;
}
qDebug
()
<<
"Computing frame"
;
if
(
m_renderStarted
==
true
)
{
unsigned
char
*
ret
;
...
...
@@ -236,5 +235,5 @@ void MainWorkflow::clipMoved( QUuid clipUuid, int oldTrack, int newTra
void
MainWorkflow
::
activateOneFrameOnly
()
{
m_renderOnlyOneFrame
=
1
;
m_lastRenderedFrame
=
NULL
;
//
m_lastRenderedFrame = NULL;
}
src/Workflow/TrackWorkflow.cpp
View file @
b49ba061
...
...
@@ -246,10 +246,7 @@ unsigned char* TrackWorkflow::getOutput( qint64 currentFrame )
m_forceRepositionning
=
false
;
}
else
{
qDebug
()
<<
currentFrame
-
lastFrame
;
needRepositioning
=
(
currentFrame
-
lastFrame
!=
1
)
?
true
:
false
;
}
}
while
(
it
!=
end
)
{
...
...
src/gui/RenderPreviewWidget.cpp
View file @
b49ba061
...
...
@@ -146,25 +146,7 @@ void RenderPreviewWidget::nextFrame()
void
RenderPreviewWidget
::
previousFrame
()
{
{
QWriteLocker
lock
(
m_framePlayedLock
);
m_framePlayed
=
false
;
}
//FIXME: MainWorkflow should be paused
m_mainWorkflow
->
previousFrame
();
qDebug
()
<<
"Activated one frame only"
;
m_mainWorkflow
->
activateOneFrameOnly
();
m_mainWorkflow
->
pause
();
m_mediaPlayer
->
play
();
bool
framePlayed
=
false
;
while
(
framePlayed
==
false
)
{
SleepMS
(
50
);
QReadLocker
lock
(
m_framePlayedLock
);
framePlayed
=
m_framePlayed
;
}
m_mediaPlayer
->
pause
();
m_mainWorkflow
->
pause
();
}
void
RenderPreviewWidget
::
togglePlayPause
(
bool
forcePause
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment