ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

fix up BaseUI to use crossthreadchannel on all platforms

Browse Source
This commit is contained in:
Paul Davis 2014-12-03 21:11:02 -05:00
parent d3e2de8b4e
commit 7ab3da66b5
2 changed files with 3 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libs/pbd/base_ui.cc
View File

@ -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 */
}
@ -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)
{
@ -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);
}

9
libs/pbd/pbd/base_ui.h
View File

@ -93,14 +93,9 @@ 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 ();
@ -115,10 +110,8 @@ class LIBPBD_API BaseUI : public sigc::trackable, public PBD::EventLoop
std::string _name;
BaseUI* base_ui_instance;
#ifndef PLATFORM_WINDOWS
CrossThreadChannel request_channel;
#endif
static uint64_t rt_bit;
int setup_request_pipe ();