[vlmc-devel] ClipWorkflow: Stop the renderer unconditionnaly.
Hugo Beauzée-Luyssen
git at videolan.org
Thu Mar 24 13:22:22 CET 2016
vlmc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Tue Mar 15 23:28:39 2016 +0100| [1b1e550768009cfce55d84b58e66dcd8f8dfb1b2] | committer: Hugo Beauzée-Luyssen
ClipWorkflow: Stop the renderer unconditionnaly.
libvlc handles multiple stopping just fine, and holding the state lock
while stopping is the highway to a deadlock
> https://code.videolan.org/videolan/vlmc/commit/1b1e550768009cfce55d84b58e66dcd8f8dfb1b2
---
src/Workflow/ClipWorkflow.cpp | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/src/Workflow/ClipWorkflow.cpp b/src/Workflow/ClipWorkflow.cpp
index 5a125bc..cc2feae 100644
--- a/src/Workflow/ClipWorkflow.cpp
+++ b/src/Workflow/ClipWorkflow.cpp
@@ -125,13 +125,7 @@ ClipWorkflow::clipEndReached()
void
ClipWorkflow::stop()
{
- QWriteLocker lockState( m_stateLock );
-
- //Let's make sure the ClipWorkflow isn't beeing stopped from another thread.
- if ( m_renderer && m_state != Stopped )
- {
- m_renderer->stop();
- }
+ m_renderer->stop();
}
void
More information about the Vlmc-devel
mailing list