allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Fix master/monitor auto-connect

Browse Source 
When initially using a different backend, the engine does
not yet have a reference to the Session, and main busses
were not connected.
This commit is contained in:
Robin Gareus
2025-10-15 18:09:45 +02:00
parent df88d2f60c
commit 6e62c49749
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/ardour/port_manager.h
View File

@@ -146,7 +146,7 @@ public:
int disconnect (std::shared_ptr<Port>);
int disconnect (std::string const&);
int reestablish_ports ();
int reconnect_ports ();
int reconnect_ports (Session* s = nullptr);
bool connected (const std::string&);
bool physically_connected (const std::string&);

7
libs/ardour/port_manager.cc
View File

@@ -920,7 +920,7 @@ PortManager::set_pretty_names (std::vector<std::string> const& port_names, DataT
}
int
PortManager::reconnect_ports ()
PortManager::reconnect_ports (Session* s)
{
std::shared_ptr<Ports const> p = _ports.reader ();
@@ -928,7 +928,10 @@ PortManager::reconnect_ports ()
DEBUG_TRACE (DEBUG::Ports, string_compose ("reconnect %1 ports\n", p->size ()));
Session* s = AudioEngine::instance ()->session ();
if (!s) {
s = AudioEngine::instance ()->session ();
}
if (s && s->master_out() && !s->master_out ()->output()->has_ext_connection()) {
s->auto_connect_master_bus ();
}

2
libs/ardour/session.cc
View File

@@ -1670,7 +1670,7 @@ Session::hookup_io ()
/* Get everything connected */
AudioEngine::instance()->reconnect_ports ();
AudioEngine::instance()->reconnect_ports (this);
AfterConnect (); /* EMIT SIGNAL */