ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

debug/fix LV2 state loading on OSX 10.5/PPC

Browse Source
This commit is contained in:
Robin Gareus 2015-07-27 17:11:35 +02:00
parent c55b659f39
commit 22bc62ed43
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libs/ardour/lv2_plugin.cc
View File

@ -1624,10 +1624,24 @@ LV2Plugin::set_state(const XMLNode& node, int version)
plugin_dir(),
Glib::build_filename(prop->value(), "state.ttl"));
LilvState* state = lilv_state_new_from_file(
_world.world, _uri_map.urid_map(), NULL, state_file.c_str());
if (!Glib::file_test (state_file, Glib::FileTest (Glib::FILE_TEST_EXISTS | Glib::FILE_TEST_IS_REGULAR))) {
/* this should be done in lilv_state_new_from_file()
* some systems don't like realpath() calls with an non-existent file.
* (hopefully this fixes crashes on OSX 10.5/PPC, see #6456,
* segfault in __asm realpath$DARWIN_EXTSN
* if so, backport upstream to liblilv)
*/
error << string_compose(
"LV2: expected state file \"%1\" does not exist.",
state_file) << endmsg;
} else {
lilv_state_restore(state, _impl->instance, NULL, NULL, 0, NULL);
LilvState* state = lilv_state_new_from_file(
_world.world, _uri_map.urid_map(), NULL, state_file.c_str());
// lilv_state_restore allows/ignores possible NULL state
lilv_state_restore(state, _impl->instance, NULL, NULL, 0, NULL);
}
}
latency_compute_run();