Fix OSX crash

When compensating for underrun from our ring buffer, the calculation for number of silent samples was incorrect. This led to smashing whatever followed PortAudio's buffer.

Author: jmcker

src/audio/OSAudio.cpp

@@ -49,7 +49,7 @@ void OSAudio::addBuffer(HulaRingBuffer *rb)
  */
 void OSAudio::startRecord()
 {
-    hlDebug() << "Start record called" << std::endl;
+    hlDebug() << "OSAudio: Start record called." << std::endl;
 
     // Prevent other state changes
     this->stateSem.wait();
@@ -61,6 +61,7 @@ void OSAudio::startRecord()
     }
     else
     {
+        hlDebug() << "OSAudio: Start record fell through." << std::endl;
         this->stateSem.notify();
     }
 }
@@ -110,7 +111,7 @@ void OSAudio::removeBuffer(HulaRingBuffer *rb)
  */
 void OSAudio::endRecord()
 {
-    hlDebug() << "End record called" << std::endl;
+    hlDebug() << "OSAudio: End record called." << std::endl;
 
     this->stateSem.wait();
 
@@ -281,6 +282,9 @@ void OSAudio::backgroundPlayback()
  */
 void OSAudio::startPlayback()
 {
+    hlDebug() << "OSAudio: Start playback called." << std::endl;
+
+
     this->stateSem.wait();
 
     if(this->endPlay.load() && this->endCapture.load())
@@ -291,6 +295,7 @@ void OSAudio::startPlayback()
     }
     else
     {
+        hlDebug() << "OSAudio: Start playback fell through." << std::endl;
         this->stateSem.notify();
     }
 }
@@ -319,6 +324,8 @@ ring_buffer_size_t OSAudio::playbackCopyToBuffers(const float *samples, ring_buf
  */
 void OSAudio::endPlayback()
 {
+    hlDebug() << "OSAudio: End playback called." << std::endl;
+
     this->stateSem.wait();
 
     this->endPlay.store(true);
@@ -377,9 +384,9 @@ static int paPlayCallback(const void *inputBuffer, void *outputBuffer,
     {
         hlDebug() << "Playback: Ring buffer underrun. Received " << samplesRead << " of " << elementsToRead << std::endl;
         hlDebug() << "Writing " << elementsToRead - samplesRead << " samples of silence." << std::endl;
-        for (int i = 0; i < elementsToRead; i++)
+        for (int i = samplesRead; i < elementsToRead; i++)
         {
-            wptr[i + size1 + size2] = 0;
+            wptr[i] = 0;
         }
     }
 

src/control/Playback.cpp

@@ -60,6 +60,7 @@ void Playback::player()
     SNDFILE *sndFile = sf_open(files[fileIndex].c_str(), SFM_READ, &sfinfo);
 
     hlDebug() << "Opened file #" << fileIndex << std::endl;
+    hlDebug() << "Location: " << files[fileIndex] << std::endl;
 
     sf_count_t samplesRead = 0;
     while(!this->endPlay.load())
@@ -85,7 +86,7 @@ void Playback::player()
         if (samplesRead == 0)
         {
             // Open the next file or end the playback
-            if (fileIndex != files.size() - 1)
+            if (fileIndex < files.size() - 1)
             {
                 sf_close(sndFile);