Mercurial > hg > svcore
diff data/fileio/MP3FileReader.cpp @ 1343:c380e56c95f5 3.0-integration
Untabify some more
| author | Chris Cannam |
|---|---|
| date | Fri, 06 Jan 2017 09:50:13 +0000 |
| parents | c0fece5e7755 |
| children | 75ad55315db4 |
line wrap: on
line diff
--- a/data/fileio/MP3FileReader.cpp Fri Jan 06 09:43:40 2017 +0000 +++ b/data/fileio/MP3FileReader.cpp Fri Jan 06 09:50:13 2017 +0000 @@ -99,7 +99,7 @@ m_error = QString("Failed to open file %1 for reading.").arg(m_path); SVDEBUG << "MP3FileReader: " << m_error << endl; return; - } + } try { // We need a mysterious MAD_BUFFER_GUARD (== 8) zero bytes at @@ -483,7 +483,7 @@ enum mad_flow MP3FileReader::accept(struct mad_header const *header, - struct mad_pcm *pcm) + struct mad_pcm *pcm) { int channels = pcm->channels; int frames = pcm->length; @@ -552,14 +552,14 @@ for (int i = 0; i < frames; ++i) { - mad_fixed_t sample = 0; - if (ch < activeChannels) { - sample = pcm->samples[ch][i]; - } - float fsample = float(sample) / float(MAD_F_ONE); + mad_fixed_t sample = 0; + if (ch < activeChannels) { + sample = pcm->samples[ch][i]; + } + float fsample = float(sample) / float(MAD_F_ONE); m_sampleBuffer[ch][i] = fsample; - } + } } addSamplesToDecodeCache(m_sampleBuffer, frames);