From a2656d66128713f88108d3528ec23e532b7b1586 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed, 13 Sep 2023 23:56:45 -0600
Subject: [PATCH] when the "draw channel" is set to auto, consider the midnam
 display channel

This has higher priority than the playback mask
---
 gtk2_ardour/midi_time_axis.cc | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc
index 1bae4de065..e69687c38b 100644
--- a/gtk2_ardour/midi_time_axis.cc
+++ b/gtk2_ardour/midi_time_axis.cc
@@ -1856,6 +1856,16 @@ MidiTimeAxisView::get_preferred_midi_channel () const
 		return _editor.draw_channel();
 	}
 
+	if (_midnam_channel_selector.is_visible()) {
+		string chn = gui_property (X_("midnam-channel"));
+		if (!chn.empty()) {
+			int midnam_channel;
+			sscanf (chn.c_str(), "%*s %d", &midnam_channel);
+			midnam_channel--;
+			return midnam_channel;
+		}
+	}
+
 	uint16_t const chn_mask = midi_track()->get_playback_channel_mask();
 	int chn_cnt = 0;
 	uint8_t channel = 0;