From 68e943265edf04e63a8e8b8f62bab20f99d9c637 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 10 Sep 2008 15:03:30 +0000 Subject: merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/port_insert.cc | 40 ++++------------------------------------ 1 file changed, 4 insertions(+), 36 deletions(-) (limited to 'libs/ardour/port_insert.cc') diff --git a/libs/ardour/port_insert.cc b/libs/ardour/port_insert.cc index e14835b083..8c33d989dd 100644 --- a/libs/ardour/port_insert.cc +++ b/libs/ardour/port_insert.cc @@ -172,36 +172,6 @@ PortInsert::signal_latency() const return _session.engine().frames_per_cycle() + _io->input_latency(); } -bool -PortInsert::can_support_input_configuration (ChanCount in) const -{ - if (_io->input_maximum() == ChanCount::INFINITE && _io->output_maximum() == ChanCount::INFINITE) { - - /* not configured yet */ - - return true; /* we can support anything the first time we're asked */ - - } else { - - /* the "input" config for a port insert corresponds to how - many output ports it will have. - */ - - if (_io->output_maximum() == in) { - - return true; - } - } - - return false; -} - -ChanCount -PortInsert::output_for_input_configuration (ChanCount in) const -{ - return in; -} - bool PortInsert::configure_io (ChanCount in, ChanCount out) { @@ -209,7 +179,6 @@ PortInsert::configure_io (ChanCount in, ChanCount out) the last request config. or something like that. */ - /* this is a bit odd: the number of inputs we are required to handle corresponds @@ -224,12 +193,11 @@ PortInsert::configure_io (ChanCount in, ChanCount out) _io->set_input_maximum (out); _io->set_input_minimum (out); - bool success = (_io->ensure_io (out, in, false, this) == 0); - - if (success) - return Processor::configure_io(in, out); - else + if (_io->ensure_io (out, in, false, this) != 0) { return false; + } + + return Processor::configure_io (in, out); } ChanCount -- cgit v1.2.3