Update of /cvsroot/audacity/audacity-src/src/effects
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27913/effects
Modified Files:
Effect.cpp Effect.h Generator.cpp
Log Message:
Fixed Paste bug with Linked Tracks (this also solves Generate Silence bug
reported by Martyn Shaw)
HandleLinkedTracksOnGenerate removed.
Index: Effect.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Effect.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- Effect.cpp 24 Jun 2009 20:37:29 -0000 1.79
+++ Effect.cpp 24 Jun 2009 23:55:41 -0000 1.80
@@ -233,53 +233,6 @@
}
}
-void Effect::HandleLinkedTracksOnGenerate(double length, double t0)
-{
- AudacityProject *p = (AudacityProject*)mParent;
- if ( !p || !(p->IsSticky())) return;
-
- TrackListIterator iter(p->GetTracks());
-
- int editGroup = 0;
- bool handleGroup = false;
- Track *t=iter.First();
- Track *n=t;
-
- while (t){//find edit group number
- n=iter.Next();
- if (t->GetSelected()) handleGroup = true;
- if ( (n && n->GetKind()==Track::Wave && t->GetKind()==Track::Label)
- || (!n) ) {
- if (handleGroup){
- t=iter.First();
- for (int i=0; i<editGroup; i++){//go to first in edit group
- while (t && t->GetKind()==Track::Wave) t=iter.Next();
- while (t && t->GetKind()==Track::Label) t=iter.Next();
- }
- while (t && t->GetKind()==Track::Wave){
- if ( !(t->GetSelected()) ){
- //printf("t(w)(gen): %x\n", t);
- TrackFactory *factory = p->GetTrackFactory();
- WaveTrack *tmp = factory->NewWaveTrack(
((WaveTrack*)t)->GetSampleFormat(), ((WaveTrack*)t)->GetRate());
- tmp->InsertSilence(0.0, length);
- tmp->Flush();
- ((WaveTrack *)t)->HandlePaste(t0, tmp);
- }
- t=iter.Next();
- }
- while (t && t->GetKind()==Track::Label){
- //printf("t(l)(gen): %x\n", t);
- ((LabelTrack *)t)->ShiftLabelsOnInsert(length, t0);
- t=iter.Next();
- }
- }
- editGroup++;
- handleGroup = false;
- }
- t=n;
- }
-}
-
// If bGoodResult, replace mTracks tracks with successfully processed
mOutputTracks copies.
// Else clear and delete mOutputTracks copies.
void Effect::ReplaceProcessedTracks(const bool bGoodResult)
Index: Effect.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Effect.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- Effect.h 19 Jun 2009 16:50:20 -0000 1.47
+++ Effect.h 24 Jun 2009 23:55:41 -0000 1.48
@@ -138,7 +138,6 @@
// important for sorting.
static wxString StripAmpersand(const wxString& str);
- void HandleLinkedTracksOnGenerate(double length, double t0);
bool HandleGroupChangeSpeed(double m_PercentChange, double mCurT0, double
mCurT1);
//
// protected virtual methods
Index: Generator.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Generator.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Generator.cpp 19 Jun 2009 16:50:20 -0000 1.5
+++ Generator.cpp 24 Jun 2009 23:55:41 -0000 1.6
@@ -71,7 +71,6 @@
Success();
this->ReplaceProcessedTracks(bGoodResult);
- //HandleLinkedTracksOnGenerate(mDuration, mT0);
mT1 = mT0 + mDuration; // Update selection.
------------------------------------------------------------------------------
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
