[Audacity-cvs] audacity-src/src/effects DtmfGen.cpp, 1.10, 1.11 Noise.cpp, 1.18, 1.19 ToneGen.cpp, 1.41, 1.42

[Leland Lucius]

Update of /cvsroot/audacity/audacity-src/src/effects
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv27988

Modified Files:
        DtmfGen.cpp Noise.cpp ToneGen.cpp 
Log Message:
Add progress dialogs to generate effects

Index: DtmfGen.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/DtmfGen.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- DtmfGen.cpp 14 May 2007 03:34:38 -0000      1.10
+++ DtmfGen.cpp 28 Jul 2007 08:48:15 -0000      1.11
@@ -214,6 +214,7 @@
       return false;
 
    //Iterate over each track
+   int ntrack = 0;
    TrackListIterator iter(mWaveTracks);
    WaveTrack *track = (WaveTrack *)iter.First();
    while (track) {
@@ -308,6 +309,10 @@
          }
          // flip flag
          isTone=!isTone;
+
+         //Update the Progress meter
+         if (TrackProgress(ntrack, (double)i / numSamplesSequence))
+            return false;
       } // finished the whole dtmf sequence
 
       delete[] data;
@@ -318,6 +323,7 @@
       delete tmp;
 
       //Iterate to the next track
+      ntrack++;
       track = (WaveTrack *)iter.Next();
    }
 

Index: ToneGen.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/ToneGen.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- ToneGen.cpp 4 Jul 2007 09:20:35 -0000       1.41
+++ ToneGen.cpp 28 Jul 2007 08:48:15 -0000      1.42
@@ -224,6 +224,7 @@
 
    mPositionInCycles = 0.0;
    //Iterate over each track
+   int ntrack = 0;
    TrackListIterator iter(mWaveTracks);
    WaveTrack *track = (WaveTrack *)iter.First();
    while (track) {
@@ -242,6 +243,10 @@
          MakeTone(data, block);
          tmp->Append((samplePtr)data, floatSample, block);
          i += block;
+
+         //Update the Progress meter
+         if (TrackProgress(ntrack, (double)i / numSamples))
+            return false;
       }
       delete[] data;
 
@@ -251,6 +256,7 @@
       delete tmp;
 
       //Iterate to the next track
+      ntrack++;
       track = (WaveTrack *)iter.Next();
    }
 

Index: Noise.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Noise.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Noise.cpp   4 Jul 2007 09:19:30 -0000       1.18
+++ Noise.cpp   28 Jul 2007 08:48:15 -0000      1.19
@@ -143,6 +143,7 @@
       noiseDuration = sDefaultGenerateLen;
 
    //Iterate over each track
+   int ntrack = 0;
    TrackListIterator iter(mWaveTracks);
    WaveTrack *track = (WaveTrack *)iter.First();
    while (track) {
@@ -161,6 +162,10 @@
 
          tmp->Append((samplePtr)data, floatSample, block);
          i += block;
+
+         //Update the Progress meter
+         if (TrackProgress(ntrack, (double)i / numSamples))
+            return false;
       }
       delete[] data;
 
@@ -170,6 +175,7 @@
       delete tmp;
 
       //Iterate to the next track
+      ntrack++;
       track = (WaveTrack *)iter.Next();
    }
 


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs