smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-19 21:26:26 +01:00
Code Issues Projects Releases Wiki Activity

[Summary] Fixed error with draining IOChannel in CrossthreadChannel on Windows.

Browse source 
Used IOChannel for base_ui on Windows instead of workaround which used to be working instead.

[Reviewed by] Paul Davis
This commit is contained in:
Greg Zharun 2014-11-27 14:15:19 +02:00
parent 2494724f96
commit a84c0892f1
3 changed files with 31 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

36
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.set_receive_handler (sigc::mem_fun (*this, &BaseUI::request_handler));
#endif
/* 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,11 +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.attach (m_context);
#endif
request_channel.attach (m_context);
}