Merge branch 'master' into cairocanvas

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

diff --git a/libs/pbd/pbd/base_ui.h b/libs/pbd/pbd/base_ui.h
index ee2bbf5ee9b0f4edf5b2084fe6720209da2b649a..ea1afbbb5a3428e84fd4cc9b4fe0a02db45d2597 100644 (file)
--- a/libs/pbd/pbd/base_ui.h
+++ b/libs/pbd/pbd/base_ui.h
@@ -72,13 +72,13 @@ class LIBPBD_API BaseUI : public sigc::trackable, public PBD::EventLoop
        void quit ();
 
   protected:
-       CrossThreadChannel request_channel;
        bool _ok; 
 
        Glib::RefPtr<Glib::MainLoop> _main_loop;
-        Glib::Threads::Thread*       run_loop_thread;
+       Glib::RefPtr<Glib::MainContext> m_context;
+       Glib::Threads::Thread*       run_loop_thread;
        Glib::Threads::Mutex        _run_lock;
-        Glib::Threads::Cond         _running;
+       Glib::Threads::Cond         _running;
 
        /* this signals _running from within the event loop,
           from an idle callback 
@@ -93,9 +93,17 @@ class LIBPBD_API BaseUI : public sigc::trackable, public PBD::EventLoop
 
        virtual void thread_init () {};
 
+#ifdef PLATFORM_WINDOWS
+       static gboolean _request_handler (gpointer);
+       bool request_handler ();
+#else
        /** Called when there input ready on the request_channel
         */
        bool request_handler (Glib::IOCondition);
+#endif
+
+       void signal_new_request ();
+       void attach_request_source ();
 
        /** Derived UI objects must implement this method,
         * which will be called whenever there are requests
@@ -106,6 +114,10 @@ class LIBPBD_API BaseUI : public sigc::trackable, public PBD::EventLoop
   private:
        std::string _name; 
        BaseUI* base_ui_instance;
+
+#ifndef PLATFORM_WINDOWS
+       CrossThreadChannel request_channel;
+#endif
        
        static uint64_t rt_bit;