X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_params_ui.cc;h=a8ddc02c1f9bef62c8560dae48620861d670f369;hb=6424a0eab93c85f8b1ff56334f779c1232dfe475;hp=82e6f10a15fddc7576898016f497e4879a8fc681;hpb=b5c9a92a584b70b2af172e7240d4a58b007e0608;p=ardour.git

diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc
index 82e6f10a15..a8ddc02c1f 100644
--- a/gtk2_ardour/route_params_ui.cc
+++ b/gtk2_ardour/route_params_ui.cc
@@ -48,7 +48,7 @@
 #include "send_ui.h"
 #include "timers.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
@@ -124,19 +124,11 @@ RouteParams_UI::RouteParams_UI ()
 	route_vpacker.pack_start (title_label, false, false);
 	route_vpacker.pack_start (route_hpacker, true, true);
 
+	list_hpane.add (list_vpacker);
+	list_hpane.add (route_vpacker);
 
-	list_hpane.pack1 (list_vpacker);
-	list_hpane.add2 (route_vpacker);
-
-	list_hpane.set_position(110);
-
-	redir_hpane.set_position(110);
-
-	//global_vpacker.pack_start (list_hpane, true, true);
-	//get_vbox()->pack_start (global_vpacker);
 	add (list_hpane);
 
-
 	set_name ("RouteParamsWindow");
 	set_default_size (620,370);
 	set_wmclass (X_("ardour_route_parameters"), PROGRAM_NAME);
@@ -250,7 +242,7 @@ RouteParams_UI::setup_processor_boxes()
 		if (at) {
 			at->FreezeChange.connect (route_connections, invalidator (*this), boost::bind (&RouteParams_UI::map_frozen, this), gui_context());
 		}
-		redir_hpane.pack1 (*insert_box);
+		redir_hpane.add (*insert_box);
 
 		insert_box->ProcessorSelected.connect (sigc::mem_fun(*this, &RouteParams_UI::redirect_selected));  //note:  this indicates a double-click activation, not just a "selection"
 		insert_box->ProcessorUnselected.connect (sigc::mem_fun(*this, &RouteParams_UI::redirect_selected));
@@ -520,9 +512,7 @@ RouteParams_UI::show_track_menu()
 	if (track_menu == 0) {
 		track_menu = new Menu;
 		track_menu->set_name ("ArdourContextMenu");
-		track_menu->items().push_back
-				(MenuElem (_("Add Track or Bus"),
-					   sigc::bind (sigc::mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::add_route), (Gtk::Window*) 0)));
+		track_menu->items().push_back (MenuElem (_("Add Track or Bus"), sigc::mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::add_route)));
 	}
 	track_menu->popup (1, gtk_get_current_event_time());
 }
@@ -548,7 +538,7 @@ RouteParams_UI::redirect_selected (boost::shared_ptr<ARDOUR::Processor> proc)
 		send->DropReferences.connect (_processor_going_away_connection, invalidator (*this), boost::bind (&RouteParams_UI::processor_going_away, this, boost::weak_ptr<Processor>(proc)), gui_context());
 		_active_view = send_ui;
 
-		redir_hpane.add2 (*_active_view);
+		redir_hpane.add (*_active_view);
 		redir_hpane.show_all();
 
 	} else if ((retrn = boost::dynamic_pointer_cast<Return> (proc)) != 0) {
@@ -559,7 +549,7 @@ RouteParams_UI::redirect_selected (boost::shared_ptr<ARDOUR::Processor> proc)
 		retrn->DropReferences.connect (_processor_going_away_connection, invalidator (*this), boost::bind (&RouteParams_UI::processor_going_away, this, boost::weak_ptr<Processor>(proc)), gui_context());
 		_active_view = return_ui;
 
-		redir_hpane.add2 (*_active_view);
+		redir_hpane.add (*_active_view);
 		redir_hpane.show_all();
 
 	} else if ((plugin_insert = boost::dynamic_pointer_cast<PluginInsert> (proc)) != 0) {
@@ -571,7 +561,7 @@ RouteParams_UI::redirect_selected (boost::shared_ptr<ARDOUR::Processor> proc)
 		plugin_ui->start_updating (0);
 		_active_view = plugin_ui;
 
-		redir_hpane.pack2 (*_active_view);
+		redir_hpane.add (*_active_view);
 		redir_hpane.show_all();
 
 	} else if ((port_insert = boost::dynamic_pointer_cast<PortInsert> (proc)) != 0) {
@@ -582,7 +572,7 @@ RouteParams_UI::redirect_selected (boost::shared_ptr<ARDOUR::Processor> proc)
 		port_insert->DropReferences.connect (_processor_going_away_connection, invalidator (*this), boost::bind (&RouteParams_UI::processor_going_away, this, boost::weak_ptr<Processor> (proc)), gui_context());
 		_active_view = portinsert_ui;
 
-		redir_hpane.pack2 (*_active_view);
+		redir_hpane.add (*_active_view);
 		portinsert_ui->redisplay();
 		redir_hpane.show_all();
 	}