Mercurial > hg > svcore
annotate data/fileio/AudioFileReader.cpp @ 432:113cf8781bd1
* Fix two problems reported by Matthias in the data editor window:
- highlighted row was incorrect (it was highlighting the row for the
next item after the current position, not the one before it as it
should be)
- making a row current moved the centre frame of the view, but did
not change the playback position as it should do
author | Chris Cannam |
---|---|
date | Thu, 26 Jun 2008 12:41:23 +0000 (2008-06-26) |
parents | 1d656dcda8ef |
children | 59e7fe1b1003 |
rev | line source |
---|---|
Chris@175 | 1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */ |
Chris@175 | 2 |
Chris@175 | 3 /* |
Chris@175 | 4 Sonic Visualiser |
Chris@175 | 5 An audio file viewer and annotation editor. |
Chris@175 | 6 Centre for Digital Music, Queen Mary, University of London. |
Chris@175 | 7 This file copyright 2006 Chris Cannam. |
Chris@175 | 8 |
Chris@175 | 9 This program is free software; you can redistribute it and/or |
Chris@175 | 10 modify it under the terms of the GNU General Public License as |
Chris@175 | 11 published by the Free Software Foundation; either version 2 of the |
Chris@175 | 12 License, or (at your option) any later version. See the file |
Chris@175 | 13 COPYING included with this distribution for more information. |
Chris@175 | 14 */ |
Chris@175 | 15 |
Chris@175 | 16 #include "AudioFileReader.h" |
Chris@175 | 17 |
Chris@327 | 18 void |
Chris@327 | 19 AudioFileReader::getDeInterleavedFrames(size_t start, size_t count, |
Chris@327 | 20 std::vector<SampleBlock> &frames) const |
Chris@327 | 21 { |
Chris@327 | 22 SampleBlock interleaved; |
Chris@327 | 23 getInterleavedFrames(start, count, interleaved); |
Chris@327 | 24 |
Chris@327 | 25 size_t channels = getChannelCount(); |
Chris@327 | 26 size_t rc = interleaved.size() / channels; |
Chris@327 | 27 |
Chris@327 | 28 frames.clear(); |
Chris@327 | 29 |
Chris@327 | 30 for (size_t c = 0; c < channels; ++c) { |
Chris@327 | 31 frames.push_back(SampleBlock()); |
Chris@327 | 32 } |
Chris@327 | 33 |
Chris@327 | 34 for (size_t i = 0; i < rc; ++i) { |
Chris@327 | 35 for (size_t c = 0; c < channels; ++c) { |
Chris@327 | 36 frames[c].push_back(interleaved[i * channels + c]); |
Chris@327 | 37 } |
Chris@327 | 38 } |
Chris@327 | 39 } |
Chris@327 | 40 |