diff data/model/DenseTimeValueModel.h @ 1086:9f4505ac9072

Tidy dense time-value model API a bit; add first simple unit test for FFT model
author Chris Cannam
date Wed, 10 Jun 2015 17:06:02 +0100
parents cc27f35aa75c
children 4d9816ba0ebe
line wrap: on
line diff
--- a/data/model/DenseTimeValueModel.h	Wed Jun 10 14:44:09 2015 +0100
+++ b/data/model/DenseTimeValueModel.h	Wed Jun 10 17:06:02 2015 +0100
@@ -66,23 +66,13 @@
                                float *buffer) const = 0;
 
     /**
-     * Get the specified set of samples from the given channel of the
-     * model in double-precision floating-point format.  Return the
-     * number of samples actually retrieved.
-     * If the channel is given as -1, mix all available channels and
-     * return the result.
-     */
-    virtual sv_frame_t getData(int channel, sv_frame_t start, sv_frame_t count,
-                               double *buffer) const = 0;
-    
-    /**
      * Get the specified set of samples from given contiguous range
      * of channels of the model in single-precision floating-point
      * format.  Return the number of sample frames actually retrieved.
      */
-    virtual sv_frame_t getData(int fromchannel, int tochannel,
-                               sv_frame_t start, sv_frame_t count,
-                               float **buffers) const = 0;
+    virtual sv_frame_t getMultiChannelData(int fromchannel, int tochannel,
+                                           sv_frame_t start, sv_frame_t count,
+                                           float **buffers) const = 0;
 
     virtual bool canPlay() const { return true; }
     virtual QString getDefaultPlayClipId() const { return ""; }