X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_params_ui.h;h=4c79bb0829e8e1c4b6f59e96df1f31def2e0dbf1;hb=de5e463904de7b58218a5bb1e9080ba5353bb985;hp=484c4f28a825d7cca4ad32199bc4b2111a44ad96;hpb=aaa91db6d9592684258267981e619b44cc2b7c40;p=ardour.git

diff --git a/gtk2_ardour/route_params_ui.h b/gtk2_ardour/route_params_ui.h
index 484c4f28a8..4c79bb0829 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
@@ -32,9 +32,9 @@
 #include <gtkmm/togglebutton.h>
 #include <gtkmm/treeview.h>
 
-#include <pbd/stateful.h>
+#include "pbd/stateful.h"
 
-#include <ardour/ardour.h>
+#include "ardour/ardour.h"
 
 #include "io_selector.h"
 #include "ardour_dialog.h"
@@ -62,7 +62,7 @@ class RouteParams_UI : public ArdourDialog
 
 	void set_session (ARDOUR::Session *);
 	void session_gone ();
-	PluginSelector&  plugin_selector() { return *_plugin_selector; }
+	PluginSelector*  plugin_selector() { return _plugin_selector; }
 
   private:
 	Gtk::HBox                global_hpacker;
@@ -78,29 +78,27 @@ class RouteParams_UI : public ArdourDialog
 	Gtk::ScrolledWindow      route_select_scroller;
 
 	Gtk::Notebook            notebook;
-	Gtk::Frame 		 input_frame;
-	Gtk::Frame 		 output_frame;
-	Gtk::HPaned		 pre_redir_hpane;
-	Gtk::HPaned		 post_redir_hpane;
+	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              * pre_insert_box;
-	ProcessorBox              * post_insert_box;
-	
+	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;
@@ -112,18 +110,17 @@ class RouteParams_UI : public ArdourDialog
 	sigc::connection         latency_apply_conn;
 
 	void refresh_latency ();
-	
+
 	Gtk::ToggleButton input_button;
 	Gtk::ToggleButton output_button;
 	Gtk::Label  track_input_label;
-	
+
 	Gtk::Label  title_label;
-	
-	Gtk::Container * _active_pre_view;
-	Gtk::Container * _active_post_view;
+
+	Gtk::Container * _active_view;
 	IOSelector     * _input_iosel;
 	IOSelector     * _output_iosel;
-	
+
 	PluginSelector    *_plugin_selector;
 	RouteRedirectSelection  _rr_selection;
 
@@ -131,27 +128,24 @@ class RouteParams_UI : public ArdourDialog
 	sigc::connection            _route_conn;
 	sigc::connection            _route_ds_conn;
 
-	boost::shared_ptr<ARDOUR::Processor> _pre_processor;
-	sigc::connection                    _pre_plugin_conn;
+	boost::shared_ptr<ARDOUR::Processor> _processor;
+	sigc::connection                    _plugin_conn;
+
 
-	boost::shared_ptr<ARDOUR::Processor> _post_processor;
-	sigc::connection                     _post_plugin_conn;
-	
-	
 	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);
@@ -164,7 +158,7 @@ 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);
@@ -176,29 +170,28 @@ class RouteParams_UI : public ArdourDialog
 
 	void setup_io_frames();
 	void cleanup_io_frames();
-	void cleanup_pre_view(bool stopupdate = true);
-	void cleanup_post_view(bool stopupdate = true);
+	void cleanup_view(bool stopupdate = true);
 	void cleanup_latency_frame ();
 	void setup_latency_frame ();
-	
+
 	void processors_changed ();
-	
+
 	void setup_processor_boxes();
 	void cleanup_processor_boxes();
 
-	void redirect_selected (boost::shared_ptr<ARDOUR::Processor>, ARDOUR::Placement);
-	
+	void redirect_selected (boost::shared_ptr<ARDOUR::Processor>);
+
 	void plugin_going_away (ARDOUR::Placement);
 	void redirect_going_away (boost::shared_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 ();