MIDI File: allow for filtering when querying notes.

kosua20 · Aug 23, 2023 · 86d5609 · 86d5609
1 parent cd63c5b
commit 86d5609
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 12 deletions.
diff --git a/src/midi/MIDIFile.cpp b/src/midi/MIDIFile.cpp
@@ -4,6 +4,7 @@
 
 #include "MIDIFile.h"
 #include "../helpers/System.h"
+#include "../rendering/State.h"
 
 MIDIFile::MIDIFile(){};
 
@@ -106,9 +107,10 @@ MIDIFile::MIDIFile(const std::string & filePath){
 	}
 
 	// Compute duration.
+	FilterOptions noFilter;
 	for(const auto & track : _tracks){
 		std::vector<MIDINote> notes;
-		track.getNotes(notes, NoteType::ALL);
+		track.getNotes(notes, NoteType::ALL, noFilter);
 		for(const auto & note : notes){
 			_duration = (std::max)(_duration, note.start + note.duration);
 		}
@@ -169,18 +171,18 @@ void MIDIFile::mergeTracks(){
 
 }
 
-void MIDIFile::getNotes(std::vector<MIDINote> & notes, NoteType type, size_t track) const {
+void MIDIFile::getNotes(std::vector<MIDINote> & notes, NoteType type, const FilterOptions& filter, size_t track) const {
 	if(track >= _tracks.size()){
 		return;
 	}
-	_tracks[track].getNotes(notes, type);
+	_tracks[track].getNotes(notes, type, filter );
 }
 
-void MIDIFile::getNotesActive(ActiveNotesArray & actives, double time, size_t track) const {
+void MIDIFile::getNotesActive(ActiveNotesArray & actives, double time, const FilterOptions& filter, size_t track) const {
 	if(track >= _tracks.size()){
 		return;
 	}
-	_tracks[track].getNotesActive(actives, time);
+	_tracks[track].getNotesActive(actives, time, filter);
 }
 
 void MIDIFile::getPedalsActive(float & damper, float &sostenuto, float &soft, float &expression, double time, size_t track) const {

diff --git a/src/midi/MIDIFile.h b/src/midi/MIDIFile.h
@@ -17,9 +17,9 @@ class MIDIFile {
 
 	void print() const;
 
-	void getNotes(std::vector<MIDINote>& notes, NoteType type, size_t track) const;
+	void getNotes(std::vector<MIDINote>& notes, NoteType type, const FilterOptions& filter, size_t track) const;
 
-	void getNotesActive(ActiveNotesArray& actives, double time, size_t track) const;
+	void getNotesActive(ActiveNotesArray& actives, double time, const FilterOptions& filter, size_t track) const;
 
 	void getPedalsActive(float &damper, float &sostenuto, float &soft, float &expression, double time, size_t track) const;
 

diff --git a/src/midi/MIDITrack.cpp b/src/midi/MIDITrack.cpp
@@ -4,6 +4,7 @@
 #include <cmath>
 #include <algorithm>
 #include "../rendering/SetOptions.h"
+#include "../rendering/State.h"
 
 // We will have to keep track of active notes per-channel.
 struct NoteKey {
@@ -185,21 +186,23 @@ void MIDITrack::extractNotes(const std::vector<MIDITempo> & tempos, uint16_t uni
 	}
 }
 
-void MIDITrack::getNotes(std::vector<MIDINote> & notes, NoteType type) const {
+void MIDITrack::getNotes(std::vector<MIDINote> & notes, NoteType type, const FilterOptions& filter ) const {
 	notes.clear();
-
+	notes.reserve( _notes.size() );
 	for(auto& note : _notes){
 		const bool isMin = noteIsMinor[note.note % 12];
 		const short shiftId = (note.note/12) * 7 + noteShift[note.note % 12];
 		if(type == NoteType::ALL || (type == NoteType::MINOR && isMin) || (type == NoteType::MAJOR && !isMin)){
+			if( !filter.accepts( note.track, note.channel ) )
+				continue;
 			notes.push_back(note);
 			notes.back().note = shiftId;
 		}
 	}
 
 }
 
-void MIDITrack::getNotesActive(ActiveNotesArray & actives, double time) const {
+void MIDITrack::getNotesActive(ActiveNotesArray & actives, double time, const FilterOptions& filter ) const {
 	// Reset all notes.
 	for(int i = 0; i < int(actives.size()); ++i){
 		 actives[i].enabled = false;
@@ -208,6 +211,8 @@ void MIDITrack::getNotesActive(ActiveNotesArray & actives, double time) const {
 	for(size_t i = 0; i < count; ++i){
 		auto& note = _notes[i];
 		if(note.start <= time && note.start+note.duration >= time){
+			if( !filter.accepts( note.track, note.channel ) )
+				continue;
 			auto & actNote = actives[note.note];
 			actNote.enabled = true;
 			actNote.duration = float(note.duration);

diff --git a/src/midi/MIDITrack.h b/src/midi/MIDITrack.h
@@ -5,6 +5,8 @@
 
 typedef std::array<ActiveNoteInfos, 128> ActiveNotesArray;
 
+struct FilterOptions;
+
 class MIDITrack {
 public:
 
@@ -16,9 +18,9 @@ class MIDITrack {
 
 	void print() const;
 
-	void getNotes(std::vector<MIDINote> & notes, NoteType type) const;
+	void getNotes(std::vector<MIDINote> & notes, NoteType type, const FilterOptions& filter ) const;
 
-	void getNotesActive(ActiveNotesArray & actives, double time) const;
+	void getNotesActive(ActiveNotesArray & actives, double time, const FilterOptions& filter ) const;
 
 	void normalizePedalVelocity();