Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-10 17:37:45 +02:00
Code Issues Releases Wiki Activity

Fix bug 1824

Browse Source 
Generate effect preview fails when no selection
This commit is contained in:
SteveDaulton 2019-09-05 21:01:46 +01:00
parent 76d52fdc99
commit 5d4c884764
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/effects/Effect.cpp
View File

@ -266,7 +266,7 @@ bool Effect::IsDefault()
return true; return true;
} }
bool Effect::IsLegacy() bool Effect::IsLegacy()
{ {
if (mClient) if (mClient)
{ {
@ -543,7 +543,7 @@ bool Effect::ShowInterface(wxWindow *parent, bool forceModal)
// mUIDialog is null // mUIDialog is null
auto cleanup = valueRestorer( mUIDialog ); auto cleanup = valueRestorer( mUIDialog );
mUIDialog = CreateUI(parent, this); mUIDialog = CreateUI(parent, this);
if (!mUIDialog) if (!mUIDialog)
{ {
@ -1103,7 +1103,7 @@ bool Effect::SetAutomationParameters(const wxString & parms)
RegistryPaths Effect::GetUserPresets() RegistryPaths Effect::GetUserPresets()
{ {
RegistryPaths presets; RegistryPaths presets;
GetPrivateConfigSubgroups(GetUserPresetsGroup(wxEmptyString), presets); GetPrivateConfigSubgroups(GetUserPresetsGroup(wxEmptyString), presets);
std::sort( presets.begin(), presets.end() ); std::sort( presets.begin(), presets.end() );
@ -1255,7 +1255,7 @@ bool Effect::DoEffect(wxWindow *parent,
return false; return false;
} }
// Prompting will be bypassed when applying an effect that has already // Prompting will be bypassed when applying an effect that has already
// been configured, e.g. repeating the last effect on a different selection. // been configured, e.g. repeating the last effect on a different selection.
// Prompting may call Effect::Preview // Prompting may call Effect::Preview
if (shouldPrompt && IsInteractive() && !PromptUser(parent)) if (shouldPrompt && IsInteractive() && !PromptUser(parent))
@ -1344,7 +1344,7 @@ bool Effect::Process()
} }
} }
ReplaceProcessedTracks(bGoodResult); ReplaceProcessedTracks(bGoodResult);
return bGoodResult; return bGoodResult;
} }
@ -1546,7 +1546,7 @@ bool Effect::ProcessTrack(int count,
// //
// At the same time the total number of delayed samples are gathered and when // At the same time the total number of delayed samples are gathered and when
// there is no further input data to process, the loop continues to call the // there is no further input data to process, the loop continues to call the
// effect with an empty input buffer until the effect has had a chance to // effect with an empty input buffer until the effect has had a chance to
// return all of the remaining delayed samples. // return all of the remaining delayed samples.
auto inLeftPos = leftStart; auto inLeftPos = leftStart;
auto inRightPos = rightStart; auto inRightPos = rightStart;
@ -1621,7 +1621,7 @@ bool Effect::ProcessTrack(int count,
curBlockSize = mBlockSize; curBlockSize = mBlockSize;
if (curBlockSize > inputRemaining) if (curBlockSize > inputRemaining)
{ {
// We've reached the last block...set current block size to what's left // We've reached the last block...set current block size to what's left
// inputRemaining is positive and bounded by a size_t // inputRemaining is positive and bounded by a size_t
curBlockSize = inputRemaining.as_size_t(); curBlockSize = inputRemaining.as_size_t();
inputRemaining = 0; inputRemaining = 0;
@ -2310,7 +2310,7 @@ void Effect::Preview(bool dryOnly)
double t1 = mT0 + previewDuration; double t1 = mT0 + previewDuration;
if ((t1 > mT1) && !(isNyquist && isGenerator)) { if ((t1 > mT1) && !isGenerator) {
t1 = mT1; t1 = mT1;
} }
@ -2713,7 +2713,7 @@ EffectUIHost::~EffectUIHost()
{ {
if (mNeedsResume) if (mNeedsResume)
Resume(); Resume();
mClient->CloseUI(); mClient->CloseUI();
mClient = NULL; mClient = NULL;
} }
@ -2734,9 +2734,9 @@ bool EffectUIHost::TransferDataToWindow()
bool EffectUIHost::TransferDataFromWindow() bool EffectUIHost::TransferDataFromWindow()
{ {
if( mEffect) if( mEffect)
return mEffect->TransferDataFromWindow(); return mEffect->TransferDataFromWindow();
if( mCommand) if( mCommand)
return mCommand->TransferDataFromWindow(); return mCommand->TransferDataFromWindow();
return false; return false;
} }
@ -2822,7 +2822,7 @@ bool EffectUIHost::Initialize()
#if defined(__WXMAC__) #if defined(__WXMAC__)
margin = 3; // I'm sure it's needed because of the order things are created... margin = 3; // I'm sure it's needed because of the order things are created...
#endif #endif
if (!mIsGUI) if (!mIsGUI)
{ {
@ -2857,10 +2857,10 @@ bool EffectUIHost::Initialize()
mPlayToggleBtn->SetToolTip(_("Start and stop playback")); mPlayToggleBtn->SetToolTip(_("Start and stop playback"));
bs->Add(mPlayToggleBtn, 0, wxALIGN_CENTER | wxTOP | wxBOTTOM, margin); bs->Add(mPlayToggleBtn, 0, wxALIGN_CENTER | wxTOP | wxBOTTOM, margin);
} }
else if (mEffect && else if (mEffect &&
(mEffect->GetType() != EffectTypeAnalyze) && (mEffect->GetType() != EffectTypeAnalyze) &&
(mEffect->GetType() != EffectTypeTool) (mEffect->GetType() != EffectTypeTool)
) )
{ {
wxASSERT(bar); // To justify safenew wxASSERT(bar); // To justify safenew
mPlayToggleBtn = safenew wxButton(bar, kPlayID, _("&Preview")); mPlayToggleBtn = safenew wxButton(bar, kPlayID, _("&Preview"));
@ -2987,7 +2987,7 @@ bool EffectUIHost::Initialize()
w->SetAccept(!mIsGUI); w->SetAccept(!mIsGUI);
(!mIsGUI ? w : FindWindow(wxID_APPLY))->SetFocus(); (!mIsGUI ? w : FindWindow(wxID_APPLY))->SetFocus();
LoadUserPresets(); LoadUserPresets();
InitializeRealtime(); InitializeRealtime();
@ -3060,10 +3060,10 @@ void EffectUIHost::OnApply(wxCommandEvent & evt)
} }
// Honor the "select all if none" preference...a little hackish, but whatcha gonna do... // Honor the "select all if none" preference...a little hackish, but whatcha gonna do...
if (!mIsBatch && if (!mIsBatch &&
mEffect && mEffect &&
mEffect->GetType() != EffectTypeGenerate && mEffect->GetType() != EffectTypeGenerate &&
mEffect->GetType() != EffectTypeTool && mEffect->GetType() != EffectTypeTool &&
ViewInfo::Get( *mProject ).selectedRegion.isPoint()) ViewInfo::Get( *mProject ).selectedRegion.isPoint())
{ {
auto flags = AlwaysEnabledFlag; auto flags = AlwaysEnabledFlag;