smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-29 00:13:10 +01:00
Code Issues Projects Releases Wiki Activity

fix broken patch that caused crash when loading an older session without "default-type" property for each Route; don't call Session::fail_roll(), just no_roll() when stopping transport

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@5004 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2009-04-27 19:31:15 +00:00
parent 3fc1f9fb4c
commit 8ed0d9e95a
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/ardour/session_process.cc
View file

@ -759,7 +759,7 @@ Session::process_without_events (nframes_t nframes)
}
if (maybe_stop (stop_limit)) {
fail_roll (nframes);
no_roll (nframes);
return;
}

10
libs/ardour/session_state.cc
View file

@ -1359,10 +1359,12 @@ Session::load_routes (const XMLNode& node)
set_dirty();
for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
if ((*niter)->property ("default-type")->value() == "unknown" ) {
std::cout << "ignoring route with type unknown. (video-track)" << std::endl;
// Note: this may mess up remote_control IDs or more..
continue;
XMLProperty* prop = (*niter)->property ("default-type");
if (prop && prop->value() == "unknown" ) {
std::cout << "ignoring route with type unknown. (video-track)" << std::endl;
// Note: this may mess up remote_control IDs or more..
continue;
}
boost::shared_ptr<Route> route (XMLRouteFactory (**niter));