Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-08 14:13:57 +01:00
Code Issues Releases Wiki Activity

Reinstate FileNames::PlugInDir() for Linux

Browse Source 
Reverting its removal in commit 1dd6b848c2.
Path added to Nyquist *SYSTEM-DIR* PLUG-IN property.
This commit is contained in:
Steve Daulton
2017-06-04 17:21:07 +01:00
parent ee9649eeb5
commit 9816cc8c7b
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/FileNames.h
View File

@@ -53,7 +53,7 @@ public:
* This returns the string path to where the user may have put plug-ins * This returns the string path to where the user may have put plug-ins
* if they don't have system admin rights. Under default settings, it's * if they don't have system admin rights. Under default settings, it's
* <DataDir>/Plug-Ins/ */ * <DataDir>/Plug-Ins/ */
static wxString PlugInDir(); // Windows and Mac only static wxString PlugInDir();
static wxString ThemeDir(); static wxString ThemeDir();
static wxString ThemeComponentsDir(); static wxString ThemeComponentsDir();
static wxString ThemeCachePng(); static wxString ThemeCachePng();

4
src/PluginManager.cpp
View File

@@ -1437,13 +1437,11 @@ void PluginManager::FindFilesInPathList(const wxString & pattern,
wxArrayString paths; wxArrayString paths;
// Add the "per-user" plug-ins directory Windows / Mac // Add the "per-user" plug-ins directory
#if defined(__WXMAC__) || defined(__WXMSW__)
{ {
const wxFileName &ff = FileNames::PlugInDir(); const wxFileName &ff = FileNames::PlugInDir();
paths.Add(ff.GetFullPath()); paths.Add(ff.GetFullPath());
} }
#endif
// Add the "Audacity" plug-ins directory // Add the "Audacity" plug-ins directory
wxFileName ff = PlatformCompatibility::GetExecutablePath(); wxFileName ff = PlatformCompatibility::GetExecutablePath();

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

@@ -2024,6 +2024,7 @@ wxArrayString NyquistEffect::GetNyquistSearchPath()
wxGetApp().AddUniquePathToPathList(prefix + wxT("plugins"), pathList); wxGetApp().AddUniquePathToPathList(prefix + wxT("plugins"), pathList);
wxGetApp().AddUniquePathToPathList(prefix + wxT("plug-ins"), pathList); wxGetApp().AddUniquePathToPathList(prefix + wxT("plug-ins"), pathList);
} }
pathList.Add(FileNames::PlugInDir());
return pathList; return pathList;
} }