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
db0683a3
Commit
db0683a3
authored
Jan 12, 2010
by
Hugo Beauzee-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed dead code
parent
2613422c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
14 deletions
+0
-14
src/Workflow/ClipWorkflow.cpp
src/Workflow/ClipWorkflow.cpp
+0
-13
src/Workflow/ClipWorkflow.h
src/Workflow/ClipWorkflow.h
+0
-1
No files found.
src/Workflow/ClipWorkflow.cpp
View file @
db0683a3
...
...
@@ -40,7 +40,6 @@ ClipWorkflow::ClipWorkflow( Clip::Clip* clip ) :
m_initWaitCond
=
new
WaitCondition
;
m_pausingStateWaitCond
=
new
WaitCondition
;
m_renderLock
=
new
QMutex
;
m_feedingCondWait
=
new
WaitCondition
;
m_availableBuffersMutex
=
new
QMutex
;
m_computedBuffersMutex
=
new
QMutex
;
}
...
...
@@ -181,14 +180,9 @@ LibVLCpp::MediaPlayer* ClipWorkflow::getMediaPlayer()
bool
ClipWorkflow
::
preGetOutput
()
{
QMutexLocker
lock
(
m_feedingCondWait
->
getMutex
()
);
//Computed buffer mutex is already locked by underlying clipworkflow getoutput method
if
(
getNbComputedBuffers
()
==
0
)
{
// qWarning() << "Waiting for buffer to be fed";
return
false
;
}
return
true
;
}
...
...
@@ -220,13 +214,6 @@ void ClipWorkflow::commonUnlock()
setState
(
ClipWorkflow
::
PauseRequired
);
m_mediaPlayer
->
pause
();
}
// if ( getNbComputedBuffers() == 1 )
{
// qDebug() << "Waking feeding cont wait... acquiring lock. Type:" << debugType;
QMutexLocker
lock
(
m_feedingCondWait
->
getMutex
()
);
// qDebug() << "feeding cont wait mutex acquired. Type:" << debugType;
m_feedingCondWait
->
wake
();
}
}
void
ClipWorkflow
::
computePtsDiff
(
qint64
pts
)
...
...
src/Workflow/ClipWorkflow.h
View file @
db0683a3
...
...
@@ -197,7 +197,6 @@ class ClipWorkflow : public QObject
* the clipworkflow hasn't generate a frame yet,
* while the renderer asks for one.
*/
WaitCondition
*
m_feedingCondWait
;
QMutex
*
m_computedBuffersMutex
;
QMutex
*
m_availableBuffersMutex
;
qint64
m_beginPausePts
;
...
...
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