Fix event alignment after looping

Author: medengineer

Source/Processors/FileReader/BinaryFileSource/BinaryFileSource.cpp

@@ -27,8 +27,7 @@ using namespace BinarySource;
 
 BinaryFileSource::BinaryFileSource()
     : m_samplePos (0),
-      hasEventData (false),
-      loopCount (0)
+      hasEventData (false)
 {
 }
 
@@ -275,7 +274,6 @@ void BinaryFileSource::processEventData (EventInfo& eventInfo, int64 start, int6
 {
     int64 local_start = start % getActiveNumSamples();
     int64 local_stop = stop % getActiveNumSamples();
-    int64 loop_count = start / getActiveNumSamples();
 
     std::vector<String> includeStreams = { currentStream, "MessageCenter" };
 
@@ -291,7 +289,7 @@ void BinaryFileSource::processEventData (EventInfo& eventInfo, int64 start, int6
             {
                 eventInfo.channels.push_back (info.channels[i] - 1);
                 eventInfo.channelStates.push_back ((info.channelStates[i]));
-                eventInfo.sampleNumbers.push_back (info.sampleNumbers[i] + loop_count * getActiveNumSamples());
+                eventInfo.sampleNumbers.push_back (info.sampleNumbers[i]);
                 eventInfo.text.push_back (info.text[i]);
             }
             i++;

Source/Processors/FileReader/BinaryFileSource/BinaryFileSource.h

@@ -65,8 +65,6 @@ class BinaryFileSource : public FileSource
     /** Add info about events occurring within a sample range */
     void processEventData (EventInfo& info, int64 fromSampleNumber, int64 toSampleNumber) override;
 
-    int64 loopCount;
-
 private:
     int numActiveChannels;
     Array<float> bitVolts;

Source/Processors/FileReader/FileReader.cpp

@@ -45,7 +45,6 @@ FileReader::FileReader() : GenericProcessor ("File Reader"),
                            currentNumTotalSamples (0),
                            startSample (0),
                            stopSample (0),
-                           loopCount (0),
                            bufferCacheWindow (0),
                            m_shouldFillBackBuffer (false),
                            m_bufferSize (1024),
@@ -334,7 +333,6 @@ void FileReader::setActiveStream (int index, bool reset)
         startSample = 0;
         stopSample = currentNumTotalSamples;
         bufferCacheWindow = 0;
-        loopCount = 0;
 
         /*
         startTime->getTimeValue()->setTimeFromMilliseconds (0);
@@ -536,7 +534,6 @@ void FileReader::updateSettings()
 
     /* Set the sample to start of playback and reset loop counter */
     playbackSamplePos = startSample;
-    loopCount = 0;
 
     /* Setup internal buffer based on audio device settings */
     AudioDeviceManager& adm = AccessClass::getAudioComponent()->deviceManager;
@@ -668,13 +665,11 @@ void FileReader::process (AudioBuffer<float>& buffer)
 
     int samplesNeededPerBuffer = int (float (buffer.getNumSamples()) * (getDefaultSampleRate() / m_sysSampleRate));
 
-    if (! playbackActive && playbackSamplePos + samplesNeededPerBuffer > stopSample)
-    {
-        samplesNeededPerBuffer = int (stopSample - playbackSamplePos);
-        switchNeeded = true;
-    }
-    else
         m_samplesPerBuffer.set (samplesNeededPerBuffer);
+        m_samplesPerBuffer.set (samplesNeededPerBuffer);
+    // FIXME: needs to account for the fact that the ratio might not be an exact
+    //        integer value
+    m_samplesPerBuffer.set (samplesNeededPerBuffer);
     // FIXME: needs to account for the fact that the ratio might not be an exact
     //        integer value
 
@@ -684,8 +679,6 @@ void FileReader::process (AudioBuffer<float>& buffer)
         switchBuffer();
     }
 
-    //std::cout << "Reading " << samplesNeededPerBuffer << " samples. " << std::endl;
-
     const float* tempReadBuffer = readBuffer->getData() + (samplesNeededPerBuffer * currentNumChannels * bufferCacheWindow);
 
     for (int ch = 0; ch < currentNumChannels; ++ch)
@@ -705,7 +698,7 @@ void FileReader::process (AudioBuffer<float>& buffer)
         //                           samplesNeededPerBuffer);
     }
 
-    setTimestampAndSamples (playbackSamplePos, -1.0, samplesNeededPerBuffer, dataStreams[0]->getStreamId()); //TODO: Look at this
+    setTimestampAndSamples (playbackSamplePos, -1.0, samplesNeededPerBuffer, dataStreams[0]->getStreamId()); //TODO: Look at this could be total or playback
 
     int64 start = playbackSamplePos;
 
@@ -717,6 +710,11 @@ void FileReader::process (AudioBuffer<float>& buffer)
 
     addEventsInRange (start, stop);
 
+    if (playbackSamplePos >= stopSample)
+    {
+        playbackSamplePos = startSample + (playbackSamplePos - stopSample);
+    }
+
     bufferCacheWindow += 1;
     bufferCacheWindow %= BUFFER_WINDOW_CACHE_SIZE;
 
@@ -734,7 +732,7 @@ void FileReader::addEventsInRange (int64 start, int64 stop)
 
     for (int i = 0; i < events.channels.size(); i++)
     {
-        int64 absoluteCurrentSampleNumber = events.sampleNumbers[i] + loopCount * (stopSample - startSample);
+        int64 absoluteCurrentSampleNumber = events.sampleNumbers[i];
         if (events.text.size() && ! events.text[i].isEmpty())
         {
             String msg = events.text[i];

Source/Processors/FileReader/FileReader.h

@@ -206,7 +206,6 @@ class FileReader : public GenericProcessor,
     int64 stopSample;
     int64 bufferCacheWindow; // the current buffer window to read from readBuffer
     Array<RecordedChannelInfo> channelInfo;
-    int64 loopCount;
     bool playbackActive;
 
     std::unique_ptr<FileSource> input;
@@ -218,7 +217,7 @@ class FileReader : public GenericProcessor,
 
     HashMap<String, int> supportedExtensions;
 
-    Atomic<int> m_shouldFillBackBuffer;
+    Atomic<bool> m_shouldFillBackBuffer;
     Atomic<int> m_samplesPerBuffer;
 
     unsigned int m_bufferSize;

Source/Processors/FileReader/FileSource.h

@@ -146,9 +146,6 @@ class PLUGIN_API FileSource
     /** Get the event information for the current stream */
     const EventInfo& getEventInfo();
 
-    /** Keeps track of how many times the recording has looped */
-    int64 loopCount = 0;
-
 protected:
     /** Holds the name of the current stream */
     String currentStream;