Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-04-24 15:03:53 +02:00
Code Issues Releases Wiki Activity

Bug 368: No longer look at plugins.cfg to decide whether to rescan. Just use the rescan preference.

Browse Source
This commit is contained in:
james.k.crook@gmail.com
2013-08-31 14:24:55 +00:00
parent 507bc713a7
commit ba187bbafc
4 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/effects/VST/VSTEffect.cpp
View File

@@ -77,16 +77,21 @@ void RegisterVSTEffects()
pm.Open();
bool bRescanRequired=false;
if ( gPrefs->Read(wxT("/VST/Rescan"), (long)true) != false) {
bRescanRequired = true;
pm.PurgeType(VSTPLUGINTYPE);
}
if (!pm.HasType(VSTPLUGINTYPE)) {
pm.Close();
VSTEffect::Scan();
if( bRescanRequired )
if( VSTEffect::Scan() != wxID_CANCEL )
{
gPrefs->Write(wxT("/VST/Rescan"), false);
gPrefs->Flush();
}
pm.Open();
gPrefs->Write(wxT("/VST/Rescan"), false);
gPrefs->Flush();
}
EffectManager & em = EffectManager::Get();
@@ -160,7 +165,7 @@ PluginRegistrationDialog::PluginRegistrationDialog(wxWindow * parent, const wxAr
SetLabel(_("Install VST Effects")); // Provide visual label
SetName(_("Install VST Effects")); // Provide audible label
Populate();
SetReturnCode( wxID_OK);
mAbort = false;
}
@@ -335,12 +340,12 @@ void PluginRegistrationDialog::OnApply(wxCommandEvent & WXUNUSED(event))
mPlugins->SetItemImage( i, SHOW_CHECKED );
}
}
EndModal( true );
EndModal(wxID_OK);
}
void PluginRegistrationDialog::OnCancel(wxCommandEvent & WXUNUSED(event))
{
EndModal(false);
EndModal(wxID_CANCEL);
}
@@ -1931,10 +1936,10 @@ void VSTEffect::ScanOnePlugin( const wxString & file )
wxExecute((wxChar **) argv, wxEXEC_SYNC | wxEXEC_NODISABLE, NULL);
}
void VSTEffect::ShowPluginListDialog( const wxArrayString & files )
int VSTEffect::ShowPluginListDialog( const wxArrayString & files )
{
PluginRegistrationDialog d( wxGetApp().GetTopWindow(), files );
d.ShowModal();
return d.ShowModal();
}
void VSTEffect::ShowProgressDialog( const wxString & longest, const wxArrayString & files )
@@ -1961,7 +1966,7 @@ void VSTEffect::ShowProgressDialog( const wxString & longest, const wxArrayStrin
}
/* static */
void VSTEffect::Scan()
int VSTEffect::Scan()
{
wxArrayString audacityPathList = wxGetApp().audacityPathList;
wxArrayString pathList;
@@ -2066,7 +2071,7 @@ void VSTEffect::Scan()
// JKC: Let's not show the progress dialog if there are no
// files to test.
if( cnt <= 0 )
return;
return wxID_OK;
for (size_t i = 0; i < cnt; i++) {
if (files[i].Length() > longest.Length()) {
@@ -2076,7 +2081,7 @@ void VSTEffect::Scan()
//Choose the first for the original version which scans them all
//The second to selectively scan.
//ShowProgressDialog( longest, files );
ShowPluginListDialog( files );
return ShowPluginListDialog( files );
}
/* static */

4
src/effects/VST/VSTEffect.h
View File

@@ -65,11 +65,11 @@ class VSTEffect:public Effect
// Plugin probing
static void Scan();
static int Scan();
static void Check(const wxChar *fname);
static void ScanOnePlugin( const wxString & file );
static void ShowPluginListDialog( const wxArrayString & files );
static int ShowPluginListDialog( const wxArrayString & files );
static void ShowProgressDialog( const wxString & longest, const wxArrayString & files );