[vlmc-devel] WaitCondition: Kill this insanity with fire. WITH FIRE!!

[Hugo Beauzée-Luyssen]

vlmc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Fri Jan 24 20:15:50 2014 +0200| [f62d4492e8ac0c49fe5100a3df32f042c03fd652] | committer: Hugo Beauzée-Luyssen

WaitCondition: Kill this insanity with fire. WITH FIRE!!

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

 src/CMakeLists.txt                 |    1 -
 src/Tools/WaitCondition.hpp        |   59 ------------------------------------
 src/Workflow/VideoClipWorkflow.cpp |    4 ++-
 3 files changed, 3 insertions(+), 61 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fe82751..19a0c53 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -41,7 +41,6 @@ SET(VLMC_SRCS
     Tools/Singleton.hpp
     Tools/Toggleable.hpp
     Tools/VlmcDebug.cpp
-    Tools/WaitCondition.hpp
     Workflow/AudioClipWorkflow.cpp 
     Workflow/ClipWorkflow.cpp
     Workflow/ClipHelper.cpp
diff --git a/src/Tools/WaitCondition.hpp b/src/Tools/WaitCondition.hpp
deleted file mode 100644
index 9863ef3..0000000
--- a/src/Tools/WaitCondition.hpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/*****************************************************************************
- * WaitCondition.hpp: Small helper to ease thread synchronisation
- *****************************************************************************
- * Copyright (C) 2008-2010 VideoLAN
- *
- * Authors: Hugo Beauzee-Luyssen <hugo at vlmc.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#ifndef WAITCONDITION_HPP
-#define WAITCONDITION_HPP
-
-#include <QMutex>
-#include <QWaitCondition>
-
-class   WaitCondition
-{
-    public:
-        WaitCondition()
-        {
-            m_mutex = new QMutex;
-            m_waitCond = new QWaitCondition;
-        }
-        ~WaitCondition()
-        {
-            delete m_waitCond;
-            delete m_mutex;
-        }
-        void            waitLocked()
-        {
-            m_waitCond->wait( m_mutex );
-        }
-        void            wake()
-        {
-            m_waitCond->wakeAll();
-        }
-        QMutex*         getMutex()
-        {
-            return m_mutex;
-        }
-    private:
-        QMutex*         m_mutex;
-        QWaitCondition* m_waitCond;
-};
-
-#endif // WAITCONDITION_HPP
diff --git a/src/Workflow/VideoClipWorkflow.cpp b/src/Workflow/VideoClipWorkflow.cpp
index 77d1f9a..f77108b 100644
--- a/src/Workflow/VideoClipWorkflow.cpp
+++ b/src/Workflow/VideoClipWorkflow.cpp
@@ -27,11 +27,13 @@
 #include "SettingsManager.h"
 #include "VideoClipWorkflow.h"
 #include "VLCMedia.h"
-#include "WaitCondition.hpp"
 #include "Workflow/Types.h"
 
+#include <QMutexLocker>
 #include <QReadWriteLock>
 #include <QStringBuilder>
+#include <QWaitCondition>
+
 #include <QtDebug>
 
 VideoClipWorkflow::VideoClipWorkflow( ClipHelper *ch ) :