ardour/livetrax
13
0
Fork 0
Code

do not send MMC DeferredPlay or Stop commands if slaving to MTC when transport starts or stops

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8617 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-01-30 04:51:28 +00:00
parent 076e85cdda
commit a2e2412883
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libs/ardour/session_transport.cc
View File

@ -578,8 +578,11 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
have_looped = false; have_looped = false;
send_full_time_code (_transport_frame); send_full_time_code (_transport_frame);
MIDI::Manager::instance()->mmc()->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdStop));
send_mmc_locate (_transport_frame); if (!dynamic_cast<MTC_Slave*>(_slave)) {
MIDI::Manager::instance()->mmc()->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdStop));
send_mmc_locate (_transport_frame);
}
if ((ptw & PostTransportLocate) && get_record_enabled()) { if ((ptw & PostTransportLocate) && get_record_enabled()) {
/* capture start has been changed, so save pending state */ /* capture start has been changed, so save pending state */
@ -1147,9 +1150,11 @@ Session::start_transport ()
(*i)->automation_snapshot (_transport_frame, true); (*i)->automation_snapshot (_transport_frame, true);
} }
Timecode::Time time; Timecode::Time time;
timecode_time_subframes (_transport_frame, time); timecode_time_subframes (_transport_frame, time);
MIDI::Manager::instance()->mmc()->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdDeferredPlay)); if (!dynamic_cast<MTC_Slave*>(_slave)) {
MIDI::Manager::instance()->mmc()->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdDeferredPlay));
}
TransportStateChange (); /* EMIT SIGNAL */ TransportStateChange (); /* EMIT SIGNAL */
} }