X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fbase_ui.cc;h=3a4257ebdd9a9ecaf9bfc1109277543588e73427;hb=95ccbc452f513a9d6f70de45bc413067e568364c;hp=10f27df3bf5229aaa52df48348c42c24a95c4958;hpb=a9d77d1a70bda53c288d56dd1a2ca4f70dc09dea;p=ardour.git

diff --git a/libs/pbd/base_ui.cc b/libs/pbd/base_ui.cc
index 10f27df3bf..3a4257ebdd 100644
--- a/libs/pbd/base_ui.cc
+++ b/libs/pbd/base_ui.cc
@@ -19,12 +19,17 @@
 
 #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"
@@ -32,6 +37,8 @@
 
 #include "i18n.h"
 
+#include "pbd/debug.h"
+
 using namespace std;
 using namespace PBD;
 using namespace Glib;
@@ -41,13 +48,18 @@ BaseUI::RequestType BaseUI::CallSlot = BaseUI::new_request_type();
 BaseUI::RequestType BaseUI::Quit = BaseUI::new_request_type();
 
 BaseUI::BaseUI (const string& str)
-	: request_channel (true)
+	: m_context(MainContext::get_default())
 	, run_loop_thread (0)
 	, _name (str)
+#ifndef PLATFORM_WINDOWS
+	, request_channel (true)
+#endif
 {
 	base_ui_instance = this;
 
+#ifndef PLATFORM_WINDOWS
 	request_channel.ios()->connect (sigc::mem_fun (*this, &BaseUI::request_handler));
+#endif
 
 	/* derived class must set _ok */
 }
@@ -72,35 +84,64 @@ 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.
 	*/
 
-	_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 ();
+	m_context = MainContext::create();
+	_main_loop = MainLoop::create (m_context);
+	attach_request_source ();
 
-	run_loop_thread = Thread::create (mem_fun (*this, &BaseUI::main_thread), true);
+	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 ()
 {
-	if (_main_loop->is_running()) {
+	if (_main_loop && _main_loop->is_running()) {
 		_main_loop->quit ();
 		run_loop_thread->join ();
 	}
 }
 
+#ifdef PLATFORM_WINDOWS
+gboolean
+BaseUI::_request_handler (gpointer data)
+{
+	BaseUI* ui = static_cast<BaseUI*>(data);
+	return ui->request_handler ();
+}
+
+bool
+BaseUI::request_handler ()
+{
+	DEBUG_TRACE (DEBUG::EventLoop, "BaseUI::request_handler\n");
+	handle_ui_requests ();
+	// keep calling indefinitely at the timeout interval
+	return true;
+}
+
+#else
 bool
 BaseUI::request_handler (Glib::IOCondition ioc)
 {
@@ -119,9 +160,39 @@ BaseUI::request_handler (Glib::IOCondition ioc)
 
 		/* handle requests */
 
+		DEBUG_TRACE (DEBUG::EventLoop, "BaseUI::request_handler\n");
 		handle_ui_requests ();
 	}
 
 	return true;
 }
-	
+#endif
+
+void
+BaseUI::signal_new_request ()
+{
+	DEBUG_TRACE (DEBUG::EventLoop, "BaseUI::signal_new_request\n");
+#ifdef PLATFORM_WINDOWS
+	// handled in timeout, how to signal...?
+#else
+	request_channel.wakeup ();
+#endif
+}
+
+/**
+ * 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");
+#ifdef PLATFORM_WINDOWS
+	GSource* request_source = g_timeout_source_new(200);
+	g_source_set_callback (request_source, &BaseUI::_request_handler, this, NULL);
+	g_source_attach (request_source, m_context->gobj());
+#else
+	request_channel.ios()->attach (m_context);
+	/* glibmm hack - drop the refptr to the IOSource now before it can hurt */
+	request_channel.drop_ios ();
+#endif
+}