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

Tying up another loose end...moving the Audacity libraries

Browse Source 
to /Library/Application Support/audacity/libs to circumvent
Apple's propensity for thinking your system belongs to them.

I have sent the new installers to Gale and expect they will
go to Buanzo's site fairly soon.
This commit is contained in:
lllucius 2012-03-25 05:16:46 +00:00
parent c85dc5bb87
commit b7406f91e3
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/FFmpeg.cpp
View File

@ -644,6 +644,19 @@ bool FFmpegLibs::LoadLibs(wxWindow *parent, bool showerr)
mLibAVFormatPath = path;
}
}
#if defined(__WXMAC__)
// If not successful, try loading it from legacy path
if (!mLibsLoaded && !GetLibAVFormatPath().IsEmpty()) {
wxFileName fn(wxT("/usr/local/lib/audacity"), GetLibAVFormatName());
wxString path = fn.GetFullPath();
wxLogMessage(wxT("Trying to load FFmpeg libraries from legacy path, '%s'."), path.c_str());
mLibsLoaded = InitLibs(path,showerr);
if (mLibsLoaded) {
mLibAVFormatPath = path;
}
}
#endif
// If not successful, try loading using system search paths
if (!ValidLibsLoaded()) {

2
src/FFmpeg.h
View File

@ -246,7 +246,7 @@ public:
wxString GetLibAVFormatPath()
{
return wxT("/usr/local/lib/audacity");
return wxT("/Library/Application Support/audacity/libs");
}
wxString GetLibAVFormatName()