Enable build for FreeBSD (part 1/2)

[ardour.git] / libs / pbd / base_ui.cc

diff --git a/libs/pbd/base_ui.cc b/libs/pbd/base_ui.cc
index 14a3ef644d308b707221f8799ed57e8a52c17d04..d303d880c97c9853b2d77f138a8d0ecaaca44afd 100644 (file)
--- 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,7 +19,11 @@
 
 #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>
@@ -33,22 +37,24 @@
 
 #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)
-       : request_channel (true)
+BaseUI::BaseUI (const string& loop_name)
+       : EventLoop (loop_name)
+       , 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 */
 }
@@ -73,7 +79,7 @@ BaseUI::new_request_type ()
 void
 BaseUI::main_thread ()
 {
-       DEBUG_TRACE (DEBUG::EventLoop, string_compose ("%1: event loop running in thread %2\n", name(), pthread_self()));
+       DEBUG_TRACE (DEBUG::EventLoop, string_compose ("%1: event loop running in thread %2\n", event_loop_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));
@@ -83,9 +89,9 @@ BaseUI::main_thread ()
 bool
 BaseUI::signal_running ()
 {
-       Glib::Mutex::Lock lm (_run_lock);
+       Glib::Threads::Mutex::Lock lm (_run_lock);
        _running.signal ();
-       
+
        return false; // don't call it again
 }
 
@@ -95,14 +101,12 @@ 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 ();
 
-       Glib::Mutex::Lock lm (_run_lock);
-       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);
 }
 
@@ -126,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, string_compose ("%1: request handler\n", event_loop_name()));
                handle_ui_requests ();
        }
 
        return true;
 }
-       
+
+void
+BaseUI::signal_new_request ()
+{
+       DEBUG_TRACE (DEBUG::EventLoop, string_compose ("%1: signal_new_request\n", event_loop_name()));
+       request_channel.wakeup ();
+}
+
+/**
+ * This method relies on the caller having already set m_context
+ */
+void
+BaseUI::attach_request_source ()
+{
+       DEBUG_TRACE (DEBUG::EventLoop, string_compose ("%1: attach request source\n", event_loop_name()));
+       request_channel.attach (m_context);
+}