diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2019-11-11 18:21:47 -0700 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2019-11-15 16:04:58 -0700 |
| commit | c69227fd8ddc73f3d98a7959f5b71fd1df6a4017 (patch) | |
| tree | 974b1fe3fa0f13d3e03236e1b6b4d5d34829ede4 /libs/backends | |
| parent | 2f87b111e55b8eeb975de150941127dd54b6ee3f (diff) | |
eliminate hacky design for being able to deliver the correct time as JACK timebase master
Diffstat (limited to 'libs/backends')
| -rw-r--r-- | libs/backends/jack/jack_session.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libs/backends/jack/jack_session.cc b/libs/backends/jack/jack_session.cc index 2ea6ae9f6b..f3c5c2553f 100644 --- a/libs/backends/jack/jack_session.cc +++ b/libs/backends/jack/jack_session.cc @@ -115,7 +115,13 @@ JACKSession::timebase_callback (jack_transport_state_t /*state*/, { Timecode::BBT_Time bbt; TempoMap& tempo_map (_session->tempo_map()); - samplepos_t tf = _session->transport_sample (); + samplepos_t tf; + + /* see commit msg for e2c26e1b9 and Session::start_locate() for + details. + */ + + tf = _session->nominal_jack_transport_sample().value_or (_session->transport_sample()); /* BBT info */ @@ -191,4 +197,3 @@ JACKSession::timebase_callback (jack_transport_state_t /*state*/, } #endif } - |