Update of /cvsroot/audacity/audacity-src/src/effects
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv8267/effects
Modified Files:
Amplify.cpp AutoDuck.cpp ChangePitch.cpp ChangeSpeed.cpp
ClickRemoval.cpp Echo.cpp Equalization.cpp Generator.cpp
NoiseRemoval.cpp Normalize.cpp Repair.cpp Repeat.cpp
Reverse.cpp SBSMSEffect.cpp SimpleMono.cpp
SimplePairedTwoTrack.h SoundTouchEffect.cpp StereoToMono.cpp
TruncSilence.cpp TwoPassSimpleMono.cpp
Log Message:
Most of the effects should use an iterator over Selected Wave Tracks.
SelectedTrackListOfKindIterator created and respective files updated (I hope
all of them).
Fix for Paste when the initial paste position is not the same as the initial
selection (ex.: Repeat Effect).
Index: Equalization.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Equalization.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- Equalization.cpp 23 Jun 2009 02:05:38 -0000 1.97
+++ Equalization.cpp 25 Jun 2009 02:16:01 -0000 1.98
@@ -455,7 +455,7 @@
this->CopyInputTracks(); // Set up mOutputTracks.
bool bGoodResult = true;
- TrackListIterator iter(mOutputTracks);
+ SelectedTrackListOfKindIterator iter(Track::Wave, mOutputTracks);
WaveTrack *track = (WaveTrack *) iter.First();
int count = 0;
while (track) {
Index: ChangeSpeed.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/ChangeSpeed.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- ChangeSpeed.cpp 18 Jun 2009 00:40:05 -0000 1.59
+++ ChangeSpeed.cpp 25 Jun 2009 02:16:01 -0000 1.60
@@ -92,7 +92,7 @@
this->CopyInputTracks(); // Set up mOutputTracks.
bool bGoodResult = true;
- TrackListIterator iter(mOutputTracks);
+ SelectedTrackListOfKindIterator iter(Track::Wave, mOutputTracks);
WaveTrack* pOutWaveTrack = (WaveTrack*)(iter.First());
mCurTrackNum = 0;
m_maxNewLength = 0.0;
Index: TruncSilence.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/TruncSilence.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- TruncSilence.cpp 18 Jun 2009 00:40:05 -0000 1.25
+++ TruncSilence.cpp 25 Jun 2009 02:16:01 -0000 1.26
@@ -208,7 +208,7 @@
// Start processing
//Track::All is needed because this effect has clear functionality
this->CopyInputTracks(Track::All); // Set up mOutputTracks.
- TrackListOfKindIterator iterOut(Track::Wave, mOutputTracks);
+ SelectedTrackListOfKindIterator iterOut(Track::Wave, mOutputTracks);
sampleCount index = start;
sampleCount outTrackOffset = start;
Index: StereoToMono.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/StereoToMono.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- StereoToMono.cpp 18 Jun 2009 00:40:05 -0000 1.15
+++ StereoToMono.cpp 25 Jun 2009 02:16:01 -0000 1.16
@@ -116,7 +116,7 @@
this->CopyInputTracks(); // Set up mOutputTracks.
bool bGoodResult = true;
- TrackListIterator iter(mOutputTracks);
+ SelectedTrackListOfKindIterator iter(Track::Wave, mOutputTracks);
mLeftTrack = (WaveTrack *)iter.First();
bool refreshIter = false;
Index: Repair.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Repair.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Repair.cpp 18 Jun 2009 00:40:05 -0000 1.8
+++ Repair.cpp 25 Jun 2009 02:16:01 -0000 1.9
@@ -59,7 +59,7 @@
this->CopyInputTracks(); // Set up mOutputTracks. //v This may be too much
copying for EffectRepair.
bool bGoodResult = true;
- TrackListIterator iter(mOutputTracks);
+ SelectedTrackListOfKindIterator iter(Track::Wave, mOutputTracks);
WaveTrack *track = (WaveTrack *) iter.First();
int count = 0;
while (track) {
Index: AutoDuck.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/AutoDuck.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- AutoDuck.cpp 18 Jun 2009 00:40:05 -0000 1.15
+++ AutoDuck.cpp 25 Jun 2009 02:16:01 -0000 1.16
@@ -339,7 +339,7 @@
if (!cancel)
{
this->CopyInputTracks(); // Set up mOutputTracks.
- TrackListIterator iter(mOutputTracks);
+ SelectedTrackListOfKindIterator iter(Track::Wave, mOutputTracks);
Track *iterTrack = iter.First();
int trackNumber = 0;
Index: Repeat.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Repeat.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- Repeat.cpp 19 Jun 2009 15:26:28 -0000 1.32
+++ Repeat.cpp 25 Jun 2009 02:16:01 -0000 1.33
@@ -115,9 +115,10 @@
bool bGoodResult = true;
double maxDestLen = 0.0; // used to change selection to generated bit
- TrackListOfKindIterator iter(Track::Wave, mOutputTracks);
- WaveTrack *track = (WaveTrack *)iter.First();
- for (; track && bGoodResult; track = (WaveTrack *)iter.Next(), nTrack++) {
+ SelectedTrackListOfKindIterator iter(Track::Wave, mOutputTracks);
+ for (WaveTrack *track = (WaveTrack *)iter.First(); track && bGoodResult;
+ track = (WaveTrack *)iter.Next(), nTrack++) {
+
double trackStart = track->GetStartTime();
double trackEnd = track->GetEndTime();
double t0 = mT0 < trackStart? trackStart: mT0;
Index: NoiseRemoval.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/NoiseRemoval.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- NoiseRemoval.cpp 23 Jun 2009 02:08:44 -0000 1.61
+++ NoiseRemoval.cpp 25 Jun 2009 02:16:01 -0000 1.62
@@ -284,7 +284,7 @@
this->CopyInputTracks(); // Set up mOutputTracks.
bool bGoodResult = true;
- TrackListIterator iter(mOutputTracks);
+ SelectedTrackListOfKindIterator iter(Track::Wave, mOutputTracks);
WaveTrack *track = (WaveTrack *) iter.First();
int count = 0;
while (track) {
Index: Reverse.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Reverse.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Reverse.cpp 18 Jun 2009 00:40:05 -0000 1.14
+++ Reverse.cpp 25 Jun 2009 02:16:01 -0000 1.15
@@ -34,7 +34,7 @@
this->CopyInputTracks(); // Set up mOutputTracks.
bool bGoodResult = true;
- TrackListIterator iter(mOutputTracks);
+ SelectedTrackListOfKindIterator iter(Track::Wave, mOutputTracks);
WaveTrack *track = (WaveTrack *) iter.First();
int count = 0;
while (track) {
Index: Amplify.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Amplify.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- Amplify.cpp 26 May 2009 06:12:30 -0000 1.47
+++ Amplify.cpp 25 Jun 2009 02:16:01 -0000 1.48
@@ -58,13 +58,9 @@
{
peak = float(0.0);
- TrackListOfKindIterator iter(Track::Wave, mTracks);
+ SelectedTrackListOfKindIterator iter(Track::Wave, mTracks);
for (Track *t = iter.First(); t; t = iter.Next()) {
- if (!t->GetSelected()) {
- continue;
- }
-
float min, max;
((WaveTrack *)t)->GetMinMax(&min, &max, mT0, mT1);
float newpeak = (fabs(min) > fabs(max) ? fabs(min) : fabs(max));
Index: SBSMSEffect.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/SBSMSEffect.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- SBSMSEffect.cpp 18 Jun 2009 00:40:05 -0000 1.9
+++ SBSMSEffect.cpp 25 Jun 2009 02:16:01 -0000 1.10
@@ -159,7 +159,7 @@
//Iterate over each track
this->CopyInputTracks(); // Set up mOutputTracks.
- TrackListIterator iter(mOutputTracks);
+ SelectedTrackListOfKindIterator iter(Track::Wave, mOutputTracks);
WaveTrack* leftTrack = (WaveTrack*)(iter.First());
WaveTrack* saveLeft = leftTrack;
mCurTrackNum = 0;
Index: SimpleMono.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/SimpleMono.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- SimpleMono.cpp 18 Jun 2009 00:40:05 -0000 1.20
+++ SimpleMono.cpp 25 Jun 2009 02:16:01 -0000 1.21
@@ -32,7 +32,7 @@
this->CopyInputTracks(); // Set up mOutputTracks.
bool bGoodResult = true;
- TrackListIterator iter(mOutputTracks);
+ SelectedTrackListOfKindIterator iter(Track::Wave, mOutputTracks);
WaveTrack* pOutWaveTrack = (WaveTrack*)(iter.First());
mCurTrackNum = 0;
while (pOutWaveTrack != NULL)
Index: Echo.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Echo.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- Echo.cpp 18 Jun 2009 00:40:05 -0000 1.35
+++ Echo.cpp 25 Jun 2009 02:16:01 -0000 1.36
@@ -78,7 +78,7 @@
this->CopyInputTracks(); // Set up mOutputTracks.
bool bGoodResult = true;
- TrackListIterator iter(mOutputTracks);
+ SelectedTrackListOfKindIterator iter(Track::Wave, mOutputTracks);
WaveTrack *track = (WaveTrack *) iter.First();
int count = 0;
while (track) {
Index: Generator.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Generator.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Generator.cpp 24 Jun 2009 23:55:41 -0000 1.6
+++ Generator.cpp 25 Jun 2009 02:16:01 -0000 1.7
@@ -30,38 +30,36 @@
// Iterate over the tracks
bool bGoodResult = true;
int ntrack = 0;
- TrackListOfKindIterator iter(Track::Wave, mOutputTracks);
+ SelectedTrackListOfKindIterator iter(Track::Wave, mOutputTracks);
WaveTrack *track = (WaveTrack *)iter.First();
while (track) {
- if (track->GetSelected()) {
- if (mDuration > 0.0)
- {
- // Create a temporary track
- WaveTrack *tmp = mFactory->NewWaveTrack(track->GetSampleFormat(),
- track->GetRate());
- BeforeTrack(*track);
+ if (mDuration > 0.0)
+ {
+ // Create a temporary track
+ WaveTrack *tmp = mFactory->NewWaveTrack(track->GetSampleFormat(),
+ track->GetRate());
+ BeforeTrack(*track);
- // Fill it with data
- if (!GenerateTrack(tmp, *track, ntrack))
- bGoodResult = false;
+ // Fill it with data
+ if (!GenerateTrack(tmp, *track, ntrack))
+ bGoodResult = false;
- // Transfer the data from the temporary track to the actual one
- tmp->Flush();
- track->ClearAndPaste(mT0, mT1, tmp, true, true, mOutputTracks);
- delete tmp;
+ // Transfer the data from the temporary track to the actual one
+ tmp->Flush();
+ track->ClearAndPaste(mT0, mT1, tmp, true, true, mOutputTracks);
+ delete tmp;
- if (!bGoodResult) {
- Failure();
- return false;
- }
- }
- else
- {
- // If the duration is zero, there's no need to actually
- // generate anything
- track->Clear(mT0, mT1);
+ if (!bGoodResult) {
+ Failure();
+ return false;
}
}
+ else
+ {
+ // If the duration is zero, there's no need to actually
+ // generate anything
+ track->Clear(mT0, mT1);
+ }
// Move on to the next track
ntrack++;
Index: SoundTouchEffect.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/SoundTouchEffect.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- SoundTouchEffect.cpp 18 Jun 2009 00:40:05 -0000 1.23
+++ SoundTouchEffect.cpp 25 Jun 2009 02:16:01 -0000 1.24
@@ -32,7 +32,7 @@
this->CopyInputTracks(); // Set up mOutputTracks.
bool bGoodResult = true;
- TrackListIterator iter(mOutputTracks);
+ SelectedTrackListOfKindIterator iter(Track::Wave, mOutputTracks);
WaveTrack* leftTrack = (WaveTrack*)(iter.First());
mCurTrackNum = 0;
m_maxNewLength = 0.0;
Index: ChangePitch.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/ChangePitch.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- ChangePitch.cpp 23 Mar 2009 00:32:54 -0000 1.52
+++ ChangePitch.cpp 25 Jun 2009 02:16:01 -0000 1.53
@@ -70,7 +70,7 @@
{
// As a neat trick, attempt to get the frequency of the note at the
// beginning of the selection.
- TrackListOfKindIterator iter(Track::Wave, mTracks);
+ SelectedTrackListOfKindIterator iter(Track::Wave, mTracks);
WaveTrack *track = (WaveTrack *) iter.First();
if (track) {
const int windowSize = 1024;
Index: SimplePairedTwoTrack.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/SimplePairedTwoTrack.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- SimplePairedTwoTrack.h 18 Jun 2009 00:40:05 -0000 1.14
+++ SimplePairedTwoTrack.h 25 Jun 2009 02:16:01 -0000 1.15
@@ -129,7 +129,7 @@
this->CopyInputTracks(); // Set up mOutputTracks.
bool bGoodResult = true;
- TrackListIterator iter(mOutputTracks);
+ SelectedTrackListOfKindIterator iter(Track::Wave, mOutputTracks);
int count = 0;
WaveTrack *left = (WaveTrack*)(iter.First());
WaveTrack *right;
Index: ClickRemoval.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/ClickRemoval.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- ClickRemoval.cpp 18 Jun 2009 00:40:05 -0000 1.18
+++ ClickRemoval.cpp 25 Jun 2009 02:16:01 -0000 1.19
@@ -127,7 +127,7 @@
this->CopyInputTracks(); // Set up mOutputTracks.
bool bGoodResult = true;
- TrackListIterator iter(mOutputTracks);
+ SelectedTrackListOfKindIterator iter(Track::Wave, mOutputTracks);
WaveTrack *track = (WaveTrack *) iter.First();
int count = 0;
while (track) {
Index: TwoPassSimpleMono.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/TwoPassSimpleMono.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- TwoPassSimpleMono.cpp 18 Jun 2009 00:40:05 -0000 1.8
+++ TwoPassSimpleMono.cpp 25 Jun 2009 02:16:01 -0000 1.9
@@ -45,7 +45,7 @@
bool EffectTwoPassSimpleMono::ProcessPass()
{
//Iterate over each track
- TrackListIterator iter(mOutputTracks);
+ SelectedTrackListOfKindIterator iter(Track::Wave, mOutputTracks);
WaveTrack *track = (WaveTrack *) iter.First();
mCurTrackNum = 0;
while (track) {
Index: Normalize.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Normalize.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- Normalize.cpp 18 Jun 2009 00:40:05 -0000 1.30
+++ Normalize.cpp 25 Jun 2009 02:16:01 -0000 1.31
@@ -142,8 +142,8 @@
this->CopyInputTracks(); // Set up mOutputTracks.
bool bGoodResult = true;
- TrackListIterator iter(mOutputTracks);
- WaveTrack *track = (WaveTrack *) iter.First();
+ SelectedTrackListOfKindIterator iter(Track::Wave, mOutputTracks);
+ WaveTrack *track = (WaveTrack *) iter.First();
mCurTrackNum = 0;
while (track) {
//Get start and end times from track
------------------------------------------------------------------------------
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
