From c831ea516791f171d2e5910baf7100af5378ee95 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 4 Aug 2010 15:42:45 +0000 Subject: [PATCH] Fix SNAFU with auto-connect. Fixes #3379. git-svn-id: svn://localhost/ardour2/branches/3.0@7536 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/audioengine.cc | 10 ++++++++-- libs/ardour/session.cc | 7 ++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index c40180e91d..3453deea5c 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -1166,16 +1166,22 @@ AudioEngine::get_physical (DataType type, unsigned long flags, vector& 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& 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& outs) { - get_physical (type, JackPortIsOutput, outs); + get_physical (type, JackPortIsInput, outs); } void diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 6e557e6d49..7978123695 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -431,11 +431,8 @@ Session::when_engine_running () vector inputs[DataType::num_types]; vector 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