# HG changeset patch
# User Chris Cannam
# Date 1562072905 -3600
# Node ID 074b860a78281b72365a60b9fc81a27d70a046e9
# Parent  b92bdcd4954b4052bd8023e713b2489a1b7ff929
Use reference rather than bare pointer

diff -r b92bdcd4954b -r 074b860a7828 data/model/WaveformOversampler.cpp
--- a/data/model/WaveformOversampler.cpp	Tue Jul 02 11:49:28 2019 +0100
+++ b/data/model/WaveformOversampler.cpp	Tue Jul 02 14:08:25 2019 +0100
@@ -19,7 +19,7 @@
 #include "data/model/DenseTimeValueModel.h"
 
 floatvec_t
-WaveformOversampler::getOversampledData(const DenseTimeValueModel *source,
+WaveformOversampler::getOversampledData(const DenseTimeValueModel &source,
                                         int channel,
                                         sv_frame_t sourceStartFrame,
                                         sv_frame_t sourceFrameCount,
@@ -53,14 +53,14 @@
 }
 
 floatvec_t
-WaveformOversampler::getFixedRatioData(const DenseTimeValueModel *source,
+WaveformOversampler::getFixedRatioData(const DenseTimeValueModel &source,
                                        int channel,
                                        sv_frame_t sourceStartFrame,
                                        sv_frame_t sourceFrameCount)
 {
     Profiler profiler("WaveformOversampler::getFixedRatioData");
     
-    sv_frame_t sourceLength = source->getEndFrame();
+    sv_frame_t sourceLength = source.getEndFrame();
     
     if (sourceStartFrame + sourceFrameCount > sourceLength) {
         sourceFrameCount = sourceLength - sourceStartFrame;
@@ -84,7 +84,7 @@
         i1 = sourceLength;
     }
     
-    floatvec_t sourceData = source->getData(channel, i0, i1 - i0);
+    floatvec_t sourceData = source.getData(channel, i0, i1 - i0);
     
     for (sv_frame_t i = i0; i < i1; ++i) {
         float v = sourceData[i - i0];
diff -r b92bdcd4954b -r 074b860a7828 data/model/WaveformOversampler.h
--- a/data/model/WaveformOversampler.h	Tue Jul 02 11:49:28 2019 +0100
+++ b/data/model/WaveformOversampler.h	Tue Jul 02 14:08:25 2019 +0100
@@ -38,14 +38,14 @@
      *  will have sourceFrameCount * oversampleBy samples, except when
      *  truncated because the end of the model was reached.
      */
-    static floatvec_t getOversampledData(const DenseTimeValueModel *source,
+    static floatvec_t getOversampledData(const DenseTimeValueModel &source,
                                          int channel,
                                          sv_frame_t sourceStartFrame,
                                          sv_frame_t sourceFrameCount,
                                          int oversampleBy);
 
 private:
-    static floatvec_t getFixedRatioData(const DenseTimeValueModel *source,
+    static floatvec_t getFixedRatioData(const DenseTimeValueModel &source,
                                         int channel,
                                         sv_frame_t sourceStartFrame,
                                         sv_frame_t sourceFrameCount);
diff -r b92bdcd4954b -r 074b860a7828 data/model/test/TestWaveformOversampler.h
--- a/data/model/test/TestWaveformOversampler.h	Tue Jul 02 11:49:28 2019 +0100
+++ b/data/model/test/TestWaveformOversampler.h	Tue Jul 02 14:08:25 2019 +0100
@@ -72,7 +72,7 @@
                    sv_frame_t sourceFrameCount,
                    int oversampleBy) {
         return WaveformOversampler::getOversampledData
-            (m_sourceModel, 0,
+            (*m_sourceModel, 0,
              sourceStartFrame, sourceFrameCount, oversampleBy);
     }