diff options
| author | Carl Hetherington <carl@carlh.net> | 2009-07-17 14:35:22 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2009-07-17 14:35:22 +0000 |
| commit | 0102b1dc93f0ad0a5ba5516cd3cc24b9cd8e240b (patch) | |
| tree | 2b9d4b25fe5a738ca1ddd0c771de9ac915798d55 /gtk2_ardour/port_group.cc | |
| parent | 748ad24ace7a37059b6812a1f9f0145d4725ba66 (diff) | |
Whoops. That optimisation breaks things. Revert it.
git-svn-id: svn://localhost/ardour2/branches/3.0@5370 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/port_group.cc')
| -rw-r--r-- | gtk2_ardour/port_group.cc | 22 |
1 files changed, 7 insertions, 15 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 |