ardour/livetrax
13
0
Fork 0
Code

Load the tempo map before regions so that MIDI region positions / lengths don't get corrupted (part of #3789).

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8964 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-02-26 11:36:27 +00:00
parent e18cebd6d7
commit 7f1e89c64b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/ardour/session_state.cc
View File

@ -1265,7 +1265,7 @@ Session::set_state (const XMLNode& node, int version)
Metadata
Locations
Sources
AudioRegions
Regions
Connections
Routes
RouteGroups
@ -1331,6 +1331,13 @@ Session::set_state (const XMLNode& node, int version)
goto out;
}
if ((child = find_named_node (node, "TempoMap")) == 0) {
error << _("Session: XML state has no Tempo Map section") << endmsg;
goto out;
} else if (_tempo_map->set_state (*child, version)) {
goto out;
}
if ((child = find_named_node (node, "Regions")) == 0) {
error << _("Session: XML state has no Regions section") << endmsg;
goto out;
@ -1369,13 +1376,6 @@ Session::set_state (const XMLNode& node, int version)
}
}
if ((child = find_named_node (node, "TempoMap")) == 0) {
error << _("Session: XML state has no Tempo Map section") << endmsg;
goto out;
} else if (_tempo_map->set_state (*child, version)) {
goto out;
}
if (version < 3000) {
if ((child = find_named_node (node, X_("DiskStreams"))) == 0) {
error << _("Session: XML state has no diskstreams section") << endmsg;