simplified and optimized samplebuffer

app/widget/audiomonitor/audiomonitor.cpp

@@ -75,7 +75,7 @@ void AudioMonitor::Stop()
   // loop will stop itself since file_ and waveform_ are null.
 }
 
-void AudioMonitor::PushSampleBuffer(SampleBufferPtr d)
+void AudioMonitor::PushSampleBuffer(const SampleBuffer &d)
 {
   if (!params_.channel_count()) {
     return;
@@ -83,7 +83,7 @@ void AudioMonitor::PushSampleBuffer(SampleBufferPtr d)
 
   QVector<double> v(params_.channel_count(), 0);
 
-  AudioVisualWaveform::Sample summed = AudioVisualWaveform::SumSamples(d, 0, d->sample_count());
+  AudioVisualWaveform::Sample summed = AudioVisualWaveform::SumSamples(d, 0, d.sample_count());
 
   AudioVisualWaveformSampleToInternalValues(summed, v);
 

app/widget/audiomonitor/audiomonitor.h

@@ -59,7 +59,7 @@ public:
     }
   }
 
-  static void PushSampleBufferOnAll(SampleBufferPtr d)
+  static void PushSampleBufferOnAll(const SampleBuffer &d)
   {
     foreach (AudioMonitor *m, instances_) {
       m->PushSampleBuffer(d);
@@ -71,7 +71,7 @@ public slots:
 
   void Stop();
 
-  void PushSampleBuffer(SampleBufferPtr samples);
+  void PushSampleBuffer(const SampleBuffer &samples);
 
   void StartWaveform(const AudioVisualWaveform *waveform, const rational& start, int playback_speed);
 

app/widget/viewer/viewer.cpp

@@ -511,16 +511,16 @@ void ViewerWidget::ReceivedAudioBufferForPlayback()
     audio_playback_queue_.pop_front();
 
     if (watcher->HasResult()) {
-      SampleBufferPtr samples = watcher->Get().value<SampleBufferPtr>();
-      if (samples) {
+      SampleBuffer samples = watcher->Get().value<SampleBuffer>();
+      if (samples.is_allocated()) {
         // If the samples must be reversed, reverse them now
         if (playback_speed_ < 0) {
-          samples->reverse();
+          samples.reverse();
         }
 
         // Convert to packed data for audio output
         AudioProcessor::Buffer buf;
-        int r = audio_processor_.Convert(samples->to_raw_ptrs(), samples->sample_count(), &buf);
+        int r = audio_processor_.Convert(samples.to_raw_ptrs().data(), samples.sample_count(), &buf);
 
         // TempoProcessor may have emptied the array
         if (r >= 0) {
@@ -556,8 +556,9 @@ void ViewerWidget::ReceivedAudioBufferForScrubbing()
   RenderTicketWatcher *watcher = static_cast<RenderTicketWatcher *>(sender());
 
   if (watcher->HasResult()) {
-    if (SampleBufferPtr samples = watcher->Get().value<SampleBufferPtr>()) {
-      if (samples->audio_params().channel_count() > 0) {
+    SampleBuffer samples = watcher->Get().value<SampleBuffer>();
+    if (samples.is_allocated()) {
+      if (samples.audio_params().channel_count() > 0) {
         /* Fade code
         const int kFadeSz = qMin(200, samples->sample_count()/4);
         for (int i=0; i<kFadeSz; i++) {
@@ -567,7 +568,7 @@ void ViewerWidget::ReceivedAudioBufferForScrubbing()
         }*/
 
         AudioProcessor::Buffer buf;
-        int r = audio_processor_.Convert(samples->to_raw_ptrs(), samples->sample_count(), &buf);
+        int r = audio_processor_.Convert(samples.to_raw_ptrs().data(), samples.sample_count(), &buf);
 
         if (r >= 0) {
           if (!buf.empty()) {