try that one on for size (VST build fu)

[ardour.git] / gtk2_ardour / gui_thread.h

diff --git a/gtk2_ardour/gui_thread.h b/gtk2_ardour/gui_thread.h
index 7b09007d808d1342c3b836d54aa778cfe578ba3d..1f53f9700474257ca371b55745d751161dc8ac1f 100644 (file)
--- a/gtk2_ardour/gui_thread.h
+++ b/gtk2_ardour/gui_thread.h
@@ -1,10 +1,17 @@
 #ifndef __ardour_gtk_gui_thread_h__
 #define __ardour_gtk_gui_thread_h__
 
+#include <gtkmm2ext/gtk_ui.h>
+#include <pbd/crossthread.h>
+
 #define ENSURE_GUI_THREAD(slot) \
-     if (!Gtkmmext::UI::instance()->caller_is_gui_thread()) {\
-       Gtkmmext::UI::instance()->call_slot ((slot));\
+     if (!Gtkmm2ext::UI::instance()->caller_is_ui_thread()) {\
+       Gtkmm2ext::UI::instance()->call_slot ((slot));\
         return;\
      }
 
+#define GTK_SAFE(theSlot) crossthread_safe (Gtkmm2ext::UI::instance()->thread_id(),\
+                                           *Gtkmm2ext::UI::instance(), \
+                                           (theSlot))
+
 #endif /* __ardour_gtk_gui_thread_h__ */