Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-02 08:59:28 +02:00
Code Issues Releases Wiki Activity

Fix some warnings in AudioIO.cpp

Browse Source
This commit is contained in:
James Crook 2018-08-29 14:00:57 +01:00
parent a5e9fb9e34
commit b5f9acefa4
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/AudioIO.cpp
View File

@ -4828,9 +4828,6 @@ int AudioIO::AudioCallback(const void *inputBuffer, void *outputBuffer,
#endif #endif
#endif #endif
unsigned int i;
/* Send data to recording VU meter if applicable */ /* Send data to recording VU meter if applicable */
if (mInputMeter && if (mInputMeter &&
@ -4939,7 +4936,7 @@ int AudioIO::AudioCallback(const void *inputBuffer, void *outputBuffer,
bool linkFlag = false; bool linkFlag = false;
float *outputFloats = (float *)outputBuffer; float *outputFloats = (float *)outputBuffer;
for( i = 0; i < framesPerBuffer*numPlaybackChannels; i++) for( unsigned i = 0; i < framesPerBuffer*numPlaybackChannels; i++)
outputFloats[i] = 0.0; outputFloats[i] = 0.0;
if (inputBuffer && mSoftwarePlaythrough) { if (inputBuffer && mSoftwarePlaythrough) {
@ -4950,7 +4947,7 @@ int AudioIO::AudioCallback(const void *inputBuffer, void *outputBuffer,
// Copy the results to outputMeterFloats if necessary // Copy the results to outputMeterFloats if necessary
if (outputMeterFloats != outputFloats) { if (outputMeterFloats != outputFloats) {
for (i = 0; i < framesPerBuffer*numPlaybackChannels; ++i) { for (unsigned i = 0; i < framesPerBuffer*numPlaybackChannels; ++i) {
outputMeterFloats[i] = outputFloats[i]; outputMeterFloats[i] = outputFloats[i];
} }
} }
@ -5197,7 +5194,7 @@ int AudioIO::AudioCallback(const void *inputBuffer, void *outputBuffer,
// //
// Clip output to [-1.0,+1.0] range (msmeyer) // Clip output to [-1.0,+1.0] range (msmeyer)
// //
for( i = 0; i < framesPerBuffer*numPlaybackChannels; i++) for(unsigned i = 0; i < framesPerBuffer*numPlaybackChannels; i++)
{ {
float f = outputFloats[i]; float f = outputFloats[i];
if (f > 1.0) if (f > 1.0)
@ -5209,7 +5206,7 @@ int AudioIO::AudioCallback(const void *inputBuffer, void *outputBuffer,
// Same for meter output // Same for meter output
if (outputMeterFloats != outputFloats) if (outputMeterFloats != outputFloats)
{ {
for (i = 0; i < framesPerBuffer*numPlaybackChannels; ++i) for (unsigned i = 0; i < framesPerBuffer*numPlaybackChannels; ++i)
{ {
float f = outputMeterFloats[i]; float f = outputMeterFloats[i];
if (f > 1.0) if (f > 1.0)
@ -5286,7 +5283,7 @@ int AudioIO::AudioCallback(const void *inputBuffer, void *outputBuffer,
switch(mCaptureFormat) { switch(mCaptureFormat) {
case floatSample: { case floatSample: {
float *inputFloats = (float *)inputBuffer; float *inputFloats = (float *)inputBuffer;
for( i = 0; i < len; i++) for(unsigned i = 0; i < len; i++)
tempFloats[i] = tempFloats[i] =
inputFloats[numCaptureChannels*i+t]; inputFloats[numCaptureChannels*i+t];
} break; } break;
@ -5300,7 +5297,7 @@ int AudioIO::AudioCallback(const void *inputBuffer, void *outputBuffer,
case int16Sample: { case int16Sample: {
short *inputShorts = (short *)inputBuffer; short *inputShorts = (short *)inputBuffer;
short *tempShorts = (short *)tempBuffer; short *tempShorts = (short *)tempBuffer;
for( i = 0; i < len; i++) { for( unsigned i = 0; i < len; i++) {
float tmp = inputShorts[numCaptureChannels*i+t]; float tmp = inputShorts[numCaptureChannels*i+t];
if (tmp > 32767) if (tmp > 32767)
tmp = 32767; tmp = 32767;
@ -5363,7 +5360,7 @@ int AudioIO::AudioCallback(const void *inputBuffer, void *outputBuffer,
if( outputBuffer && (numPlaybackChannels > 0) ) { if( outputBuffer && (numPlaybackChannels > 0) ) {
float *outputFloats = (float *)outputBuffer; float *outputFloats = (float *)outputBuffer;
for( i = 0; i < framesPerBuffer*numPlaybackChannels; i++) for(unsigned i = 0; i < framesPerBuffer*numPlaybackChannels; i++)
outputFloats[i] = 0.0; outputFloats[i] = 0.0;
if (inputBuffer && mSoftwarePlaythrough) { if (inputBuffer && mSoftwarePlaythrough) {
@ -5374,7 +5371,7 @@ int AudioIO::AudioCallback(const void *inputBuffer, void *outputBuffer,
// Copy the results to outputMeterFloats if necessary // Copy the results to outputMeterFloats if necessary
if (outputMeterFloats != outputFloats) { if (outputMeterFloats != outputFloats) {
for (i = 0; i < framesPerBuffer*numPlaybackChannels; ++i) { for (unsigned i = 0; i < framesPerBuffer*numPlaybackChannels; ++i) {
outputMeterFloats[i] = outputFloats[i]; outputMeterFloats[i] = outputFloats[i];
} }
} }
@ -5518,7 +5515,7 @@ double AudioIO::PlaybackSchedule::AdvancedTrackTime(
if (mTimeTrack) { if (mTimeTrack) {
wxASSERT( speed == 1.0 ); wxASSERT( speed == 1.0 );
double total; double total=0.0;
bool foundTotal = false; bool foundTotal = false;
do { do {
auto oldTime = time; auto oldTime = time;