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

Auto-connect metronome when using a device the first time

Browse Source
This commit is contained in:
Robin Gareus
2023-06-26 21:45:28 +02:00
parent fbc776de52
commit 25f5b275f4
3 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/ardour/ardour/session.h
View File

@@ -2143,8 +2143,8 @@ private:
Clicks clicks;
bool _clicking;
bool _click_rec_only;
std::shared_ptr<IO> _click_io;
std::shared_ptr<Amp> _click_gain;
std::shared_ptr<IO> _click_io;
std::shared_ptr<Amp> _click_gain;
Sample* click_data;
Sample* click_emphasis_data;
samplecnt_t click_length;
@@ -2196,6 +2196,7 @@ private:
friend class PortManager;
void auto_connect_master_bus ();
void auto_connect_monitor_bus ();
void auto_connect_io (std::shared_ptr<IO>);
void setup_route_monitor_sends (bool enable, bool need_process_lock);

4
libs/ardour/port_manager.cc
View File

@@ -925,6 +925,10 @@ PortManager::reconnect_ports ()
if (s && s->monitor_out() && !s->monitor_out ()->output()->has_ext_connection()) {
s->auto_connect_monitor_bus ();
}
if (s && s->click_io() && !s->click_io ()->has_ext_connection()) {
s->auto_connect_io (s->click_io());
}
for (auto const& i : *p) {
if (i.second->reconnect ()) {

54
libs/ardour/session.cc
View File

@@ -995,6 +995,33 @@ Session::get_physical_ports (vector<string>& inputs, vector<string>& outputs, Da
_engine.get_physical_outputs (type, outputs, include, exclude);
}
void
Session::auto_connect_io (std::shared_ptr<IO> io)
{
vector<string> outputs[DataType::num_types];
for (uint32_t i = 0; i < DataType::num_types; ++i) {
_engine.get_physical_outputs (DataType (DataType::Symbol (i)), outputs[i]);
}
uint32_t limit = io->n_ports ().n_total ();
for (uint32_t n = 0; n < limit; ++n) {
std::shared_ptr<Port> p = io->nth (n);
string connect_to;
if (outputs[p->type()].size() > n) {
connect_to = outputs[p->type()][n];
}
if (connect_to.empty() || p->connected_to (connect_to)) {
continue;
}
if (io->connect (p, connect_to, this)) {
error << string_compose (_("cannot connect %1 output %2 to %3"), io->name(), n, connect_to) << endmsg;
break;
}
}
}
void
Session::auto_connect_master_bus ()
@@ -1003,31 +1030,8 @@ Session::auto_connect_master_bus ()
return;
}
/* if requested auto-connect the outputs to the first N physical ports.
*/
uint32_t limit = _master_out->n_outputs().n_total();
vector<string> outputs[DataType::num_types];
for (uint32_t i = 0; i < DataType::num_types; ++i) {
_engine.get_physical_outputs (DataType (DataType::Symbol (i)), outputs[i]);
}
for (uint32_t n = 0; n < limit; ++n) {
std::shared_ptr<Port> p = _master_out->output()->nth (n);
string connect_to;
if (outputs[p->type()].size() > n) {
connect_to = outputs[p->type()][n];
}
if (!connect_to.empty() && p->connected_to (connect_to) == false) {
if (_master_out->output()->connect (p, connect_to, this)) {
error << string_compose (_("cannot connect master output %1 to %2"), n, connect_to)
<< endmsg;
break;
}
}
}
/* if requested auto-connect the outputs to the first N physical ports. */
auto_connect_io (_master_out->output());
}
std::shared_ptr<GainControl>