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 /gtk2_ardour/connection_editor.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 'gtk2_ardour/connection_editor.h')
-rw-r--r-- | gtk2_ardour/connection_editor.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/connection_editor.h b/gtk2_ardour/connection_editor.h index 1d6dd7d7fc..71d201cd8d 100644 --- a/gtk2_ardour/connection_editor.h +++ b/gtk2_ardour/connection_editor.h @@ -39,7 +39,7 @@ using __gnu_cxx::slist; #include "ardour_dialog.h" -#include <pbd/lockmonitor.h> +#include <glibmm/thread.h> namespace ARDOUR { class Session; @@ -116,7 +116,7 @@ class ConnectionEditor : public ArdourDialog { Gtk::Button clear_button; Gtk::Button add_port_button; - PBD::Lock port_display_lock; + Glib::Mutex port_display_lock; slist<Gtk::ScrolledWindow *> port_displays; Gtk::Button ok_button; |