Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23144/src

Modified Files:
        FreqWindow.cpp 
Log Message:
Add more performance monitoring messages to the function. Suspect that 
GetAudio() may be the cause of slow draws / redraws experienced on the Mac 
especially.


Index: FreqWindow.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/FreqWindow.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- FreqWindow.cpp      3 Nov 2009 21:55:27 -0000       1.82
+++ FreqWindow.cpp      7 Nov 2009 15:29:39 -0000       1.83
@@ -378,6 +378,7 @@
    int selcount = 0;
    int i;
    bool warning = false;
+   wxLogMessage(wxT("Entering FreqWindow::GetAudio()"));
    TrackListIterator iter(p->GetTracks());
    Track *t = iter.First();
    while (t) {
@@ -430,8 +431,11 @@
       wxString msg;
       msg.Printf(_("Too much audio was selected.  Only the first %.1f seconds 
of audio will be analyzed."),
                           (mDataLen / mRate));
+      wxLogMessage(wxT("About to show length warning message"));
       wxMessageBox(msg);
+      wxLogMessage(wxT("Length warning message done"));
    }
+   wxLogMessage(wxT("Leaving FreqWindow::GetAudio()"));
 }
 
 void FreqWindow::OnSize(wxSizeEvent & event)
@@ -920,6 +924,7 @@
 
 void FreqWindow::Plot()
 {
+   wxLogMessage(wxT("Starting FreqWindow::Plot()"));
    if (mData) {
       delete[]mData;
       mData = NULL;
@@ -934,6 +939,7 @@
 
    wxSizeEvent dummy;
    OnSize( dummy );
+   wxLogMessage(wxT("Leaving FreqWindow::Plot()"));
 }
 
 void FreqWindow::Recalc()
@@ -953,7 +959,6 @@
    long windowSize = 0;
    (mSizeChoice->GetStringSelection()).ToLong(&windowSize);
 
-   wxLogMessage(wxT("Collected control settings in FreqWindow::Recalc()"));
    int f = NumWindowFuncs();
 
    if (!(windowSize >= 32 && windowSize <= 65536 &&
@@ -969,7 +974,6 @@
       return;
    }
 
-   wxLogMessage(wxT("About to allocate a load of memory in 
FreqWindow::Recalc()"));
    mProcessed = new float[mWindowSize];
 
    int i;
@@ -983,7 +987,6 @@
    float *out2 = new float[mWindowSize];
    float *win = new float[mWindowSize];
 
-   wxLogMessage(wxT("OK, memory done, doing Window function in 
FreqWindow::Recalc()"));
    // initialize the window
    for(int i=0; i<mWindowSize; i++)
       win[i] = 1.0;
@@ -998,7 +1001,7 @@
    else
       wss = 1.0;
 
-   //add progress dialog
+   //Progress dialog over FFT operation
    wxLogMessage(wxT("Starting progress dialogue in FreqWindow::Recalc()"));
    ProgressDialog *mProgress = new ProgressDialog(_("FreqWindow"),_("Drawing 
Spectrum"));
 


------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs

Reply via email to