summaryrefslogtreecommitdiff
path: root/libs/surfaces/wiimote/wiimote.h
diff options
context:
space:
mode:
Diffstat (limited to 'libs/surfaces/wiimote/wiimote.h')
-rw-r--r--libs/surfaces/wiimote/wiimote.h76
1 files changed, 38 insertions, 38 deletions
diff --git a/libs/surfaces/wiimote/wiimote.h b/libs/surfaces/wiimote/wiimote.h
index c7c2cd59c9..4ab19749e5 100644
--- a/libs/surfaces/wiimote/wiimote.h
+++ b/libs/surfaces/wiimote/wiimote.h
@@ -4,7 +4,7 @@
#include "ardour/types.h"
#include "control_protocol/control_protocol.h"
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
#include "pbd/abstract_ui.h"
@@ -16,7 +16,7 @@ namespace ARDOUR {
}
#define ENSURE_WIIMOTE_THREAD(slot) \
- if (Glib::Thread::self() != main_thread) {\
+ if (Glib::Threads::Thread::self() != main_thread) { \
slot_mutex.lock();\
slot_list.push_back(slot);\
slot_cond.signal();\
@@ -26,42 +26,42 @@ namespace ARDOUR {
class WiimoteControlProtocol : public ARDOUR::ControlProtocol {
- public:
- WiimoteControlProtocol (ARDOUR::Session &);
- virtual ~WiimoteControlProtocol ();
-
- static bool probe();
-
- int set_active (bool yn);
- XMLNode& get_state();
- int set_state(const XMLNode&);
-
- void wiimote_callback(cwiid_wiimote_t *, int, union cwiid_mesg [],
- struct timespec *);
-
- private:
-
- void wiimote_main();
- volatile bool main_thread_quit;
- volatile bool restart_discovery;
-
- Glib::Thread *main_thread;
-
- void update_led_state();
-
- bool callback_thread_registered_for_ardour;
-
- static uint16_t button_state;
-
- cwiid_wiimote_t *wiimote_handle;
-
- Glib::Cond slot_cond;
- Glib::Mutex slot_mutex;
-
- std::list< sigc::slot<void> > slot_list;
-
- sigc::connection transport_state_conn;
- sigc::connection record_state_conn;
+ public:
+ WiimoteControlProtocol (ARDOUR::Session &);
+ virtual ~WiimoteControlProtocol ();
+
+ static bool probe();
+
+ int set_active (bool yn);
+ XMLNode& get_state();
+ int set_state(const XMLNode&);
+
+ void wiimote_callback(cwiid_wiimote_t *, int, union cwiid_mesg [],
+ struct timespec *);
+
+ private:
+
+ void wiimote_main();
+ volatile bool main_thread_quit;
+ volatile bool restart_discovery;
+
+ Glib::Threads::Thread *main_thread;
+
+ void update_led_state();
+
+ bool callback_thread_registered_for_ardour;
+
+ static uint16_t button_state;
+
+ cwiid_wiimote_t *wiimote_handle;
+
+ Glib::Threads::Cond slot_cond;
+ Glib::Threads::Mutex slot_mutex;
+
+ std::list< sigc::slot<void> > slot_list;
+
+ sigc::connection transport_state_conn;
+ sigc::connection record_state_conn;
};