Send both MTC and MMC locates on auto-return. Should fix #3303.
authorCarl Hetherington <carl@carlh.net>
Fri, 9 Jul 2010 00:58:28 +0000 (00:58 +0000)
committerCarl Hetherington <carl@carlh.net>
Fri, 9 Jul 2010 00:58:28 +0000 (00:58 +0000)
git-svn-id: svn://localhost/ardour2/branches/3.0@7399 d708f5d6-7413-0410-9779-e7cbd77b26cf

libs/ardour/session_transport.cc

index c73677a9324c63d8e2d72c1b040f4899d154e7f4..f737b194c09605b36065d8b2006fddfb32ec6ed2 100644 (file)
@@ -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 */