summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour
diff options
context:
space:
mode:
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r--libs/ardour/ardour/audio_diskstream.h2
-rw-r--r--libs/ardour/ardour/interpolation.h4
-rw-r--r--libs/ardour/ardour/session.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/ardour/audio_diskstream.h b/libs/ardour/ardour/audio_diskstream.h
index ecced007cf..401ed9ec19 100644
--- a/libs/ardour/ardour/audio_diskstream.h
+++ b/libs/ardour/ardour/audio_diskstream.h
@@ -146,7 +146,7 @@ class AudioDiskstream : public Diskstream
}
}
- FixedPointLinearInterpolation interpolation;
+ LinearInterpolation interpolation;
XMLNode* deprecated_io_node;
diff --git a/libs/ardour/ardour/interpolation.h b/libs/ardour/ardour/interpolation.h
index e398171d2b..1ebdafefa2 100644
--- a/libs/ardour/ardour/interpolation.h
+++ b/libs/ardour/ardour/interpolation.h
@@ -13,9 +13,9 @@ class Interpolation {
double _speed, _target_speed;
public:
- Interpolation () { _speed = 1.0; }
+ Interpolation () { _speed = 1.0; _target_speed = 1.0; }
- void set_speed (double new_speed) { _speed = new_speed; }
+ void set_speed (double new_speed) { _speed = new_speed; _target_speed = new_speed; }
void set_target_speed (double new_speed) { _target_speed = new_speed; }
double target_speed() const { return _target_speed; }
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 7669883185..03112fb022 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -1016,7 +1016,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
volatile double _transport_speed;
double _last_transport_speed;
double _target_transport_speed;
- FixedPointLinearInterpolation interpolation;
+ LinearInterpolation interpolation;
bool auto_play_legal;
nframes_t _last_slave_transport_frame;