transport master deletion is no longer in parallel with process()
authorPaul Davis <paul@linuxaudiosystems.com>
Fri, 20 Sep 2019 20:11:53 +0000 (14:11 -0600)
committerPaul Davis <paul@linuxaudiosystems.com>
Sun, 22 Sep 2019 18:23:54 +0000 (12:23 -0600)
libs/ardour/mtc_slave.cc

index 048ac95455e742135e07248899c5e20eefcbe7a9..fd23b5f2678b572a3bf3d44e69a885d1e77cabd0 100644 (file)
@@ -78,17 +78,7 @@ MTC_TransportMaster::~MTC_TransportMaster()
        port_connections.drop_connections();
        config_connection.disconnect();
 
-       while (busy_guard1 != busy_guard2) {
-               /* make sure MIDI parser is not currently calling any callbacks in here,
-                * else there's a segfault ahead!
-                *
-                * XXX this is called from jack rt-context :(
-                * TODO fix libs/ardour/session_transport.cc:1321 (delete _slave;)
-                */
-               sched_yield();
-       }
-
-       if (did_reset_tc_format) {
+       if (_session && did_reset_tc_format) {
                _session->config.set_timecode_format (saved_tc_format);
        }
 }