X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_params_ui.h;h=850c56af7c358447262edaf19eb4d8f44a8edae9;hb=e8903a7590caaa46498d3e53c9d7df63edb24090;hp=2dcb1b921d2c03e75cebcad5b1ae9b97c3289407;hpb=f6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe;p=ardour.git

diff --git a/gtk2_ardour/route_params_ui.h b/gtk2_ardour/route_params_ui.h
index 2dcb1b921d..850c56af7c 100644
--- a/gtk2_ardour/route_params_ui.h
+++ b/gtk2_ardour/route_params_ui.h
@@ -27,20 +27,20 @@
 #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/scoped_connections.h"
+#include "pbd/signals.h"
 
 #include "ardour/ardour.h"
 
-#include "io_selector.h"
-#include "ardour_dialog.h"
+#include <widgets/pane.h>
+
+#include "ardour_window.h"
 #include "processor_box.h"
-#include "route_processor_selection.h"
+#include "processor_selection.h"
 #include "latency_gui.h"
 
 namespace ARDOUR {
@@ -54,49 +54,39 @@ namespace ARDOUR {
 }
 
 class PluginSelector;
+class IOSelector;
 
-class RouteParams_UI : public ArdourDialog, public PBD::ScopedConnectionList
+class RouteParams_UI : public ArdourWindow, public PBD::ScopedConnectionList
 {
-  public:
+public:
 	RouteParams_UI ();
 	~RouteParams_UI();
 
 	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;
+	PluginSelector* plugin_selector() { return _plugin_selector; }
 
+private:
 	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;
+	Gtk::Frame               input_frame;
+	Gtk::Frame               output_frame;
+	ArdourWidgets::HPane     redir_hpane;
 
-	Gtk::Frame		 route_select_frame;
+	Gtk::Frame               route_select_frame;
 
 	Gtk::HBox                route_hpacker;
 	Gtk::VBox                route_vpacker;
 
 	ProcessorBox*            insert_box;
 
-	Gtk::HPaned		 list_hpane;
-
-	Gtk::HPaned		 right_hpane;
+	ArdourWidgets::HPane     list_hpane;
 
-	Gtk::Frame		 route_choice_frame;
+	ArdourWidgets::HPane     right_hpane;
 
-	Gtk::Frame		 route_param_frame;
+	Gtk::Frame               route_param_frame;
 
 	Gtk::VBox                choice_vpacker;
 
@@ -123,13 +113,14 @@ class RouteParams_UI : public ArdourDialog, public PBD::ScopedConnectionList
 	IOSelector     * _output_iosel;
 
 	PluginSelector    *_plugin_selector;
-	RouteRedirectSelection  _rr_selection;
+	ProcessorSelection  _p_selection;
 
 	boost::shared_ptr<ARDOUR::Route> _route;
-	boost::signals2::scoped_connection _route_processors_connection;
+	PBD::ScopedConnection _route_processors_connection;
+	PBD::ScopedConnectionList route_connections;
 
 	boost::shared_ptr<ARDOUR::Processor> _processor;
-	boost::signals2::scoped_connection _processor_going_away_connection;
+	PBD::ScopedConnection _processor_going_away_connection;
 
 
 	enum ConfigView {
@@ -150,7 +141,7 @@ class RouteParams_UI : public ArdourDialog, public PBD::ScopedConnectionList
 			add(text);
 			add(route);
 		}
-		Gtk::TreeModelColumn<Glib::ustring> text;
+		Gtk::TreeModelColumn<std::string> text;
 		Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Route> > route;
 	};
 
@@ -161,15 +152,16 @@ class RouteParams_UI : public ArdourDialog, public PBD::ScopedConnectionList
 
 	void add_routes (ARDOUR::RouteList&);
 
-	void route_name_changed (boost::weak_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();
 	//void route_unselected (gint row, gint col, GdkEvent *ev);
 
-	void setup_io_frames();
-	void cleanup_io_frames();
+	void setup_io_samples();
+	void cleanup_io_samples();
 	void cleanup_view(bool stopupdate = true);
 	void cleanup_latency_frame ();
 	void setup_latency_frame ();