diff options
| author | Taybin Rutkin <taybin@taybin.com> | 2006-06-07 14:54:12 +0000 |
|---|---|---|
| committer | Taybin Rutkin <taybin@taybin.com> | 2006-06-07 14:54:12 +0000 |
| commit | 9fdc36bac5fa1c004751c0dd42f9ff62b9d60814 (patch) | |
| tree | 34a2d26c5cadcbe5c31b424e3e50a34a4360d87b /libs/ardour/ardour/control_protocol_manager.h | |
| parent | 55ba7c46c60d3cc9938abc34252fa930f1c883cb (diff) | |
Merged timbyr's win32 branch. -r 547:566.
git-svn-id: svn://localhost/ardour2/trunk@567 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/control_protocol_manager.h')
| -rw-r--r-- | libs/ardour/ardour/control_protocol_manager.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/ardour/control_protocol_manager.h b/libs/ardour/ardour/control_protocol_manager.h index 42b5a69a48..03b21a299c 100644 --- a/libs/ardour/ardour/control_protocol_manager.h +++ b/libs/ardour/ardour/control_protocol_manager.h @@ -6,7 +6,7 @@ #include <sigc++/sigc++.h> -#include <pbd/lockmonitor.h> +#include <glibmm/thread.h> #include <ardour/stateful.h> @@ -52,7 +52,7 @@ struct ControlProtocolInfo { static ControlProtocolManager* _instance; Session* _session; - PBD::Lock protocols_lock; + Glib::Mutex protocols_lock; std::list<ControlProtocol*> control_protocols; void drop_session (); |