From 07d74fb21bf70a6fbc24217e558e934cc428acf0 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 31 Aug 2010 16:01:42 +0000 Subject: [PATCH] don't set jack transport position frame (violates JACK API); clean up other related code git-svn-id: svn://localhost/ardour2/branches/3.0@7723 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/session_time.cc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libs/ardour/session_time.cc b/libs/ardour/session_time.cc index 609b1d7fa8..7fb5b677ea 100644 --- a/libs/ardour/session_time.cc +++ b/libs/ardour/session_time.cc @@ -493,10 +493,9 @@ Session::jack_timebase_callback (jack_transport_state_t /*state*/, { BBT_Time bbt; - /* frame info */ - - pos->frame = _transport_frame; - pos->valid = JackPositionTimecode; + if (pos->frame != _transport_frame) { + cerr << "ARDOUR says " << _transport_frame << " JACK says " << pos->frame << endl; + } /* BBT info */ @@ -528,8 +527,9 @@ Session::jack_timebase_callback (jack_transport_state_t /*state*/, #if 0 /* Timecode info */ - t.timecode_offset = _timecode_offset; + pos->timecode_offset = _timecode_offset; t.timecode_frame_rate = timecode_frames_per_second(); + pos->valid = jack_position_bits_t (pos->valid | JackPositionTimecode; if (_transport_speed) { @@ -561,7 +561,6 @@ Session::jack_timebase_callback (jack_transport_state_t /*state*/, } } - #endif }