mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Fixed a problem when reading mono audio formats.

Browse source
This commit is contained in:
jules 2011-11-16 21:10:09 +00:00
parent 296c2446b8
commit ba2287033c
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
modules/juce_audio_formats/format/juce_AudioFormatReader.cpp
View file

@ -117,12 +117,13 @@ void AudioFormatReader::read (AudioSampleBuffer* buffer,
if (numSamples > 0) if (numSamples > 0)
{ {
const int numTargetChannels = buffer->getNumChannels();
int* chans[3]; int* chans[3];
if (useReaderLeftChan == useReaderRightChan) if (useReaderLeftChan == useReaderRightChan)
{ {
chans[0] = reinterpret_cast<int*> (buffer->getSampleData (0, startSample)); chans[0] = reinterpret_cast<int*> (buffer->getSampleData (0, startSample));
chans[1] = (numChannels > 1 && buffer->getNumChannels() > 1) ? reinterpret_cast<int*> (buffer->getSampleData (1, startSample)) : nullptr; chans[1] = (numChannels > 1 && numTargetChannels > 1) ? reinterpret_cast<int*> (buffer->getSampleData (1, startSample)) : nullptr;
} }
else if (useReaderLeftChan || (numChannels == 1)) else if (useReaderLeftChan || (numChannels == 1))
{ {
@ -155,7 +156,7 @@ void AudioFormatReader::read (AudioSampleBuffer* buffer,
} }
} }
if (numChannels > 1 && (chans[0] == nullptr || chans[1] == nullptr)) if (numTargetChannels > 1 && (chans[0] == nullptr || chans[1] == nullptr))
{ {
// if this is a stereo buffer and the source was mono, dupe the first channel.. // if this is a stereo buffer and the source was mono, dupe the first channel..
memcpy (buffer->getSampleData (1, startSample), memcpy (buffer->getSampleData (1, startSample),
@ -221,9 +222,9 @@ void AudioFormatReader::readMaxLevels (int64 startSampleInFile,
rmin = lmin; rmin = lmin;
} }
lowestLeft = lmin; lowestLeft = lmin;
highestLeft = lmax; highestLeft = lmax;
lowestRight = rmin; lowestRight = rmin;
highestRight = rmax; highestRight = rmax;
} }
else else
@ -266,9 +267,9 @@ void AudioFormatReader::readMaxLevels (int64 startSampleInFile,
rmin = lmin; rmin = lmin;
} }
lowestLeft = lmin / (float) std::numeric_limits<int>::max(); lowestLeft = lmin / (float) std::numeric_limits<int>::max();
highestLeft = lmax / (float) std::numeric_limits<int>::max(); highestLeft = lmax / (float) std::numeric_limits<int>::max();
lowestRight = rmin / (float) std::numeric_limits<int>::max(); lowestRight = rmin / (float) std::numeric_limits<int>::max();
highestRight = rmax / (float) std::numeric_limits<int>::max(); highestRight = rmax / (float) std::numeric_limits<int>::max();
} }
} }