Update file scrubber controls

Author: medengineer

Source/Processors/FileReader/FileReader.cpp

@@ -105,14 +105,12 @@ FileReader::FileReader() : GenericProcessor ("File Reader")
 
 }
 
-
 FileReader::~FileReader()
 {
     signalThreadShouldExit();
     notify();
 }
 
-
 AudioProcessorEditor* FileReader::createEditor()
 {
     editor = std::make_unique<FileReaderEditor>(this);
@@ -149,18 +147,7 @@ void FileReader::initialize(bool signalChainIsLoading)
 
 void FileReader::togglePlayback()
 {
-
     playbackActive = !playbackActive;
-
-    if (!playbackActive) 
-    {
-        stopAcquisition();
-    } 
-    else 
-    {
-        startAcquisition();
-    }
-
 }
 
 bool FileReader::playbackIsActive()
@@ -202,6 +189,7 @@ bool FileReader::startAcquisition()
 
 bool FileReader::stopAcquisition()
 {
+
 	stopThread(500);
     static_cast<FileReaderEditor*> (getEditor())->stopTimer();
 	return true;
@@ -320,6 +308,15 @@ void FileReader::setPlaybackStart(int64 startSample)
 
     input->seekTo(startSample);
     currentSample = startSample;
+
+    switchBuffer();
+
+    if (CoreServices::getAcquisitionStatus() && !isThreadRunning())
+    {
+        m_shouldFillBackBuffer.set(true);
+        startThread();
+    }
+    
 }
 
 void FileReader::setPlaybackStop(int64 stopSample)
@@ -336,7 +333,6 @@ String FileReader::getFile() const
         return String();
 }
 
-
 void FileReader::updateSettings()
 {
 
@@ -466,7 +462,6 @@ Array<EventInfo> FileReader::getActiveEventInfo()
     return input->getEventInfo();
 }
 
-
 String FileReader::handleConfigMessage(String msg)
 {
 
@@ -494,19 +489,17 @@ String FileReader::handleConfigMessage(String msg)
 void FileReader::process(AudioBuffer<float>& buffer)
 {
 
+    bool switchNeeded = false;
+
     int samplesNeededPerBuffer = int (float (buffer.getNumSamples()) * (getDefaultSampleRate() / m_sysSampleRate));
 
-    if (!loopPlayback && totalSamplesAcquired + samplesNeededPerBuffer > stopSample)
+    if (!playbackActive && totalSamplesAcquired + samplesNeededPerBuffer > stopSample)
     {
         samplesNeededPerBuffer = stopSample - totalSamplesAcquired;
-        playbackActive = false;
+        switchNeeded = true;
     }
-    else if (!playbackActive)
-    {
-        samplesNeededPerBuffer = 0;
-    }
-    
-    m_samplesPerBuffer.set(samplesNeededPerBuffer);
+    else
+        m_samplesPerBuffer.set(samplesNeededPerBuffer);
     // FIXME: needs to account for the fact that the ratio might not be an exact
     //        integer value
 
@@ -533,13 +526,21 @@ void FileReader::process(AudioBuffer<float>& buffer)
 
     totalSamplesAcquired += samplesNeededPerBuffer;
 
+    //LOGD("Total samples acquired: ", totalSamplesAcquired);
+
     int64 stop = totalSamplesAcquired;
 
     addEventsInRange(start, stop);
 
     bufferCacheWindow += 1;
     bufferCacheWindow %= BUFFER_WINDOW_CACHE_SIZE;
 
+    if (switchNeeded)
+    {
+        bufferCacheWindow = 0;
+        this->stopThread(100);
+    }
+
 }
 
 void FileReader::addEventsInRange(int64 start, int64 stop)
@@ -634,6 +635,7 @@ void FileReader::run()
 
 void FileReader::readAndFillBufferCache(HeapBlock<int16> &cacheBuffer)
 {
+
     const int samplesNeededPerBuffer = m_samplesPerBuffer.get();
     const int samplesNeeded = samplesNeededPerBuffer * BUFFER_WINDOW_CACHE_SIZE;
 
@@ -654,6 +656,11 @@ void FileReader::readAndFillBufferCache(HeapBlock<int16> &cacheBuffer)
             samplesToRead = stopSample - currentSample;
             if (samplesToRead > 0)
                 input->readData (cacheBuffer + samplesRead * currentNumChannels, samplesToRead);
+
+            if (startSample != 0)
+            {
+                startSample = 0;
+            }
 
             // reset stream to beginning
             input->seekTo (startSample);

Source/Processors/FileReader/FileReader.h

@@ -135,6 +135,9 @@ class FileReader :
     /** Converts milliseconds to samples using current stream's sample rate */
     int64 millisecondsToSamples (unsigned int ms) const;
 
+        /** Swaps the backbuffer to the front and flags the background readerthread to update the new backbuffer */
+    void switchBuffer();
+
 private:
 
     /** Currently only support one event channel per stream */
@@ -178,9 +181,6 @@ class FileReader :
 	unsigned int m_bufferSize;
 	float m_sysSampleRate;
 
-    /** Swaps the backbuffer to the front and flags the background readerthread to update the new backbuffer */
-    void switchBuffer();
-    
     HeapBlock<int16>* getFrontBuffer();
     HeapBlock<int16>* getBackBuffer();
 

Source/Processors/FileReader/FileReaderEditor.cpp

@@ -150,11 +150,6 @@ void FullTimeline::mouseUp(const MouseEvent& event)
     intervalIsSelected = false;
 
     static_cast<FileReaderEditor*>(fileReader->getEditor())->updatePlaybackTimes();
-
-    if (CoreServices::getAcquisitionStatus())
-    {
-        fileReader->startAcquisition();
-    }
 
 }
 
@@ -188,7 +183,7 @@ void ZoomTimeline::updatePlaybackRegion(int min, int max)
 {
     /* Default zoom slider region to first 10s */
     leftSliderPosition = 0;
-    rightSliderPosition = ( getWidth() - sliderWidth )  / 3.0f;
+    rightSliderPosition = ( getWidth() - sliderWidth )  / 10.0f;
 }
 
 int ZoomTimeline::getStartInterval()
@@ -285,13 +280,14 @@ void ZoomTimeline::paint(Graphics& g)
 
     /* Draw the current playback position */
     float timelinePos = (float)(fileReader->getCurrentSample() - startTimestamp) / (stopTimestamp - startTimestamp) * getWidth();
-
-    if (timelinePos < rightSliderPosition + sliderWidth || (timelinePos < rightSliderPosition + sliderWidth && !fileReader->loopPlayback))
+    //LOGD("Timeline pos: ", timelinePos, " current sample: ", fileReader->getCurrentSample(), " start timestamp: ", startTimestamp, " stop timestamp: ", stopTimestamp);
+    if (fileReader->playbackIsActive() || (!fileReader->playbackIsActive() && timelinePos < rightSliderPosition + sliderWidth))
     {
         g.setOpacity(1.0f);
         g.fillRoundedRectangle(timelinePos, 0, 1, this->getHeight(), 0.2);
     }
 
+
 }
 
 void ZoomTimeline::mouseDown(const MouseEvent& event)
