X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fbase_ui.cc;h=3a4257ebdd9a9ecaf9bfc1109277543588e73427;hb=95ccbc452f513a9d6f70de45bc413067e568364c;hp=5725d691829d4874e68be9bcfe404c3b40debb91;hpb=4adb2f97cc991341d7e3b2a165e72373221a1b5e;p=ardour.git diff --git a/libs/pbd/base_ui.cc b/libs/pbd/base_ui.cc index 5725d69182..3a4257ebdd 100644 --- a/libs/pbd/base_ui.cc +++ b/libs/pbd/base_ui.cc @@ -19,7 +19,11 @@ #include #include +#ifdef COMPILER_MSVC +#include // Microsoft's nearest equivalent to +#else #include +#endif #include #include #include @@ -47,13 +51,13 @@ BaseUI::BaseUI (const string& str) : m_context(MainContext::get_default()) , run_loop_thread (0) , _name (str) -#ifndef WIN32 +#ifndef PLATFORM_WINDOWS , request_channel (true) #endif { base_ui_instance = this; -#ifndef WIN32 +#ifndef PLATFORM_WINDOWS request_channel.ios()->connect (sigc::mem_fun (*this, &BaseUI::request_handler)); #endif @@ -120,7 +124,7 @@ BaseUI::quit () } } -#ifdef WIN32 +#ifdef PLATFORM_WINDOWS gboolean BaseUI::_request_handler (gpointer data) { @@ -168,7 +172,7 @@ void BaseUI::signal_new_request () { DEBUG_TRACE (DEBUG::EventLoop, "BaseUI::signal_new_request\n"); -#ifdef WIN32 +#ifdef PLATFORM_WINDOWS // handled in timeout, how to signal...? #else request_channel.wakeup (); @@ -182,7 +186,7 @@ void BaseUI::attach_request_source () { DEBUG_TRACE (DEBUG::EventLoop, "BaseUI::attach_request_source\n"); -#ifdef WIN32 +#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());