Midi Busses? why yes!

4 files changed, 57 insertions, 15 deletions

diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc
index 1127ab2da7..14dda03d08 100644
--- a/gtk2_ardour/add_route_dialog.cc
+++ b/gtk2_ardour/add_route_dialog.cc
@@ -77,7 +77,8 @@ AddRouteDialog::AddRouteDialog ()
 	track_bus_combo.append_text (_("Audio Tracks"));
 	track_bus_combo.append_text (_("MIDI Tracks"));
 	track_bus_combo.append_text (_("Audio+MIDI Tracks"));
-	track_bus_combo.append_text (_("Busses"));
+	track_bus_combo.append_text (_("Audio Busses"));
+	track_bus_combo.append_text (_("MIDI Busses"));
 	track_bus_combo.set_active (0);
 
 	insert_at_combo.append_text (_("First"));
@@ -198,8 +199,10 @@ AddRouteDialog::TypeWanted
 AddRouteDialog::type_wanted() const
 {
 	std::string str = track_bus_combo.get_active_text();
-	if (str == _("Busses")) {
+	if (str == _("Audio Busses")) {
 		return AudioBus;
+	} else if (str == _("MIDI Busses")){
+		return MidiBus;
 	} else if (str == _("MIDI Tracks")){
 		return MidiTrack;
 	} else if (str == _("Audio+MIDI Tracks")) {
@@ -232,6 +235,7 @@ AddRouteDialog::maybe_update_name_template_entry ()
 		name_template_entry.set_text (_("Audio+MIDI"));
 		break;
 	case AudioBus:
+	case MidiBus:
 		name_template_entry.set_text (_("Bus"));
 		break;
 	}
@@ -280,6 +284,14 @@ AddRouteDialog::track_type_chosen ()
 		mode_label.set_sensitive (true);
 		instrument_label.set_sensitive (false);
 		break;
+	case MidiBus:
+		mode_combo.set_sensitive (false);
+		channel_combo.set_sensitive (false);
+		instrument_combo.set_sensitive (true);
+		configuration_label.set_sensitive (false);
+		mode_label.set_sensitive (true);
+		instrument_label.set_sensitive (true);
+		break;
 	}
 
 	maybe_update_name_template_entry ();
diff --git a/gtk2_ardour/add_route_dialog.h b/gtk2_ardour/add_route_dialog.h
index eb38338f1f..08359c2000 100644
--- a/gtk2_ardour/add_route_dialog.h
+++ b/gtk2_ardour/add_route_dialog.h
@@ -49,19 +49,20 @@ class AddRouteDialog : public ArdourDialog
 	AddRouteDialog ();
 	~AddRouteDialog ();
 
-        enum TypeWanted {
+	enum TypeWanted {
 		AudioTrack,
 		MidiTrack,
 		MixedTrack,
-		AudioBus
+		AudioBus,
+		MidiBus
 	};
-        TypeWanted type_wanted() const;
+	TypeWanted type_wanted() const;
 
-        ARDOUR::ChanCount channels ();
+	ARDOUR::ChanCount channels ();
 	int count ();
 
-        std::string name_template () const;
-        bool name_template_is_default () const;
+	std::string name_template () const;
+	bool name_template_is_default () const;
 	std::string track_template ();
 	ARDOUR::PluginInfoPtr requested_instrument ();
 
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index a01f2edaed..e1bcd06b7c 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -1806,6 +1806,31 @@ restart with more ports."), PROGRAM_NAME));
 	}
 }
 
+void
+ARDOUR_UI::session_add_midi_bus (RouteGroup* route_group, uint32_t how_many, const string& name_template, PluginInfoPtr instrument)
+{
+
+	if (_session == 0) {
+		warning << _("You cannot add a track without a session already loaded.") << endmsg;
+		return;
+	}
+
+	try {
+		RouteList routes = _session->new_midi_route (route_group, how_many, name_template, instrument);
+		if (routes.size() != how_many) {
+			error << string_compose(P_("could not create %1 new Midi Bus", "could not create %1 new Midi Busses", how_many), how_many) << endmsg;
+		}
+
+	}
+	catch (...) {
+		MessageDialog msg (_main_window,
+				   string_compose (_("There are insufficient ports available\n\
+to create a new track or bus.\n\
+You should save %1, exit and\n\
+restart with more ports."), PROGRAM_NAME));
+		msg.run ();
+	}
+}
 
 void
 ARDOUR_UI::session_add_midi_route (bool disk, RouteGroup* route_group, uint32_t how_many, const string& name_template, PluginInfoPtr instrument)
@@ -1815,6 +1840,8 @@ ARDOUR_UI::session_add_midi_route (bool disk, RouteGroup* route_group, uint32_t
 
 	if (disk) {
 		session_add_mixed_track (one_midi_channel, one_midi_channel, route_group, how_many, name_template, instrument);
+	} else {
+		session_add_midi_bus (route_group, how_many, name_template, instrument);
 	}
 }
 
@@ -3939,6 +3966,9 @@ ARDOUR_UI::add_route (Gtk::Window* /* ignored */)
 	case AddRouteDialog::AudioBus:
 		session_add_audio_bus (input_chan.n_audio(), output_chan.n_audio(), route_group, count, name_template);
 		break;
+	case AddRouteDialog::MidiBus:
+		session_add_midi_bus (route_group, count, name_template, instrument);
+		break;
 	}
 }
 
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index bc58341ec7..09baa2c9ee 100644
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -289,19 +289,18 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 		session_add_audio_route (false, input_channels, output_channels, ARDOUR::Normal, route_group, how_many, name_template);
 	}
 
+
 	void session_add_midi_track (ARDOUR::RouteGroup* route_group, uint32_t how_many, std::string const & name_template,
-				     ARDOUR::PluginInfoPtr instrument) {
+			ARDOUR::PluginInfoPtr instrument) {
 		session_add_midi_route (true, route_group, how_many, name_template, instrument);
 	}
 
-        void session_add_mixed_track (const ARDOUR::ChanCount& input, const ARDOUR::ChanCount& output, ARDOUR::RouteGroup* route_group, uint32_t how_many, std::string const & name_template,
-				      ARDOUR::PluginInfoPtr instrument);
+	void session_add_mixed_track (const ARDOUR::ChanCount& input, const ARDOUR::ChanCount& output, ARDOUR::RouteGroup* route_group, uint32_t how_many, std::string const & name_template,
+			ARDOUR::PluginInfoPtr instrument);
 
-	/*void session_add_midi_bus () {
-		session_add_midi_route (false);
-	}*/
+	void session_add_midi_bus (ARDOUR::RouteGroup* route_group, uint32_t how_many, std::string const & name_template, ARDOUR::PluginInfoPtr instrument);
 
-        void attach_to_engine ();
+	void attach_to_engine ();
 	void post_engine ();
 
 	gint exit_on_main_window_close (GdkEventAny *);