Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv31516
Modified Files:
AudioIO.cpp FreqWindow.cpp Internat.cpp Theme.cpp
TrackArtist.cpp TrackPanel.cpp WaveTrack.cpp
Log Message:
Get rid of more warnings. (Hope they're all correct...)
Index: Internat.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Internat.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Internat.cpp 12 Mar 2007 09:23:06 -0000 1.18
+++ Internat.cpp 28 Mar 2007 04:14:03 -0000 1.19
@@ -289,7 +289,7 @@
{
wxString result;
result.Alloc(s.Length());
- for(int i = 0; i < s.Length(); i++) {
+ for(size_t i = 0; i < s.Length(); i++) {
if (s[i] == '\t')
break;
if (s[i] != '&' && s[i] != '.')
Index: FreqWindow.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/FreqWindow.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- FreqWindow.cpp 26 Mar 2007 23:35:50 -0000 1.47
+++ FreqWindow.cpp 28 Mar 2007 04:14:03 -0000 1.48
@@ -702,7 +702,7 @@
bool up = (mProcessed[1] > mProcessed[0]);
float bestdist = 1000000;
- float bestValue;
+ float bestValue = 0.0;
for (int bin = 2; bin < mProcessedSize; bin++) {
bool nowUp = mProcessed[bin] > mProcessed[bin - 1];
if (!nowUp && up) {
@@ -710,7 +710,7 @@
int leftbin = bin - 2;
if (leftbin < 1)
leftbin = 1;
- float valueAtMax;
+ float valueAtMax = 0.0;
float max = leftbin + CubicMaximize(mProcessed[leftbin],
mProcessed[leftbin + 1],
mProcessed[leftbin + 2],
Index: TrackArtist.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/TrackArtist.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- TrackArtist.cpp 29 Jan 2007 00:48:25 -0000 1.91
+++ TrackArtist.cpp 28 Mar 2007 04:14:03 -0000 1.92
@@ -313,13 +313,13 @@
return;
double rate = ((WaveTrack *) t)->GetRate();
- int windowSize = gPrefs->Read(wxT("/Spectrum/FFTSize"), 256);
- int maxFreq = gPrefs->Read(wxT("/Spectrum/MaxFreq"), rate/2.);
- if(maxFreq > rate/2.)
- maxFreq = rate/2.;
- int minFreq = gPrefs->Read(wxT("/Spectrum/MinFreq"), 0.);
+ int freq = lrint(rate/2.);
+ int maxFreq = gPrefs->Read(wxT("/Spectrum/MaxFreq"), freq);
+ if(maxFreq > freq)
+ maxFreq = freq;
+ int minFreq = gPrefs->Read(wxT("/Spectrum/MinFreq"), 0L);
if(minFreq < 0) {
- minFreq = 0.;
+ minFreq = 0;
gPrefs->Write(wxT("/Spectrum/MinFreq"), 0L);
}
@@ -1423,12 +1423,13 @@
t0, pps, autocorrelation);
bool isGrayscale = false;
gPrefs->Read(wxT("/Spectrum/Grayscale"), &isGrayscale, false);
- int maxFreq = gPrefs->Read(wxT("/Spectrum/MaxFreq"), rate/2.);
- if(maxFreq > rate/2.)
- maxFreq = rate/2.;
+ int ifreq = lrint(rate/2);
+ int maxFreq = gPrefs->Read(wxT("/Spectrum/MaxFreq"), ifreq);
+ if(maxFreq > ifreq)
+ maxFreq = ifreq;
int minFreq = gPrefs->Read(wxT("/Spectrum/MinFreq"), 0L);
if(minFreq < 0) {
- minFreq = 0.;
+ minFreq = 0;
gPrefs->Write(wxT("/Spectrum/MinFreq"), 0L);
}
bool usePxCache = false;
Index: WaveTrack.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/WaveTrack.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- WaveTrack.cpp 26 Mar 2007 22:34:36 -0000 1.99
+++ WaveTrack.cpp 28 Mar 2007 04:14:03 -0000 1.100
@@ -974,7 +974,7 @@
if (!XMLValueChecker::IsGoodString(strValue) ||
!Internat::CompatibleToDouble(strValue, &dblValue) ||
(dblValue < 100.0) || (dblValue > 100000.0)) // same bounds
as ImportRawDialog::OnOK
- mRate = dblValue;
+ mRate = lrint(dblValue);
}
else if (!wxStrcmp(attr, wxT("offset")) &&
XMLValueChecker::IsGoodString(strValue) &&
@@ -1482,7 +1482,7 @@
delete newClip;
return false;
}
- longSampleCount here = floor(((t - c->GetStartTime() - mOffset) *
mRate) + 0.5);
+ longSampleCount here = llrint(floor(((t - c->GetStartTime() -
mOffset) * mRate) + 0.5));
newClip->Offset((double)here/(double)mRate);
mClips.Append(newClip);
return true;
Index: TrackPanel.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/TrackPanel.cpp,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -d -r1.347 -r1.348
--- TrackPanel.cpp 17 Mar 2007 05:43:10 -0000 1.347
+++ TrackPanel.cpp 28 Mar 2007 04:14:03 -0000 1.348
@@ -2534,9 +2534,9 @@
mZoomStart = temp;
}
- float min, max, c, l, binSize;
+ float min, max, c, l, binSize = 0.0;
bool spectrum;
- int windowSize, minBins;
+ int windowSize, minBins = 0;
double rate = ((WaveTrack *)track)->GetRate();
((WaveTrack *) track)->GetDisplay() == WaveTrack::SpectrumDisplay ?
spectrum = true : spectrum = false;
if(spectrum) {
Index: AudioIO.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AudioIO.cpp,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -d -r1.153 -r1.154
--- AudioIO.cpp 12 Mar 2007 09:23:05 -0000 1.153
+++ AudioIO.cpp 28 Mar 2007 04:14:03 -0000 1.154
@@ -1753,7 +1753,7 @@
}
else
{
- int size = avail * mFactor;
+ int size = lrint(avail * mFactor);
samplePtr temp1 = NewSamples(avail, floatSample);
samplePtr temp2 = NewSamples(size, floatSample);
mCaptureBuffers[i]->Get(temp1, floatSample, avail);
Index: Theme.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Theme.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- Theme.cpp 12 Mar 2007 09:23:08 -0000 1.28
+++ Theme.cpp 28 Mar 2007 04:14:03 -0000 1.29
@@ -227,7 +227,6 @@
if( mbInitialised )
return;
mbInitialised = true;
- int i=0;
// This initialises the variables e.g
// RegisterImage( bmpRecordButton, some image, wxT("RecordButton"));
@@ -334,7 +333,7 @@
wxImage Img1( Bmp1.ConvertToImage());
wxImage Img2( Bmp2.ConvertToImage());
- unsigned char *src = Img1.GetData();
+// unsigned char *src = Img1.GetData();
unsigned char *mk = Img2.GetData();
unsigned char *alpha = (unsigned char*)malloc( nBytes );
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
