some basic but incomplete logic for track autoconnect in livetrax

This commit is contained in:
Paul Davis 2024-04-06 21:46:32 -06:00
parent 6546a035c6
commit 8eb2dbef11
4 changed files with 96 additions and 9 deletions

View File

@ -858,14 +858,14 @@ public:
PBD::TimingStats dsp_stats[NTT];
void setup_channel_masks (size_t in, size_t out);
protected:
AudioBackendInfo& _info;
AudioEngine& engine;
virtual int _start (bool for_latency_measurement) = 0;
void setup_channel_masks (size_t in, size_t out);
ChannelMask _input_channel_mask;
ChannelMask _output_channel_mask;
};

View File

@ -116,6 +116,9 @@ AudioBackend::setup_channel_masks (size_t in, size_t out)
{
_input_channel_mask.assign (in, true);
_output_channel_mask.assign (out, true);
_input_channel_mask[2] = false;
_output_channel_mask[3] = false;
}
} // namespace ARDOUR

View File

@ -1075,13 +1075,15 @@ AudioEngine::start (bool for_latency)
}
if (!for_latency) {
/* Do this here so we do not have to add it to every backend */
_backend->setup_channel_masks (_backend->input_channels(), _backend->output_channels());
/* Call the library-wide ::init_post_engine() before emitting
* running to ensure that its tasks are complete before any
* signal handlers execute. PBD::Signal does not ensure
* ordering of signal handlers so even if ::init_post_engine()
* is connected first, it may not run first.
*/
ARDOUR::init_post_engine (_start_cnt);
Running (_start_cnt); /* EMIT SIGNAL */

View File

@ -3548,7 +3548,7 @@ Session::add_routes_inner (RouteList& new_routes, bool input_auto_connect, bool
* we will resort when done.
*/
if (!_monitor_out && !loading() && !input_auto_connect && !output_auto_connect) {
if (!_monitor_out && !loading() && !input_auto_connect && !output_auto_connect && !Profile->get_livetrax()) {
resort_routes_using (r);
}
}
@ -7799,17 +7799,99 @@ Session::livetrax_auto_connect (std::shared_ptr<Route> route)
get_physical_ports (physinputs, physoutputs, DataType::AUDIO);
const vector<string>::size_type n = route->track_number() - 1;
AudioBackend::ChannelMask const & input_channel_mask ( _engine.current_backend()->input_channel_mask());
AudioBackend::ChannelMask const & output_channel_mask ( _engine.current_backend()->output_channel_mask());
route->input()->disconnect (this);
route->output()->disconnect (this);
route->input()->connect (route->input()->ports().port (DataType::AUDIO, 0), physinputs[n % physinputs.size()], this);
route->output()->connect (route->output()->ports().port (DataType::AUDIO, 0), physoutputs[n % physoutputs.size()], this);
vector<string>::size_type n;
vector<string>::size_type ichn;
vector<string>::size_type ochn;
vector<string>::size_type i;
vector<string>::size_type start_from;
vector<string>::size_type enabled;
n = route->track_number() - 1;
/* move to the nth enabled input channel */
i = 0;
start_from = 0;
enabled = 0;
while (enabled <= n && i < input_channel_mask.size()) {
if (input_channel_mask[i]) {
start_from = i;
enabled++;
}
++i;
}
n = start_from;
size_t attempts = 0;
size_t limit = physinputs.size();
while (attempts < limit) {
ichn = n % physinputs.size();
if (input_channel_mask[ichn]) {
route->input()->connect (route->input()->ports().port (DataType::AUDIO, 0), physinputs[ichn], this);
break;
} else {
/* reduce limit because we found a channel that can't be used */
--limit;
}
++attempts;
++n;
if (n >= physinputs.size()) {
n = 0;
}
}
n = route->track_number() - 1;
i = 0;
start_from = 0;
enabled = 0;
while (enabled <= n && i < output_channel_mask.size()) {
if (output_channel_mask[i]) {
start_from = i;
enabled++;
}
++i;
}
n = start_from;
attempts = 0;
limit = physoutputs.size();
while (attempts < limit) {
ochn = n % physoutputs.size();
if (output_channel_mask[ochn]) {
route->output()->connect (route->output()->ports().port (DataType::AUDIO, 0), physoutputs[ochn], this);
break;
} else {
/* reduce limit because we found a channel that can't be used */
--limit;
}
++attempts;
++n;
if (n >= physinputs.size()) {
n = 0;
}
}
DEBUG_TRACE (DEBUG::PortConnectAuto, string_compose ("livetrax auto connect %1 [%2] to %3 and %4\n", route->name(), route->track_number(),
physinputs[n % physinputs.size()],
physoutputs[n % physoutputs.size()]));
physinputs[ichn],
physoutputs[ochn]));
}
void