audacia
/
audacia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove some uses of GetActiveProject in src/effects

This commit is contained in:
Paul Licameli 2019-05-21 19:10:06 -04:00
parent 83f7bc6b5c
commit 914bb1dc95
3 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/effects/Equalization.cpp
View File

@ -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

18
src/effects/Equalization48x.cpp
View File

@ -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);

3
src/effects/StereoToMono.cpp
View File

@ -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);