diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2019-09-20 14:11:53 -0600 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2019-09-22 12:23:54 -0600 |
| commit | 0869f638662a557277ba661cd297775fe0a8ab19 (patch) | |
| tree | d8a6e9f14551971a58656f631f509aca18037360 | |
| parent | 057ce335635ebf87e5507f7d78379eb36cc66ef1 (diff) | |
transport master deletion is no longer in parallel with process()
| -rw-r--r-- | libs/ardour/mtc_slave.cc | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/libs/ardour/mtc_slave.cc b/libs/ardour/mtc_slave.cc index 048ac95455..fd23b5f267 100644 --- a/libs/ardour/mtc_slave.cc +++ b/libs/ardour/mtc_slave.cc @@ -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); } } |