diff options
author | David Robillard <d@drobilla.net> | 2009-10-14 16:10:01 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2009-10-14 16:10:01 +0000 |
commit | bb9cc45cd22af67ac275a5e73accbe14fee664d8 (patch) | |
tree | e52977d3eae6ff07b856088041a080a2fa3e5b79 /libs/ardour/caimportable.cc | |
parent | 8c4ce1e2ce35571aed5a686671431fdfffae7f8c (diff) |
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only.
Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent...
git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/caimportable.cc')
-rw-r--r-- | libs/ardour/caimportable.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libs/ardour/caimportable.cc b/libs/ardour/caimportable.cc index 37e8f487f2..f5a70a5f6a 100644 --- a/libs/ardour/caimportable.cc +++ b/libs/ardour/caimportable.cc @@ -35,7 +35,7 @@ CAImportableSource::~CAImportableSource () } nframes_t -CAImportableSource::read (Sample* buffer, nframes_t nframes) +CAImportableSource::read (Sample* buffer, nframes_t nframes) { nframes_t nread = 0; AudioBufferList abl; @@ -48,12 +48,12 @@ CAImportableSource::read (Sample* buffer, nframes_t nframes) per_channel = nframes / abl.mBuffers[0].mNumberChannels; while (nread < per_channel) { - + UInt32 new_cnt = per_channel - nread; - + abl.mBuffers[0].mDataByteSize = new_cnt * abl.mBuffers[0].mNumberChannels * sizeof(Sample); abl.mBuffers[0].mData = buffer + nread; - + try { af.Read (new_cnt, &abl); } catch (CAXException& cax) { @@ -73,18 +73,18 @@ CAImportableSource::read (Sample* buffer, nframes_t nframes) if (!at_end && nread < per_channel) { return 0; } else { - return nread * abl.mBuffers[0].mNumberChannels; + return nread * abl.mBuffers[0].mNumberChannels; } } uint -CAImportableSource::channels () const +CAImportableSource::channels () const { return af.GetFileDataFormat().NumberChannels(); } nframes_t -CAImportableSource::length () const +CAImportableSource::length () const { return af.GetNumberFrames(); } @@ -114,5 +114,5 @@ CAImportableSource::seek (nframes_t pos) } } - + |