added meta-event end-of-track

and using std::function instead of raw function pointers
pedrolcl · Sep 11, 2024 · 47b0c35 · 47b0c35
1 parent 065a0c7
commit 47b0c35
Show file tree

Hide file tree

Showing 5 changed files with 137 additions and 128 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,13 +19,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 cmake_minimum_required(VERSION 3.16)
 
 project(kmidimon
-    VERSION 1.4.0
+    VERSION 1.4.1
     LANGUAGES CXX
     DESCRIPTION "ALSA Sequencer based MIDI Monitor"
     HOMEPAGE_URL "https://kmidimon.sourceforge.io/"
 )
 
-set(PROJECT_RELEASE_DATE "December 25, 2023")
+#set(PROJECT_RELEASE_DATE "December 25, 2023")
 option(BUILD_DOCS "Process Markdown sources of man pages and help files" ON)
 option(EMBED_TRANSLATIONS "Embed translations instead of installing" OFF)
 option(USE_QT5 "Prefer building with Qt5 instead of Qt6" OFF)

diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2024-09-11
+    * added meta-event end-of-track
+    * using std::function instead of raw function pointers
+
 2024-09-08
     * better formatting of event times in 'hh:mm:ss.zzz'
 

diff --git a/src/eventfilter.cpp b/src/eventfilter.cpp
@@ -54,55 +54,57 @@ void CategoryFilter::insert(QObject* parent, snd_seq_event_type_t t)
 
 QString CategoryFilter::nameOfEvent(int t)
 {
-    QHash<int, QString> names {
-        /* MIDI Channel events */
-        {SND_SEQ_EVENT_NOTE, QApplication::tr("Note")},
-        {SND_SEQ_EVENT_NOTEON, QApplication::tr("Note on")},
-        {SND_SEQ_EVENT_NOTEOFF, QApplication::tr("Note off")},
-        {SND_SEQ_EVENT_KEYPRESS, QApplication::tr("Polyphonic aftertouch")},
-        {SND_SEQ_EVENT_CONTROLLER, QApplication::tr("Control change")},
-        {SND_SEQ_EVENT_PGMCHANGE, QApplication::tr("Program change")},
-        {SND_SEQ_EVENT_CHANPRESS, QApplication::tr("Channel aftertouch")},
-        {SND_SEQ_EVENT_PITCHBEND, QApplication::tr("Pitch bend")},
-        {SND_SEQ_EVENT_CONTROL14, QApplication::tr("Control change")},
-        {SND_SEQ_EVENT_NONREGPARAM, QApplication::tr("Non-registered parameter")},
-        {SND_SEQ_EVENT_REGPARAM, QApplication::tr("Registered parameter")},
-        /* MIDI System exclusive events */
-        {SND_SEQ_EVENT_SYSEX, QApplication::tr("System exclusive")},
-        /* MIDI Common events */
-        {SND_SEQ_EVENT_SONGPOS, QApplication::tr("Song Position")},
-        {SND_SEQ_EVENT_SONGSEL, QApplication::tr("Song Selection")},
-        {SND_SEQ_EVENT_QFRAME, QApplication::tr("MTC Quarter Frame")},
-        {SND_SEQ_EVENT_TUNE_REQUEST, QApplication::tr("Tune Request")},
-        /* MIDI Realtime Events */
-        {SND_SEQ_EVENT_START, QApplication::tr("Start", "player start")},
-        {SND_SEQ_EVENT_CONTINUE, QApplication::tr("Continue")},
-        {SND_SEQ_EVENT_STOP, QApplication::tr("Stop")},
-        {SND_SEQ_EVENT_CLOCK, QApplication::tr("Clock")},
-        {SND_SEQ_EVENT_TICK, QApplication::tr("Tick")},
-        {SND_SEQ_EVENT_RESET, QApplication::tr("Reset")},
-        {SND_SEQ_EVENT_SENSING, QApplication::tr("Active Sensing")},
-        /* ALSA Client/Port events */
-        {SND_SEQ_EVENT_PORT_START, QApplication::tr("ALSA Port start")},
-        {SND_SEQ_EVENT_PORT_EXIT, QApplication::tr("ALSA Port exit")},
-        {SND_SEQ_EVENT_PORT_CHANGE, QApplication::tr("ALSA Port change")},
-        {SND_SEQ_EVENT_CLIENT_START, QApplication::tr("ALSA Client start")},
-        {SND_SEQ_EVENT_CLIENT_EXIT, QApplication::tr("ALSA Client exit")},
-        {SND_SEQ_EVENT_CLIENT_CHANGE, QApplication::tr("ALSA Client change")},
-        {SND_SEQ_EVENT_PORT_SUBSCRIBED, QApplication::tr("ALSA Port subscribed")},
-        {SND_SEQ_EVENT_PORT_UNSUBSCRIBED, QApplication::tr("ALSA Port unsubscribed")},
-        /* SMF events */
-        {SND_SEQ_EVENT_TEMPO, QApplication::tr("Tempo")},
-        {SND_SEQ_EVENT_USR_VAR0, QApplication::tr("SMF Text")},
-        {SND_SEQ_EVENT_TIMESIGN, QApplication::tr("Time Signature")},
-        {SND_SEQ_EVENT_KEYSIGN, QApplication::tr("Key Signature")},
-        {SND_SEQ_EVENT_USR1, QApplication::tr("Sequence Number")},
-        {SND_SEQ_EVENT_USR2, QApplication::tr("Forced Channel")},
-        {SND_SEQ_EVENT_USR3, QApplication::tr("Forced Port")},
-        {SND_SEQ_EVENT_USR4, QApplication::tr("SMPTE Offset")},
-        {SND_SEQ_EVENT_USR_VAR1, QApplication::tr("Sequencer Specific")},
-        {SND_SEQ_EVENT_USR_VAR2, QApplication::tr("Meta (unregistered)")}
-    };
+    QHash<int, QString> names{/* MIDI Channel events */
+                              {SND_SEQ_EVENT_NOTE, QApplication::tr("Note")},
+                              {SND_SEQ_EVENT_NOTEON, QApplication::tr("Note on")},
+                              {SND_SEQ_EVENT_NOTEOFF, QApplication::tr("Note off")},
+                              {SND_SEQ_EVENT_KEYPRESS, QApplication::tr("Polyphonic aftertouch")},
+                              {SND_SEQ_EVENT_CONTROLLER, QApplication::tr("Control change")},
+                              {SND_SEQ_EVENT_PGMCHANGE, QApplication::tr("Program change")},
+                              {SND_SEQ_EVENT_CHANPRESS, QApplication::tr("Channel aftertouch")},
+                              {SND_SEQ_EVENT_PITCHBEND, QApplication::tr("Pitch bend")},
+                              {SND_SEQ_EVENT_CONTROL14, QApplication::tr("Control change")},
+                              {SND_SEQ_EVENT_NONREGPARAM,
+                               QApplication::tr("Non-registered parameter")},
+                              {SND_SEQ_EVENT_REGPARAM, QApplication::tr("Registered parameter")},
+                              /* MIDI System exclusive events */
+                              {SND_SEQ_EVENT_SYSEX, QApplication::tr("System exclusive")},
+                              /* MIDI Common events */
+                              {SND_SEQ_EVENT_SONGPOS, QApplication::tr("Song Position")},
+                              {SND_SEQ_EVENT_SONGSEL, QApplication::tr("Song Selection")},
+                              {SND_SEQ_EVENT_QFRAME, QApplication::tr("MTC Quarter Frame")},
+                              {SND_SEQ_EVENT_TUNE_REQUEST, QApplication::tr("Tune Request")},
+                              /* MIDI Realtime Events */
+                              {SND_SEQ_EVENT_START, QApplication::tr("Start", "player start")},
+                              {SND_SEQ_EVENT_CONTINUE, QApplication::tr("Continue")},
+                              {SND_SEQ_EVENT_STOP, QApplication::tr("Stop")},
+                              {SND_SEQ_EVENT_CLOCK, QApplication::tr("Clock")},
+                              {SND_SEQ_EVENT_TICK, QApplication::tr("Tick")},
+                              {SND_SEQ_EVENT_RESET, QApplication::tr("Reset")},
+                              {SND_SEQ_EVENT_SENSING, QApplication::tr("Active Sensing")},
+                              /* ALSA Client/Port events */
+                              {SND_SEQ_EVENT_PORT_START, QApplication::tr("ALSA Port start")},
+                              {SND_SEQ_EVENT_PORT_EXIT, QApplication::tr("ALSA Port exit")},
+                              {SND_SEQ_EVENT_PORT_CHANGE, QApplication::tr("ALSA Port change")},
+                              {SND_SEQ_EVENT_CLIENT_START, QApplication::tr("ALSA Client start")},
+                              {SND_SEQ_EVENT_CLIENT_EXIT, QApplication::tr("ALSA Client exit")},
+                              {SND_SEQ_EVENT_CLIENT_CHANGE, QApplication::tr("ALSA Client change")},
+                              {SND_SEQ_EVENT_PORT_SUBSCRIBED,
+                               QApplication::tr("ALSA Port subscribed")},
+                              {SND_SEQ_EVENT_PORT_UNSUBSCRIBED,
+                               QApplication::tr("ALSA Port unsubscribed")},
+                              /* SMF events */
+                              {SND_SEQ_EVENT_TEMPO, QApplication::tr("Tempo")},
+                              {SND_SEQ_EVENT_USR_VAR0, QApplication::tr("SMF Text")},
+                              {SND_SEQ_EVENT_TIMESIGN, QApplication::tr("Time Signature")},
+                              {SND_SEQ_EVENT_KEYSIGN, QApplication::tr("Key Signature")},
+                              {SND_SEQ_EVENT_USR1, QApplication::tr("Sequence Number")},
+                              {SND_SEQ_EVENT_USR2, QApplication::tr("Forced Channel")},
+                              {SND_SEQ_EVENT_USR3, QApplication::tr("Forced Port")},
+                              {SND_SEQ_EVENT_USR4, QApplication::tr("SMPTE Offset")},
+                              {SND_SEQ_EVENT_USR5, QApplication::tr("End Of Track")},
+                              {SND_SEQ_EVENT_USR_VAR1, QApplication::tr("Sequencer Specific")},
+                              {SND_SEQ_EVENT_USR_VAR2, QApplication::tr("Meta (unregistered)")}};
     if (names.contains(t)) {
         return names[t];
     }
@@ -163,8 +165,9 @@ EventFilter::EventFilter(QObject* parent)
     insert(SMFCategory, SND_SEQ_EVENT_USR2);// tr("Forced Channel"));
     insert(SMFCategory, SND_SEQ_EVENT_USR3);// tr("Forced Port"));
     insert(SMFCategory, SND_SEQ_EVENT_USR4);// tr("SMPTE Offset"));
-    insert(SMFCategory, SND_SEQ_EVENT_USR_VAR1);// tr("Sequencer Specific"));
-    insert(SMFCategory, SND_SEQ_EVENT_USR_VAR2);// tr("Meta (unregistered)"));
+    insert(SMFCategory, SND_SEQ_EVENT_USR5);     // tr("End Of Track"));
+    insert(SMFCategory, SND_SEQ_EVENT_USR_VAR1); // tr("Sequencer Specific"));
+    insert(SMFCategory, SND_SEQ_EVENT_USR_VAR2); // tr("Meta (unregistered)"));
 }
 
 EventFilter::~EventFilter()