From 5dfff70f5b5436f191f6bbaac6ddaf5fbfbf7fc3 Mon Sep 17 00:00:00 2001
From: Darrell Walisser <darrell.walisser@gmail.com>
Date: Tue, 30 Jan 2018 14:13:57 -0500
Subject: [PATCH] Fix OpenMP build

---
 src/Mix.cpp         | 6 +++---
 src/TrackArtist.cpp | 2 +-
 src/WaveClip.cpp    | 2 +-
 src/WaveTrack.h     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Mix.cpp b/src/Mix.cpp
index 43d5fa93e..35b54585d 100644
--- a/src/Mix.cpp
+++ b/src/Mix.cpp
@@ -387,7 +387,7 @@ size_t Mixer::MixVariableRates(int *channelFlags, WaveTrackCache &cache,
                                     int *queueStart, int *queueLen,
                                     Resample * pResample)
 {
-   const WaveTrack *const track = cache.GetTrack();
+   const WaveTrack *const track = cache.GetTrack().get();
    const double trackRate = track->GetRate();
    const double initialWarp = mRate / mSpeed / trackRate;
    const double tstep = 1.0 / trackRate;
@@ -532,7 +532,7 @@ size_t Mixer::MixVariableRates(int *channelFlags, WaveTrackCache &cache,
 size_t Mixer::MixSameRate(int *channelFlags, WaveTrackCache &cache,
                                sampleCount *pos)
 {
-   const WaveTrack *const track = cache.GetTrack();
+   const WaveTrack *const track = cache.GetTrack().get();
    const double t = ( *pos ).as_double() / track->GetRate();
    const double trackEndTime = track->GetEndTime();
    const double trackStartTime = track->GetStartTime();
@@ -605,7 +605,7 @@ size_t Mixer::Process(size_t maxToProcess)
 
    Clear();
    for(size_t i=0; i<mNumInputTracks; i++) {
-      const WaveTrack *const track = mInputTrack[i].GetTrack();
+      const WaveTrack *const track = mInputTrack[i].GetTrack().get();
       for(size_t j=0; j<mNumChannels; j++)
          channelFlags[j] = 0;
 
diff --git a/src/TrackArtist.cpp b/src/TrackArtist.cpp
index 10be120db..346fd5b21 100644
--- a/src/TrackArtist.cpp
+++ b/src/TrackArtist.cpp
@@ -2188,7 +2188,7 @@ void TrackArtist::DrawClipSpectrum(WaveTrackCache &waveTrackCache,
    Profiler profiler;
 #endif
 
-   const WaveTrack *const track = waveTrackCache.GetTrack();
+   const WaveTrack *const track = waveTrackCache.GetTrack().get();
    const SpectrogramSettings &settings = track->GetSpectrogramSettings();
    const bool autocorrelation = (settings.algorithm == SpectrogramSettings::algPitchEAC);
 
diff --git a/src/WaveClip.cpp b/src/WaveClip.cpp
index 913991b57..b002782d9 100644
--- a/src/WaveClip.cpp
+++ b/src/WaveClip.cpp
@@ -1200,7 +1200,7 @@ bool WaveClip::GetSpectrogram(WaveTrackCache &waveTrackCache,
                               size_t numPixels,
                               double t0, double pixelsPerSecond) const
 {
-   const WaveTrack *const track = waveTrackCache.GetTrack();
+   const WaveTrack *const track = waveTrackCache.GetTrack().get();
    const SpectrogramSettings &settings = track->GetSpectrogramSettings();
 
    bool match =
diff --git a/src/WaveTrack.h b/src/WaveTrack.h
index 7f6552897..e9ecad0ec 100644
--- a/src/WaveTrack.h
+++ b/src/WaveTrack.h
@@ -687,7 +687,7 @@ public:
    }
    ~WaveTrackCache();
 
-   const WaveTrack *GetTrack() const { return mPTrack.get(); }
+   const std::shared_ptr<const WaveTrack>& GetTrack() const { return mPTrack; }
    void SetTrack(const std::shared_ptr<const WaveTrack> &pTrack);
 
    // Uses fillZero always