diff options
| author | Robin Gareus <robin@gareus.org> | 2017-09-19 18:40:29 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-09-19 18:40:29 +0200 |
| commit | 59ccf91eea357f9a202f9611e5e5927d7a02552d (patch) | |
| tree | 7899ccaac9ba7b97fd9380924b42c065289fd94d /libs/backends | |
| parent | ebf6856579af286cde2c7e9046b59ea2f0761603 (diff) | |
Revert some more frame/sample API issues
Diffstat (limited to 'libs/backends')
| -rw-r--r-- | libs/backends/jack/jack_session.cc | 2 | ||||
| -rw-r--r-- | libs/backends/jack/weak_libjack.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libs/backends/jack/jack_session.cc b/libs/backends/jack/jack_session.cc index b7d37a673f..778e23b7f6 100644 --- a/libs/backends/jack/jack_session.cc +++ b/libs/backends/jack/jack_session.cc @@ -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_samples_per_video_frame = _session->sample_rate() / _session->timecode_frames_per_second(); + pos->audio_frames_per_video_frame = _session->sample_rate() / _session->timecode_frames_per_second(); pos->valid = jack_position_bits_t (pos->valid | JackAudioVideoRatio); #endif diff --git a/libs/backends/jack/weak_libjack.h b/libs/backends/jack/weak_libjack.h index 6af3e9c351..88365dee7e 100644 --- a/libs/backends/jack/weak_libjack.h +++ b/libs/backends/jack/weak_libjack.h @@ -52,9 +52,9 @@ int have_libjack(void); #define jack_get_client_name WJACK_get_client_name #define jack_get_sample_rate WJACK_get_sample_rate #define jack_get_buffer_size WJACK_get_buffer_size -#define jack_frames_since_cycle_start WJACK_samples_since_cycle_start -#define jack_frame_time WJACK_sample_time -#define jack_last_frame_time WJACK_last_sample_time +#define jack_frames_since_cycle_start WJACK_frames_since_cycle_start +#define jack_frame_time WJACK_frame_time +#define jack_last_frame_time WJACK_last_frame_time #define jack_get_time WJACK_get_time #define jack_cpu_load WJACK_cpu_load #define jack_is_realtime WJACK_is_realtime @@ -115,7 +115,7 @@ int have_libjack(void); #define jack_set_thread_init_callback WJACK_set_thread_init_callback /* <jack/transport.h> */ -#define jack_get_current_transport_frame WJACK_get_current_transport_sample +#define jack_get_current_transport_frame WJACK_get_current_transport_frame #define jack_transport_locate WJACK_transport_locate #define jack_transport_start WJACK_transport_start #define jack_transport_stop WJACK_transport_stop |