Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-27 15:53:49 +01:00
Code Issues Releases Wiki Activity

Add log messages (similar to FFmpeg) to assist in resolving detection issues.

Browse Source
This commit is contained in:
lllucius
2011-03-06 20:58:33 +00:00
parent f88b7f67ab
commit b1e5b022a8
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/export/ExportMP3.cpp
View File

@@ -76,6 +76,7 @@
#include <wx/window.h> #include <wx/window.h>
#include "../Audacity.h" #include "../Audacity.h"
#include "../FileNames.h"
#include "../float_cast.h" #include "../float_cast.h"
#include "../Internat.h" #include "../Internat.h"
#include "../Mix.h" #include "../Mix.h"
@@ -903,8 +904,6 @@ bool MP3Exporter::FindLibrary(wxWindow *parent)
bool MP3Exporter::LoadLibrary(wxWindow *parent, AskUser askuser) bool MP3Exporter::LoadLibrary(wxWindow *parent, AskUser askuser)
{ {
wxLogNull logNo;
if (ValidLibraryLoaded()) { if (ValidLibraryLoaded()) {
FreeLibrary(); FreeLibrary();
mLibraryLoaded = false; mLibraryLoaded = false;
@@ -916,17 +915,20 @@ bool MP3Exporter::LoadLibrary(wxWindow *parent, AskUser askuser)
// First try loading it from a previously located path // First try loading it from a previously located path
if (!mLibPath.IsEmpty()) { if (!mLibPath.IsEmpty()) {
wxLogMessage(wxT("Attempting to load LAME from previously defined path"));
mLibraryLoaded = InitLibrary(mLibPath); mLibraryLoaded = InitLibrary(mLibPath);
} }
// If not successful, try loading using system search paths // If not successful, try loading using system search paths
if (!ValidLibraryLoaded()) { if (!ValidLibraryLoaded()) {
wxLogMessage(wxT("Attempting to load LAME from system search paths"));
mLibPath = GetLibraryName(); mLibPath = GetLibraryName();
mLibraryLoaded = InitLibrary(mLibPath); mLibraryLoaded = InitLibrary(mLibPath);
} }
// If not successful, try loading using compiled in path // If not successful, try loading using compiled in path
if (!ValidLibraryLoaded()) { if (!ValidLibraryLoaded()) {
wxLogMessage(wxT("Attempting to load LAME from builtin path"));
wxFileName fn(GetLibraryPath(), GetLibraryName()); wxFileName fn(GetLibraryPath(), GetLibraryName());
mLibPath = fn.GetFullPath(); mLibPath = fn.GetFullPath();
mLibraryLoaded = InitLibrary(mLibPath); mLibraryLoaded = InitLibrary(mLibPath);
@@ -934,6 +936,7 @@ bool MP3Exporter::LoadLibrary(wxWindow *parent, AskUser askuser)
// If not successful, must ask the user // If not successful, must ask the user
if (!ValidLibraryLoaded()) { if (!ValidLibraryLoaded()) {
wxLogMessage(wxT("(Maybe) ask user for library"));
if (askuser == MP3Exporter::Maybe && FindLibrary(parent)) { if (askuser == MP3Exporter::Maybe && FindLibrary(parent)) {
mLibraryLoaded = InitLibrary(mLibPath); mLibraryLoaded = InitLibrary(mLibPath);
} }
@@ -946,10 +949,13 @@ bool MP3Exporter::LoadLibrary(wxWindow *parent, AskUser askuser)
wxMessageBox(mBladeVersion); wxMessageBox(mBladeVersion);
} }
#endif #endif
wxLogMessage(wxT("Failed to locate LAME library"));
return false; return false;
} }
wxLogMessage(wxT("LAME library successfully loaded"));
return true; return true;
} }
@@ -981,10 +987,16 @@ void MP3Exporter::SetChannel(int mode)
bool MP3Exporter::InitLibrary(wxString libpath) bool MP3Exporter::InitLibrary(wxString libpath)
{ {
wxLogMessage(wxT("Loading LAME from %s"), libpath.c_str());
if (!lame_lib.Load(libpath, wxDL_LAZY)) { if (!lame_lib.Load(libpath, wxDL_LAZY)) {
wxLogMessage(wxT("load failed"));
return false; return false;
} }
wxLogMessage(wxT("Actual LAME path %s"),
FileNames::PathFromAddr(lame_lib.GetSymbol(wxT("lame_init"))).c_str());
lame_init = (lame_init_t *) lame_init = (lame_init_t *)
lame_lib.GetSymbol(wxT("lame_init")); lame_lib.GetSymbol(wxT("lame_init"));
get_lame_version = (get_lame_version_t *) get_lame_version = (get_lame_version_t *)
@@ -1062,6 +1074,7 @@ bool MP3Exporter::InitLibrary(wxString libpath)
!lame_set_padding_type || !lame_set_padding_type ||
!lame_set_bWriteVbrTag) !lame_set_bWriteVbrTag)
{ {
wxLogMessage(wxT("Failed to find a required symbol in the LAME library\n"));
#if defined(__WXMSW__) #if defined(__WXMSW__)
if (beVersion) { if (beVersion) {
be_version v; be_version v;