From 914bb1dc95cc3e3335795478f272b018edf4331d Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Tue, 21 May 2019 19:10:06 -0400
Subject: [PATCH] Remove some uses of GetActiveProject in src/effects

---
 src/effects/Equalization.cpp    |  3 +--
 src/effects/Equalization48x.cpp | 18 ++++++------------
 src/effects/StereoToMono.cpp    |  3 +--
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/effects/Equalization.cpp b/src/effects/Equalization.cpp
index e6e9c3d7d..996fc62e4 100644
--- a/src/effects/Equalization.cpp
+++ b/src/effects/Equalization.cpp
@@ -1262,8 +1262,7 @@ bool EffectEqualization::ProcessOne(int count, WaveTrack * t,
                                     sampleCount start, sampleCount len)
 {
    // create a NEW WaveTrack to hold all of the output, including 'tails' each end
-   AudacityProject *p = GetActiveProject();
-   auto output = TrackFactory::Get( *p ).NewWaveTrack(floatSample, t->GetRate());
+   auto output = mFactory->NewWaveTrack(floatSample, t->GetRate());
 
    wxASSERT(mM - 1 < windowSize);
    size_t L = windowSize - (mM - 1);   //Process L samples at a go
diff --git a/src/effects/Equalization48x.cpp b/src/effects/Equalization48x.cpp
index ccd96d598..8b2b6c6bb 100644
--- a/src/effects/Equalization48x.cpp
+++ b/src/effects/Equalization48x.cpp
@@ -410,8 +410,7 @@ bool EffectEqualization48x::DeltaTrack(
    Floats buffer1{ trackBlockSize };
    Floats buffer2{ trackBlockSize };
 
-   AudacityProject *p = GetActiveProject();
-   auto output = TrackFactory::Get( *p ).NewWaveTrack(floatSample, t->GetRate());
+   auto output = mEffectEqualization->mFactory->NewWaveTrack(floatSample, t->GetRate());
    auto originalLen = len;
    auto currentSample = start;
 
@@ -633,8 +632,7 @@ bool EffectEqualization48x::ProcessOne1x(int count, WaveTrack * t,
 
    auto trackBlockSize = t->GetMaxBlockSize();
 
-   AudacityProject *p = GetActiveProject();
-   auto output = TrackFactory::Get( *p ).NewWaveTrack(floatSample, t->GetRate());
+   auto output = mEffectEqualization->mFactory->NewWaveTrack(floatSample, t->GetRate());
 
    mEffectEqualization->TrackProgress(count, 0.0);
    int subBufferSize=mBufferCount==8?(mSubBufferSize>>1):mSubBufferSize; // half the buffers if avx is active
@@ -820,8 +818,7 @@ bool EffectEqualization48x::ProcessOne4x(int count, WaveTrack * t,
 
    auto trackBlockSize = t->GetMaxBlockSize();
 
-   AudacityProject *p = GetActiveProject();
-   auto output = TrackFactory::Get( *p ).NewWaveTrack(floatSample, t->GetRate());
+   auto output = mEffectEqualization->mFactory->NewWaveTrack(floatSample, t->GetRate());
 
    mEffectEqualization->TrackProgress(count, 0.0);
    auto bigRuns = len/(subBufferSize-mBlockSize);
@@ -910,8 +907,7 @@ bool EffectEqualization48x::ProcessOne1x4xThreaded(int count, WaveTrack * t,
    for(int i=0;i<mThreadCount;i++)
       mEQWorkers[i].mProcessingType=processingType;
 
-   AudacityProject *p = GetActiveProject();
-   auto output = TrackFactory::Get( *p ).NewWaveTrack(floatSample, t->GetRate());
+   auto output = mEffectEqualization->mFactory->NewWaveTrack(floatSample, t->GetRate());
 
    auto trackBlockSize = t->GetMaxBlockSize();
    mEffectEqualization->TrackProgress(count, 0.0);
@@ -1156,8 +1152,7 @@ bool EffectEqualization48x::ProcessOne8x(int count, WaveTrack * t,
 
    auto trackBlockSize = t->GetMaxBlockSize();
 
-   AudacityProject *p = GetActiveProject();
-   auto output = TrackFactory::Get( *p ).NewWaveTrack(floatSample, t->GetRate());
+   auto output = mEffectEqualization->mFactory->NewWaveTrack(floatSample, t->GetRate());
 
    mEffectEqualization->TrackProgress(count, 0.0);
    int bigRuns=len/(mSubBufferSize-mBlockSize);
@@ -1208,8 +1203,7 @@ bool EffectEqualization48x::ProcessOne8xThreaded(int count, WaveTrack * t,
    if(mThreadCount<=0 || blockCount<256) // dont do it without cores or big data
       return ProcessOne4x(count, t, start, len);
 
-   AudacityProject *p = GetActiveProject();
-   auto output = TrackFactory::Get( *p ).NewWaveTrack(floatSample, t->GetRate());
+   auto output = mEffectEqualization->mFactory->NewWaveTrack(floatSample, t->GetRate());
 
    auto trackBlockSize = t->GetMaxBlockSize();
    mEffectEqualization->TrackProgress(count, 0.0);
diff --git a/src/effects/StereoToMono.cpp b/src/effects/StereoToMono.cpp
index 1d585d437..34da98cc1 100644
--- a/src/effects/StereoToMono.cpp
+++ b/src/effects/StereoToMono.cpp
@@ -133,9 +133,8 @@ bool EffectStereoToMono::ProcessOne(int count)
    Floats rightBuffer{ idealBlockLen };
    bool bResult = true;
 
-   AudacityProject *p = GetActiveProject();
    auto outTrack =
-      TrackFactory::Get( *p ).NewWaveTrack(floatSample, mLeftTrack->GetRate());
+      mFactory->NewWaveTrack(floatSample, mLeftTrack->GetRate());
 
    while (index < mEnd) {
       bResult &= mLeftTrack->Get((samplePtr)leftBuffer.get(), floatSample, index, idealBlockLen);