diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-22 20:21:43 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-22 20:21:43 +0000 |
| commit | c83389b8ec5fef9553a401e6123b7e55702af9e2 (patch) | |
| tree | 5580dd13b6275eefe67b9147ce96fa10db4d8674 /gtk2_ardour/gui_thread.h | |
| parent | 87fb46859c5950af7c00111afa81a00a1fad2196 (diff) | |
cleanup up cleanup at session destruction; clarify the meaning of 3 signals (DropReferences & Destroyed in libardour ; CatchDeletion in the GTK UI); clarify ownership of objects (session no longer pays attention to DropReferences for objects that it is considered to own, such as routes, sources, etc); fix up MIDI parsing and a couple of other places by correcting syntax for return of values from a boost::signals2::signal (possible danger elsewhere to be checked)
git-svn-id: svn://localhost/ardour2/branches/3.0@6389 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/gui_thread.h')
| -rw-r--r-- | gtk2_ardour/gui_thread.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/gtk2_ardour/gui_thread.h b/gtk2_ardour/gui_thread.h index edea9b9d21..cb9c1860f2 100644 --- a/gtk2_ardour/gui_thread.h +++ b/gtk2_ardour/gui_thread.h @@ -20,15 +20,12 @@ #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__)) |