pulling trunk

[ardour.git] / gtk2_ardour / io_selector.cc

diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc
index 2d910519b9dff62b7adf5c19c898d8699fc5ebcb..b45966c5e3cdaca419db25a28d3bc3310f9e63ed 100644 (file)
--- 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;
 
@@ -466,10 +466,9 @@ IOSelector::display_ports ()
                        TreeViewColumn* col = tview->get_column (0);
                        
                        col->set_clickable (true);
-                       
-                       /* handle button events on the column header and within the treeview itself */
 
-                       //col->signal_button_release_event().connect (bind (mem_fun(*this, &IOSelector::port_column_button_release), tview));
+                       /* handle button events on the column header and within the treeview itself */
+                       col->signal_clicked().connect (bind (mem_fun(*this, &IOSelector::select_treeview), tview));
                        tview->signal_button_release_event().connect (bind (mem_fun(*this, &IOSelector::connection_button_release), tview));
                }
 
@@ -646,8 +645,6 @@ IOSelector::connection_button_release (GdkEventButton *ev, TreeView *treeview)
 
                /* path is valid */
                ustring connected_port_name = (*iter)[port_display_columns.full_name];
-               cerr << "selected row displayed_name: " << (*iter)[port_display_columns.displayed_name] << endl;
-               cerr << "selected row string was " << connected_port_name << endl;
                Port *port = reinterpret_cast<Port *> (treeview->get_data (_("port")));
                
                if (for_input) {
@@ -673,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")));
                        
@@ -727,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) {