[vlmc-devel] MainWorkflow: Remove a never used mutex.

Hugo Beauzée-Luyssen git at videolan.org
Fri Jan 24 19:37:04 CET 2014


vlmc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Fri Jan 24 19:30:34 2014 +0200| [5ae5a25867c996f1d839bd3754df329eff597ba5] | committer: Hugo Beauzée-Luyssen

MainWorkflow: Remove a never used mutex.

(Locking a mutex from a single thread doesn't count as being used)

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=5ae5a25867c996f1d839bd3754df329eff597ba5
---

 src/Workflow/MainWorkflow.cpp |    4 ----
 src/Workflow/MainWorkflow.h   |    1 -
 2 files changed, 5 deletions(-)

diff --git a/src/Workflow/MainWorkflow.cpp b/src/Workflow/MainWorkflow.cpp
index 00c81cb..fe35150 100644
--- a/src/Workflow/MainWorkflow.cpp
+++ b/src/Workflow/MainWorkflow.cpp
@@ -46,7 +46,6 @@ MainWorkflow::MainWorkflow( int trackCount ) :
         m_trackCount( trackCount )
 {
     m_currentFrameLock = new QReadWriteLock;
-    m_renderStartedMutex = new QMutex;
 
     m_tracks = new TrackHandler*[Workflow::NbTrackType];
     m_currentFrame = new qint64[Workflow::NbTrackType];
@@ -64,7 +63,6 @@ MainWorkflow::MainWorkflow( int trackCount ) :
 
 MainWorkflow::~MainWorkflow()
 {
-    delete m_renderStartedMutex;
     delete m_currentFrameLock;
     delete m_currentFrame;
     for ( unsigned int i = 0; i < Workflow::NbTrackType; ++i )
@@ -110,8 +108,6 @@ MainWorkflow::startRender( quint32 width, quint32 height, double fps )
 const Workflow::OutputBuffer*
 MainWorkflow::getOutput( Workflow::TrackType trackType, bool paused )
 {
-    QMutexLocker        lock( m_renderStartedMutex );
-
     if ( m_renderStarted == true )
     {
         qint64              currentFrame;
diff --git a/src/Workflow/MainWorkflow.h b/src/Workflow/MainWorkflow.h
index 5994ece..8a9c8b8 100644
--- a/src/Workflow/MainWorkflow.h
+++ b/src/Workflow/MainWorkflow.h
@@ -300,7 +300,6 @@ class   MainWorkflow : public QObject, public Singleton<MainWorkflow>
         qint64                          m_lengthFrame;
         /// This boolean describe is a render has been started
         bool                            m_renderStarted;
-        QMutex*                         m_renderStartedMutex;
 
         /// Contains the trackhandler, indexed by Workflow::TrackType
         TrackHandler**                  m_tracks;



More information about the Vlmc-devel mailing list