diff options
author | Robin Gareus <robin@gareus.org> | 2018-05-22 20:32:13 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2018-07-09 17:30:38 +0200 |
commit | 2953b575f243a6fc2e863f3289c366b21f9c3f3e (patch) | |
tree | dbf3e81511f85a9d9f9deca7a02de97074b2637b /libs/ardour/session.cc | |
parent | 249640267cc9afa7b0f048d56b7e961af6441111 (diff) |
Remove unused AutoLoopDeclick, PendingLoopDeclick
The flags were set, but not used. They also won't be needed anymore.
Diffstat (limited to 'libs/ardour/session.cc')
-rw-r--r-- | libs/ardour/session.cc | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index fa2235aac6..789c313ae6 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -846,7 +846,6 @@ Session::destroy () bool del = true; switch (ev->type) { case SessionEvent::AutoLoop: - case SessionEvent::AutoLoopDeclick: case SessionEvent::Skip: case SessionEvent::PunchIn: case SessionEvent::PunchOut: @@ -1693,34 +1692,17 @@ Session::auto_loop_changed (Location* location) samplecnt_t dcl; auto_loop_declick_range (location, dcp, dcl); - if (transport_rolling() && play_loop) { + bool rolling = transport_rolling (); - replace_event (SessionEvent::AutoLoopDeclick, dcp, dcl); - - // if (_transport_sample > location->end()) { + if (rolling && play_loop) { if (_transport_sample < location->start() || _transport_sample > location->end()) { // relocate to beginning of loop clear_events (SessionEvent::LocateRoll); - request_locate (location->start(), true); } - else if (Config->get_seamless_loop() && !loop_changing) { - - // schedule a locate-roll to refill the disk readers at the - // previous loop end - loop_changing = true; - - if (location->end() > last_loopend) { - clear_events (SessionEvent::LocateRoll); - SessionEvent *ev = new SessionEvent (SessionEvent::LocateRoll, SessionEvent::Add, last_loopend, last_loopend, 0, true); - queue_event (ev); - } - - } } else { - clear_events (SessionEvent::AutoLoopDeclick); clear_events (SessionEvent::AutoLoop); } @@ -1730,13 +1712,12 @@ Session::auto_loop_changed (Location* location) samplepos_t pos; - if (!transport_rolling() && select_playhead_priority_target (pos)) { + if (!rolling && select_playhead_priority_target (pos)) { if (pos == location->start()) { request_locate (pos); } } - last_loopend = location->end(); set_dirty (); } @@ -1809,7 +1790,6 @@ Session::set_auto_loop_location (Location* location) samplepos_t dcp; samplecnt_t dcl; auto_loop_declick_range (existing, dcp, dcl); - remove_event (dcp, SessionEvent::AutoLoopDeclick); auto_loop_location_changed (0); } |