Update of /cvsroot/audacity/audacity-src/src/import
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv7219
Modified Files:
ImportRaw.cpp ImportFLAC.cpp ImportPCM.cpp ImportMP3.cpp
ImportOGG.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: ImportOGG.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/import/ImportOGG.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- ImportOGG.cpp 15 Jul 2006 08:57:13 -0000 1.23
+++ ImportOGG.cpp 25 Aug 2006 05:12:37 -0000 1.24
@@ -188,8 +188,7 @@
int c;
for (c = 0; c < *outNumTracks; c++) {
- channels[c] = trackFactory->NewWaveTrack(int16Sample);
- channels[c]->SetRate(vi->rate);
+ channels[c] = trackFactory->NewWaveTrack(int16Sample, vi->rate);
if (*outNumTracks > 1)
switch (c) {
Index: ImportPCM.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/import/ImportPCM.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- ImportPCM.cpp 8 Aug 2006 06:03:56 -0000 1.25
+++ ImportPCM.cpp 25 Aug 2006 05:12:37 -0000 1.26
@@ -168,8 +168,7 @@
int c;
for (c = 0; c < *outNumTracks; c++) {
- channels[c] = trackFactory->NewWaveTrack(mFormat);
- channels[c]->SetRate(mInfo.samplerate);
+ channels[c] = trackFactory->NewWaveTrack(mFormat, mInfo.samplerate);
if (*outNumTracks > 1)
switch (c) {
@@ -378,8 +377,7 @@
int c;
for(c=0; c<*numChannels; c++) {
- (*channels)[c] = new WaveTrack(dirManager, format);
- (*channels)[c]->SetRate(info.samplerate);
+ (*channels)[c] = new WaveTrack(dirManager, format, info.samplerate);
(*channels)[c]->SetName(TrackNameFromFileName(fName));
(*channels)[c]->SetChannel(Track::MonoChannel);
}
Index: ImportFLAC.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/import/ImportFLAC.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ImportFLAC.cpp 16 Jul 2006 00:39:10 -0000 1.13
+++ ImportFLAC.cpp 25 Aug 2006 05:12:37 -0000 1.14
@@ -313,8 +313,7 @@
int c;
for (c = 0; c < *outNumTracks; c++) {
- mChannels[c] = trackFactory->NewWaveTrack(mFormat);
- mChannels[c]->SetRate(mSampleRate);
+ mChannels[c] = trackFactory->NewWaveTrack(mFormat, mSampleRate);
if (*outNumTracks == 2)
switch (c) {
Index: ImportMP3.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/import/ImportMP3.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- ImportMP3.cpp 15 Jul 2006 08:57:12 -0000 1.27
+++ ImportMP3.cpp 25 Aug 2006 05:12:37 -0000 1.28
@@ -322,8 +322,7 @@
Read(wxT("/SamplingRate/DefaultProjectSampleFormat"), floatSample);
for(chn = 0; chn < channels; chn++) {
- data->channels[chn] = data->trackFactory->NewWaveTrack(format);
- data->channels[chn]->SetRate(samplerate);
+ data->channels[chn] = data->trackFactory->NewWaveTrack(format,
samplerate);
data->channels[chn]->SetChannel(Track::MonoChannel);
}
Index: ImportRaw.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/import/ImportRaw.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- ImportRaw.cpp 15 Jul 2006 08:57:12 -0000 1.26
+++ ImportRaw.cpp 25 Aug 2006 05:12:37 -0000 1.27
@@ -177,8 +177,7 @@
int c;
for (c = 0; c < numChannels; c++) {
- channels[c] = trackFactory->NewWaveTrack(format);
- channels[c]->SetRate(rate);
+ channels[c] = trackFactory->NewWaveTrack(format, rate);
if (numChannels > 1)
switch (c) {
-------------------------------------------------------------------------
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
