"treadmill" design for new faders

[ardour.git] / gtk2_ardour / connection_editor.h

diff --git a/gtk2_ardour/connection_editor.h b/gtk2_ardour/connection_editor.h
index 69b6b835777354924a8518387176a103373d2bac..71d201cd8df2a3bfe2022ae5bccff71e40feb841 100644 (file)
--- 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;
@@ -54,7 +54,7 @@ class ConnectionEditor : public ArdourDialog {
        void set_session (ARDOUR::Session *);
 
   protected:
-       bool on_map (GdkEventAny *);
+       void on_map ();
 
   private:
        ARDOUR::Connection *current_connection;
@@ -71,8 +71,7 @@ class ConnectionEditor : public ArdourDialog {
            Gtk::TreeModelColumn<ARDOUR::Connection*> connection;
        };
 
-       ConnectionDisplayModelColumns input_connection_columns;
-       ConnectionDisplayModelColumns output_connection_columns;
+       ConnectionDisplayModelColumns connection_columns;
 
        Glib::RefPtr<Gtk::ListStore> input_connection_model;
        Glib::RefPtr<Gtk::ListStore> output_connection_model;
@@ -117,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;
@@ -145,7 +144,7 @@ class ConnectionEditor : public ArdourDialog {
        void cancel ();
        void accept ();
 
-       void port_selection_handler (gint row, gint col, GdkEvent*, Gtk::TreeView*);
+       void selection_changed (Gtk::TreeView* display);
 
        void add_port ();
        void remove_port (int which_port);