diff options
| author | David Robillard <d@drobilla.net> | 2006-06-13 07:27:52 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-06-13 07:27:52 +0000 |
| commit | 868f557f2612903f72614a2b3a317c7a528188d1 (patch) | |
| tree | 979151d7bbb25fb633adb662d386ef4df0d46158 /gtk2_ardour/io_selector.cc | |
| parent | edc7a146f5f3c9facd97b3e8951e1607b5e9ec31 (diff) | |
Merged with trunk (painfully)
git-svn-id: svn://localhost/ardour2/branches/midi@581 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/io_selector.cc')
| -rw-r--r-- | gtk2_ardour/io_selector.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc index 247ad602bd..b45966c5e3 100644 --- a/gtk2_ardour/io_selector.cc +++ b/gtk2_ardour/io_selector.cc @@ -23,7 +23,7 @@ #include <gtkmm/messagedialog.h> -#include <pbd/lockmonitor.h> +#include <glibmm/thread.h> #include <ardour/io.h> #include <ardour/route.h> @@ -368,7 +368,7 @@ IOSelector::display_ports () TreeView *selected_port_tview = 0; { - LockMonitor lm (port_display_lock, __LINE__, __FILE__); + Glib::Mutex::Lock lm (port_display_lock); Port *port; uint32_t limit; @@ -670,7 +670,7 @@ IOSelector::port_column_button_release (GdkEventButton* event, TreeView* treevie if (Keyboard::is_delete_event (event)) { Port* port; { - LockMonitor lm (port_display_lock, __LINE__, __FILE__); + Glib::Mutex::Lock lm (port_display_lock); port = static_cast<Port *> (treeview->get_data (_("port"))); @@ -724,7 +724,7 @@ IOSelector::select_treeview (TreeView* tview) switch. */ - LockMonitor lm (port_display_lock, __LINE__, __FILE__); + Glib::Mutex::Lock lm (port_display_lock); Port* port = reinterpret_cast<Port *> (tview->get_data (_("port"))); if (port != selected_port) { |