diff --git a/src/DirManager.cpp b/src/DirManager.cpp index 616076c21..5426cf68b 100644 --- a/src/DirManager.cpp +++ b/src/DirManager.cpp @@ -566,7 +566,7 @@ wxFileName DirManager::MakeBlockFilePath(wxString value){ dir.AppendDir(middir); if(!dir.DirExists() && !dir.Mkdir(0777,wxPATH_MKDIR_FULL)) - wxLogSysError(_("mkdir in DirManager::MakeBlockFilePath failed.\n")); + wxLogSysError(_("mkdir in DirManager::MakeBlockFilePath failed.")); } return dir; } @@ -596,7 +596,7 @@ bool DirManager::AssignFile(wxFileName &fileName, wxString collision; 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()); return FALSE; diff --git a/src/Sequence.cpp b/src/Sequence.cpp index 5b2c6d4d3..614e1e54c 100644 --- a/src/Sequence.cpp +++ b/src/Sequence.cpp @@ -836,7 +836,7 @@ void Sequence::HandleXMLEndTag(const wxChar *tag) // the silent replacement to mMaxSamples. len = mMaxSamples; mBlock->Item(b)->f = new SilentBlockFile(len); - wxLogWarning(_("Gap detected in project file\n")); + wxLogError(_("Gap detected in project file.")); mErrorOpening = true; } } @@ -846,14 +846,14 @@ void Sequence::HandleXMLEndTag(const wxChar *tag) for (b = 0; b < mBlock->Count(); b++) { if (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; } numSamples += mBlock->Item(b)->f->GetLength(); } if (mNumSamples != numSamples) { mNumSamples = numSamples; - wxLogWarning(_("Gap detected in project file\n")); + wxLogError(_("Gap detected in project file.")); mErrorOpening = true; } } @@ -947,7 +947,7 @@ bool Sequence::Read(samplePtr buffer, sampleFormat format, 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) result = 0; ClearSamples(buffer, format, result, len-result); @@ -1645,11 +1645,11 @@ bool Sequence::ConsistencyCheck(const wxChar *whereStr) if (bError) { - wxLogError(wxT("*** Consistency check failed after %s ***\n"), whereStr); + wxLogError(wxT("*** Consistency check failed after %s. ***"), whereStr); wxString str; DebugPrintf(&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; diff --git a/src/WaveClip.cpp b/src/WaveClip.cpp index d167f0ddc..2fe77cba2 100644 --- a/src/WaveClip.cpp +++ b/src/WaveClip.cpp @@ -1034,7 +1034,7 @@ bool WaveClip::Append(samplePtr buffer, sampleFormat format, sampleCount len, unsigned int stride /* = 1 */, XMLWriter* blockFileLog /*=NULL*/) { - //wxLogDebug(wxT("Append: len=%i\n"), len); + //wxLogDebug(wxT("Append: len=%i"), len); sampleCount maxBlockSize = mSequence->GetMaxBlockSize(); sampleCount blockSize = mSequence->GetIdealAppendLen(); @@ -1109,8 +1109,8 @@ bool WaveClip::AppendCoded(wxString fName, sampleCount start, bool WaveClip::Flush() { //wxLogDebug(wxT("WaveClip::Flush")); - //wxLogDebug(wxT(" mAppendBufferLen=%i\n"), mAppendBufferLen); - //wxLogDebug(wxT(" previous sample count %i\n"), mSequence->GetNumSamples()); + //wxLogDebug(wxT(" mAppendBufferLen=%i"), mAppendBufferLen); + //wxLogDebug(wxT(" previous sample count %i"), mSequence->GetNumSamples()); bool success = true; 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; } diff --git a/src/effects/nyquist/Nyquist.cpp b/src/effects/nyquist/Nyquist.cpp index 6c8dec17d..900e74224 100644 --- a/src/effects/nyquist/Nyquist.cpp +++ b/src/effects/nyquist/Nyquist.cpp @@ -332,8 +332,6 @@ void EffectNyquist::Parse(wxString line) void EffectNyquist::ParseFile() { - wxLogDebug(wxT("EffectNyquist::ParseFile called")); - wxTextFile f(mFileName.GetFullPath()); if (!f.Open()) return; diff --git a/src/export/ExportMP3.cpp b/src/export/ExportMP3.cpp index fbd649889..c2ba1b515 100644 --- a/src/export/ExportMP3.cpp +++ b/src/export/ExportMP3.cpp @@ -1102,7 +1102,7 @@ bool MP3Exporter::InitLibrary(wxString libpath) !lame_set_padding_type || !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 (beVersion) { be_version v; diff --git a/src/ondemand/ODManager.cpp b/src/ondemand/ODManager.cpp index 58d5fb096..01fd00772 100644 --- a/src/ondemand/ODManager.cpp +++ b/src/ondemand/ODManager.cpp @@ -212,7 +212,7 @@ void ODManager::Init() mCurrentThreads = 0; mMaxThreads = 5; - // wxLogDebug(wxT("Initializing ODManager...Creating manager thread\n")); + // wxLogDebug(wxT("Initializing ODManager...Creating manager thread")); ODManagerHelperThread* startThread = new ODManagerHelperThread; // startThread->SetPriority(0);//default of 50.