Update of /cvsroot/audacity/audacity-src/src/effects
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv31516/effects
Modified Files:
Equalization.cpp Leveller.cpp ToneGen.cpp ToneGen.h
Log Message:
Get rid of more warnings. (Hope they're all correct...)
Index: Equalization.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Equalization.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- Equalization.cpp 14 Mar 2007 00:00:32 -0000 1.58
+++ Equalization.cpp 28 Mar 2007 04:14:04 -0000 1.59
@@ -406,7 +406,7 @@
TrackProgress(count, 0.);
- int wcopy;
+ int wcopy = 0;
int offset = (mM - 1)/2;
while(len)
@@ -417,7 +417,7 @@
t->Get((samplePtr)buffer, floatSample, s, block);
- int j;
+ int j = 0;
for(i=0; i<block; i+=L) //go through block in lumps of length L
{
@@ -455,7 +455,7 @@
lastWindow = tempP;
} //next i, lump of size L or less
i -= L; //put pointer back where it was
- for(j; j<wcopy+offset; j++) //fill the last 'offset' samples from the
filter
+ for(; j<wcopy+offset; j++) //fill the last 'offset' samples from the
filter
buffer[i+j-offset] = lastWindow[j];
t->Set((samplePtr)buffer, floatSample, s, block);
@@ -841,7 +841,7 @@
setCurve( mLogEnvelope );
bandsInUse = NUMBER_OF_BANDS;
- double loLog = log10(mLoFreq);
+ //double loLog = log10(mLoFreq);
//double stepLog = (log10(mHiFreq) - loLog)/((double)NUM_PTS-1.);
for(int i=0; i<NUM_PTS-1; i++)
whens[i] = (double)i/(NUM_PTS-1.);
@@ -2158,7 +2158,7 @@
int i;
double error;
double oldError;
- double m_EQValsOld;
+ double m_EQValsOld = 0.0;
double correction = 1.6;
bool flag;
int j=0;
Index: Leveller.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Leveller.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Leveller.cpp 12 Mar 2007 09:23:11 -0000 1.12
+++ Leveller.cpp 28 Mar 2007 04:14:04 -0000 1.13
@@ -208,7 +208,6 @@
wxDialog( parent, id, title)
{
wxBoxSizer *mainSizer = new wxBoxSizer(wxVERTICAL);
- wxControl *item;
wxStaticText *statText = new wxStaticText(this, -1,
_("Leveller by Lynn Allan"));
@@ -220,14 +219,6 @@
wxStaticBoxSizer *group = new wxStaticBoxSizer(new wxStaticBox(this, -1,
_("Degree of Leveling")), wxVERTICAL);;
- #if 0
- // dmazzoni: This is too much text.
- item = new wxStaticText(this, -1,
- wxT("You want to preclude the listener feeling the
need to increase\nthe volume during soft sections and decreasing during loud
parts.\nSome distortion can result from excessive leveling, so try to
minimize\nthis with good equipment, recording technique, the speaker not\nusing
too much dynamic range, and perhaps 'working the mic'."),
- wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT );
- group->Add(item, 0, wxALIGN_CENTRE|wxALL, 5 );
- #endif
-
wxBoxSizer *hSizer = new wxBoxSizer(wxHORIZONTAL);
// wxString numPasses[] = { "None-Skip", "Light", "Moderate", "Heavy",
"Heavier", "Heaviest" };
statText = new wxStaticText(this, -1, _("Degree of Leveling") +
wxString(wxT(": ")));
@@ -243,14 +234,6 @@
group = new wxStaticBoxSizer(new wxStaticBox(this, -1,
_("Noise Threshold
(Hiss/Hum/Ambient Noise)")), wxVERTICAL);
- #if 0
- // dmazzoni: This is too much text.
- item = new wxStaticText(this, -1,
- wxT("Below the Noise Threshold, the Signal Strength
is reduced.\nAbove this Threshold, the Signal Strength is equalized so
that\nsoft parts are made louder and loud parts are made softer.\n\nGenerally,
recordings with low noise can use lower settings. so\ngood equipment,
technique, and NoiseRemoval help out a LOT."),
- wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT );
- group->Add(item, 0, wxALIGN_CENTRE|wxALL, 5 );
- #endif
-
hSizer = new wxBoxSizer(wxHORIZONTAL);
statText = new wxStaticText(this, -1, _("Threshold for Noise: "));
hSizer->Add(statText, 0, wxALIGN_CENTRE | wxALL, 5);
Index: ToneGen.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/ToneGen.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- ToneGen.cpp 12 Mar 2007 09:23:11 -0000 1.39
+++ ToneGen.cpp 28 Mar 2007 04:14:04 -0000 1.40
@@ -116,15 +116,11 @@
{
double throwaway = 0; //passed to modf but never used
int i;
- double f;
+ double f = 0.0;
double BlendedFrequency;
double BlendedAmplitude;
- // mSample is an external placeholder to remember the last "buffer"
- // position so we use it to reinitialize from where we left
- int iSample = mSample;
-
// calculate delta, and reposition from where we left
double amplitudeQuantum = (amplitude[1]-amplitude[0]) / numSamples;
double frequencyQuantum = (frequency[1]-frequency[0]) / numSamples;
Index: ToneGen.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/ToneGen.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- ToneGen.h 31 Jan 2007 07:21:31 -0000 1.19
+++ ToneGen.h 28 Mar 2007 04:14:04 -0000 1.20
@@ -73,8 +73,11 @@
float amplitude[2];
double length;
float logFrequency[2];
- int mSample;
double mCurRate;
+
+ // mSample is an external placeholder to remember the last "buffer"
+ // position so we use it to reinitialize from where we left
+ int mSample;
};
// WDR: class declarations
-------------------------------------------------------------------------
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
