Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-03 01:19:24 +02:00
Code Issues Releases Wiki Activity

Revert "2096: Windows & Mac high quality Change Pitch/Tempo preview"

Browse Source 
This reverts commit fe22b2ae228ebd79f1ea0161bd33eb4ef2a47bf1.
This commit is contained in:
Paul Licameli 2019-04-20 10:24:04 -04:00
parent 9eab996489
commit fe1be2b6a8
5 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/effects/ChangePitch.cpp
View File

@ -211,12 +211,11 @@ bool EffectChangePitch::Process()
if (mUseSBSMS) if (mUseSBSMS)
{ {
double pitchRatio = 1.0 + m_dPercentChange / 100.0; double pitchRatio = 1.0 + m_dPercentChange / 100.0;
SelectedRegion region(mT0, mT1);
EffectSBSMS proxy; EffectSBSMS proxy;
proxy.mProxyEffectName = XO("High Quality Pitch Change"); proxy.mProxyEffectName = XO("High Quality Pitch Change");
proxy.setParameters(1.0, pitchRatio); proxy.setParameters(1.0, pitchRatio);
return Delegate(proxy, mUIParent, &region, false); return Delegate(proxy, mUIParent, false);
} }
else else
#endif #endif

3
src/effects/ChangeTempo.cpp
View File

@ -197,11 +197,10 @@ bool EffectChangeTempo::Process()
if (mUseSBSMS) if (mUseSBSMS)
{ {
double tempoRatio = 1.0 + m_PercentChange / 100.0; double tempoRatio = 1.0 + m_PercentChange / 100.0;
SelectedRegion region(mT0, mT1);
EffectSBSMS proxy; EffectSBSMS proxy;
proxy.mProxyEffectName = XO("High Quality Tempo Change"); proxy.mProxyEffectName = XO("High Quality Tempo Change");
proxy.setParameters(tempoRatio, 1.0); proxy.setParameters(tempoRatio, 1.0);
success = Delegate(proxy, mUIParent, &region, false); success = Delegate(proxy, mUIParent, false);
} }
else else
#endif #endif

6
src/effects/Effect.cpp
View File

@ -1180,6 +1180,7 @@ bool Effect::DoEffect(wxWindow *parent,
mOutputTracks.reset(); mOutputTracks.reset();
mpSelectedRegion = selectedRegion;
mFactory = factory; mFactory = factory;
mProjectRate = projectRate; mProjectRate = projectRate;
mTracks = list; mTracks = list;
@ -1288,11 +1289,10 @@ bool Effect::DoEffect(wxWindow *parent,
return returnVal; return returnVal;
} }
bool Effect::Delegate( Effect &delegate, bool Effect::Delegate( Effect &delegate, wxWindow *parent, bool shouldPrompt)
wxWindow *parent, SelectedRegion *selectedRegion, bool shouldPrompt)
{ {
return delegate.DoEffect( parent, mProjectRate, mTracks, mFactory, return delegate.DoEffect( parent, mProjectRate, mTracks, mFactory,
selectedRegion, shouldPrompt ); mpSelectedRegion, shouldPrompt );
} }
// All legacy effects should have this overridden // All legacy effects should have this overridden

4
src/effects/Effect.h
View File

@ -249,8 +249,7 @@ class AUDACITY_DLL_API Effect /* not final */ : public wxEvtHandler,
TrackFactory *factory, SelectedRegion *selectedRegion, TrackFactory *factory, SelectedRegion *selectedRegion,
bool shouldPrompt = true); bool shouldPrompt = true);
bool Delegate( Effect &delegate, bool Delegate( Effect &delegate, wxWindow *parent, bool shouldPrompt);
wxWindow *parent, SelectedRegion *selectedRegion, bool shouldPrompt);
// Realtime Effect Processing // Realtime Effect Processing
/* not virtual */ bool RealtimeAddProcessor(int group, unsigned chans, float rate); /* not virtual */ bool RealtimeAddProcessor(int group, unsigned chans, float rate);
@ -458,6 +457,7 @@ protected:
double mProjectRate; // Sample rate of the project - NEW tracks should double mProjectRate; // Sample rate of the project - NEW tracks should
// be created with this rate... // be created with this rate...
double mSampleRate; double mSampleRate;
SelectedRegion *mpSelectedRegion{};
TrackFactory *mFactory; TrackFactory *mFactory;
const TrackList *inputTracks() const { return mTracks; } const TrackList *inputTracks() const { return mTracks; }
std::shared_ptr<TrackList> mOutputTracks; // used only if CopyInputTracks() is called. std::shared_ptr<TrackList> mOutputTracks; // used only if CopyInputTracks() is called.

3
src/effects/nyquist/Nyquist.cpp
View File

@ -968,8 +968,7 @@ bool NyquistEffect::ShowInterface(wxWindow *parent, bool forceModal)
effect.SetCommand(mInputCmd); effect.SetCommand(mInputCmd);
effect.mDebug = (mUIResultID == eDebugID); effect.mDebug = (mUIResultID == eDebugID);
SelectedRegion region(mT0, mT1); bool result = Delegate(effect, parent, true);
bool result = Delegate(effect, parent, &region, true);
mT0 = effect.mT0; mT0 = effect.mT0;
mT1 = effect.mT1; mT1 = effect.mT1;
return result; return result;