smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-30 08:53:08 +01:00
Code Issues Projects Releases Wiki Activity

Fix SNAFU with auto-connect. Fixes #3379.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7536 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-08-04 15:42:45 +00:00
parent cc6016400b
commit c831ea5167
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libs/ardour/audioengine.cc
View file

@ -1166,16 +1166,22 @@ AudioEngine::get_physical (DataType type, unsigned long flags, vector<string>& p
}
}
/** Get physical ports for which JackPortIsOutput is set; ie those that correspond to
* a physical input connector.
*/
void
AudioEngine::get_physical_inputs (DataType type, vector<string>& ins)
{
get_physical (type, JackPortIsInput, ins);
get_physical (type, JackPortIsOutput, ins);
}
/** Get physical ports for which JackPortIsInput is set; ie those that correspond to
* a physical output connector.
*/
void
AudioEngine::get_physical_outputs (DataType type, vector<string>& outs)
{
get_physical (type, JackPortIsOutput, outs);
get_physical (type, JackPortIsInput, outs);
}
void

7
libs/ardour/session.cc
View file

@ -431,11 +431,8 @@ Session::when_engine_running ()
vector<string> inputs[DataType::num_types];
vector<string> outputs[DataType::num_types];
for (uint32_t i = 0; i < DataType::num_types; ++i) {
/* the engine's terms for inputs and outputs are reversed from what the
code below expects.
*/
_engine.get_physical_outputs (DataType (DataType::Symbol (i)), inputs[i]);
_engine.get_physical_inputs (DataType (DataType::Symbol (i)), outputs[i]);
_engine.get_physical_inputs (DataType (DataType::Symbol (i)), inputs[i]);
_engine.get_physical_outputs (DataType (DataType::Symbol (i)), outputs[i]);
}
/* Create a set of Bundle objects that map