Made requests for bug reports consistently go to feedback@audacityteam.org and compile issues go to "Compling Audacity" board on the Forum rather than going to -devel. Removed some related code cruft.

src/Benchmark.cpp

@@ -397,7 +397,6 @@ void BenchmarkDialog::OnRun( wxCommandEvent &event )
              t->GetClipByIndex(0)->GetSequence()->GetNumSamples());
       goto fail;
    }
-   //t->Debug();
 
    Printf(wxT("Performing %d edits...\n"), trials);
    wxTheApp->Yield();

src/Project.cpp

@@ -3556,10 +3556,8 @@ void AudacityProject::PopState(TrackList * l)
    ODComputeSummaryTask* computeTask;
    Track* copyTrack;
 
-   while (t) {
+   while (t) 
-      //    printf("Popping track with %d samples\n",
+   {
-      //           ((WaveTrack *)t)->numSamples);
-      //  ((WaveTrack *)t)->Debug();
       copyTrack=t->Duplicate();
       mTracks->Add(copyTrack);
      

src/Sequence.cpp

@@ -934,10 +934,9 @@ bool Sequence::Read(samplePtr buffer, sampleFormat format,
 
    int result = f->ReadData(buffer, format, start, len);
 
-   if (result != len) {
+   if (result != len) 
-      // TODO err
+   {
-      wxPrintf(wxT("Expected to read %d samples, got %d samples.\n"),
+      wxLogError(wxT("Expected to read %d samples, got %d samples.\n"), len, result);
-             len, result);
       if (result < 0)
          result = 0;
       ClearSamples(buffer, format, result, len-result);
@@ -1621,29 +1620,26 @@ bool Sequence::ConsistencyCheck(const wxChar *whereStr)
    unsigned int i;
    sampleCount pos = 0;
    unsigned int numBlocks = mBlock->Count();
-   bool error = false;
+   bool bError = false;
 
    for (i = 0; i < numBlocks; i++) {
       if (pos != mBlock->Item(i)->start)
-         error = true;
+         bError = true;
       pos += mBlock->Item(i)->f->GetLength();
    }
    if (pos != mNumSamples)
-      error = true;
+      bError = true;
 
-   if (error) {
+   if (bError) 
-      wxPrintf(wxT("*** Consistency check failed after %s ***\n"), whereStr);
+   {
-      Debug();
+      wxLogError(wxT("*** Consistency check failed after %s ***\n"), whereStr);
-      printf("*** Please report this error to audacity-devel@lists.sourceforge.net ***\n");
+      wxString str;
-
+      DebugPrintf(&str);
-      printf("\n");
+      wxLogError(wxT("%s"), str.c_str());
-      printf("Recommended course of action:\n");
+      wxLogError(wxT("*** Please report this error to feedback@audacityteam.org ***\n\n\Recommended course of action:\nUndo the failed operation(s), then export or save your work and quit.\n"));   
-      printf("Undo the failed operation(s), then export or save your work and quit.\n");
-      
-      return false;
    }
 
-   return true;
+   return !bError;
 }
 
 void Sequence::DebugPrintf(wxString *dest)
@@ -1653,14 +1649,14 @@ void Sequence::DebugPrintf(wxString *dest)
 
    for (i = 0; i < mBlock->Count(); i++) {
       *dest += wxString::Format
-         (wxT("Block %3d: start %8d len %8d refs %d %s"),
+         (wxT("   Block %3d: start %8d len %8d refs %d %s"),
           i,
           mBlock->Item(i)->start,
           mBlock->Item(i)->f->GetLength(),
           mDirManager->GetRefCount(mBlock->Item(i)->f),
           mBlock->Item(i)->f->GetFileName().GetFullName().c_str());
       if (pos != mBlock->Item(i)->start)
-         *dest += wxT("  ERROR\n");
+         *dest += wxT("      ERROR\n");
       else
          *dest += wxT("\n");
       pos += mBlock->Item(i)->f->GetLength();
@@ -1670,14 +1666,7 @@ void Sequence::DebugPrintf(wxString *dest)
          (wxT("ERROR mNumSamples = %d\n"), mNumSamples);
 }
 
-void Sequence::Debug()
+// static
-{
-   wxString s;
-   DebugPrintf(&s);
-   wxPrintf(wxT("%s"), s.c_str());
-}
-
-// Static
 void Sequence::SetMaxDiskBlockSize(int bytes)
 {
    sMaxDiskBlockSize = bytes;

src/Sequence.h

@@ -232,21 +232,8 @@ class Sequence: public XMLTagHandler {
 
    // This function prints information to stdout about the blocks in the
    // tracks and indicates if there are inconsistencies.
-   void Debug();
    void DebugPrintf(wxString *dest);
 };
 
 #endif // __AUDACITY_SEQUENCE__
 
-
-// Indentation settings for Vim and Emacs and unique identifier for Arch, a
-// version control system. Please do not modify past this point.
-//
-// Local Variables:
-// c-basic-offset: 3
-// indent-tabs-mode: nil
-// End:
-//
-// vim: et sts=3 sw=3
-// arch-tag: 7548fd38-7dc7-4c51-b5c5-04505be69088
-

src/UndoManager.cpp

@@ -338,15 +338,16 @@ void UndoManager::StateSaved()
    ResetODChangesFlag();
 }
 
-void UndoManager::Debug()
+// currently unused
-{
+//void UndoManager::Debug()
-   for (unsigned int i = 0; i < stack.Count(); i++) {
+//{
-      TrackListIterator iter(stack[i]->tracks);
+//   for (unsigned int i = 0; i < stack.Count(); i++) {
-      WaveTrack *t = (WaveTrack *) (iter.First());
+//      TrackListIterator iter(stack[i]->tracks);
-      wxPrintf(wxT("*%d* %s %f\n"), i, (i == (unsigned int)current) ? wxT("-->") : wxT("   "),
+//      WaveTrack *t = (WaveTrack *) (iter.First());
-             t ? t->GetEndTime()-t->GetStartTime() : 0);
+//      wxPrintf(wxT("*%d* %s %f\n"), i, (i == (unsigned int)current) ? wxT("-->") : wxT("   "),
-   }
+//             t ? t->GetEndTime()-t->GetStartTime() : 0);
-}
+//   }
+//}
 
 ///to mark as unsaved changes without changing the state/tracks.
 void UndoManager::SetODChangesFlag()

src/UndoManager.h

@@ -95,7 +95,7 @@ class AUDACITY_DLL_API UndoManager {
    bool UnsavedChanges();
    void StateSaved();
 
-   void Debug();
+   // void Debug(); // currently unused
 
    ///to mark as unsaved changes without changing the state/tracks.
    void SetODChangesFlag();

win/compile.txt

@@ -14,9 +14,10 @@ Authors:
   Martyn Shaw
 
 ========================================================================
-This version is currently accurate for Audacity version 1.3.13.		.
+This version is currently accurate for Audacity version 1.3.13.
-If the advice here is inaccurate or incomplete, please
+If you find the advice here inaccurate or incomplete, please
-email audacity-devel@lists.sourceforge.net.
+first discuss on the "Compling Audacity" forum at 
+http://forum.audacityteam.org/.
 See also 
 "http://audacityteam.org/wiki/index.php?title=Developing_On_Windows".
 ========================================================================
@@ -309,14 +310,12 @@ So for instance, a Unicode Debug version of Audacity should have:
         
 in the "audacity\win\unicode debug" directory.
 
-
+If this procedure doesn't work, you can ask for help on the 
-That's all - if this procedure doesn't work, you can ask for
+"Compling Audacity" forum at http://forum.audacityteam.org/. 
-help on the Audacity development mailing list:
+However, the first suggestion there is likely to be "try it again 
-audacity-devel@lists.sourceforge.net.  However, the first
+with a clean installation of the wxWidgets source and the latest 
-suggestion is likely to be "try it again with a clean installation
+Audacity source from SVN". So if that's not what you attempted, 
-of the wxWidgets source and the latest Audacity source from SVN",
+please try that first. 
-so if that's not what you just attempted, you might want to try
-that first... 
 
 
 ---------------------------