lib/platform: Use standard mutex primitives in Windows desks code

src/lib/platform/MSWindowsDesks.cpp

@@ -22,7 +22,6 @@
 #include "platform/MSWindowsScreen.h"
 #include "barrier/IScreenSaver.h"
 #include "barrier/XScreen.h"
-#include "mt/Lock.h"
 #include "mt/Thread.h"
 #include "arch/win32/ArchMiscWindows.h"
 #include "base/Log.h"
@@ -110,8 +109,6 @@ MSWindowsDesks::MSWindowsDesks(bool isPrimary, bool noHooks,
     m_screensaverNotify(false),
     m_activeDesk(NULL),
     m_activeDeskName(),
-    m_mutex(),
-    m_deskReady(&m_mutex, false),
     m_updateKeys(updateKeys),
     m_events(events),
     m_stopOnDeskSwitch(stopOnDeskSwitch)
@@ -623,9 +620,9 @@ void MSWindowsDesks::desk_thread(Desk* desk)
 
     // tell main thread that we're ready
     {
-        Lock lock(&m_mutex);
+        std::lock_guard<std::mutex> lock(mutex_);
-        m_deskReady = true;
+        is_desks_ready_ = true;
-        m_deskReady.broadcast();
+        desks_ready_cv_.notify_all();
     }
 
     while (GetMessage(&msg, NULL, 0, 0)) {
@@ -725,9 +722,9 @@ void MSWindowsDesks::desk_thread(Desk* desk)
         }
 
         // notify that message was processed
-        Lock lock(&m_mutex);
+        std::lock_guard<std::mutex> lock(mutex_);
-        m_deskReady = true;
+        is_desks_ready_ = true;
-        m_deskReady.broadcast();
+        desks_ready_cv_.notify_all();
     }
 
     // clean up
@@ -855,11 +852,9 @@ MSWindowsDesks::waitForDesk() const
 {
     MSWindowsDesks* self = const_cast<MSWindowsDesks*>(this);
 
-    Lock lock(&m_mutex);
+    std::unique_lock<std::mutex> lock(mutex_);
-    while (!(bool)m_deskReady) {
+    desks_ready_cv_.wait(lock, [this](){ return is_desks_ready_; });
-        m_deskReady.wait();
+    self->is_desks_ready_ = false;
-    }
-    self->m_deskReady = false;
 }
 
 void

src/lib/platform/MSWindowsDesks.h

@@ -23,16 +23,15 @@
 #include "barrier/key_types.h"
 #include "barrier/mouse_types.h"
 #include "barrier/option_types.h"
-#include "mt/CondVar.h"
-#include "mt/Mutex.h"
 #include "common/stdmap.h"
+#include <condition_variable>
 #include <functional>
+#include <mutex>
 #include <string>
 
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 
-
 class Event;
 class EventQueueTimer;
 class Thread;
@@ -280,8 +279,9 @@ private:
     std::string m_activeDeskName;
 
     // one desk per desktop and a cond var to communicate with it
-    Mutex                m_mutex;
+    mutable std::mutex mutex_;
-    CondVar<bool>        m_deskReady;
+    mutable std::condition_variable desks_ready_cv_;
+    bool is_desks_ready_ = false;
     Desks                m_desks;
 
     // keyboard stuff