major design changes: use glib event loop for MIDI thread/UI; rework design of BaseUI and AbstractUI; solo & mute are both temporarily broken; OSC control up next; may segfault during exit

git-svn-id: svn://localhost/ardour2/branches/3.0@6328 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 20 insertions, 33 deletions

diff --git a/libs/pbd/pbd/crossthread.h b/libs/pbd/pbd/crossthread.h
index c63c863f38..f2fb4aa469 100644
--- a/libs/pbd/pbd/crossthread.h
+++ b/libs/pbd/pbd/crossthread.h
@@ -20,38 +20,25 @@
 #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.
-	*/
-
-	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);
-}
+#include <glibmm/main.h>
+
+class CrossThreadChannel { 
+  public:
+	CrossThreadChannel();
+	~CrossThreadChannel();
+	
+	void wakeup();
+	int selectable() const { return fds[0]; }
+
+	void drain ();
+	static void drain (int fd);
+
+	Glib::RefPtr<Glib::IOSource> 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__ */