13
0

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
This commit is contained in:
Paul Davis 2010-08-31 16:01:42 +00:00
parent 1ba9060c44
commit 07d74fb21b

View File

@ -493,10 +493,9 @@ Session::jack_timebase_callback (jack_transport_state_t /*state*/,
{ {
BBT_Time bbt; BBT_Time bbt;
/* frame info */ if (pos->frame != _transport_frame) {
cerr << "ARDOUR says " << _transport_frame << " JACK says " << pos->frame << endl;
pos->frame = _transport_frame; }
pos->valid = JackPositionTimecode;
/* BBT info */ /* BBT info */
@ -528,8 +527,9 @@ Session::jack_timebase_callback (jack_transport_state_t /*state*/,
#if 0 #if 0
/* Timecode info */ /* Timecode info */
t.timecode_offset = _timecode_offset; pos->timecode_offset = _timecode_offset;
t.timecode_frame_rate = timecode_frames_per_second(); t.timecode_frame_rate = timecode_frames_per_second();
pos->valid = jack_position_bits_t (pos->valid | JackPositionTimecode;
if (_transport_speed) { if (_transport_speed) {
@ -561,7 +561,6 @@ Session::jack_timebase_callback (jack_transport_state_t /*state*/,
} }
} }
#endif #endif
} }