changes to help strp silence

[ardour.git] / gtk2_ardour / gui_thread.h

diff --git a/gtk2_ardour/gui_thread.h b/gtk2_ardour/gui_thread.h
index f932c603ac68d4e495df1b01b6032ddac21006d1..cb9c1860f2486fbea705646610136b6c2f8069f7 100644 (file)
--- a/gtk2_ardour/gui_thread.h
+++ b/gtk2_ardour/gui_thread.h
@@ -20,13 +20,14 @@
 #ifndef __ardour_gtk_gui_thread_h__
 #define __ardour_gtk_gui_thread_h__
 
+#include <cstdlib>
 #include <gtkmm2ext/gtk_ui.h>
 #include <boost/bind.hpp>
+#include <boost/bind/protect.hpp>
 
-#define ENSURE_GUI_THREAD(obj,method, ...) \
-     if (!Gtkmm2ext::UI::instance()->caller_is_self()) { \
-            Gtkmm2ext::UI::instance()->call_slot (boost::bind ((method), &(obj), ## __VA_ARGS__)); \
-        return;\
-     }
+#define ENSURE_GUI_THREAD(obj,method, ...) if (!Gtkmm2ext::UI::instance()->caller_is_self()) { abort (); } 
+
+#define gui_context() Gtkmm2ext::UI::instance() /* a UICallback-derived object that specifies the event loop for GUI signal handling */
+#define ui_bind(f, ...) boost::protect (boost::bind (f, __VA_ARGS__))
 
 #endif /* __ardour_gtk_gui_thread_h__ */