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

fix for mantis 802 - work if there are no physical output or input ports in JACK

Browse Source 
git-svn-id: svn://localhost/ardour2/trunk@1088 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis
2006-11-07 05:16:01 +00:00
parent f5f141bb18
commit 5b6524bed4
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libs/ardour/session.cc
View File

@@ -328,8 +328,16 @@ Session::Session (AudioEngine &eng,
cerr << "Loading session " << fullpath << " using snapshot " << snapshot_name << " (2)" << endl;
n_physical_outputs = max (requested_physical_out, _engine.n_physical_outputs());
n_physical_inputs = max (requested_physical_in, _engine.n_physical_inputs());
n_physical_outputs = _engine.n_physical_outputs();
n_physical_inputs = _engine.n_physical_inputs();
if (n_physical_inputs) {
n_physical_inputs = max (requested_physical_in, n_physical_inputs);
}
if (n_physical_outputs) {
n_physical_outputs = max (requested_physical_out, n_physical_outputs);
}
first_stage_init (fullpath, snapshot_name);
@@ -1771,12 +1779,12 @@ Session::new_audio_route (int input_channels, int output_channels, uint32_t how_
<< endmsg;
}
for (uint32_t x = 0; x < bus->n_inputs(); ++x) {
for (uint32_t x = 0; n_physical_inputs && x < bus->n_inputs(); ++x) {
port = "";
if (Config->get_input_auto_connect() & AutoConnectPhysical) {
port = physinputs[((n+x)%n_physical_inputs)];
port = physinputs[((n+x)%n_physical_inputs)];
}
if (port.length() && bus->connect_input (bus->input (x), port, this)) {
@@ -1784,7 +1792,7 @@ Session::new_audio_route (int input_channels, int output_channels, uint32_t how_
}
}
for (uint32_t x = 0; x < bus->n_outputs(); ++x) {
for (uint32_t x = 0; n_physical_outputs && x < bus->n_outputs(); ++x) {
port = "";