From 88beef2e93d26d28467fe151f5ef2972d0ca9169 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 13 Jul 2009 00:26:28 +0000 Subject: merge pre- and post-fader processor boxes; start removing Placement (not finished) ; add -DWAF_BUILD and use per-directory foobar-config.h to correctly pick up configure-time settings like HAVE_OGG ; check for libgiomm (part of upgrade to newer gtk stack); 32 bit marker reload fix from 2.X; audiounit IO config cache fix from 2.X; multi-add route template fix from 2.X; plugin GUI delete fix from 2.X; solo button labels are A or P for listen mode git-svn-id: svn://localhost/ardour2/branches/3.0@5344 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/route_params_ui.h | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) (limited to 'gtk2_ardour/route_params_ui.h') diff --git a/gtk2_ardour/route_params_ui.h b/gtk2_ardour/route_params_ui.h index 0f9fe6423f..5fd7487bc1 100644 --- a/gtk2_ardour/route_params_ui.h +++ b/gtk2_ardour/route_params_ui.h @@ -80,16 +80,14 @@ class RouteParams_UI : public ArdourDialog Gtk::Notebook notebook; Gtk::Frame input_frame; Gtk::Frame output_frame; - Gtk::HPaned pre_redir_hpane; - Gtk::HPaned post_redir_hpane; + Gtk::HPaned redir_hpane; 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; @@ -119,8 +117,7 @@ class RouteParams_UI : public ArdourDialog Gtk::Label title_label; - Gtk::Container * _active_pre_view; - Gtk::Container * _active_post_view; + Gtk::Container * _active_view; IOSelector * _input_iosel; IOSelector * _output_iosel; @@ -131,12 +128,9 @@ class RouteParams_UI : public ArdourDialog sigc::connection _route_conn; sigc::connection _route_ds_conn; - boost::shared_ptr _pre_processor; - sigc::connection _pre_plugin_conn; + boost::shared_ptr _processor; + sigc::connection _plugin_conn; - boost::shared_ptr _post_processor; - sigc::connection _post_plugin_conn; - enum ConfigView { NO_CONFIG_VIEW = 0, @@ -176,8 +170,7 @@ 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 (); @@ -186,7 +179,7 @@ class RouteParams_UI : public ArdourDialog void setup_processor_boxes(); void cleanup_processor_boxes(); - void redirect_selected (boost::shared_ptr, ARDOUR::Placement); + void redirect_selected (boost::shared_ptr); void plugin_going_away (ARDOUR::Placement); void redirect_going_away (boost::shared_ptr); -- cgit v1.2.3