Mercurial > hg > svcore
diff data/model/Model.h @ 929:59e7fe1b1003 warnfix_no_size_t
Unsigned removals and warning fixes in data/
author | Chris Cannam |
---|---|
date | Tue, 17 Jun 2014 14:33:42 +0100 |
parents | d81c16e47e22 |
children | df82da55e86a |
line wrap: on
line diff
--- a/data/model/Model.h Tue Jun 17 13:52:07 2014 +0100 +++ b/data/model/Model.h Tue Jun 17 14:33:42 2014 +0100 @@ -50,23 +50,23 @@ /** * Return the first audio frame spanned by the model. */ - virtual size_t getStartFrame() const = 0; + virtual int getStartFrame() const = 0; /** * Return the last audio frame spanned by the model. */ - virtual size_t getEndFrame() const = 0; + virtual int getEndFrame() const = 0; /** * Return the frame rate in frames per second. */ - virtual size_t getSampleRate() const = 0; + virtual int getSampleRate() const = 0; /** * Return the frame rate of the underlying material, if the model * itself has already been resampled. */ - virtual size_t getNativeRate() const { return getSampleRate(); } + virtual int getNativeRate() const { return getSampleRate(); } /** * Return the "work title" of the model, if known. @@ -180,13 +180,13 @@ * Return the frame number of the reference model that corresponds * to the given frame number in this model. */ - virtual size_t alignToReference(size_t frame) const; + virtual int alignToReference(int frame) const; /** * Return the frame number in this model that corresponds to the * given frame number of the reference model. */ - virtual size_t alignFromReference(size_t referenceFrame) const; + virtual int alignFromReference(int referenceFrame) const; /** * Return the completion percentage for the alignment model: 100 @@ -214,9 +214,9 @@ QString extraAttributes = "") const; virtual QString toDelimitedDataString(QString delimiter) const { - return toDelimitedDataString(delimiter, getStartFrame(), getEndFrame()); + return toDelimitedDataStringSubset(delimiter, getStartFrame(), getEndFrame()); } - virtual QString toDelimitedDataString(QString, size_t /* f0 */, size_t /* f1 */) const { + virtual QString toDelimitedDataStringSubset(QString, int /* f0 */, int /* f1 */) const { return ""; } @@ -235,7 +235,7 @@ * Emitted when a model has been edited (or more data retrieved * from cache, in the case of a cached model that generates slowly) */ - void modelChanged(size_t startFrame, size_t endFrame); + void modelChanged(int startFrame, int endFrame); /** * Emitted when some internal processing has advanced a stage, but