X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_params_ui.h;h=65bef26b5254a2c2aaea49dc41f18f7cdc4a5ac6;hb=ebcd8f696cead9682cafc75815ec4c5702e85fc8;hp=5fd7487bc1873d0a0b82d9117f91449eb782fd3b;hpb=88beef2e93d26d28467fe151f5ef2972d0ca9169;p=ardour.git

diff --git a/gtk2_ardour/route_params_ui.h b/gtk2_ardour/route_params_ui.h
index 5fd7487bc1..65bef26b52 100644
--- a/gtk2_ardour/route_params_ui.h
+++ b/gtk2_ardour/route_params_ui.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000 Paul Davis 
+    Copyright (C) 2000 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -33,11 +33,11 @@
 #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 "ardour_window.h"
 #include "processor_box.h"
 #include "route_processor_selection.h"
 #include "latency_gui.h"
@@ -53,16 +53,17 @@ 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;
@@ -78,79 +79,79 @@ class RouteParams_UI : public ArdourDialog
 	Gtk::ScrolledWindow      route_select_scroller;
 
 	Gtk::Notebook            notebook;
-	Gtk::Frame 		 input_frame;
-	Gtk::Frame 		 output_frame;
+	Gtk::Frame		 input_frame;
+	Gtk::Frame		 output_frame;
 	Gtk::HPaned		 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;
-	
-	Gtk::Frame 		 route_choice_frame;
 
-	Gtk::Frame 		 route_param_frame;
+	Gtk::Frame		 route_choice_frame;
+
+	Gtk::Frame		 route_param_frame;
 
 	Gtk::VBox                choice_vpacker;
-	
+
 	Gtk::Frame               latency_frame;
 	Gtk::VBox                latency_packer;
 	Gtk::HButtonBox          latency_button_box;
 	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 ();
-	
+
 	Gtk::ToggleButton input_button;
 	Gtk::ToggleButton output_button;
 	Gtk::Label  track_input_label;
-	
+
 	Gtk::Label  title_label;
-	
+
 	Gtk::Container * _active_view;
 	IOSelector     * _input_iosel;
 	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 {
 		NO_CONFIG_VIEW = 0,
 		INPUT_CONFIG_VIEW,
 		OUTPUT_CONFIG_VIEW,
-		PLUGIN_CONFIG_VIEW,		
+		PLUGIN_CONFIG_VIEW,
 		PORTINSERT_CONFIG_VIEW,
 		SEND_CONFIG_VIEW
 	};
-	
+
 	ConfigView _current_view;
 
 
 	/* treeview */
- 	struct RouteDisplayModelColumns : public Gtk::TreeModel::ColumnRecord {
+	struct RouteDisplayModelColumns : public Gtk::TreeModel::ColumnRecord {
 		RouteDisplayModelColumns() {
 			add(text);
 			add(route);
 		}
-		Gtk::TreeModelColumn<Glib::ustring> text;
+		Gtk::TreeModelColumn<std::string> text;
 		Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Route> > route;
 	};
 
@@ -158,11 +159,12 @@ class RouteParams_UI : public ArdourDialog
 	Gtk::TreeView route_display;
 	Glib::RefPtr<Gtk::ListStore> route_display_model;
 
-	
+
 	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();
@@ -173,25 +175,25 @@ class RouteParams_UI : public ArdourDialog
 	void cleanup_view(bool stopupdate = true);
 	void cleanup_latency_frame ();
 	void setup_latency_frame ();
-	
-	void processors_changed ();
-	
+
+	void processors_changed (ARDOUR::RouteProcessorChange);
+
 	void setup_processor_boxes();
 	void cleanup_processor_boxes();
 
 	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);
-	
+
 	void update_routeinfo (ARDOUR::Route * route);
-	
+
 	Gtk::Menu *track_menu;
 	void show_track_menu();
-	
+
 	void update_title ();
 	//void unselect_all_redirects ();