Mercurial > hg > svcore
changeset 1343:c380e56c95f5 3.0-integration
Untabify some more
author | Chris Cannam |
---|---|
date | Fri, 06 Jan 2017 09:50:13 +0000 (2017-01-06) |
parents | c0fece5e7755 |
children | 980afe3f1a76 |
files | data/fileio/AudioFileSizeEstimator.h data/fileio/CoreAudioFileReader.cpp data/fileio/MP3FileReader.cpp data/fileio/OggVorbisFileReader.cpp data/fileio/WavFileReader.cpp |
diffstat | 5 files changed, 32 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/data/fileio/AudioFileSizeEstimator.h Fri Jan 06 09:43:40 2017 +0000 +++ b/data/fileio/AudioFileSizeEstimator.h Fri Jan 06 09:50:13 2017 +0000 @@ -43,7 +43,7 @@ * will return 0. */ static sv_frame_t estimate(FileSource source, - sv_samplerate_t targetRate = 0); + sv_samplerate_t targetRate = 0); }; #endif
--- a/data/fileio/CoreAudioFileReader.cpp Fri Jan 06 09:43:40 2017 +0000 +++ b/data/fileio/CoreAudioFileReader.cpp Fri Jan 06 09:50:13 2017 +0000 @@ -114,14 +114,14 @@ UInt32 propsize = sizeof(AudioStreamBasicDescription); m_d->err = ExtAudioFileGetProperty - (m_d->file, kExtAudioFileProperty_FileDataFormat, &propsize, &m_d->asbd); + (m_d->file, kExtAudioFileProperty_FileDataFormat, &propsize, &m_d->asbd); if (m_d->err) { m_error = "CoreAudioReadStream: Error in getting basic description: code " + codestr(m_d->err); ExtAudioFileDispose(m_d->file); return; } - + m_channelCount = m_d->asbd.mChannelsPerFrame; m_fileRate = m_d->asbd.mSampleRate; @@ -137,9 +137,9 @@ m_d->asbd.mBytesPerPacket = sizeof(float) * m_channelCount; m_d->asbd.mFramesPerPacket = 1; m_d->asbd.mReserved = 0; - + m_d->err = ExtAudioFileSetProperty - (m_d->file, kExtAudioFileProperty_ClientDataFormat, propsize, &m_d->asbd); + (m_d->file, kExtAudioFileProperty_ClientDataFormat, propsize, &m_d->asbd); if (m_d->err) { m_error = "CoreAudioReadStream: Error in setting client format: code " + codestr(m_d->err);
--- 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);
--- a/data/fileio/OggVorbisFileReader.cpp Fri Jan 06 09:43:40 2017 +0000 +++ b/data/fileio/OggVorbisFileReader.cpp Fri Jan 06 09:50:13 2017 +0000 @@ -64,8 +64,8 @@ m_fileSize = info.size(); if (!(m_oggz = oggz_open(m_path.toLocal8Bit().data(), OGGZ_READ))) { - m_error = QString("File %1 is not an OGG file.").arg(m_path); - return; + m_error = QString("File %1 is not an OGG file.").arg(m_path); + return; } FishSoundInfo fsinfo; @@ -172,7 +172,7 @@ int OggVorbisFileReader::acceptFrames(FishSound *fs, float **frames, long nframes, - void *data) + void *data) { OggVorbisFileReader *reader = (OggVorbisFileReader *)data; @@ -196,11 +196,11 @@ } if (reader->m_channelCount == 0) { - FishSoundInfo fsinfo; - fish_sound_command(fs, FISH_SOUND_GET_INFO, - &fsinfo, sizeof(FishSoundInfo)); - reader->m_fileRate = fsinfo.samplerate; - reader->m_channelCount = fsinfo.channels; + FishSoundInfo fsinfo; + fish_sound_command(fs, FISH_SOUND_GET_INFO, + &fsinfo, sizeof(FishSoundInfo)); + reader->m_fileRate = fsinfo.samplerate; + reader->m_channelCount = fsinfo.channels; reader->initialiseDecodeCache(); }
--- a/data/fileio/WavFileReader.cpp Fri Jan 06 09:43:40 2017 +0000 +++ b/data/fileio/WavFileReader.cpp Fri Jan 06 09:50:13 2017 +0000 @@ -43,18 +43,18 @@ m_file = sf_open(m_path.toLocal8Bit(), SFM_READ, &m_fileInfo); if (!m_file || (!fileUpdating && m_fileInfo.channels <= 0)) { - SVDEBUG << "WavFileReader::initialize: Failed to open file at \"" + SVDEBUG << "WavFileReader::initialize: Failed to open file at \"" << m_path << "\" (" << sf_strerror(m_file) << ")" << endl; - if (m_file) { - m_error = QString("Couldn't load audio file '%1':\n%2") - .arg(m_path).arg(sf_strerror(m_file)); - } else { - m_error = QString("Failed to open audio file '%1'") - .arg(m_path); - } - return; + if (m_file) { + m_error = QString("Couldn't load audio file '%1':\n%2") + .arg(m_path).arg(sf_strerror(m_file)); + } else { + m_error = QString("Failed to open audio file '%1'") + .arg(m_path); + } + return; } if (m_fileInfo.channels > 0) { @@ -147,11 +147,11 @@ if (start >= m_fileInfo.frames) { // SVDEBUG << "WavFileReader::getInterleavedFrames: " << start // << " > " << m_fileInfo.frames << endl; - return {}; + return {}; } if (start + count > m_fileInfo.frames) { - count = m_fileInfo.frames - start; + count = m_fileInfo.frames - start; } // Because WaveFileModel::getSummaries() is called separately for