ardour/livetrax
13
0
Fork 0
Code

Sort Route xml node order by PBD::ID instead of by PresentationInfo

Browse Source 
This prevents the node order from changing when the display order of the Routes
changes, which helps to reduce the amount of Session file change.

This is useful for testing and if keeping sessions under version control.

Resolves: #7327
This commit is contained in:
Tim Mayberry 2017-04-21 20:33:05 +10:00
parent 21f5f434c6
commit 3589740d69
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libs/ardour/session_state.cc
View File

@ -1126,6 +1126,17 @@ Session::export_track_state (boost::shared_ptr<RouteList> rl, const string& path
return tree.write (sn.c_str());
}
namespace
{
struct route_id_compare {
bool
operator() (const boost::shared_ptr<Route>& r1, const boost::shared_ptr<Route>& r2)
{
return r1->id () < r2->id ();
}
};
} // anon namespace
XMLNode&
Session::state (bool full_state)
{
@ -1326,17 +1337,11 @@ Session::state (bool full_state)
{
boost::shared_ptr<RouteList> r = routes.reader ();
RoutePublicOrderSorter cmp;
RouteList public_order (*r);
public_order.sort (cmp);
route_id_compare cmp;
RouteList xml_node_order (*r);
xml_node_order.sort (cmp);
/* the sort should have put the monitor out first */
if (_monitor_out) {
assert (_monitor_out == public_order.front());
}
for (RouteList::iterator i = public_order.begin(); i != public_order.end(); ++i) {
for (RouteList::iterator i = xml_node_order.begin(); i != xml_node_order.end(); ++i) {
if (!(*i)->is_auditioner()) {
if (full_state) {
child->add_child_nocopy ((*i)->get_state());