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

diff --git a/libs/pbd/base_ui.cc b/libs/pbd/base_ui.cc
index 3a4257ebdd..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
@@ -42,7 +42,7 @@
 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();
@@ -51,15 +51,10 @@ BaseUI::BaseUI (const string& str)
 	: 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
+	request_channel.set_receive_handler (sigc::mem_fun (*this, &BaseUI::request_handler));
 
 	/* derived class must set _ok */
 }
@@ -96,7 +91,7 @@ BaseUI::signal_running ()
 {
 	Glib::Threads::Mutex::Lock lm (_run_lock);
 	_running.signal ();
-	
+
 	return false; // don't call it again
 }
 
@@ -124,24 +119,6 @@ BaseUI::quit ()
 	}
 }
 
-#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)
 {
@@ -153,7 +130,7 @@ 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.
 		*/
@@ -166,17 +143,12 @@ BaseUI::request_handler (Glib::IOCondition ioc)
 
 	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
 }
 
 /**
@@ -186,13 +158,5 @@ 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
+	request_channel.attach (m_context);
 }