X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_params_ui.h;h=83ddf27110f937275159bd926b57745233279c7b;hb=bd865c8c9092b46cf9441d74affa3477c8707ca5;hp=4d21805778be7dcb10ca73bf214455c4e06fdb1a;hpb=fddc11f556061d0ffa9a173a3652aa34c20bac3b;p=ardour.git

diff --git a/gtk2_ardour/route_params_ui.h b/gtk2_ardour/route_params_ui.h
index 4d21805778..83ddf27110 100644
--- a/gtk2_ardour/route_params_ui.h
+++ b/gtk2_ardour/route_params_ui.h
@@ -27,17 +27,18 @@
 #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 "pbd/stateful.h"
+#include "pbd/signals.h"
 
 #include "ardour/ardour.h"
 
-#include "io_selector.h"
-#include "ardour_dialog.h"
+#include <gtkmm2ext/pane.h>
+
+#include "ardour_window.h"
 #include "processor_box.h"
 #include "route_processor_selection.h"
 #include "latency_gui.h"
@@ -53,34 +54,26 @@ namespace ARDOUR {
 }
 
 class PluginSelector;
+class IOSelector;
 
-class RouteParams_UI : public ArdourDialog
+class RouteParams_UI : public ArdourWindow, public PBD::ScopedConnectionList
 {
   public:
 	RouteParams_UI ();
 	~RouteParams_UI();
 
-	void set_session (ARDOUR::Session *);
-	void session_gone ();
-	PluginSelector*  plugin_selector() { return _plugin_selector; }
+	void set_session (ARDOUR::Session*);
+	void session_going_away ();
+	PluginSelector* plugin_selector() { return _plugin_selector; }
 
   private:
-	Gtk::HBox                global_hpacker;
-	Gtk::VBox                global_vpacker;
-	Gtk::ScrolledWindow      scroller;
-	Gtk::EventBox            scroller_base;
-	Gtk::HBox                scroller_hpacker;
-	Gtk::VBox                mixer_scroller_vpacker;
-
 	Gtk::VBox                list_vpacker;
-	Gtk::Label               route_list_button_label;
-	Gtk::Button              route_list_button;
 	Gtk::ScrolledWindow      route_select_scroller;
 
 	Gtk::Notebook            notebook;
 	Gtk::Frame		 input_frame;
 	Gtk::Frame		 output_frame;
-	Gtk::HPaned		 redir_hpane;
+	Gtkmm2ext::HPane	 redir_hpane;
 
 	Gtk::Frame		 route_select_frame;
 
@@ -89,11 +82,9 @@ class RouteParams_UI : public ArdourDialog
 
 	ProcessorBox*            insert_box;
 
-	Gtk::HPaned		 list_hpane;
+	Gtkmm2ext::HPane	 list_hpane;
 
-	Gtk::HPaned		 right_hpane;
-
-	Gtk::Frame		 route_choice_frame;
+	Gtkmm2ext::HPane	 right_hpane;
 
 	Gtk::Frame		 route_param_frame;
 
@@ -105,9 +96,9 @@ class RouteParams_UI : public ArdourDialog
 	Gtk::Button              latency_apply_button;
 	LatencyGUI*              latency_widget;
 	Gtk::Label               delay_label;
-	sigc::connection         latency_conn;
-	sigc::connection         delay_conn;
-	sigc::connection         latency_apply_conn;
+
+	PBD::ScopedConnectionList latency_connections;
+	sigc::connection          latency_click_connection;
 
 	void refresh_latency ();
 
@@ -122,14 +113,14 @@ class RouteParams_UI : public ArdourDialog
 	IOSelector     * _output_iosel;
 
 	PluginSelector    *_plugin_selector;
-	RouteRedirectSelection  _rr_selection;
+	RouteProcessorSelection  _rr_selection;
 
 	boost::shared_ptr<ARDOUR::Route> _route;
-	sigc::connection            _route_conn;
-	sigc::connection            _route_ds_conn;
+	PBD::ScopedConnection _route_processors_connection;
+	PBD::ScopedConnectionList route_connections;
 
 	boost::shared_ptr<ARDOUR::Processor> _processor;
-	sigc::connection                    _plugin_conn;
+	PBD::ScopedConnection _processor_going_away_connection;
 
 
 	enum ConfigView {
@@ -150,7 +141,7 @@ class RouteParams_UI : public ArdourDialog
 			add(text);
 			add(route);
 		}
-		Gtk::TreeModelColumn<Glib::ustring> text;
+		Gtk::TreeModelColumn<std::string> text;
 		Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Route> > route;
 	};
 
@@ -161,8 +152,9 @@ class RouteParams_UI : public ArdourDialog
 
 	void add_routes (ARDOUR::RouteList&);
 
-	void route_name_changed (boost::shared_ptr<ARDOUR::Route> route);
-	void route_removed (boost::shared_ptr<ARDOUR::Route> route);
+	void route_property_changed (const PBD::PropertyChange&, boost::weak_ptr<ARDOUR::Route> route);
+	void route_removed (boost::weak_ptr<ARDOUR::Route> route);
+	void map_frozen ();
 
 
 	void route_selected();
@@ -182,7 +174,7 @@ class RouteParams_UI : public ArdourDialog
 	void redirect_selected (boost::shared_ptr<ARDOUR::Processor>);
 
 	void plugin_going_away (ARDOUR::Placement);
-	void redirect_going_away (boost::shared_ptr<ARDOUR::Processor>);
+	void processor_going_away (boost::weak_ptr<ARDOUR::Processor>);
 
 	gint edit_input_configuration (GdkEventButton *ev);
 	gint edit_output_configuration (GdkEventButton *ev);