From 62f9edfc072ace5ce2b8aac808bdf4c9abeb7c0f Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 3 Nov 2021 15:15:54 -0600 Subject: [PATCH] Remove TransportMasterManager::reconnect_ports(). PortManager::reconnect_ports() covers all ports, and this method was only used directly after a call to PortManager::reconnect_ports(). --- libs/ardour/ardour/transport_master_manager.h | 2 -- libs/ardour/session.cc | 2 +- libs/ardour/transport_master_manager.cc | 13 ------------- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/libs/ardour/ardour/transport_master_manager.h b/libs/ardour/ardour/transport_master_manager.h index 6f40abe3c3..9621422cec 100644 --- a/libs/ardour/ardour/transport_master_manager.h +++ b/libs/ardour/ardour/transport_master_manager.h @@ -85,8 +85,6 @@ class LIBARDOUR_API TransportMasterManager : public boost::noncopyable static const std::string state_node_name; - void reconnect_ports (); - void block_disk_output (); void unblock_disk_output (); void reinit (double speed, samplepos_t pos); diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 958e84617f..a6bb73721d 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -1335,7 +1335,7 @@ Session::hookup_io () */ AudioEngine::instance()->reconnect_ports (); - TransportMasterManager::instance().reconnect_ports (); + AfterConnect (); /* EMIT SIGNAL */ /* Anyone who cares about input state, wake up and do something */ diff --git a/libs/ardour/transport_master_manager.cc b/libs/ardour/transport_master_manager.cc index 1273ae3639..71c7c93f56 100644 --- a/libs/ardour/transport_master_manager.cc +++ b/libs/ardour/transport_master_manager.cc @@ -740,19 +740,6 @@ TransportMasterManager::restart () } } -void -TransportMasterManager::reconnect_ports () -{ - DEBUG_TRACE (DEBUG::Slave, "reconnecting all transport master ports\n"); - { - Glib::Threads::RWLock::ReaderLock lm (lock); - - for (TransportMasters::const_iterator tm = _transport_masters.begin(); tm != _transport_masters.end(); ++tm) { - (*tm)->connect_port_using_state (); - } - } -} - void TransportMasterManager::block_disk_output () {