Mercurial > hg > svcore
diff base/ViewManagerBase.h @ 1057:5c5d4863b428 tonioni
Merge from cxx11 branch
author | Chris Cannam |
---|---|
date | Mon, 23 Mar 2015 11:26:28 +0000 |
parents | fe39581d249b |
children | 8541563f1fd3 |
line wrap: on
line diff
--- a/base/ViewManagerBase.h Mon Mar 23 10:04:48 2015 +0000 +++ b/base/ViewManagerBase.h Mon Mar 23 11:26:28 2015 +0000 @@ -37,15 +37,15 @@ virtual void setAudioPlaySource(AudioPlaySource *source) = 0; - virtual int alignPlaybackFrameToReference(int) const = 0; - virtual int alignReferenceToPlaybackFrame(int) const = 0; + virtual sv_frame_t alignPlaybackFrameToReference(sv_frame_t) const = 0; + virtual sv_frame_t alignReferenceToPlaybackFrame(sv_frame_t) const = 0; virtual const MultiSelection &getSelection() const = 0; virtual const MultiSelection::SelectionList &getSelections() const = 0; - virtual int constrainFrameToSelection(int frame) const = 0; + virtual sv_frame_t constrainFrameToSelection(sv_frame_t frame) const = 0; virtual Selection getContainingSelection - (int frame, bool defaultToFollowing) const = 0; + (sv_frame_t frame, bool defaultToFollowing) const = 0; virtual bool getPlayLoopMode() const = 0; virtual bool getPlaySelectionMode() const = 0;