cleanup sequence player API

ModernMIDI.xcodeproj/project.pbxproj

@@ -44,7 +44,6 @@
 		08567C601B6D684A00EB6C0D /* ModernMIDI */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = ModernMIDI; sourceTree = BUILT_PRODUCTS_DIR; };
 		08567C6E1B6D68D700EB6C0D /* RtMidi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RtMidi.cpp; path = third_party/rtmidi/RtMidi.cpp; sourceTree = "<group>"; };
 		08567C6F1B6D68D700EB6C0D /* RtMidi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RtMidi.h; path = third_party/rtmidi/RtMidi.h; sourceTree = "<group>"; };
-		08567C711B6D68E200EB6C0D /* circular_buffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = circular_buffer.h; path = src/circular_buffer.h; sourceTree = SOURCE_ROOT; };
 		08567C721B6D68E200EB6C0D /* concurrent_queue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = concurrent_queue.h; path = src/concurrent_queue.h; sourceTree = SOURCE_ROOT; };
 		08567C741B6D68E200EB6C0D /* midi_input.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = midi_input.cpp; path = src/midi_input.cpp; sourceTree = SOURCE_ROOT; };
 		08567C751B6D68E200EB6C0D /* midi_input.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = midi_input.h; path = src/midi_input.h; sourceTree = SOURCE_ROOT; };
@@ -83,7 +82,6 @@
 		08264DD01B726E8A004BE7B2 /* util */ = {
 			isa = PBXGroup;
 			children = (
-				08567C711B6D68E200EB6C0D /* circular_buffer.h */,
 				08567C721B6D68E200EB6C0D /* concurrent_queue.h */,
 				08567C7F1B6D68E200EB6C0D /* timer.h */,
 			);

sample.cpp

@@ -1,3 +1,28 @@
+/*
+ Copyright (c) 2015, Dimitri Diakopoulos All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ 
+ * Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ 
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #include <time.h>
 #include <chrono>
 #include <functional>
@@ -79,7 +104,7 @@ int main(int argc, char *argv[], char *envp[])
         }
     }
 
-    std::fstream output("loopback_a.mid", std::ios::out);
+    std::fstream output("assets/loopback.mid", std::ios::out);
     theLetterA.write(output);
 
     output.close();

src/midi_input.h

@@ -30,8 +30,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "modernmidi.h"
 #include "midi_message.h"
-#include "rtmidi/RtMidi.h"
 #include <functional>
+#include "rtmidi/RtMidi.h"
 
 namespace mm
 {

src/sequence_player.cpp

@@ -44,6 +44,19 @@ MidiSequencePlayer::~MidiSequencePlayer()
         sequencerThread.join();
 }
 
+double MidiSequencePlayer::ticksToSeconds(int ticks)
+{
+    double beats = (double) ticks / ticksPerBeat;
+    double seconds = beats / (beatsPerMinute / 60.0);
+    return seconds;
+}
+
+int MidiSequencePlayer::secondsToTicks(float seconds)
+{
+    double ticksPerSecond = (beatsPerMinute * ticksPerBeat) / 60.0;
+    double ticks = ticksPerSecond * seconds;
+    return (int) ticks;
+}
 
 void MidiSequencePlayer::loadSingleTrack(const MidiTrack & track, double ticksPerBeat, double beatsPerMinute)
 {
@@ -62,10 +75,6 @@ void MidiSequencePlayer::loadSingleTrack(const MidiTrack & track, double ticksPe
         double deltaTimestampInSeconds = ticksToSeconds(localElapsedTicks);
         if (m->m->getMessageType() == (uint8_t) MessageType::NOTE_ON) addTimestampedEvent(0, deltaTimestampInSeconds, m); // already checks if non-meta message
     }
-
-    //std::cout << "Track Idx: " << trackIdx << std::endl;
-    //std::cout << "Local Elapsed Ticks " << localElapsedTicks << std::endl;
-
 }
 
 void MidiSequencePlayer::loadMultipleTracks(const std::vector<MidiTrack> & tracks, double ticksPerBeat, double beatsPerMinute)
@@ -118,7 +127,7 @@ void MidiSequencePlayer::run()
 
         while((timer.running_time_s()) <= (outputMsg.timestamp))
         {
-            continue; // Spinny spin spin.
+            continue;
         }
 
         output.send(*outputMsg.msg);
@@ -144,15 +153,28 @@ void MidiSequencePlayer::stop()
     shouldSequence = false;
 }
 
-void MidiSequencePlayer::addTimestampedEvent(int track, double now, std::shared_ptr<TrackEvent> ev)
+void MidiSequencePlayer::addTimestampedEvent(int track, double when, std::shared_ptr<TrackEvent> ev)
 {
     if (ev->m->isMetaEvent() == false)
     {
-        eventList.push_back(MidiPlayerEvent(now, ev->m, track));
+        eventList.push_back(MidiPlayerEvent(when, ev->m, track));
     }
 }
 
 float MidiSequencePlayer::length() const
 {
     return playTimeSeconds;
 }
+
+void MidiSequencePlayer::setLooping(bool newState)
+{
+    loop = newState;
+}
+
+void MidiSequencePlayer::reset()
+{
+    eventList.clear();
+    eventCursor = 0;
+    startTime = 0;
+    playTimeSeconds = 0;
+}

src/sequence_player.h

@@ -45,10 +45,31 @@ namespace mm
 
 // This class is always a work in progress, and does not currently handle things like
 // mid-track tempo changes.
-
 class MidiSequencePlayer 
 {
     MidiOutput & output;
+
+    void run();
+
+    // Default behavior of this function is to reject playing any metadata events
+    void addTimestampedEvent(int track, double when, std::shared_ptr<TrackEvent> ev);
+
+    double ticksToSeconds(int ticks);
+
+    int secondsToTicks(float seconds);
+
+    float beatsPerMinute;
+    double ticksPerBeat;
+    double msPerTick;
+
+    float playTimeSeconds = 0;
+    float startTime = 0;
+    int eventCursor = 0;
+
+    std::thread sequencerThread;
+    std::atomic<bool> shouldSequence;
+    bool loop = false;
+
 public:
 
     MidiSequencePlayer(MidiOutput & output);
@@ -60,34 +81,11 @@ class MidiSequencePlayer
     void start();
     void stop();
 
-    void setLooping(bool newState)
-    {
-        loop = newState;
-    }
+    void setLooping(bool newState);
 
-    float length() const; // length of the song in seconds
-
-    double ticksToSeconds(int ticks)
-    {
-        double beats = (double) ticks / ticksPerBeat;
-        double seconds = beats / (beatsPerMinute / 60.0);
-        return seconds;
-    }
-
-    int secondsToTicks(float seconds)
-    {
-        double ticksPerSecond = (beatsPerMinute * ticksPerBeat) / 60.0;
-        double ticks = ticksPerSecond * seconds;
-        return (int) ticks;
-    }
-
-    void reset()
-    {
-        eventList.clear();
-        eventCursor = 0;
-        startTime = 0;
-        playTimeSeconds = 0;
-    }
+    float length() const;
+
+    void reset();
 
     std::function<void ()> startedEvent;
     std::function<void ()> stoppedEvent;
@@ -97,24 +95,6 @@ class MidiSequencePlayer
     ConcurrentQueue<MidiPlayerEvent> eventQueue;
 
     std::vector<MidiPlayerEvent> eventList; // indexed by track
-
-private:
-
-    void run();
-
-    void addTimestampedEvent(int track, double now, std::shared_ptr<TrackEvent> ev);
-
-    float beatsPerMinute;
-    double ticksPerBeat;
-    double msPerTick;
-
-    float playTimeSeconds = 0;
-    float startTime = 0;
-    int eventCursor = 0;
-
-    std::thread sequencerThread;
-    std::atomic<bool> shouldSequence;
-    bool loop = false;
 };
 
 } // mm