Joystick: Remap joystick-specific KeyTypes to generic ones

[minetest.git] / src / threading / event.cpp

diff --git a/src/threading/event.cpp b/src/threading/event.cpp
index 0d5928f105ae89ed24ce5bd830af8bc574fe81d2..885e732c8d2ba0b82ced3e99f9ffc900e203d99f 100644 (file)
--- a/src/threading/event.cpp
+++ b/src/threading/event.cpp
@@ -24,66 +24,21 @@ DEALINGS IN THE SOFTWARE.
 */
 
 #include "threading/event.h"
-
-Event::Event()
-{
-#ifndef USE_CPP11_MUTEX
-#      if USE_WIN_MUTEX
-       event = CreateEvent(NULL, false, false, NULL);
-#      else
-       pthread_cond_init(&cv, NULL);
-       pthread_mutex_init(&mutex, NULL);
-       notified = false;
-#      endif
-#endif
-}
-
-#ifndef USE_CPP11_MUTEX
-Event::~Event()
-{
-#if USE_WIN_MUTEX
-       CloseHandle(event);
-#else
-       pthread_cond_destroy(&cv);
-       pthread_mutex_destroy(&mutex);
-#endif
-}
-#endif
-
+#include "threading/mutex_auto_lock.h"
 
 void Event::wait()
 {
-#if USE_CPP11_MUTEX
        MutexAutoLock lock(mutex);
        while (!notified) {
                cv.wait(lock);
        }
        notified = false;
-#elif USE_WIN_MUTEX
-       WaitForSingleObject(event, INFINITE);
-#else
-       pthread_mutex_lock(&mutex);
-       while (!notified) {
-               pthread_cond_wait(&cv, &mutex);
-       }
-       notified = false;
-       pthread_mutex_unlock(&mutex);
-#endif
 }
 
 
 void Event::signal()
 {
-#if USE_CPP11_MUTEX
        MutexAutoLock lock(mutex);
        notified = true;
        cv.notify_one();
-#elif USE_WIN_MUTEX
-       SetEvent(event);
-#else
-       pthread_mutex_lock(&mutex);
-       notified = true;
-       pthread_cond_signal(&cv);
-       pthread_mutex_unlock(&mutex);
-#endif
 }