summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2010-07-09 00:58:28 +0000
committerCarl Hetherington <carl@carlh.net>2010-07-09 00:58:28 +0000
commit876a8547e46bfe1cce58492f23a43355bf08bafd (patch)
treee6c4aefffd0045da79a04080e8340230f4f5cb62 /libs
parentc1dafd7c0e182cee66420260241759dfaa9467d5 (diff)
Send both MTC and MMC locates on auto-return. Should fix #3303.
git-svn-id: svn://localhost/ardour2/branches/3.0@7399 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r--libs/ardour/session_transport.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index c73677a932..f737b194c0 100644
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -182,12 +182,6 @@ Session::realtime_stop (bool abort, bool clear_state)
/* assume that when we start, we'll be moving forwards */
- // FIXME: where should this really be? [DR]
- //send_full_time_code();
-
- MIDI::Manager::instance()->mmc()->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdStop));
- send_mmc_locate (_transport_frame);
-
if (_transport_speed < 0.0f) {
todo = (PostTransportWork (todo | PostTransportStop | PostTransportReverse));
} else {
@@ -564,6 +558,8 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
have_looped = false;
send_full_time_code (_transport_frame);
+ MIDI::Manager::instance()->mmc()->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdStop));
+ send_mmc_locate (_transport_frame);
if ((ptw & PostTransportLocate) && get_record_enabled()) {
/* capture start has been changed, so save pending state */