Mercurial > hg > sonic-annotator
changeset 195:3f7c65f26559
Fixes from last merge
| author | Chris Cannam |
|---|---|
| date | Wed, 26 Aug 2015 21:46:52 +0100 |
| parents | c71d6ae15882 |
| children | 082c3f21f49e |
| files | .hgsubstate platform-dataquay.pri runner.pro runner/FeatureExtractionManager.cpp runner/MIDIFeatureWriter.h runner/MultiplexedReader.cpp runner/MultiplexedReader.h version.h |
| diffstat | 8 files changed, 13 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsubstate Wed Aug 19 16:36:41 2015 +0100 +++ b/.hgsubstate Wed Aug 26 21:46:52 2015 +0100 @@ -1,4 +1,4 @@ d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay -879bdc878826bebec67130326f99397c430419b1 sv-dependency-builds +55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds 067b60ae4861b8fdcdbf55f08f267074c268e0df svcore 632d90c185ecc8655f7a85ba58dc568351449dfd vamp-plugin-sdk
--- a/platform-dataquay.pri Wed Aug 19 16:36:41 2015 +0100 +++ b/platform-dataquay.pri Wed Aug 26 21:46:52 2015 +0100 @@ -3,7 +3,7 @@ include(./config.pri) } -CONFIG += staticlib +CONFIG += staticlib c++11 DEFINES -= USE_REDLAND QMAKE_CXXFLAGS -= -I/usr/include/rasqal -I/usr/include/raptor2
--- a/runner.pro Wed Aug 19 16:36:41 2015 +0100 +++ b/runner.pro Wed Aug 26 21:46:52 2015 +0100 @@ -38,7 +38,7 @@ } } -CONFIG += qt thread warn_on stl rtti exceptions console +CONFIG += qt thread warn_on stl rtti exceptions console c++11 QT += xml network QT -= gui widgets
--- a/runner/FeatureExtractionManager.cpp Wed Aug 19 16:36:41 2015 +0100 +++ b/runner/FeatureExtractionManager.cpp Wed Aug 26 21:46:52 2015 +0100 @@ -750,8 +750,7 @@ //!!! inefficient, although much of the inefficiency may be // susceptible to compiler optimisation - SampleBlock frames; - reader->getInterleavedFrames(i, m_blockSize, frames); + SampleBlock frames = reader->getInterleavedFrames(i, m_blockSize); // We have to do our own channel handling here; we can't just // leave it to the plugin adapter because the same plugin
--- a/runner/MIDIFeatureWriter.h Wed Aug 19 16:36:41 2015 +0100 +++ b/runner/MIDIFeatureWriter.h Wed Aug 26 21:46:52 2015 +0100 @@ -52,7 +52,7 @@ virtual NoteList getNotes() const { return m_notes; } - virtual NoteList getNotesWithin(int, int) const { + virtual NoteList getNotesWithin(sv_frame_t, sv_frame_t) const { // Not required by MIDIFileWriter, not supported return NoteList(); }
--- a/runner/MultiplexedReader.cpp Wed Aug 19 16:36:41 2015 +0100 +++ b/runner/MultiplexedReader.cpp Wed Aug 26 21:46:52 2015 +0100 @@ -49,20 +49,18 @@ } } -void -MultiplexedReader::getInterleavedFrames(int start, int frameCount, - SampleBlock &block) const +SampleBlock +MultiplexedReader::getInterleavedFrames(sv_frame_t start, sv_frame_t frameCount) const { int out_chans = m_readers.size(); // Allocate and zero - block = SampleBlock(frameCount * out_chans, 0.f); + SampleBlock block(frameCount * out_chans, 0.f); for (int out_chan = 0; out_chan < out_chans; ++out_chan) { AudioFileReader *reader = m_readers[out_chan]; - SampleBlock readerBlock; - reader->getInterleavedFrames(start, frameCount, readerBlock); + SampleBlock readerBlock = getInterleavedFrames(start, frameCount); int in_chans = reader->getChannelCount(); @@ -81,6 +79,8 @@ } } } + + return block; } int
--- a/runner/MultiplexedReader.h Wed Aug 19 16:36:41 2015 +0100 +++ b/runner/MultiplexedReader.h Wed Aug 26 21:46:52 2015 +0100 @@ -33,8 +33,7 @@ virtual QString getError() const { return m_error; } virtual bool isQuicklySeekable() const { return m_quicklySeekable; } - virtual void getInterleavedFrames(int start, int count, - SampleBlock &frames) const; + virtual SampleBlock getInterleavedFrames(sv_frame_t start, sv_frame_t count) const; virtual int getDecodeCompletion() const;