diff options
| -rw-r--r-- | gtk2_ardour/port_group.cc | 22 | ||||
| -rw-r--r-- | gtk2_ardour/port_group.h | 1 |
2 files changed, 7 insertions, 16 deletions
diff --git a/gtk2_ardour/port_group.cc b/gtk2_ardour/port_group.cc index 149baf3046..beaa69959d 100644 --- a/gtk2_ardour/port_group.cc +++ b/gtk2_ardour/port_group.cc @@ -159,7 +159,7 @@ PortGroup::total_channels () const /** PortGroupList constructor. */ PortGroupList::PortGroupList () - : _type (DataType::AUDIO), _signals_suspended (false), _pending_change (false), _bundles_dirty (true) + : _type (DataType::AUDIO), _signals_suspended (false), _pending_change (false) { } @@ -319,7 +319,6 @@ PortGroupList::gather (ARDOUR::Session& session, bool inputs) add_group (other); emit_changed (); - _bundles_dirty = true; } boost::shared_ptr<Bundle> @@ -403,25 +402,20 @@ PortGroupList::clear () _bundle_changed_connections.clear (); emit_changed (); - _bundles_dirty = true; } PortGroup::BundleList const & PortGroupList::bundles () const { - if (_bundles_dirty) { - _bundles.clear (); - - for (PortGroupList::List::const_iterator i = begin (); i != end (); ++i) { - if ((*i)->visible()) { - std::copy ((*i)->bundles().begin(), (*i)->bundles().end(), std::back_inserter (_bundles)); - } + _bundles.clear (); + + for (PortGroupList::List::const_iterator i = begin (); i != end (); ++i) { + if ((*i)->visible()) { + std::copy ((*i)->bundles().begin(), (*i)->bundles().end(), std::back_inserter (_bundles)); } - - _bundles_dirty = false; } - + return _bundles; } @@ -452,7 +446,6 @@ PortGroupList::add_group (boost::shared_ptr<PortGroup> g) ); emit_changed (); - _bundles_dirty = true; } void @@ -463,7 +456,6 @@ PortGroupList::remove_bundle (boost::shared_ptr<Bundle> b) } emit_changed (); - _bundles_dirty = true; } void diff --git a/gtk2_ardour/port_group.h b/gtk2_ardour/port_group.h index 21dc9445cc..f3f84a23ad 100644 --- a/gtk2_ardour/port_group.h +++ b/gtk2_ardour/port_group.h @@ -134,7 +134,6 @@ class PortGroupList : public sigc::trackable ARDOUR::DataType _type; mutable PortGroup::BundleList _bundles; - mutable bool _bundles_dirty; List _groups; std::vector<sigc::connection> _bundle_changed_connections; bool _signals_suspended; |