make it easier to add new midi sequences

diff --git a/libs/backends/dummy/dummy_audiobackend.cc b/libs/backends/dummy/dummy_audiobackend.cc
index 91d27fb8cdeae92f71818dbe38864a22ebbbd43c..a96db7a37cd22a2a0d80d21d1afd98f02581a1b5 100644 (file)
--- a/libs/backends/dummy/dummy_audiobackend.cc
+++ b/libs/backends/dummy/dummy_audiobackend.cc
@@ -1754,20 +1754,7 @@ struct MidiEventSorter {
 void DummyMidiPort::setup_generator (int seq_id, const float sr)
 {
        DummyPort::setup_random_number_generator();
-       switch (seq_id) {
-               case 1:
-                       _midi_seq_dat = DummyMidiData::s1;
-                       break;
-               case 2:
-                       _midi_seq_dat = DummyMidiData::s2;
-                       break;
-               case 3:
-                       _midi_seq_dat = DummyMidiData::s3;
-                       break;
-               default:
-                       _midi_seq_dat = DummyMidiData::s0;
-                       break;
-       }
+       _midi_seq_dat = DummyMidiData::sequences[seq_id % NUM_MIDI_EVENT_GENERATORS];
        _midi_seq_spb = sr * .5f; // 120 BPM, beat_time 1.0 per beat.
        _midi_seq_pos = 0;
        _midi_seq_time = 0;

diff --git a/libs/backends/dummy/dummy_midi_seq.h b/libs/backends/dummy/dummy_midi_seq.h
index 1ca27b87fab9aef4066fbead5e6d2df19c69117b..e086a5aed661102736325032fb24efd03875d616 100644 (file)
--- a/libs/backends/dummy/dummy_midi_seq.h
+++ b/libs/backends/dummy/dummy_midi_seq.h
@@ -23,9 +23,7 @@
 
 namespace ARDOUR { namespace DummyMidiData {
 
-#define NUM_MIDI_EVENT_GENERATORS 4
-
-const MIDISequence s0[] = { // some arbitrary short sequence
+static const MIDISequence s0[] = { // some arbitrary short sequence
        { 0.00, {0x90,  64, 0x7f} },
        { 0.50, {0x80,  64, 0x00} },
        { 1.00, {0x90,  66, 0x7f} },
@@ -37,7 +35,7 @@ const MIDISequence s0[] = { // some arbitrary short sequence
        { 4.00, {0xff, 255, 0xff} }, // sentinel
 };
 
-const MIDISequence s1[] = {  // Cmaj7 - iterate all channels
+static const MIDISequence s1[] = {  // Cmaj7 - iterate all channels
        { 0.00, {0x90,  60, 0x7f} },
        { 0.25, {0x90,  64, 0x7f} },
        { 0.50, {0x90,  67, 0x7f} },
@@ -201,7 +199,7 @@ const MIDISequence s1[] = {  // Cmaj7 - iterate all channels
        {32.00, {0xff, 255, 0xff} }, // sentinel
 };
 
-const MIDISequence s2[] = { // channel 1, sweep all notes
+static const MIDISequence s2[] = { // channel 1, sweep all notes
        { 0.00, {0x90,   0, 0x7f} },
        { 0.25, {0x80,   0, 0x00} },
        { 0.25, {0x90,   1, 0x7f} },
@@ -461,7 +459,7 @@ const MIDISequence s2[] = { // channel 1, sweep all notes
        {32.00, {0xff, 255, 0xff} }, // sentinel
 };
 
-const MIDISequence s3[] = { // velocity sweep
+static const MIDISequence s3[] = { // velocity sweep
        { 0.000, {0x90, 60, 0x00} },
        { 0.125, {0x80, 60, 0x00} },
        { 0.125, {0x90, 61, 0x01} },
@@ -721,6 +719,12 @@ const MIDISequence s3[] = { // velocity sweep
        {16.000, {0xff, 255, 0xff} }, // sentinel
 };
 
+static const MIDISequence *sequences[] = {
+       s0, s1, s2, s3
+};
+
 }} // namespace
 
+#define NUM_MIDI_EVENT_GENERATORS (sizeof (ARDOUR::DummyMidiData::sequences) / sizeof(ARDOUR::DummyMidiData::MIDISequence*))
+
 #endif