Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv7144
Modified Files:
WaveTrack.cpp ControlToolBar.cpp Mix.cpp Menus.cpp Project.cpp
Log Message:
Removed SetRate()s and moved to track creation.
Removed several unnecessary SetRate()s.
Fixed a freed pointer reference after MixAndRender().
Use current project rate instead of preferences rate.
Index: WaveTrack.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/WaveTrack.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- WaveTrack.cpp 24 Jul 2006 14:58:57 -0000 1.87
+++ WaveTrack.cpp 25 Aug 2006 05:12:16 -0000 1.88
@@ -38,24 +38,13 @@
#include "Sequence.h"
#include "Spectrum.h"
-#include "Prefs.h"
+#include "Project.h"
#include "Internat.h"
#include "AudioIO.h"
WaveTrack *TrackFactory::NewWaveTrack(sampleFormat format, double rate)
{
- if (format == (sampleFormat)0)
- {
- format = (sampleFormat) gPrefs->
- Read(wxT("/SamplingRate/DefaultProjectSampleFormat"), floatSample);
- }
- if (rate == 0)
- {
- rate = (double) gPrefs->
- Read(wxT("/SamplingRate/DefaultProjectSampleRate"),
AudioIO::GetOptimalSupportedSampleRate());
- }
-
return new WaveTrack(mDirManager, format, rate);
}
@@ -64,13 +53,11 @@
{
if (format == (sampleFormat)0)
{
- format = (sampleFormat) gPrefs->
- Read(wxT("/SamplingRate/DefaultProjectSampleFormat"), floatSample);
+ format = GetActiveProject()->GetDefaultFormat();
}
if (rate == 0)
{
- rate = (double) gPrefs->
- Read(wxT("/SamplingRate/DefaultProjectSampleRate"),
AudioIO::GetOptimalSupportedSampleRate());
+ rate = GetActiveProject()->GetRate();
}
mDisplay = 0; // Move to GUIWaveTrack
Index: Project.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Project.cpp,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -d -r1.274 -r1.275
--- Project.cpp 20 Aug 2006 08:50:22 -0000 1.274
+++ Project.cpp 25 Aug 2006 05:12:16 -0000 1.275
@@ -834,6 +834,8 @@
mTrackPanel->UpdatePrefs();
mRate = (double)
gPrefs->Read(wxT("/SamplingRate/DefaultProjectSampleRate"),
AudioIO::GetOptimalSupportedSampleRate());
+ mDefaultFormat = (sampleFormat) gPrefs->
+ Read(wxT("/SamplingRate/DefaultProjectSampleFormat"), floatSample);
if( mSelectionBar )
mSelectionBar->SetRate(mRate);
@@ -2883,7 +2885,6 @@
dest->SetTeamed( wt->GetTeamed() ); // do first
dest->SetLinked( wt->GetLinked() );
dest->SetName( wt->GetName() );
- ( ( WaveTrack* )dest )->SetRate( wt->GetRate() );
if( !merged )
merged = ( WaveTrack* )dest;
else
Index: Mix.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Mix.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- Mix.cpp 8 Aug 2006 06:04:10 -0000 1.55
+++ Mix.cpp 25 Aug 2006 05:12:16 -0000 1.56
@@ -88,16 +88,14 @@
t = iter.Next();
}
- WaveTrack *mixLeft = trackFactory->NewWaveTrack(format);
- mixLeft->SetRate((int) rate);
+ WaveTrack *mixLeft = trackFactory->NewWaveTrack(format, rate);
mixLeft->SetName(_("Mix"));
WaveTrack *mixRight = 0;
if (mono) {
mixLeft->SetChannel(Track::MonoChannel);
}
else {
- mixRight = trackFactory->NewWaveTrack(format);
- mixRight->SetRate((int) rate);
+ mixRight = trackFactory->NewWaveTrack(format, rate);
mixRight->SetName(_("Mix"));
mixLeft->SetChannel(Track::LeftChannel);
mixRight->SetChannel(Track::RightChannel);
Index: Menus.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Menus.cpp,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -d -r1.269 -r1.270
--- Menus.cpp 21 Aug 2006 20:55:37 -0000 1.269
+++ Menus.cpp 25 Aug 2006 05:12:16 -0000 1.270
@@ -2340,9 +2340,6 @@
dest->SetTeamed(n->GetTeamed()); // do first
dest->SetLinked(n->GetLinked());
dest->SetName(n->GetName());
- if (n->GetKind() == Track::Wave) {
- ((WaveTrack *)dest)->SetRate(((WaveTrack *)n)->GetRate());
- }
msClipboard->Add(dest);
}
}
@@ -2383,9 +2380,6 @@
dest->SetTeamed(n->GetTeamed()); // do first
dest->SetLinked(n->GetLinked());
dest->SetName(n->GetName());
- if (n->GetKind() == Track::Wave) {
- ((WaveTrack *)dest)->SetRate(((WaveTrack *)n)->GetRate());
- }
msClipboard->Add(dest);
}
}
@@ -2432,9 +2426,6 @@
dest->SetTeamed(n->GetTeamed()); // do first
dest->SetLinked(n->GetLinked());
dest->SetName(n->GetName());
- if (n->GetKind() == Track::Wave) {
- ((WaveTrack *)dest)->SetRate(((WaveTrack *)n)->GetRate());
- }
msClipboard->Add(dest);
}
}
@@ -2490,8 +2481,7 @@
switch(c->GetKind()) {
case Track::Wave: {
WaveTrack *w = (WaveTrack *)c;
- n = mTrackFactory->NewWaveTrack(w->GetSampleFormat());
- ((WaveTrack *)n)->SetRate(w->GetRate());
+ n = mTrackFactory->NewWaveTrack(w->GetSampleFormat(),
w->GetRate());
} break;
case Track::Note:
@@ -3599,6 +3589,7 @@
PushState(msg, _("Mix and Render"));
}
+ mTrackPanel->SetFocusedTrack(newLeft);
RedrawProject();
}
}
@@ -3790,8 +3781,7 @@
void AudacityProject::OnNewWaveTrack()
{
- WaveTrack *t = mTrackFactory->NewWaveTrack(mDefaultFormat);
- t->SetRate((int) mRate);
+ WaveTrack *t = mTrackFactory->NewWaveTrack(mDefaultFormat, mRate);
SelectNone();
mTracks->Add(t);
@@ -3805,18 +3795,16 @@
void AudacityProject::OnNewStereoTrack()
{
- WaveTrack *t = mTrackFactory->NewWaveTrack(mDefaultFormat);
+ WaveTrack *t = mTrackFactory->NewWaveTrack(mDefaultFormat, mRate);
t->SetChannel(Track::LeftChannel);
- t->SetRate((int) mRate);
SelectNone();
mTracks->Add(t);
t->SetSelected(true);
t->SetLinked (true);
- t = mTrackFactory->NewWaveTrack(mDefaultFormat);
+ t = mTrackFactory->NewWaveTrack(mDefaultFormat, mRate);
t->SetChannel(Track::RightChannel);
- t->SetRate((int) mRate);
mTracks->Add(t);
t->SetSelected(true);
Index: ControlToolBar.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/ControlToolBar.cpp,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- ControlToolBar.cpp 25 Jul 2006 18:50:20 -0000 1.107
+++ ControlToolBar.cpp 25 Aug 2006 05:12:16 -0000 1.108
@@ -708,8 +708,7 @@
WaveTrack *newTrack = p->GetTrackFactory()->NewWaveTrack();
int initialheight = newTrack->GetHeight();
newTrack->SetOffset(t0);
- newTrack->SetRate((int) p->GetRate());
- newTrack->SetHeight(initialheight / recordingChannels);
+ newTrack->SetHeight(initialheight / recordingChannels);
if( recordingChannels == 2 )
{
if( c == 0 )
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
