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

Make better discrimination of wxLogMessage, wxLogDebug, and wxLogError usage so user doesn't see lots of irrelevant info in log window, only messages and errors they should need to see. For example, user doesn't need to see every step of loading FFmpeg in release build, only errors, if they occur.

Browse Source 
Comment out in FreqWindow.cpp the wxLog* stuff that can just be done with breakpoints ("Starting FreqWindow::Plot()" et al).
This commit is contained in:
v.audacity
2010-08-10 05:13:28 +00:00
parent a6cb818f42
commit 0ae919f656
9 changed files with 106 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/import/Import.cpp
View File

@@ -343,8 +343,8 @@ int Importer::Import(wxString fName,
// False if override filter is not found
bool foundOverride = false;
gPrefs->Read(wxT("/ExtendedImport/OverrideExtendedImportByOpenFileDialogChoice"), &usersSelectionOverrides, false);
wxLogMessage(wxT("LastOpenType is %s"),type.c_str());
wxLogMessage(wxT("OverrideExtendedImportByOpenFileDialogChoice is %i"),usersSelectionOverrides);
wxLogDebug(wxT("LastOpenType is %s"),type.c_str());
wxLogDebug(wxT("OverrideExtendedImportByOpenFileDialogChoice is %i"),usersSelectionOverrides);
if (usersSelectionOverrides)
{
@@ -355,7 +355,7 @@ int Importer::Import(wxString fName,
if (plugin->GetPluginFormatDescription().CompareTo(type) == 0)
{
// This plugin corresponds to user-selected filter, try it first.
wxLogMessage(wxT("Inserting %s"),plugin->GetPluginStringID().c_str());
wxLogDebug(wxT("Inserting %s"),plugin->GetPluginStringID().c_str());
importPlugins.Insert(plugin);
foundOverride = true;
}
@@ -369,46 +369,46 @@ int Importer::Import(wxString fName,
{
ExtImportItem *item = &(*mExtImportItems)[i];
bool matches_ext = false, matches_mime = false;
wxLogMessage(wxT("Testing extensions"));
wxLogDebug(wxT("Testing extensions"));
for (size_t j = 0; j < item->extensions.Count(); j++)
{
wxLogMessage(wxT("%s"),item->extensions[j].Lower().c_str());
wxLogDebug(wxT("%s"),item->extensions[j].Lower().c_str());
if (wxMatchWild (item->extensions[j].Lower(),fName.Lower(), false))
{
wxLogMessage(wxT("Match!"));
wxLogDebug(wxT("Match!"));
matches_ext = true;
break;
}
}
if (item->extensions.Count() == 0)
{
wxLogMessage(wxT("Match! (empty list)"));
wxLogDebug(wxT("Match! (empty list)"));
matches_ext = true;
}
if (matches_ext)
wxLogMessage(wxT("Testing mime types"));
wxLogDebug(wxT("Testing mime types"));
else
wxLogMessage(wxT("Not testing mime types"));
wxLogDebug(wxT("Not testing mime types"));
for (size_t j = 0; matches_ext && j < item->mime_types.Count(); j++)
{
if (wxMatchWild (item->mime_types[j].Lower(),mime_type.Lower(), false))
{
wxLogMessage(wxT("Match!"));
wxLogDebug(wxT("Match!"));
matches_mime = true;
break;
}
}
if (item->mime_types.Count() == 0)
{
wxLogMessage(wxT("Match! (empty list)"));
wxLogDebug(wxT("Match! (empty list)"));
matches_mime = true;
}
if (matches_ext && matches_mime)
{
wxLogMessage(wxT("Complete match!"));
wxLogDebug(wxT("Complete match!"));
for (size_t j = 0; j < item->filter_objects.Count() && (item->divider < 0 || (int) j < item->divider); j++)
{
wxLogMessage(wxT("Inserting %s"),item->filter_objects[j]->GetPluginStringID().c_str());
wxLogDebug(wxT("Inserting %s"),item->filter_objects[j]->GetPluginStringID().c_str());
importPlugins.Append(item->filter_objects[j]);
}
foundItem = true;
@@ -420,7 +420,7 @@ int Importer::Import(wxString fName,
bool prioritizeMp3 = false;
if (usersSelectionOverrides && !foundOverride)
importPlugins.Clear();
wxLogMessage(wxT("Applying default rule"));
wxLogDebug(wxT("Applying default rule"));
// Special treatment for mp3 files
if (wxMatchWild (wxT("*.mp3"),fName.Lower(), false))
prioritizeMp3 = true;
@@ -434,19 +434,19 @@ int Importer::Import(wxString fName,
// Skip MP3 import plugin. Opens some non-mp3 audio files (ac3 for example) as garbage.
if (plugin->GetPluginFormatDescription().CompareTo( _("MP3 files") ) != 0)
{
wxLogMessage(wxT("Inserting %s"),plugin->GetPluginStringID().c_str());
wxLogDebug(wxT("Inserting %s"),plugin->GetPluginStringID().c_str());
importPlugins.Append(plugin);
}
else if (prioritizeMp3)
{
if (usersSelectionOverrides)
{
wxLogMessage(wxT("Inserting %s at 1"),plugin->GetPluginStringID().c_str());
wxLogDebug(wxT("Inserting %s at 1"),plugin->GetPluginStringID().c_str());
importPlugins.Insert((size_t) 1, plugin);
}
else
{
wxLogMessage(wxT("Inserting %s at 0"),plugin->GetPluginStringID().c_str());
wxLogDebug(wxT("Inserting %s at 0"),plugin->GetPluginStringID().c_str());
importPlugins.Insert((size_t) 0, plugin);
}
}
@@ -464,7 +464,7 @@ int Importer::Import(wxString fName,
inFile = plugin->Open(fName);
if ( (inFile != NULL) && (inFile->GetStreamCount() > 0) )
{
wxLogMessage(wxT("Open() succeeded"));
wxLogMessage(wxT("Open(%s) succeeded"), fName.Lower().c_str());
// File has more than one stream - display stream selector
if (inFile->GetStreamCount() > 1)
{
@@ -510,7 +510,7 @@ int Importer::Import(wxString fName,
}
importPluginNode = importPluginNode->GetNext();
}
wxLogMessage(wxT("Opening failed."));
wxLogError(wxT("Importer::Import: Opening failed."));
// None of our plugins can handle this file. It might be that
// Audacity supports this format, but support was not compiled in.
// If so, notify the user of this fact

12
src/import/ImportFFmpeg.cpp
View File

@@ -379,14 +379,14 @@ bool FFmpegImportFileHandle::Init()
int err = ufile_fopen_input(&mFormatContext, mName);
if (err < 0)
{
wxLogMessage(wxT("FFmpeg : av_open_input_file() failed for file %s"),mName.c_str());
wxLogError(wxT("FFmpeg : av_open_input_file() failed for file %s"),mName.c_str());
return false;
}
err = FFmpegLibsInst->av_find_stream_info(mFormatContext);
if (err < 0)
{
wxLogMessage(wxT("FFmpeg : av_find_stream_info() failed for file %s"),mName.c_str());
wxLogError(wxT("FFmpeg : av_find_stream_info() failed for file %s"),mName.c_str());
return false;
}
@@ -414,14 +414,14 @@ bool FFmpegImportFileHandle::InitCodecs()
AVCodec *codec = FFmpegLibsInst->avcodec_find_decoder(sc->m_codecCtx->codec_id);
if (codec == NULL)
{
wxLogMessage(wxT("FFmpeg : avcodec_find_decoder() failed. Index[%02d], Codec[%02x - %s]"),i,sc->m_codecCtx->codec_id,sc->m_codecCtx->codec_name);
wxLogError(wxT("FFmpeg : avcodec_find_decoder() failed. Index[%02d], Codec[%02x - %s]"),i,sc->m_codecCtx->codec_id,sc->m_codecCtx->codec_name);
//FFmpeg can't decode this stream, skip it
delete sc;
continue;
}
if (codec->type != sc->m_codecCtx->codec_type)
{
wxLogMessage(wxT("FFmpeg : Codec type mismatch, skipping. Index[%02d], Codec[%02x - %s]"),i,sc->m_codecCtx->codec_id,sc->m_codecCtx->codec_name);
wxLogError(wxT("FFmpeg : Codec type mismatch, skipping. Index[%02d], Codec[%02x - %s]"),i,sc->m_codecCtx->codec_id,sc->m_codecCtx->codec_name);
//Non-audio codec reported as audio? Nevertheless, we don't need THIS.
delete sc;
continue;
@@ -429,7 +429,7 @@ bool FFmpegImportFileHandle::InitCodecs()
if (FFmpegLibsInst->avcodec_open(sc->m_codecCtx, codec) < 0)
{
wxLogMessage(wxT("FFmpeg : avcodec_open() failed. Index[%02d], Codec[%02x - %s]"),i,sc->m_codecCtx->codec_id,sc->m_codecCtx->codec_name);
wxLogError(wxT("FFmpeg : avcodec_open() failed. Index[%02d], Codec[%02x - %s]"),i,sc->m_codecCtx->codec_id,sc->m_codecCtx->codec_name);
//Can't open decoder - skip this stream
delete sc;
continue;
@@ -534,7 +534,7 @@ int FFmpegImportFileHandle::Import(TrackFactory *trackFactory,
if (mScs[s]->m_stream->start_time != int64_t(AV_NOPTS_VALUE))
{
stream_delay = mScs[s]->m_stream->start_time;
wxLogMessage(wxT("Stream %d start_time = %d, that would be %f milliseconds."), s, mScs[s]->m_stream->start_time, double(mScs[s]->m_stream->start_time)/AV_TIME_BASE*1000);
wxLogError(wxT("Stream %d start_time = %d, that would be %f milliseconds."), s, mScs[s]->m_stream->start_time, double(mScs[s]->m_stream->start_time)/AV_TIME_BASE*1000);
}
if (stream_delay != 0)
{

4
src/import/ImportPCM.cpp
View File

@@ -244,7 +244,7 @@ int PCMImportFileHandle::Import(TrackFactory *trackFactory,
// BEGIN_TASK_PROFILING("On Demand Drag and Drop 5 80 mb files into audacity, 5 wavs per task");
//BEGIN_TASK_PROFILING("On Demand open an 80 mb wav stereo file");
if (doEdit) {
wxLogDebug(wxT("Importing PCM Start\n"));
wxLogDebug(wxT("Importing PCM Start"));
// If this mode has been selected, we form the tracks as
// aliases to the files we're editing, i.e. ("foo.wav", 12000-18000)
@@ -270,7 +270,7 @@ int PCMImportFileHandle::Import(TrackFactory *trackFactory,
//now go over the wavetrack/waveclip/sequence and load all the blockfiles into a ComputeSummaryTask.
//Add this task to the ODManager and the Track itself.
wxLogDebug(wxT("Importing PCM \n"));
wxLogDebug(wxT("Importing PCM"));
if(useOD)
{