tweak transport bar spacing

[ardour.git] / libs / pbd / pbd / crossthread.h

diff --git a/libs/pbd/pbd/crossthread.h b/libs/pbd/pbd/crossthread.h
index c63c863f385d41e698dc0d4f07853930c2c63b48..a791be57981ea8c4140c5347446466e84d4aba76 100644 (file)
--- a/libs/pbd/pbd/crossthread.h
+++ b/libs/pbd/pbd/crossthread.h
@@ -20,38 +20,42 @@
 #ifndef __pbd__crossthread_h__
 #define __pbd__crossthread_h__
 
-#include "pbd/abstract_ui.h"
-#include <sigc++/sigc++.h>
-#include <pthread.h>
-
-template<class RequestType> 
-void 
-call_slot_from_thread_or_dispatch_it (pthread_t thread_id, AbstractUI<RequestType>& ui, sigc::slot<void> theSlot)
-{
-       /* when called, this function will determine whether the calling thread
-          is the same as thread specified by the first argument. if it is,
-          the we execute the slot. if not, we ask the interface given by the second
-          argument to call the slot.
+#ifdef check
+#undef check
+#endif
+
+#include <glibmm/main.h>
+
+class CrossThreadChannel { 
+  public:
+       CrossThreadChannel(bool);
+       ~CrossThreadChannel();
+       
+       void wakeup();
+       int selectable() const { return fds[0]; }
+
+        int deliver (char msg);
+        int receive (char& msg);
+        
+       void drain ();
+       static void drain (int fd);
+
+       /* glibmm 2.22 and earlier has a terrifying bug that will
+          cause crashes whenever a Source is removed from
+          a MainContext (including the destruction of the MainContext),
+          because the Source is destroyed "out from under the nose of" 
+          the RefPtr. I (Paul) have fixed this (https://bugzilla.gnome.org/show_bug.cgi?id=561885)
+          but in the meantime, we need a hack to get around the issue.
        */
 
-       if (pthread_self() == thread_id) {
-               theSlot ();
-       } else {
-               ui.call_slot (theSlot);
-       }
-}
-
-template<class RequestType> 
-sigc::slot<void>
-crossthread_safe (pthread_t thread_id, AbstractUI<RequestType>& ui, sigc::slot<void> theSlot)
-{
-       /* this function returns a slot that will ensure that theSlot is either
-          called by the specified thread or passed to the interface via 
-          AbstractUI::call_slot().
-       */
-          
-       return sigc::bind (sigc::ptr_fun (call_slot_from_thread_or_dispatch_it<RequestType>), 
-                          thread_id, ui, theSlot);
-}
+       Glib::RefPtr<Glib::IOSource> ios();
+       void drop_ios ();
+
+       bool ok() const { return fds[0] >= 0 && fds[1] >= 0; }
+
+  private:
+       Glib::RefPtr<Glib::IOSource>* _ios; // lazily constructed
+       int fds[2];
+};
 
 #endif /* __pbd__crossthread_h__ */