From 8119026bc8243a4d9a43dc459da6c1c0ca5031b3 Mon Sep 17 00:00:00 2001 From: "Julien \"_FrnchFrgg_\" RIVAUD" Date: Mon, 21 Aug 2017 18:04:25 +0200 Subject: Use port enumeration instead of manual indexed loop --- gtk2_ardour/mixer_strip.cc | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'gtk2_ardour/mixer_strip.cc') diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 81b29daeb6..7bb51f99b5 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -1284,10 +1284,6 @@ MixerStrip::guess_main_type(bool for_input, bool favor_connected) const void MixerStrip::update_io_button (bool for_input) { - uint32_t io_count; - uint32_t io_index; - boost::shared_ptr io; - boost::shared_ptr port; vector port_connections; uint32_t total_connection_count = 0; @@ -1313,14 +1309,6 @@ MixerStrip::update_io_button (bool for_input) DataType dt = guess_main_type(for_input); - if (for_input) { - io = _route->input(); - } else { - io = _route->output(); - } - - io_count = io->n_ports().n_total(); - if ( dt == DataType::MIDI ) { tooltip << _("MIDI "); } @@ -1331,9 +1319,8 @@ MixerStrip::update_io_button (bool for_input) tooltip << string_compose (_("OUTPUT from %1"), Gtkmm2ext::markup_escape_text (_route->name())); } - for (io_index = 0; io_index < io_count; ++io_index) { - port = io->nth (io_index); - + boost::shared_ptr io = for_input ? _route->input() : _route->output(); + for (PortSet::iterator port = io->ports().begin(); port != io->ports().end(); ++port) { port_connections.clear (); port->get_connections(port_connections); -- cgit v1.2.3