Mercurial > hg > svcore

diff data/model/FFTModel.h @ 1038:cc27f35aa75c cxx11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Introducing the signed 64-bit frame index type, and fixing build failures from inclusion of -Wconversion with -Werror. Not finished yet.
author Chris Cannam
date Tue, 03 Mar 2015 15:18:24 +0000
parents 59e7fe1b1003
children a1cd5abcb38b
line wrap: on
line diff
--- a/data/model/FFTModel.h	Tue Mar 03 09:33:59 2015 +0000
+++ b/data/model/FFTModel.h	Tue Mar 03 15:18:24 2015 +0000
@@ -98,7 +98,7 @@
         return m_server->getValuesAt(x << m_xshift, reals, imaginaries, minbin << m_yshift, count, getYRatio());
     }
 
-    inline int getFillExtent() const { return m_server->getFillExtent(); }
+    inline sv_frame_t getFillExtent() const { return m_server->getFillExtent(); }
 
     // DenseThreeDimensionalModel and Model methods:
     //
@@ -120,11 +120,11 @@
     virtual bool isOK() const {
         return m_server && m_server->getModel();
     }
-    virtual int getStartFrame() const {
+    virtual sv_frame_t getStartFrame() const {
         return 0;
     }
-    virtual int getEndFrame() const {
-        return getWidth() * getResolution() + getResolution();
+    virtual sv_frame_t getEndFrame() const {
+        return sv_frame_t(getWidth()) * getResolution() + getResolution();
     }
     virtual int getSampleRate() const;
     virtual int getResolution() const {