smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-21 22:26:29 +01:00
Code Issues Projects Releases Wiki Activity

MTC generator, revert inert changes in previous commit.

Browse source 
This if() case is always true - ensured by assert().

git-svn-id: svn://localhost/ardour2/branches/3.0@13807 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Robin Gareus 2013-01-08 00:45:00 +00:00
parent 44a427f0f9
commit 1b66aa8605
1 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

28
libs/ardour/session_midi.cc
View file

@ -509,25 +509,23 @@ Session::send_midi_time_code_for_cycle (framepos_t start_frame, framepos_t end_f
assert (msg_time >= start_frame); assert (msg_time >= start_frame);
assert (msg_time < end_frame); assert (msg_time < end_frame);
if (msg_time >= start_frame) { /* convert from session frames back to JACK frames using the transport speed */
/* convert from session frames back to JACK frames using the transport speed */ pframes_t const out_stamp = (msg_time - start_frame) / _transport_speed;
pframes_t const out_stamp = (msg_time - start_frame) / _transport_speed; assert (out_stamp < nframes);
assert (out_stamp < nframes);
if (MIDI::Manager::instance()->mtc_output_port()->midimsg (mtc_msg, 2, out_stamp)) { if (MIDI::Manager::instance()->mtc_output_port()->midimsg (mtc_msg, 2, out_stamp)) {
error << string_compose(_("Session: cannot send quarter-frame MTC message (%1)"), strerror (errno)) error << string_compose(_("Session: cannot send quarter-frame MTC message (%1)"), strerror (errno))
<< endmsg; << endmsg;
return -1; return -1;
} }
#ifndef NDEBUG #ifndef NDEBUG
DEBUG_STR_DECL(foo) DEBUG_STR_DECL(foo)
DEBUG_STR_APPEND(foo,"sending "); DEBUG_STR_APPEND(foo,"sending ");
DEBUG_STR_APPEND(foo, transmitting_timecode_time); DEBUG_STR_APPEND(foo, transmitting_timecode_time);
DEBUG_TRACE (DEBUG::MTC, string_compose ("%1 qfm = %2, stamp = %3\n", DEBUG_STR(foo).str(), next_quarter_frame_to_send, DEBUG_TRACE (DEBUG::MTC, string_compose ("%1 qfm = %2, stamp = %3\n", DEBUG_STR(foo).str(), next_quarter_frame_to_send,
out_stamp)); out_stamp));
#endif #endif
}
// Increment quarter frame counter // Increment quarter frame counter
next_quarter_frame_to_send++; next_quarter_frame_to_send++;