comparison audio/AudioCallbackPlaySource.cpp @ 473:c6094bca34f4 bqaudioio

Avoid playing repeated buffer while re-seeking

     }
 
     emit activity(tr("Change time-stretch factor to %1").arg(factor));
 }
 
-void
+int
 AudioCallbackPlaySource::getSourceSamples(int count, float **buffer)
 {
     if (!m_playing) {
 #ifdef DEBUG_AUDIO_PLAY_SOURCE_PLAYING
         SVDEBUG << "AudioCallbackPlaySource::getSourceSamples: Not playing" << endl;

 	for (int ch = 0; ch < getTargetChannelCount(); ++ch) {
 	    for (int i = 0; i < count; ++i) {
 		buffer[ch][i] = 0.0;
 	    }
 	}
-	return;
+	return 0;
     }
 
 #ifdef DEBUG_AUDIO_PLAY_SOURCE_PLAYING
     SVDEBUG << "AudioCallbackPlaySource::getSourceSamples: Playing" << endl;
 #endif

 #endif
             count = rs;
         }
     }
 
-    if (count == 0) return;
+    if (count == 0) return 0;
 
     RubberBandStretcher *ts = m_timeStretcher;
     RubberBandStretcher *ms = m_monoStretcher;
 
     double ratio = ts ? ts->getTimeRatio() : 1.0;

     cout << "AudioCallbackPlaySource::getSamples: awakening thread" << endl;
 #endif
 
         m_condition.wakeAll();
 
-	return;
+	return got;
     }
 
     int channels = getTargetChannelCount();
     sv_frame_t available;
     sv_frame_t fedToStretcher = 0;

     cout << "AudioCallbackPlaySource::getSamples [stretched]: awakening thread" << endl;
 #endif
 
     m_condition.wakeAll();
 
-    return;
+    return count;
 }
 
 void
 AudioCallbackPlaySource::applyAuditioningEffect(sv_frame_t count, float **buffers)
 {