Update of /cvsroot/audacity/audacity-src/src/effects
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv16116/src/effects
Modified Files:
ChangeSpeed.cpp DtmfGen.cpp Noise.cpp NoiseRemoval.cpp
SBSMSEffect.cpp Silence.cpp SoundTouchEffect.cpp ToneGen.cpp
Log Message:
Retain cut/split lines in effects that must Clear/Paste tracks instead of using
Get/Set.
Index: DtmfGen.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/DtmfGen.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- DtmfGen.cpp 6 Feb 2009 00:43:40 -0000 1.28
+++ DtmfGen.cpp 2 Mar 2009 05:11:46 -0000 1.29
@@ -357,8 +357,7 @@
delete[] data;
tmp->Flush();
- track->HandleClear(mT0, mT1, false, false);
- track->HandlePaste(mT0, tmp);
+ track->ClearAndPaste(mT0, mT1, tmp);
delete tmp;
if (!bGoodResult)
Index: ChangeSpeed.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/ChangeSpeed.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- ChangeSpeed.cpp 6 Feb 2009 00:43:40 -0000 1.56
+++ ChangeSpeed.cpp 2 Mar 2009 05:11:45 -0000 1.57
@@ -241,8 +241,7 @@
// Take the output track and insert it in place of the original
// sample data
if (bLoopSuccess) {
- track->HandleClear(mCurT0, mCurT1, false, false);
- track->HandlePaste(mCurT0, outputTrack);
+ track->ClearAndPaste(mCurT0, mCurT1, outputTrack);
}
double newLength = outputTrack->GetEndTime();
Index: Noise.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Noise.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- Noise.cpp 6 Feb 2009 00:43:40 -0000 1.34
+++ Noise.cpp 2 Mar 2009 05:11:46 -0000 1.35
@@ -175,8 +175,7 @@
delete[] data;
tmp->Flush();
- track->HandleClear(mT0, mT1, false, false);
- track->HandlePaste(mT0, tmp);
+ track->ClearAndPaste(mT0, mT1, tmp);
delete tmp;
if (!bGoodResult)
Index: NoiseRemoval.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/NoiseRemoval.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- NoiseRemoval.cpp 18 Jan 2009 23:42:39 -0000 1.54
+++ NoiseRemoval.cpp 2 Mar 2009 05:11:46 -0000 1.55
@@ -669,10 +669,9 @@
// Take the output track and insert it in place of the original
// sample data
if (bLoopSuccess) {
- track->HandleClear(mT0, mT1, false, false);
// Filtering effects always end up with more data than they started
with. Delete this 'tail'.
mOutputTrack->HandleClear(mT1 - mT0, mOutputTrack->GetEndTime(),
false, false);
- track->HandlePaste(mT0, mOutputTrack);
+ track->ClearAndPaste(mT0, mT1, mOutputTrack);
}
// Delete the outputTrack now that its data is inserted in place
Index: Silence.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Silence.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Silence.cpp 6 Feb 2009 00:43:40 -0000 1.22
+++ Silence.cpp 2 Mar 2009 05:11:46 -0000 1.23
@@ -65,8 +65,7 @@
WaveTrack *tmp = mFactory->NewWaveTrack(track->GetSampleFormat(),
track->GetRate());
tmp->InsertSilence(0.0, length);
tmp->Flush();
- track->HandleClear(mT0, mT1, false, false);
- track->HandlePaste(mT0, tmp);
+ track->ClearAndPaste(mT0, mT1, tmp);
delete tmp;
//Iterate to the next track
Index: SBSMSEffect.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/SBSMSEffect.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- SBSMSEffect.cpp 6 Feb 2009 00:43:40 -0000 1.5
+++ SBSMSEffect.cpp 2 Mar 2009 05:11:46 -0000 1.6
@@ -297,11 +297,9 @@
outputLeftTrack->Flush();
if(rightTrack) outputRightTrack->Flush();
- leftTrack->HandleClear(mCurT0, mCurT1, false, false);
- leftTrack->HandlePaste(mCurT0, outputLeftTrack);
+ leftTrack->ClearAndPaste(mCurT0, mCurT1, outputLeftTrack);
if(rightTrack) {
- rightTrack->HandleClear(mCurT0, mCurT1, false, false);
- rightTrack->HandlePaste(mCurT0, outputRightTrack);
+ rightTrack->ClearAndPaste(mCurT0, mCurT1, outputRightTrack);
}
delete outputLeftTrack;
Index: SoundTouchEffect.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/SoundTouchEffect.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- SoundTouchEffect.cpp 6 Feb 2009 00:43:40 -0000 1.19
+++ SoundTouchEffect.cpp 2 Mar 2009 05:11:46 -0000 1.20
@@ -197,8 +197,7 @@
// Take the output track and insert it in place of the original
// sample data
- track->HandleClear(mCurT0, mCurT1, false, false);
- track->HandlePaste(mCurT0, outputTrack);
+ track->ClearAndPaste(mCurT0, mCurT1, outputTrack);
double newLength = outputTrack->GetEndTime();
m_maxNewLength = wxMax(m_maxNewLength, newLength);
@@ -302,10 +301,8 @@
// Take the output tracks and insert in place of the original
// sample data.
- leftTrack->HandleClear(mCurT0, mCurT1, false, false);
- leftTrack->HandlePaste(mCurT0, outputLeftTrack);
- rightTrack->HandleClear(mCurT0, mCurT1, false, false);
- rightTrack->HandlePaste(mCurT0, outputRightTrack);
+ leftTrack->ClearAndPaste(mCurT0, mCurT1, outputLeftTrack);
+ rightTrack->ClearAndPaste(mCurT0, mCurT1, outputRightTrack);
// Track the longest result length
double newLength = outputLeftTrack->GetEndTime();
Index: ToneGen.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/ToneGen.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- ToneGen.cpp 6 Feb 2009 00:43:40 -0000 1.62
+++ ToneGen.cpp 2 Mar 2009 05:11:46 -0000 1.63
@@ -268,8 +268,7 @@
delete[] data;
tmp->Flush();
- track->HandleClear(mT0, mT1, false, false);
- track->HandlePaste(mT0, tmp);
+ track->ClearAndPaste(mT0, mT1, tmp);
delete tmp;
if (!bGoodResult)
------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
