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 /libs/pbd/pbd/abstract_ui.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 'libs/pbd/pbd/abstract_ui.h')
-rw-r--r-- | libs/pbd/pbd/abstract_ui.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/pbd/pbd/abstract_ui.h b/libs/pbd/pbd/abstract_ui.h index 39fe83b0fe..d04d62c463 100644 --- a/libs/pbd/pbd/abstract_ui.h +++ b/libs/pbd/pbd/abstract_ui.h @@ -24,12 +24,11 @@ #include <string> #include <pthread.h> -#include <sigc++/sigc++.h> - #include <glibmm/thread.h> #include "pbd/receiver.h" #include "pbd/ringbufferNPT.h" +#include "pbd/signals.h" #include "pbd/base_ui.h" class Touchable; @@ -52,8 +51,8 @@ class AbstractUI : public BaseUI Glib::Mutex request_buffer_map_lock; RequestBufferMap request_buffers; - Glib::Private<RequestBuffer> per_thread_request_buffer; - + static Glib::StaticPrivate<RequestBuffer> per_thread_request_buffer; + Glib::Mutex request_list_lock; std::list<RequestObject*> request_list; @@ -62,6 +61,7 @@ class AbstractUI : public BaseUI void send_request (RequestObject *); virtual void do_request (RequestObject *) = 0; + PBD::ScopedConnection new_thread_connection; }; #endif /* __pbd_abstract_ui_h__ */ |