smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 15:54:57 +01:00
Code Issues Projects Releases Wiki Activity

fix API and use of Session::force_locate()

Browse source 
Because of the addition of LocateTransportDisposition, this call was unconditionally forcing a roll during startup
This commit is contained in:
Paul Davis 2020-01-20 11:07:27 -07:00
parent 120be1576a
commit ad82b443f4
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/ardour/ardour/session.h
View file

@ -1686,7 +1686,7 @@ private:
void flush_all_inserts (); void flush_all_inserts ();
int micro_locate (samplecnt_t distance); int micro_locate (samplecnt_t distance);
void force_locate (samplepos_t sample, bool with_roll = false); void force_locate (samplepos_t sample, LocateTransportDisposition);
void set_transport_speed (double speed, samplepos_t destination_sample, bool abort = false, bool clear_state = false, bool as_default = false); void set_transport_speed (double speed, samplepos_t destination_sample, bool abort = false, bool clear_state = false, bool as_default = false);
void realtime_stop (bool abort, bool clear_state); void realtime_stop (bool abort, bool clear_state);
void realtime_locate (bool); void realtime_locate (bool);

2
libs/ardour/session_state.cc
View file

@ -436,7 +436,7 @@ Session::session_loaded ()
/* Now, finally, we can fill the playback buffers */ /* Now, finally, we can fill the playback buffers */
BootMessage (_("Filling playback buffers")); BootMessage (_("Filling playback buffers"));
force_locate (_transport_sample, false); force_locate (_transport_sample, MustStop);
} }
string string

7
libs/ardour/session_transport.cc
View file

@ -946,10 +946,11 @@ Session::request_locate (samplepos_t target_sample, LocateTransportDisposition l
} }
void void
Session::force_locate (samplepos_t target_sample, bool with_roll) Session::force_locate (samplepos_t target_sample, LocateTransportDisposition ltd)
{ {
SessionEvent *ev = new SessionEvent (with_roll ? SessionEvent::LocateRoll : SessionEvent::Locate, SessionEvent::Add, SessionEvent::Immediate, target_sample, 0, true); SessionEvent *ev = new SessionEvent (SessionEvent::Locate, SessionEvent::Add, SessionEvent::Immediate, target_sample, 0, true);
DEBUG_TRACE (DEBUG::Transport, string_compose ("Request forced locate to %1\n", target_sample)); ev->locate_transport_disposition = ltd;
DEBUG_TRACE (DEBUG::Transport, string_compose ("Request forced locate to %1 roll %2\n", target_sample, enum_2_string (ltd)));
queue_event (ev); queue_event (ev);
} }