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

Make wxLog* calls consistently not have \n at the end. Turn some wxLogWarning calls to wxLogError. Put some periods at the ends of sentences.

Browse Source
This commit is contained in:
v.audacity 2011-10-09 21:14:03 +00:00
parent dd47a9a5e4
commit 3a1d4334f2
6 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/DirManager.cpp
View File

@ -566,7 +566,7 @@ wxFileName DirManager::MakeBlockFilePath(wxString value){
dir.AppendDir(middir); dir.AppendDir(middir);
if(!dir.DirExists() && !dir.Mkdir(0777,wxPATH_MKDIR_FULL)) if(!dir.DirExists() && !dir.Mkdir(0777,wxPATH_MKDIR_FULL))
wxLogSysError(_("mkdir in DirManager::MakeBlockFilePath failed.\n")); wxLogSysError(_("mkdir in DirManager::MakeBlockFilePath failed."));
} }
return dir; return dir;
} }
@ -596,7 +596,7 @@ bool DirManager::AssignFile(wxFileName &fileName,
wxString collision; wxString collision;
checkit.GetFirst(&collision,filespec); checkit.GetFirst(&collision,filespec);
wxLogWarning(_("Audacity found an orphan blockfile: %s. \nPlease consider saving and reloading the project to perform a complete project check.\n"), wxLogWarning(_("Audacity found an orphan blockfile: %s. \nPlease consider saving and reloading the project to perform a complete project check."),
collision.c_str()); collision.c_str());
return FALSE; return FALSE;

12
src/Sequence.cpp
View File

@ -836,7 +836,7 @@ void Sequence::HandleXMLEndTag(const wxChar *tag)
// the silent replacement to mMaxSamples. // the silent replacement to mMaxSamples.
len = mMaxSamples; len = mMaxSamples;
mBlock->Item(b)->f = new SilentBlockFile(len); mBlock->Item(b)->f = new SilentBlockFile(len);
wxLogWarning(_("Gap detected in project file\n")); wxLogError(_("Gap detected in project file."));
mErrorOpening = true; mErrorOpening = true;
} }
} }
@ -846,14 +846,14 @@ void Sequence::HandleXMLEndTag(const wxChar *tag)
for (b = 0; b < mBlock->Count(); b++) { for (b = 0; b < mBlock->Count(); b++) {
if (mBlock->Item(b)->start != numSamples) { if (mBlock->Item(b)->start != numSamples) {
mBlock->Item(b)->start = numSamples; mBlock->Item(b)->start = numSamples;
wxLogWarning(_("Gap detected in project file\n")); wxLogError(_("Gap detected in project file."));
mErrorOpening = true; mErrorOpening = true;
} }
numSamples += mBlock->Item(b)->f->GetLength(); numSamples += mBlock->Item(b)->f->GetLength();
} }
if (mNumSamples != numSamples) { if (mNumSamples != numSamples) {
mNumSamples = numSamples; mNumSamples = numSamples;
wxLogWarning(_("Gap detected in project file\n")); wxLogError(_("Gap detected in project file."));
mErrorOpening = true; mErrorOpening = true;
} }
} }
@ -947,7 +947,7 @@ bool Sequence::Read(samplePtr buffer, sampleFormat format,
if (result != len) if (result != len)
{ {
wxLogError(wxT("Expected to read %d samples, got %d samples.\n"), len, result); wxLogError(wxT("Expected to read %d samples, got %d samples."), len, result);
if (result < 0) if (result < 0)
result = 0; result = 0;
ClearSamples(buffer, format, result, len-result); ClearSamples(buffer, format, result, len-result);
@ -1645,11 +1645,11 @@ bool Sequence::ConsistencyCheck(const wxChar *whereStr)
if (bError) if (bError)
{ {
wxLogError(wxT("*** Consistency check failed after %s ***\n"), whereStr); wxLogError(wxT("*** Consistency check failed after %s. ***"), whereStr);
wxString str; wxString str;
DebugPrintf(&str); DebugPrintf(&str);
wxLogError(wxT("%s"), str.c_str()); wxLogError(wxT("%s"), str.c_str());
wxLogError(wxT("*** Please report this error to feedback@audacityteam.org ***\n\nRecommended course of action:\nUndo the failed operation(s), then export or save your work and quit.\n")); wxLogError(wxT("*** Please report this error to feedback@audacityteam.org. ***\n\nRecommended course of action:\nUndo the failed operation(s), then export or save your work and quit."));
} }
return !bError; return !bError;

8
src/WaveClip.cpp
View File

@ -1034,7 +1034,7 @@ bool WaveClip::Append(samplePtr buffer, sampleFormat format,
sampleCount len, unsigned int stride /* = 1 */, sampleCount len, unsigned int stride /* = 1 */,
XMLWriter* blockFileLog /*=NULL*/) XMLWriter* blockFileLog /*=NULL*/)
{ {
//wxLogDebug(wxT("Append: len=%i\n"), len); //wxLogDebug(wxT("Append: len=%i"), len);
sampleCount maxBlockSize = mSequence->GetMaxBlockSize(); sampleCount maxBlockSize = mSequence->GetMaxBlockSize();
sampleCount blockSize = mSequence->GetIdealAppendLen(); sampleCount blockSize = mSequence->GetIdealAppendLen();
@ -1109,8 +1109,8 @@ bool WaveClip::AppendCoded(wxString fName, sampleCount start,
bool WaveClip::Flush() bool WaveClip::Flush()
{ {
//wxLogDebug(wxT("WaveClip::Flush")); //wxLogDebug(wxT("WaveClip::Flush"));
//wxLogDebug(wxT(" mAppendBufferLen=%i\n"), mAppendBufferLen); //wxLogDebug(wxT(" mAppendBufferLen=%i"), mAppendBufferLen);
//wxLogDebug(wxT(" previous sample count %i\n"), mSequence->GetNumSamples()); //wxLogDebug(wxT(" previous sample count %i"), mSequence->GetNumSamples());
bool success = true; bool success = true;
if (mAppendBufferLen > 0) { if (mAppendBufferLen > 0) {
@ -1122,7 +1122,7 @@ bool WaveClip::Flush()
} }
} }
//wxLogDebug(wxT("now sample count %i\n"), mSequence->GetNumSamples()); //wxLogDebug(wxT("now sample count %i"), mSequence->GetNumSamples());
return success; return success;
} }

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

@ -332,8 +332,6 @@ void EffectNyquist::Parse(wxString line)
void EffectNyquist::ParseFile() void EffectNyquist::ParseFile()
{ {
wxLogDebug(wxT("EffectNyquist::ParseFile called"));
wxTextFile f(mFileName.GetFullPath()); wxTextFile f(mFileName.GetFullPath());
if (!f.Open()) if (!f.Open())
return; return;

2
src/export/ExportMP3.cpp
View File

@ -1102,7 +1102,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")); wxLogMessage(wxT("Failed to find a required symbol in the LAME library."));
#if defined(__WXMSW__) #if defined(__WXMSW__)
if (beVersion) { if (beVersion) {
be_version v; be_version v;

2
src/ondemand/ODManager.cpp
View File

@ -212,7 +212,7 @@ void ODManager::Init()
mCurrentThreads = 0; mCurrentThreads = 0;
mMaxThreads = 5; mMaxThreads = 5;
// wxLogDebug(wxT("Initializing ODManager...Creating manager thread\n")); // wxLogDebug(wxT("Initializing ODManager...Creating manager thread"));
ODManagerHelperThread* startThread = new ODManagerHelperThread; ODManagerHelperThread* startThread = new ODManagerHelperThread;
// startThread->SetPriority(0);//default of 50. // startThread->SetPriority(0);//default of 50.