# HG changeset patch # User Chris Cannam # Date 1394559302 0 # Node ID b2ca08d16293805f4e4b6e135a659efe8fd1fe95 # Parent 1e3af7f4fa86cfb8cba91bc1c9fc2d92497aee5b# Parent 46b24009ce7a633a5150592720e192481e5adbb6 Merge from default branch diff -r 1e3af7f4fa86 -r b2ca08d16293 audioio/PlaySpeedRangeMapper.cpp --- 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; diff -r 1e3af7f4fa86 -r b2ca08d16293 audioio/PlaySpeedRangeMapper.h --- 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;