Mercurial > hg > svapp
changeset 338:b2ca08d16293 tony_integration
Merge from default branch
| author | Chris Cannam |
|---|---|
| date | Tue, 11 Mar 2014 17:35:02 +0000 |
| parents | 1e3af7f4fa86 (current diff) 46b24009ce7a (diff) |
| children | c11701af6bb4 |
| files | |
| diffstat | 2 files changed, 17 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/audioio/PlaySpeedRangeMapper.cpp Tue Mar 11 17:34:53 2014 +0000 +++ b/audioio/PlaySpeedRangeMapper.cpp Tue Mar 11 17:35:02 2014 +0000 @@ -34,6 +34,13 @@ } int +PlaySpeedRangeMapper::getPositionForValueUnclamped(float value) const +{ + // We don't really provide this + return getPositionForValue(value); +} + +int PlaySpeedRangeMapper::getPositionForFactor(float factor) const { bool slow = (factor > 1.0); @@ -65,6 +72,13 @@ } float +PlaySpeedRangeMapper::getValueForPositionUnclamped(int position) const +{ + // We don't really provide this + return getValueForPosition(position); +} + +float PlaySpeedRangeMapper::getValueForFactor(float factor) const { float pc;
--- a/audioio/PlaySpeedRangeMapper.h Tue Mar 11 17:34:53 2014 +0000 +++ b/audioio/PlaySpeedRangeMapper.h Tue Mar 11 17:35:02 2014 +0000 @@ -24,7 +24,10 @@ PlaySpeedRangeMapper(int minpos, int maxpos); virtual int getPositionForValue(float value) const; + virtual int getPositionForValueUnclamped(float value) const; + virtual float getValueForPosition(int position) const; + virtual float getValueForPositionUnclamped(int position) const; int getPositionForFactor(float factor) const; float getValueForFactor(float factor) const;