diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-18 12:39:17 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-18 12:39:17 -0400 |
| commit | 30b087ab3d28f1585987fa3f6ae006562ae192e3 (patch) | |
| tree | 620ae0250b5d77f90a18f8c2b83be61e4fe7b0b5 /libs/backends/jack/jack_session.cc | |
| parent | cb956e3e480716a3efd280a5287bdd7bee1cedc5 (diff) | |
globally change all use of "frame" to refer to audio into "sample".
Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode
and video in order to keep the legible
Diffstat (limited to 'libs/backends/jack/jack_session.cc')
| -rw-r--r-- | libs/backends/jack/jack_session.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/backends/jack/jack_session.cc b/libs/backends/jack/jack_session.cc index ce325321f3..b7d37a673f 100644 --- a/libs/backends/jack/jack_session.cc +++ b/libs/backends/jack/jack_session.cc @@ -114,14 +114,14 @@ JACKSession::timebase_callback (jack_transport_state_t /*state*/, { Timecode::BBT_Time bbt; TempoMap& tempo_map (_session->tempo_map()); - framepos_t tf = _session->transport_frame (); + samplepos_t tf = _session->transport_sample (); /* BBT info */ TempoMetric metric (tempo_map.metric_at (tf)); try { - bbt = tempo_map.bbt_at_frame (tf); + bbt = tempo_map.bbt_at_sample (tf); pos->bar = bbt.bars; pos->beat = bbt.beats; @@ -142,7 +142,7 @@ JACKSession::timebase_callback (jack_transport_state_t /*state*/, #ifdef HAVE_JACK_VIDEO_SUPPORT //poke audio video ratio so Ardour can track Video Sync - pos->audio_frames_per_video_frame = _session->frame_rate() / _session->timecode_frames_per_second(); + pos->audio_samples_per_video_frame = _session->sample_rate() / _session->timecode_frames_per_second(); pos->valid = jack_position_bits_t (pos->valid | JackAudioVideoRatio); #endif |