X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fbase_ui.cc;h=ce7018a005293014c95b937468ef853c118deeed;hb=56469c195640b561119852fd6d27a4b56e5af7e2;hp=94d039ba8633aef20c4d9f462527831a7e996de6;hpb=449aab3c465bbbf66d221fac3d7ea559f1720357;p=ardour.git

diff --git a/libs/pbd/base_ui.cc b/libs/pbd/base_ui.cc
index 94d039ba86..ce7018a005 100644
--- a/libs/pbd/base_ui.cc
+++ b/libs/pbd/base_ui.cc
@@ -21,47 +21,38 @@
 #include <stdint.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <errno.h>
+#include <cerrno>
+#include <cstring>
 
-#include <pbd/base_ui.h>
-#include <pbd/error.h>
-#include <pbd/compose.h>
-#include <pbd/failed_constructor.h>
+#include "pbd/base_ui.h"
+#include "pbd/pthread_utils.h"
+#include "pbd/error.h"
+#include "pbd/compose.h"
+#include "pbd/failed_constructor.h"
 
 #include "i18n.h"
 
 using namespace std;
 using namespace PBD;
+using namespace Glib;
 	
-uint32_t BaseUI::rt_bit = 1;
+uint64_t BaseUI::rt_bit = 1;
 BaseUI::RequestType BaseUI::CallSlot = BaseUI::new_request_type();
+BaseUI::RequestType BaseUI::Quit = BaseUI::new_request_type();
 
-BaseUI::BaseUI (string str, bool with_signal_pipe)
-	: _name (str)
+BaseUI::BaseUI (const string& str)
+	: run_loop_thread (0)
+	, _name (str)
 {
-	/* odd pseudo-singleton semantics */
-
 	base_ui_instance = this;
 
-	signal_pipe[0] = -1;
-	signal_pipe[1] = -1;
+	request_channel.ios()->connect (sigc::mem_fun (*this, &BaseUI::request_handler));
 
-	if (with_signal_pipe) {
-		if (setup_signal_pipe ()) {
-			throw failed_constructor ();
-		}
-	}
+	/* derived class must set _ok */
 }
 
 BaseUI::~BaseUI()
 {
-	if (signal_pipe[0] >= 0) {
-		close (signal_pipe[0]);
-	} 
-
-	if (signal_pipe[1] >= 0) {
-		close (signal_pipe[1]);
-	} 
 }
 
 BaseUI::RequestType
@@ -77,32 +68,59 @@ BaseUI::new_request_type ()
 	return rt;
 }
 
-int
-BaseUI::setup_signal_pipe ()
+void
+BaseUI::main_thread ()
 {
-	/* setup the pipe that other threads send us notifications/requests
-	   through.
+	set_event_loop_for_thread (this);
+	thread_init ();
+	_main_loop->run ();
+}
+
+void
+BaseUI::run ()
+{
+	/* to be called by UI's that need/want their own distinct, self-created event loop thread.
 	*/
 
-	if (pipe (signal_pipe)) {
-		error << string_compose (_("%1-UI: cannot create error signal pipe (%2)"), _name, std::strerror (errno))
-		      << endmsg;
+	_main_loop = MainLoop::create (MainContext::create());
+	request_channel.ios()->attach (_main_loop->get_context());
+
+	/* glibmm hack - drop the refptr to the IOSource now before it can hurt */
+	request_channel.drop_ios ();
+
+	run_loop_thread = Thread::create (mem_fun (*this, &BaseUI::main_thread), true);
+}
 
-		return -1;
+void
+BaseUI::quit ()
+{
+	if (_main_loop->is_running()) {
+		_main_loop->quit ();
+		run_loop_thread->join ();
 	}
+}
+
+bool
+BaseUI::request_handler (Glib::IOCondition ioc)
+{
+	/* check the transport request pipe */
 
-	if (fcntl (signal_pipe[0], F_SETFL, O_NONBLOCK)) {
-		error << string_compose (_("%1-UI: cannot set O_NONBLOCK on signal read pipe (%2)"), _name, std::strerror (errno))
-		      << endmsg;
-		return -1;
+	if (ioc & ~IO_IN) {
+		_main_loop->quit ();
 	}
 
-	if (fcntl (signal_pipe[1], F_SETFL, O_NONBLOCK)) {
-		error << string_compose (_("%1-UI: cannot set O_NONBLOCK on signal write pipe (%2)"), _name, std::strerror (errno))
-		      << endmsg;
-		return -1;
+	if (ioc & IO_IN) {
+		request_channel.drain ();
+		
+		/* there may been an error. we'd rather handle requests first,
+		   and then get IO_HUP or IO_ERR on the next loop.
+		*/
+
+		/* handle requests */
+
+		handle_ui_requests ();
 	}
 
-	return 0;
+	return true;
 }
-
+