@@ -362,12 +358,12 @@ void ZoomTimeline::mouseUp(const MouseEvent& event)
     rightSliderIsSelected = false;
     playbackRegionIsSelected = false;
 
-    //fileReader->loopPlayback = false;
+    if (fileReader->playbackIsActive())
+    {
+        fileReader->switchBuffer();
+    }
 
-    static_cast<FileReaderEditor*>(fileReader->getEditor())->updatePlaybackTimes();
-    
-    if (CoreServices::getAcquisitionStatus())
-        fileReader->startAcquisition();
+    static_cast<FileReaderEditor*>(fileReader->getEditor())->updatePlaybackTimes(); 
 
 }
 
@@ -726,6 +722,7 @@ void FileReaderEditor::buttonClicked (Button* button)
     } else if (button == playbackButton) {
 
         playbackButton->setState(!playbackButton->getState());
+        updatePlaybackTimes();
         fileReader->togglePlayback();
 
     }
@@ -734,12 +731,22 @@ void FileReaderEditor::buttonClicked (Button* button)
 
 void FileReaderEditor::updatePlaybackTimes()
 {
+
+    //fileReader->switchBuffer();
+
     int64 startTimestamp = float(getFullTimelineStartPosition()) / fullTimeline->getWidth() * fileReader->getCurrentNumTotalSamples();
     startTimestamp += float(getZoomTimelineStartPosition()) / zoomTimeline->getWidth() * fileReader->getCurrentSampleRate() * 30.0f;
     fileReader->setPlaybackStart(startTimestamp);
 
-    int64 stopTimestamp = startTimestamp + zoomTimeline->getIntervalDurationInSeconds() * fileReader->getCurrentSampleRate();
-    fileReader->setPlaybackStop(stopTimestamp);
+    if (playbackButton->getState())
+    {
+        fileReader->setPlaybackStop(fileReader->getCurrentNumTotalSamples());
+    }
+    else
+    {
+        int64 stopTimestamp = startTimestamp + zoomTimeline->getIntervalDurationInSeconds() * fileReader->getCurrentSampleRate();
+        fileReader->setPlaybackStop(stopTimestamp);
+    }
 
 }