ardour/livetrax
13
0
Fork 0
Code

Re-use locations when setting location list state, so that selected locations are preserved through an undo (#3929).

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@9480 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-05-05 12:09:37 +00:00
parent 35eecc5916
commit ae91577f2c
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libs/ardour/location.cc
View File

@ -801,13 +801,15 @@ Locations::set_state (const XMLNode& node, int version)
XMLNodeList nlist = node.children();
locations.clear ();
/* build up a new locations list in here */
LocationList new_locations;
current_location = 0;
Location* session_range_location = 0;
if (version < 3000) {
session_range_location = new Location (_session, 0, 0, _("session"), Location::IsSessionRange);
locations.push_back (session_range_location);
new_locations.push_back (session_range_location);
}
{
@ -818,7 +820,23 @@ Locations::set_state (const XMLNode& node, int version)
try {
Location *loc = new Location (_session, **niter);
XMLProperty const * prop_id = (*niter)->property ("id");
assert (prop_id);
PBD::ID id (prop_id->value ());
LocationList::const_iterator i = locations.begin();
while (i != locations.end () && (*i)->id() != id) {
++i;
}
Location* loc;
if (i != locations.end()) {
/* we can re-use an old Location object */
loc = *i;
loc->set_state (**niter, version);
} else {
loc = new Location (_session, **niter);
}
bool add = true;
@ -850,7 +868,7 @@ Locations::set_state (const XMLNode& node, int version)
}
if (add) {
locations.push_back (loc);
new_locations.push_back (loc);
}
}
@ -859,6 +877,8 @@ Locations::set_state (const XMLNode& node, int version)
}
}
locations = new_locations;
if (locations.size()) {
current_location = locations.front();
} else {