diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-10-05 17:03:23 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-10-05 17:03:23 +0000 |
| commit | c72611e1cdf1d8db76bf44a5eb6f356672ea8dfc (patch) | |
| tree | 84c30e4d7cef9791183b2d2c758e8e9d9c390993 /libs/ardour/diskstream.cc | |
| parent | 17ebbb9d3f2f361479da8f150495ec0d773fe153 (diff) | |
fixes for scrubbing, change "crop" to Crop in menu
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2516 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/diskstream.cc')
| -rw-r--r-- | libs/ardour/diskstream.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc index c9c11cc92d..2a307b1f31 100644 --- a/libs/ardour/diskstream.cc +++ b/libs/ardour/diskstream.cc @@ -109,6 +109,7 @@ Diskstream::init (Flag f) speed_buffer_size = 0; last_phase = 0; phi = (uint64_t) (0x1000000); + target_phi = phi; file_frame = 0; playback_sample = 0; playback_distance = 0; @@ -151,8 +152,7 @@ Diskstream::handle_input_change (IOChange change, void *src) void Diskstream::non_realtime_set_speed () { - if (_buffer_reallocation_required) - { + if (_buffer_reallocation_required) { Glib::Mutex::Lock lm (state_lock); allocate_temporary_buffers (); @@ -192,7 +192,7 @@ Diskstream::realtime_set_speed (double sp, bool global) } _actual_speed = new_speed; - phi = (uint64_t) (0x1000000 * fabs(_actual_speed)); + target_phi = (uint64_t) (0x1000000 * fabs(_actual_speed)); } if (changed) { |