Add MidiDispatcher::processTrack() method with other adjustments

monocasual · Aug 13, 2024 · 28f6dbd · 28f6dbd
1 parent 7b41894
commit 28f6dbd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/core/midiDispatcher.cpp b/src/core/midiDispatcher.cpp
@@ -133,7 +133,7 @@ void MidiDispatcher::process(const MidiEvent& e)
 		return;
 
 	processMaster(e);
-	processChannels(e);
+	processTracks(e);
 	onEventReceived();
 }
 
@@ -181,13 +181,18 @@ void MidiDispatcher::processPlugins(ID channelId, const std::vector<Plugin*>& pl
 
 /* -------------------------------------------------------------------------- */
 
-void MidiDispatcher::processChannels(const MidiEvent& midiEvent)
+void MidiDispatcher::processTracks(const MidiEvent& midiEvent)
 {
-	m_model.get().tracks.forEachChannel([this, &midiEvent](const Channel& c)
-	{
-		processChannel(c, midiEvent);
-		return true;
-	});
+	for (const model::Track& track : m_model.get().tracks.getAll())
+		processChannels(track.getChannels().getAll(), midiEvent);
+}
+
+/* -------------------------------------------------------------------------- */
+
+void MidiDispatcher::processChannels(const std::vector<Channel>& channels, const MidiEvent& midiEvent)
+{
+	for (const Channel& ch : channels)
+		processChannel(ch, midiEvent);
 }
 
 /* -------------------------------------------------------------------------- */

diff --git a/src/core/midiDispatcher.h b/src/core/midiDispatcher.h
@@ -75,7 +75,8 @@ class MidiDispatcher
 	bool isMasterMidiInAllowed(int c);
 	bool isChannelMidiInAllowed(ID channelId, int c);
 
-	void processChannels(const MidiEvent&);
+	void processTracks(const MidiEvent&);
+	void processChannels(const std::vector<Channel>&, const MidiEvent&);
 	void processChannel(const Channel&, const MidiEvent&);
 	void processMaster(const MidiEvent&);