X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fbase_ui.cc;h=09dfa74785c303c1723c3203303c2e2d80bf68f1;hb=6f7112547658b01594d8cd81a0f52c4edc017e1d;hp=259a51d9549b806e16da2250c488c778e05189fd;hpb=c38e02285fda1fd7966c9e4ad85994445247e6a6;p=ardour.git

diff --git a/libs/pbd/base_ui.cc b/libs/pbd/base_ui.cc
index 259a51d954..09dfa74785 100644
--- a/libs/pbd/base_ui.cc
+++ b/libs/pbd/base_ui.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    Copyright (C) 2000-2007 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -19,32 +19,42 @@
 
 #include <cstring>
 #include <stdint.h>
+#ifdef COMPILER_MSVC
+#include <io.h>      // Microsoft's nearest equivalent to <unistd.h>
+#else
 #include <unistd.h>
+#endif
 #include <fcntl.h>
 #include <cerrno>
 #include <cstring>
 
 #include "pbd/base_ui.h"
+#include "pbd/debug.h"
+#include "pbd/pthread_utils.h"
 #include "pbd/error.h"
 #include "pbd/compose.h"
 #include "pbd/failed_constructor.h"
 
 #include "i18n.h"
 
+#include "pbd/debug.h"
+
 using namespace std;
 using namespace PBD;
 using namespace Glib;
-	
+
 uint64_t BaseUI::rt_bit = 1;
 BaseUI::RequestType BaseUI::CallSlot = BaseUI::new_request_type();
+BaseUI::RequestType BaseUI::Quit = BaseUI::new_request_type();
 
 BaseUI::BaseUI (const string& str)
-	: run_loop_thread (0)
+	: m_context(MainContext::get_default())
+	, run_loop_thread (0)
 	, _name (str)
+	, request_channel (true)
 {
 	base_ui_instance = this;
-
-	request_channel.ios()->connect (sigc::mem_fun (*this, &BaseUI::request_handler));
+	request_channel.set_receive_handler (sigc::mem_fun (*this, &BaseUI::request_handler));
 
 	/* derived class must set _ok */
 }
@@ -69,33 +79,50 @@ BaseUI::new_request_type ()
 void
 BaseUI::main_thread ()
 {
+	DEBUG_TRACE (DEBUG::EventLoop, string_compose ("%1: event loop running in thread %2\n", name(), pthread_name()));
+	set_event_loop_for_thread (this);
 	thread_init ();
+	_main_loop->get_context()->signal_idle().connect (sigc::mem_fun (*this, &BaseUI::signal_running));
 	_main_loop->run ();
 }
 
+bool
+BaseUI::signal_running ()
+{
+	Glib::Threads::Mutex::Lock lm (_run_lock);
+	_running.signal ();
+
+	return false; // don't call it again
+}
+
 void
 BaseUI::run ()
 {
 	/* to be called by UI's that need/want their own distinct, self-created event loop thread.
-	   Derived classes should have set up a handler for IO on request_channel.ios()
 	*/
 
-	_main_loop = MainLoop::create (MainContext::create());
-	request_channel.ios()->attach (_main_loop->get_context());
-	run_loop_thread = Thread::create (mem_fun (*this, &BaseUI::main_thread), true);
+	m_context = MainContext::create();
+	_main_loop = MainLoop::create (m_context);
+	attach_request_source ();
+
+	Glib::Threads::Mutex::Lock lm (_run_lock);
+	run_loop_thread = Glib::Threads::Thread::create (mem_fun (*this, &BaseUI::main_thread));
+	_running.wait (_run_lock);
 }
 
 void
 BaseUI::quit ()
 {
-	_main_loop->quit ();
-	run_loop_thread->join ();
+	if (_main_loop && _main_loop->is_running()) {
+		_main_loop->quit ();
+		run_loop_thread->join ();
+	}
 }
 
 bool
 BaseUI::request_handler (Glib::IOCondition ioc)
 {
-	/* check the transport request pipe */
+	/* check the request pipe */
 
 	if (ioc & ~IO_IN) {
 		_main_loop->quit ();
@@ -103,16 +130,33 @@ BaseUI::request_handler (Glib::IOCondition ioc)
 
 	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 */
 
+		DEBUG_TRACE (DEBUG::EventLoop, "BaseUI::request_handler\n");
 		handle_ui_requests ();
 	}
 
 	return true;
 }
-	
+
+void
+BaseUI::signal_new_request ()
+{
+	DEBUG_TRACE (DEBUG::EventLoop, "BaseUI::signal_new_request\n");
+	request_channel.wakeup ();
+}
+
+/**
+ * This method relies on the caller having already set m_context
+ */
+void
+BaseUI::attach_request_source ()
+{
+	DEBUG_TRACE (DEBUG::EventLoop, "BaseUI::attach_request_source\n");
+	request_channel.attach (m_context);
+}