diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-14 17:07:53 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-14 17:07:53 +0000 |
| commit | 37969d837e16c8fbac0821074495b5ebc2297d94 (patch) | |
| tree | b79e840e364c8502aabbf785c28364c596a4632f /libs/surfaces/control_protocol/control_protocol | |
| parent | 69a242ba6496aa8d4e565a82675ca549a11e4080 (diff) | |
remove virtual inheritance of sigc::trackable by Receiver and AbstractUI<T>, done by changing Gtkmm2ext::UI to use composition (HAS-A) rather than inheritance (IS-A) for Receiver; use correct synchronization when starting up a BseUI event loop thread so that tests that start/stop quickly do not encounter a race condition
git-svn-id: svn://localhost/ardour2/branches/3.0@12264 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces/control_protocol/control_protocol')
| -rw-r--r-- | libs/surfaces/control_protocol/control_protocol/control_protocol.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/surfaces/control_protocol/control_protocol/control_protocol.h b/libs/surfaces/control_protocol/control_protocol/control_protocol.h index 6021f189fe..155c9236da 100644 --- a/libs/surfaces/control_protocol/control_protocol/control_protocol.h +++ b/libs/surfaces/control_protocol/control_protocol/control_protocol.h @@ -39,7 +39,8 @@ class Route; class Session; class Bundle; -class ControlProtocol : public PBD::Stateful, public PBD::ScopedConnectionList, public BasicUI { +class ControlProtocol : public PBD::Stateful, public PBD::ScopedConnectionList, public BasicUI +{ public: ControlProtocol (Session&, std::string name); virtual ~ControlProtocol(); |