Mercurial > hg > svcore
diff data/model/AlignmentModel.h @ 1038:cc27f35aa75c cxx11
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 | 13f53ecc8bb5 |
children | a1cd5abcb38b |
line wrap: on
line diff
--- a/data/model/AlignmentModel.h Tue Mar 03 09:33:59 2015 +0000 +++ b/data/model/AlignmentModel.h Tue Mar 03 15:18:24 2015 +0000 @@ -37,8 +37,8 @@ ~AlignmentModel(); virtual bool isOK() const; - virtual int getStartFrame() const; - virtual int getEndFrame() const; + virtual sv_frame_t getStartFrame() const; + virtual sv_frame_t getEndFrame() const; virtual int getSampleRate() const; virtual Model *clone() const; virtual bool isReady(int *completion = 0) const; @@ -49,8 +49,8 @@ const Model *getReferenceModel() const; const Model *getAlignedModel() const; - int toReference(int frame) const; - int fromReference(int frame) const; + sv_frame_t toReference(sv_frame_t frame) const; + sv_frame_t fromReference(sv_frame_t frame) const; void setPathFrom(SparseTimeValueModel *rawpath); void setPath(PathModel *path); @@ -61,12 +61,12 @@ signals: void modelChanged(); - void modelChangedWithin(int startFrame, int endFrame); + void modelChangedWithin(sv_frame_t startFrame, sv_frame_t endFrame); void completionChanged(); protected slots: void pathChanged(); - void pathChangedWithin(int startFrame, int endFrame); + void pathChangedWithin(sv_frame_t startFrame, sv_frame_t endFrame); void pathCompletionChanged(); protected: @@ -84,7 +84,7 @@ void constructPath() const; void constructReversePath() const; - int align(PathModel *path, int frame) const; + sv_frame_t align(PathModel *path, sv_frame_t frame) const; }; #endif