Mercurial > hg > svcore

diff data/model/test/MockWaveModel.h @ 1527:710e6250a401 zoom

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch
author Chris Cannam
date Mon, 17 Sep 2018 13:51:14 +0100
parents 54af1e21705c
children c01cbe41aeb5
line wrap: on
line diff
--- a/data/model/test/MockWaveModel.h	Mon Dec 12 15:18:52 2016 +0000
+++ b/data/model/test/MockWaveModel.h	Mon Sep 17 13:51:14 2018 +0100
@@ -41,8 +41,8 @@
     virtual float getValueMaximum() const { return  1.f; }
     virtual int getChannelCount() const { return int(m_data.size()); }
     
-    virtual std::vector<float> getData(int channel, sv_frame_t start, sv_frame_t count) const;
-    virtual std::vector<std::vector<float>> getMultiChannelData(int fromchannel, int tochannel, sv_frame_t start, sv_frame_t count) const;
+    virtual floatvec_t getData(int channel, sv_frame_t start, sv_frame_t count) const;
+    virtual std::vector<floatvec_t> getMultiChannelData(int fromchannel, int tochannel, sv_frame_t start, sv_frame_t count) const;
 
     virtual bool canPlay() const { return true; }
     virtual QString getDefaultPlayClipId() const { return ""; }