Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
VLMC
Commits
036f9c8d
Commit
036f9c8d
authored
Apr 07, 2010
by
Hugo Beauzee-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ClipWorkflow: Removing preGetOutput.
parent
fb9b810f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
11 deletions
+2
-11
src/Workflow/AudioClipWorkflow.cpp
src/Workflow/AudioClipWorkflow.cpp
+1
-1
src/Workflow/ClipWorkflow.cpp
src/Workflow/ClipWorkflow.cpp
+0
-8
src/Workflow/ClipWorkflow.h
src/Workflow/ClipWorkflow.h
+0
-1
src/Workflow/VideoClipWorkflow.cpp
src/Workflow/VideoClipWorkflow.cpp
+1
-1
No files found.
src/Workflow/AudioClipWorkflow.cpp
View file @
036f9c8d
...
...
@@ -82,7 +82,7 @@ AudioClipWorkflow::getOutput( ClipWorkflow::GetMode mode )
{
QMutexLocker
lock
(
m_renderLock
);
if
(
preGetOutput
()
==
false
)
if
(
getNbComputedBuffers
()
==
0
)
return
NULL
;
if
(
isEndReached
()
==
true
)
return
NULL
;
...
...
src/Workflow/ClipWorkflow.cpp
View file @
036f9c8d
...
...
@@ -172,14 +172,6 @@ LibVLCpp::MediaPlayer* ClipWorkflow::getMediaPlayer()
return
m_mediaPlayer
;
}
bool
ClipWorkflow
::
preGetOutput
()
{
//Computed buffer mutex is already locked by underlying clipworkflow getoutput method
if
(
getNbComputedBuffers
()
==
0
)
return
false
;
return
true
;
}
void
ClipWorkflow
::
postGetOutput
()
{
//If we're running out of computed buffers, refill our stack.
...
...
src/Workflow/ClipWorkflow.h
View file @
036f9c8d
...
...
@@ -97,7 +97,6 @@ class ClipWorkflow : public QObject
* of the rendering process advancement.
*/
virtual
void
*
getOutput
(
ClipWorkflow
::
GetMode
mode
)
=
0
;
bool
preGetOutput
();
void
postGetOutput
();
virtual
void
initVlcOutput
()
=
0
;
void
initialize
();
...
...
src/Workflow/VideoClipWorkflow.cpp
View file @
036f9c8d
...
...
@@ -114,7 +114,7 @@ VideoClipWorkflow::getOutput( ClipWorkflow::GetMode mode )
if
(
isEndReached
()
==
true
)
return
NULL
;
if
(
preGetOutput
()
==
false
)
if
(
getNbComputedBuffers
()
==
0
)
m_renderWaitCond
->
wait
(
m_renderLock
);
::
StackedBuffer
<
LightVideoFrame
*>*
buff
;
if
(
mode
==
ClipWorkflow
::
Pop
)
...
...
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