Remove direct busses so that all busses have internal returns.

git-svn-id: svn://localhost/ardour2/branches/3.0@8447 d708f5d6-7413-0410-9779-e7cbd77b26cf

4 files changed, 9 insertions, 30 deletions

diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc
index e25be9f84f..3330b14b92 100644
--- a/gtk2_ardour/add_route_dialog.cc
+++ b/gtk2_ardour/add_route_dialog.cc
@@ -51,15 +51,8 @@ static const char* track_mode_names[] = {
 	0
 };
 
-static const char* bus_mode_names[] = {
-	N_("Aux"),
-	N_("Direct"),
-	0
-};
-
 std::vector<std::string> AddRouteDialog::channel_combo_strings;
 std::vector<std::string> AddRouteDialog::track_mode_strings;
-std::vector<std::string> AddRouteDialog::bus_mode_strings;
 
 AddRouteDialog::AddRouteDialog (Session* s)
 	: ArdourDialog (_("Add Track or Bus"))
@@ -81,10 +74,6 @@ AddRouteDialog::AddRouteDialog (Session* s)
 		}
 	}
 
-	if (bus_mode_strings.empty()) {
-		bus_mode_strings = I18N (bus_mode_names);
-	}
-
 	set_name ("AddRouteDialog");
 	set_position (Gtk::WIN_POS_MOUSE);
 	set_modal (true);
@@ -195,13 +184,11 @@ AddRouteDialog::track_type_chosen ()
 	if (track()) {
 		mode_label.set_text (_("Track mode:"));
 		set_popdown_strings (mode_combo, track_mode_strings);
+		mode_combo.set_sensitive (true);
 		mode_combo.set_active_text (track_mode_strings.front());
 	} else {
-		mode_label.set_text (_("Bus type:"));
-		set_popdown_strings (mode_combo, bus_mode_strings);
-		mode_combo.set_active_text (bus_mode_strings.front());
+		mode_combo.set_sensitive (false);
 	}
-
 }
 
 bool
@@ -210,12 +197,6 @@ AddRouteDialog::track ()
 	return track_bus_combo.get_active_row_number () == 0;
 }
 
-bool
-AddRouteDialog::aux ()
-{
-	return !track() && mode_combo.get_active_row_number () == 0;
-}
-
 ARDOUR::DataType
 AddRouteDialog::type ()
 {
diff --git a/gtk2_ardour/add_route_dialog.h b/gtk2_ardour/add_route_dialog.h
index 1422270331..bc0434e461 100644
--- a/gtk2_ardour/add_route_dialog.h
+++ b/gtk2_ardour/add_route_dialog.h
@@ -48,7 +48,6 @@ class AddRouteDialog : public ArdourDialog
 	bool track ();
 	int channels ();
 	int count ();
-	bool aux ();
 
 	std::string name_template ();
 	std::string track_template ();
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 43fb42164f..c725bce3db 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -1370,7 +1370,7 @@ restart JACK with more ports."), PROGRAM_NAME));
 
 
 void
-ARDOUR_UI::session_add_audio_route (bool track, bool aux, int32_t input_channels, int32_t output_channels, ARDOUR::TrackMode mode, RouteGroup* route_group, uint32_t how_many)
+ARDOUR_UI::session_add_audio_route (bool track, int32_t input_channels, int32_t output_channels, ARDOUR::TrackMode mode, RouteGroup* route_group, uint32_t how_many)
 {
 	list<boost::shared_ptr<AudioTrack> > tracks;
 	RouteList routes;
@@ -1395,7 +1395,7 @@ ARDOUR_UI::session_add_audio_route (bool track, bool aux, int32_t input_channels
 
 		} else {
 
-			routes = _session->new_audio_route (aux, input_channels, output_channels, route_group, how_many);
+			routes = _session->new_audio_route (input_channels, output_channels, route_group, how_many);
 
 			if (routes.size() != how_many) {
 				if (how_many == 1) {
@@ -3178,7 +3178,6 @@ ARDOUR_UI::add_route (Gtk::Window* float_window)
 	uint32_t output_chan;
 	string name_template = add_route_dialog->name_template ();
 	bool track = add_route_dialog->track ();
-	bool aux = !track && add_route_dialog->aux();
 	RouteGroup* route_group = add_route_dialog->route_group ();
 
 	AutoConnectOption oac = Config->get_output_auto_connect();
@@ -3204,7 +3203,7 @@ ARDOUR_UI::add_route (Gtk::Window* float_window)
 		if (track) {
 			session_add_audio_track (input_chan, output_chan, add_route_dialog->mode(), route_group, count);
 		} else {
-			session_add_audio_bus (aux, input_chan, output_chan, route_group, count);
+			session_add_audio_bus (input_chan, output_chan, route_group, count);
 		}
 	}
 }
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index d09084c39d..81cbd65308 100644
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -203,11 +203,11 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 	void add_route (Gtk::Window* float_window);
 
 	void session_add_audio_track (int input_channels, int32_t output_channels, ARDOUR::TrackMode mode, ARDOUR::RouteGroup* route_group, uint32_t how_many) {
-		session_add_audio_route (true, false, input_channels, output_channels, mode, route_group, how_many);
+		session_add_audio_route (true, input_channels, output_channels, mode, route_group, how_many);
 	}
 
-	void session_add_audio_bus (bool aux,  int input_channels, int32_t output_channels, ARDOUR::RouteGroup* route_group, uint32_t how_many) {
-		session_add_audio_route (false, aux, input_channels, output_channels, ARDOUR::Normal, route_group, how_many);
+	void session_add_audio_bus (int input_channels, int32_t output_channels, ARDOUR::RouteGroup* route_group, uint32_t how_many) {
+		session_add_audio_route (false, input_channels, output_channels, ARDOUR::Normal, route_group, how_many);
 	}
 
 	void session_add_midi_track (ARDOUR::RouteGroup* route_group, uint32_t how_many) {
@@ -545,7 +545,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 	void edit_metadata ();
 	void import_metadata ();
 
-	void session_add_audio_route (bool disk, bool aux, int32_t input_channels, int32_t output_channels, ARDOUR::TrackMode mode, ARDOUR::RouteGroup *, uint32_t how_many);
+	void session_add_audio_route (bool disk, int32_t input_channels, int32_t output_channels, ARDOUR::TrackMode mode, ARDOUR::RouteGroup *, uint32_t how_many);
 	void session_add_midi_route (bool disk, ARDOUR::RouteGroup *, uint32_t how_many);
 
 	void set_transport_sensitivity (bool);