MIDI/Controllables for monitor section, and related fixes

[ardour.git] / gtk2_ardour / gui_thread.h

diff --git a/gtk2_ardour/gui_thread.h b/gtk2_ardour/gui_thread.h
index 388902fa28be8c315fa4504e31423ca9567208e4..cd453c996a35e0badd13223f25527755df1974ba 100644 (file)
--- a/gtk2_ardour/gui_thread.h
+++ b/gtk2_ardour/gui_thread.h
@@ -1,36 +1 @@
-/*
-    Copyright (C) 2000-2007 Paul Davis
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#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 (!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__ */
+#include "gtkmm2ext/gui_thread.h"