ardour/livetrax
13
0
Fork 0
Code

Whoops. That optimisation breaks things. Revert it.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@5370 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2009-07-17 14:35:22 +00:00
parent 748ad24ace
commit 0102b1dc93
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gtk2_ardour/port_group.cc
View File

@ -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

1
gtk2_ardour/port_group.h
View File

@ -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;