Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
VLMC
Commits
ab5c2836
Commit
ab5c2836
authored
Jul 24, 2009
by
Hugo Beauzee-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
This time, it should work. (No really, I mean it !)
parent
5392c2be
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
10 deletions
+20
-10
src/Workflow/ClipWorkflow.cpp
src/Workflow/ClipWorkflow.cpp
+1
-1
src/Workflow/MainWorkflow.cpp
src/Workflow/MainWorkflow.cpp
+2
-2
src/Workflow/TrackWorkflow.cpp
src/Workflow/TrackWorkflow.cpp
+7
-6
src/renderer/WorkflowRenderer.cpp
src/renderer/WorkflowRenderer.cpp
+9
-1
src/renderer/WorkflowRenderer.h
src/renderer/WorkflowRenderer.h
+1
-0
No files found.
src/Workflow/ClipWorkflow.cpp
View file @
ab5c2836
...
...
@@ -93,7 +93,7 @@ void ClipWorkflow::lock( ClipWorkflow* cw, void** pp_ret )
// else
// {
*
pp_ret
=
cw
->
m_buffer
;
qDebug
()
<<
"Clip workflow locking <<<<<<<<<<<<<<<<<<<<<<<<<<"
;
//
qDebug() << "Clip workflow locking <<<<<<<<<<<<<<<<<<<<<<<<<<";
// }
}
...
...
src/Workflow/MainWorkflow.cpp
View file @
ab5c2836
...
...
@@ -127,7 +127,7 @@ void MainWorkflow::pause()
{
QMutexLocker
lock
(
m_renderMutex
);
qDebug
()
<<
"
Pausing.......................
"
;
qDebug
()
<<
"
MainWorkflow Pausing Started >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
\n\n
"
;
m_nbTracksToPause
=
0
;
for
(
unsigned
int
i
=
0
;
i
<
m_trackCount
;
++
i
)
{
...
...
@@ -137,7 +137,7 @@ void MainWorkflow::pause()
m_tracks
[
i
]
->
pause
();
}
}
qDebug
()
<<
"Pausing completed <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
\n\n
"
;
qDebug
()
<<
"
MainWorkflow
Pausing
asked
completed <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
\n\n
"
;
}
void
MainWorkflow
::
nextFrame
()
...
...
src/Workflow/TrackWorkflow.cpp
View file @
ab5c2836
...
...
@@ -342,13 +342,13 @@ void TrackWorkflow::pauseClipWorkflow( ClipWorkflow* cw )
cw
->
getState
()
==
ClipWorkflow
::
EndReached
)
{
qDebug
()
<<
"Pausing a sleeping, ready or EndReached ClipWorkflow, state ="
<<
cw
->
getState
();
qDebug
()
<<
"getting condwait lock"
;
cw
->
getSleepMutex
()
->
lock
();
cw
->
queryStateChange
(
ClipWorkflow
::
Pausing
);
cw
->
getStateLock
()
->
unlock
();
qDebug
()
<<
"Unlocked state mutex"
;
qDebug
()
<<
"Realeasing condwait lock"
;
cw
->
getSleepMutex
()
->
unlock
();
cw
->
getStateLock
()
->
unlock
();
qDebug
()
<<
"Waiting for sleep mutex"
;
QMutexLocker
lock
(
cw
->
getSleepMutex
()
);
qDebug
()
<<
"Got sleep mutex"
;
cw
->
queryStateChange
(
ClipWorkflow
::
Pausing
);
cw
->
wake
();
}
else
if
(
cw
->
getState
()
==
ClipWorkflow
::
Rendering
)
...
...
@@ -415,6 +415,7 @@ void TrackWorkflow::pause()
//This should never be used.
//TODO: remove this in a few revision (wrote on July 16 2009 )
qDebug
()
<<
"Asking to pause in an already paused state"
;
cw
->
getStateLock
()
->
unlock
();
}
}
qDebug
()
<<
"End of loop"
;
...
...
src/renderer/WorkflowRenderer.cpp
View file @
ab5c2836
...
...
@@ -29,7 +29,8 @@
WorkflowRenderer
::
WorkflowRenderer
(
MainWorkflow
*
mainWorkflow
)
:
m_mainWorkflow
(
mainWorkflow
),
m_framePlayed
(
false
)
m_framePlayed
(
false
),
m_pauseAsked
(
false
)
{
m_actionsLock
=
new
QReadWriteLock
;
m_media
=
new
LibVLCpp
::
Media
(
"fake://"
);
...
...
@@ -126,6 +127,9 @@ void WorkflowRenderer::checkActions()
{
case
Pause
:
qDebug
()
<<
"Pausing WorkflowRenderer mediaPlayer"
;
if
(
m_pauseAsked
==
true
)
continue
;
m_pauseAsked
=
true
;
m_mediaPlayer
->
pause
();
//This will also pause the MainWorkflow via a signal/slot
break
;
...
...
@@ -186,12 +190,16 @@ void WorkflowRenderer::previousFrame()
void
WorkflowRenderer
::
pauseMainWorkflow
()
{
qDebug
()
<<
"In pause callback"
;
if
(
m_paused
==
true
)
return
;
m_mainWorkflow
->
pause
();
}
void
WorkflowRenderer
::
mainWorkflowPaused
()
{
qDebug
()
<<
"MAIN WORKFLOW PAUSED<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
;
m_paused
=
true
;
m_pauseAsked
=
false
;
emit
paused
();
}
...
...
src/renderer/WorkflowRenderer.h
View file @
ab5c2836
...
...
@@ -77,6 +77,7 @@ class WorkflowRenderer : public GenericRenderer
bool
m_framePlayed
;
QStack
<
Actions
>
m_actions
;
QReadWriteLock
*
m_actionsLock
;
bool
m_pauseAsked
;
public
slots
:
void
mainWorkflowPaused
();
...
...
Write
Preview
Markdown
is supported
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