diff options
| author | David Robillard <d@drobilla.net> | 2006-09-19 03:29:16 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-09-19 03:29:16 +0000 |
| commit | 7bd41538d951c3e476655df741adfbebbb990bde (patch) | |
| tree | f9988f959571c75535341ab1de463b7cfc5209e3 /libs/ardour/session_time.cc | |
| parent | c7307c09b8584b15610f0b29a40f839d9183419a (diff) | |
Merged with trunk R920.
git-svn-id: svn://localhost/ardour2/branches/midi@921 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session_time.cc')
| -rw-r--r-- | libs/ardour/session_time.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/ardour/session_time.cc b/libs/ardour/session_time.cc index c74d3021cb..887a9fa6c4 100644 --- a/libs/ardour/session_time.cc +++ b/libs/ardour/session_time.cc @@ -51,7 +51,7 @@ Session::bbt_time (jack_nframes_t when, BBT_Time& bbt) void Session::sync_time_vars () { - _current_frame_rate = _base_frame_rate * (1.0 + (video_pullup/100.0) ); + _current_frame_rate = (jack_nframes_t) round (_base_frame_rate * (1.0 + (video_pullup/100.0))); _frames_per_hour = _current_frame_rate * 3600; _frames_per_smpte_frame = (double) _current_frame_rate / (double) smpte_frames_per_second; _smpte_frames_per_hour = (unsigned long) (smpte_frames_per_second * 3600.0); @@ -432,9 +432,11 @@ Session::jack_timebase_callback (jack_transport_state_t state, pos->valid = jack_position_bits_t (pos->valid | JackPositionBBT); } +#ifdef HAVE_JACK_VIDEO_SUPPORT //poke audio video ratio so Ardour can track Video Sync pos->audio_frames_per_video_frame = frame_rate() / smpte_frames_per_second; pos->valid = jack_position_bits_t (pos->valid | JackAudioVideoRatio); +#endif #if 0 /* SMPTE info */ |