smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-11 09:06:33 +01:00
Code Issues Projects Releases Wiki Activity

fix up and re-enable MTC transmission

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@3158 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2008-03-19 18:10:51 +00:00
parent d9faaed2c1
commit 4808f7fe8b
4 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libs/ardour/session_midi.cc
View file

@ -748,14 +748,9 @@ Session::send_midi_time_code_for_cycle(nframes_t nframes)
assert (next_quarter_frame_to_send >= 0); assert (next_quarter_frame_to_send >= 0);
assert (next_quarter_frame_to_send <= 7); assert (next_quarter_frame_to_send <= 7);
if (next_quarter_frame_to_send < 0)
{
printf("Negative????\n");
}
if (_mtc_port == 0 || !session_send_mtc || transmitting_smpte_time.negative if (_mtc_port == 0 || !session_send_mtc || transmitting_smpte_time.negative
/*|| (next_quarter_frame_to_send < 0)*/ ) { /*|| (next_quarter_frame_to_send < 0)*/ ) {
//printf("(MTC) Not sending MTC\n"); // cerr << "(MTC) Not sending MTC\n";
return 0; return 0;
} }

8
libs/ardour/session_process.cc
View file

@ -335,7 +335,9 @@ Session::process_with_events (nframes_t nframes)
return; return;
} }
if (!_exporting) {
send_midi_time_code_for_cycle(nframes); send_midi_time_code_for_cycle(nframes);
}
if (actively_recording()) { if (actively_recording()) {
stop_limit = max_frames; stop_limit = max_frames;
@ -754,8 +756,6 @@ Session::process_without_events (nframes_t nframes)
if (!follow_slave (nframes, 0)) { if (!follow_slave (nframes, 0)) {
return; return;
} }
send_midi_time_code_for_cycle(nframes);
} }
if (_transport_speed == 0) { if (_transport_speed == 0) {
@ -763,6 +763,10 @@ Session::process_without_events (nframes_t nframes)
return; return;
} }
if (!_exporting) {
send_midi_time_code_for_cycle(nframes);
}
if (actively_recording()) { if (actively_recording()) {
stop_limit = max_frames; stop_limit = max_frames;
} else { } else {

2
libs/ardour/session_state.cc
View file

@ -352,7 +352,7 @@ Session::second_stage_init (bool new_session)
BootMessage (_("Reset Remote Controls")); BootMessage (_("Reset Remote Controls"));
//send_full_time_code (); send_full_time_code (0);
_engine.transport_locate (0); _engine.transport_locate (0);
deliver_mmc (MIDI::MachineControl::cmdMmcReset, 0); deliver_mmc (MIDI::MachineControl::cmdMmcReset, 0);
deliver_mmc (MIDI::MachineControl::cmdLocate, 0); deliver_mmc (MIDI::MachineControl::cmdLocate, 0);