Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
VideoLAN
VLMC
Commits
c076f2b7
Commit
c076f2b7
authored
Jul 23, 2009
by
Hugo Beauzee-Luyssen
Browse files
Revert "More debug on pausing render preview."
This reverts commit
37a0076e
.
parent
37a0076e
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/Workflow/TrackWorkflow.cpp
View file @
c076f2b7
...
...
@@ -341,7 +341,7 @@ void TrackWorkflow::pauseClipWorkflow( ClipWorkflow* cw )
cw
->
getState
()
==
ClipWorkflow
::
Ready
||
cw
->
getState
()
==
ClipWorkflow
::
EndReached
)
{
qDebug
()
<<
"Pausing a sleeping, ready or EndReached ClipWorkflow
, state ="
<<
cw
->
getState
()
;
qDebug
()
<<
"Pausing a sleeping, ready or EndReached ClipWorkflow
"
;
cw
->
getStateLock
()
->
unlock
();
cw
->
queryStateChange
(
ClipWorkflow
::
Pausing
);
cw
->
wake
();
...
...
@@ -406,7 +406,8 @@ 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"
;
qDebug
()
<<
"State before crash is:"
<<
cw
->
getState
();
Q_ASSERT
(
false
);
}
}
qDebug
()
<<
"End of loop"
;
...
...
src/renderer/WorkflowRenderer.cpp
View file @
c076f2b7
...
...
@@ -31,7 +31,6 @@ WorkflowRenderer::WorkflowRenderer( MainWorkflow* mainWorkflow ) :
m_mainWorkflow
(
mainWorkflow
),
m_framePlayed
(
false
)
{
m_actionsLock
=
new
QReadWriteLock
;
m_media
=
new
LibVLCpp
::
Media
(
"fake://"
);
// --invmem-width <integer> Width
// --invmem-height <integer> Height
...
...
@@ -76,7 +75,6 @@ WorkflowRenderer::~WorkflowRenderer()
disconnect
(
m_mainWorkflow
,
SIGNAL
(
mainWorkflowEndReached
()
),
this
,
SLOT
(
__endReached
()
)
);
disconnect
(
m_mainWorkflow
,
SIGNAL
(
positionChanged
(
float
)
),
this
,
SLOT
(
__positionChanged
(
float
)
)
);
delete
m_actionsLock
;
delete
m_media
;
delete
m_mainWorkflow
;
}
...
...
@@ -106,30 +104,6 @@ void WorkflowRenderer::unlock( void* datas )
self
->
m_oneFrameOnly
=
2
;
}
self
->
m_framePlayed
=
true
;
self
->
checkActions
();
}
void
WorkflowRenderer
::
checkActions
()
{
QReadLocker
lock
(
m_actionsLock
);
if
(
m_actions
.
size
()
==
0
)
return
;
while
(
m_actions
.
empty
()
==
false
)
{
Actions
act
=
m_actions
.
top
();
m_actions
.
pop
();
switch
(
act
)
{
case
Pause
:
m_mediaPlayer
->
pause
();
//This will also pause the MainWorkflow via a signal/slot
break
;
default:
qDebug
()
<<
"Unhandled action:"
<<
act
;
break
;
}
}
}
void
WorkflowRenderer
::
stopPreview
()
...
...
@@ -204,10 +178,8 @@ void WorkflowRenderer::togglePlayPause( bool forcePause )
//So be careful about pausing two times :
if
(
m_paused
==
false
)
{
// m_mediaPlayer->pause();
// qDebug() << "Waiting for paused media player";
QWriteLocker
lock
(
m_actionsLock
);
m_actions
.
push
(
Pause
);
m_mediaPlayer
->
pause
();
qDebug
()
<<
"Waiting for paused media player"
;
}
}
}
...
...
src/renderer/WorkflowRenderer.h
View file @
c076f2b7
...
...
@@ -26,7 +26,6 @@
#include
<QObject>
#include
<QWidget>
#include
<QStack>
#include
"Workflow/MainWorkflow.h"
#include
"GenericRenderer.h"
...
...
@@ -37,11 +36,6 @@ class WorkflowRenderer : public GenericRenderer
Q_DISABLE_COPY
(
WorkflowRenderer
)
public:
enum
Actions
{
Pause
,
Unpause
,
};
WorkflowRenderer
(
MainWorkflow
*
mainWorkflow
);
~
WorkflowRenderer
();
...
...
@@ -67,7 +61,6 @@ class WorkflowRenderer : public GenericRenderer
private:
void
pauseMainWorkflow
();
virtual
void
startPreview
();
void
checkActions
();
private:
MainWorkflow
*
m_mainWorkflow
;
...
...
@@ -75,8 +68,6 @@ class WorkflowRenderer : public GenericRenderer
QAtomicInt
m_oneFrameOnly
;
unsigned
char
*
m_lastFrame
;
bool
m_framePlayed
;
QStack
<
Actions
>
m_actions
;
QReadWriteLock
*
m_actionsLock
;
public
slots
:
void
__positionChanged
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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