diff options
| author | Hans Baier <hansfbaier@googlemail.com> | 2009-06-10 00:03:47 +0000 |
|---|---|---|
| committer | Hans Baier <hansfbaier@googlemail.com> | 2009-06-10 00:03:47 +0000 |
| commit | 43340cd37ce91752f80b776d905e1b0d103c89ef (patch) | |
| tree | a4aa17688238e96d686ba7435e88eccfa4000ff9 /libs/ardour/session_transport.cc | |
| parent | f284d28d5306114e9badc9077835683e541420e0 (diff) | |
* Refactor varispeed playback into own class, replace fixed-point arithmetic by double, fix unit tests for libardour
git-svn-id: svn://localhost/ardour2/branches/3.0@5145 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session_transport.cc')
| -rw-r--r-- | libs/ardour/session_transport.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc index 31dc52a11b..34b1e825d9 100644 --- a/libs/ardour/session_transport.cc +++ b/libs/ardour/session_transport.cc @@ -176,9 +176,7 @@ Session::realtime_stop (bool abort) reset_slave_state (); _transport_speed = 0; - phi = 0; - target_phi = 0; - phase = 0; + _target_transport_speed = 0; if (config.get_use_video_sync()) { waiting_for_sync_offset = true; @@ -804,7 +802,7 @@ Session::set_transport_speed (double speed, bool abort) return; } - target_phi = (uint64_t) (0x1000000 * fabs(speed)); + _target_transport_speed = fabs(speed); /* 8.0 max speed is somewhat arbitrary but based on guestimates regarding disk i/o capability and user needs. We really need CD-style "skip" playback for ffwd and rewind. @@ -987,9 +985,7 @@ Session::start_transport () transport_sub_state |= PendingDeclickIn; _transport_speed = 1.0; - target_phi = 0x1000000; // speed = 1 - phi = target_phi; - phase = 0; + _target_transport_speed = 1.0; boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader(); for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) { |