make MIDI thru work even when not rolling; add GUI control over MIDI thru (midi track context menu); add "default channel" concept for MIDI tracks so that piano roll header events can send stuff on the right channel; add GUI control over this channel setting

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

3 files changed, 60 insertions, 3 deletions

diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc
index 6103e02544..b189827782 100644
--- a/gtk2_ardour/midi_time_axis.cc
+++ b/gtk2_ardour/midi_time_axis.cc
@@ -108,6 +108,9 @@ MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session& sess,
 	, _meter_color_mode_item(0)
 	, _channel_color_mode_item(0)
 	, _track_color_mode_item(0)
+	, _step_edit_item (0)
+	, _midi_thru_item (0)
+	, default_channel_menu (0)
 {
 	subplugin_menu.set_name ("ArdourContextMenu");
 
@@ -301,8 +304,57 @@ MidiTimeAxisView::append_extra_display_menu_items ()
 			MidiStreamView::ContentsRange)));
 
 	items.push_back (MenuElem (_("Note range"), *range_menu));
-
 	items.push_back (MenuElem (_("Note mode"), *build_note_mode_menu()));
+	items.push_back (MenuElem (_("Default Channel"), *build_def_channel_menu()));
+
+	items.push_back (CheckMenuElem (_("MIDI Thru"), mem_fun(*this, &MidiTimeAxisView::toggle_midi_thru)));
+	_midi_thru_item = dynamic_cast<CheckMenuItem*>(&items.back());
+}
+
+Gtk::Menu*
+MidiTimeAxisView::build_def_channel_menu ()
+{
+	using namespace Menu_Helpers;
+	
+	if (default_channel_menu == 0) {
+		default_channel_menu = manage (new Menu ());
+	} 
+	
+	uint8_t defchn = midi_track()->default_channel();
+	MenuList& def_channel_items = default_channel_menu->items();
+	RadioMenuItem* item;
+	RadioMenuItem::Group dc_group;
+	
+	for (int i = 0; i < 16; ++i) {
+		char buf[4];
+		snprintf (buf, sizeof (buf), "%d", i+1);
+		
+		def_channel_items.push_back (RadioMenuElem (dc_group, buf,
+							    bind (mem_fun (*this, &MidiTimeAxisView::set_default_channel), i)));
+		item = dynamic_cast<RadioMenuItem*>(&def_channel_items.back());
+		item->set_active ((i == defchn));
+	}
+
+	return default_channel_menu;
+}
+
+void
+MidiTimeAxisView::set_default_channel (int chn)
+{
+	midi_track()->set_default_channel (chn);
+}
+
+void
+MidiTimeAxisView::toggle_midi_thru ()
+{
+	if (!_midi_thru_item) {
+		return;
+	}
+
+	bool view_yn = _midi_thru_item->get_active();
+	if (view_yn != midi_track()->midi_thru()) {
+		midi_track()->set_midi_thru (view_yn);
+	}
 }
 
 void
diff --git a/gtk2_ardour/midi_time_axis.h b/gtk2_ardour/midi_time_axis.h
index fd9db05a99..d71c156f48 100644
--- a/gtk2_ardour/midi_time_axis.h
+++ b/gtk2_ardour/midi_time_axis.h
@@ -129,12 +129,17 @@ class MidiTimeAxisView : public RouteTimeAxisView
 	Gtk::ComboBoxText            _custom_device_mode_selector;
 
 	Gtk::CheckMenuItem*          _step_edit_item;
+	Gtk::CheckMenuItem*          _midi_thru_item;
+	Gtk::Menu*                    default_channel_menu;
 
 	nframes64_t step_edit_insert_position;
 	Evoral::MusicalTime step_edit_beat_pos;
 	boost::shared_ptr<ARDOUR::Region> step_edit_region;
 	MidiRegionView* step_edit_region_view;
 
+	Gtk::Menu* build_def_channel_menu();
+	void set_default_channel (int);
+	void toggle_midi_thru ();
 };
 
 #endif /* __ardour_midi_time_axis_h__ */
diff --git a/gtk2_ardour/piano_roll_header.cc b/gtk2_ardour/piano_roll_header.cc
index 9a7b86396f..c6784bf853 100644
--- a/gtk2_ardour/piano_roll_header.cc
+++ b/gtk2_ardour/piano_roll_header.cc
@@ -651,7 +651,7 @@ PianoRollHeader::send_note_on(uint8_t note)
 	//cerr << "note on: " << (int) note << endl;
 
 	if (track) {
-		_event[0] = MIDI_CMD_NOTE_ON;
+		_event[0] = (MIDI_CMD_NOTE_ON | track->default_channel());
 		_event[1] = note;
 		_event[2] = 100;
 
@@ -665,7 +665,7 @@ PianoRollHeader::send_note_off(uint8_t note)
 	boost::shared_ptr<ARDOUR::MidiTrack> track = _view.trackview().midi_track();
 
 	if (track) {
-		_event[0] = MIDI_CMD_NOTE_OFF;
+		_event[0] = (MIDI_CMD_NOTE_OFF | track->default_channel());
 		_event[1] = note;
 		_event[2] = 100;