X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_params_ui.h;h=96b2041db4525f79cf82c7df7f476773d6af1206;hb=cd87dceb0fda44d7c8fcc2b7844f65def25edb23;hp=deaac6f279ff9cfcd85ef6a9e9bdf22db3752091;hpb=209d967b1bb80a9735d690d8f4f0455ecb9970ca;p=ardour.git

diff --git a/gtk2_ardour/route_params_ui.h b/gtk2_ardour/route_params_ui.h
index deaac6f279..96b2041db4 100644
--- a/gtk2_ardour/route_params_ui.h
+++ b/gtk2_ardour/route_params_ui.h
@@ -23,7 +23,15 @@
 
 #include <list>
 
-#include <gtk--.h>
+#include <gtkmm/box.h>
+#include <gtkmm/button.h>
+#include <gtkmm/eventbox.h>
+#include <gtkmm/frame.h>
+#include <gtkmm/label.h>
+#include <gtkmm/paned.h>
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/togglebutton.h>
+#include <gtkmm/treeview.h>
 
 #include <ardour/ardour.h>
 #include <ardour/stateful.h>
@@ -69,7 +77,6 @@ class RouteParams_UI : public ArdourDialog
 	Gtk::VBox                mixer_scroller_vpacker;
 
 	Gtk::VBox                list_vpacker;
-	Gtk::CList               route_select_list;
 	Gtk::Label               route_list_button_label;
 	Gtk::Button              route_list_button;
 	Gtk::ScrolledWindow      route_select_scroller;
@@ -114,14 +121,14 @@ class RouteParams_UI : public ArdourDialog
 	RouteRedirectSelection  _rr_selection;
 
 	ARDOUR::Route           *_route;
-	SigC::Connection            _route_conn;
-	SigC::Connection            _route_ds_conn;
+	sigc::connection            _route_conn;
+	sigc::connection            _route_ds_conn;
 
 	ARDOUR::Redirect       * _pre_redirect;
-	SigC::Connection            _pre_plugin_conn;
+	sigc::connection            _pre_plugin_conn;
 
 	ARDOUR::Redirect       * _post_redirect;
-	SigC::Connection            _post_plugin_conn;
+	sigc::connection            _post_plugin_conn;
 	
 	
 	enum ConfigView {
@@ -134,6 +141,22 @@ class RouteParams_UI : public ArdourDialog
 	};
 	
 	ConfigView _current_view;
+
+
+	/* treeview */
+ 	struct RouteDisplayModelColumns : public Gtk::TreeModel::ColumnRecord {
+		RouteDisplayModelColumns() {
+			add(text);
+			add(route);
+		}
+		Gtk::TreeModelColumn<Glib::ustring> text;
+		Gtk::TreeModelColumn<ARDOUR::Route*> route;
+	};
+
+	RouteDisplayModelColumns route_display_columns ;
+	Gtk::TreeView route_display;
+	Glib::RefPtr<Gtk::ListStore> route_display_model;
+
 	
 	void add_route (ARDOUR::Route*);
 
@@ -141,8 +164,8 @@ class RouteParams_UI : public ArdourDialog
 	void route_removed (ARDOUR::Route *route);
 
 
-	void route_selected (gint row, gint col, GdkEvent *ev);
-	void route_unselected (gint row, gint col, GdkEvent *ev);
+	void route_selected();
+	//void route_unselected (gint row, gint col, GdkEvent *ev);
 
 	void setup_io_frames();
 	void cleanup_io_frames();
@@ -168,12 +191,12 @@ class RouteParams_UI : public ArdourDialog
 	void update_routeinfo (ARDOUR::Route * route);
 	
 	Gtk::Menu *track_menu;
-	void show_track_menu(gint arg);
+	void show_track_menu();
 	
 	void update_title ();
 	//void unselect_all_redirects ();
 
-	SigC::Connection update_connection;
+	sigc::connection update_connection;
 	void update_views ();
 
 	void start_updating ();