diff options
| author | Robin Gareus <robin@gareus.org> | 2015-07-28 18:58:17 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-07-28 18:58:17 +0200 |
| commit | 64af6c880ca2248ecae764340d3da9d4ffa3736b (patch) | |
| tree | ffc53d80287edd1396a673ef938b4e14281cf579 | |
| parent | 2a0365cbef41da195e8ed115d29ab1c8713267e1 (diff) | |
Revert "debug/fix LV2 state loading on OSX 10.5/PPC"
This reverts commit 22bc62ed4360aaea29c131cc7dead87fa25ef228.
forwarded upstream: http://dev.drobilla.net/ticket/1073
| -rw-r--r-- | libs/ardour/lv2_plugin.cc | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc index 9bf33d60d4..4f3964eaa5 100644 --- a/libs/ardour/lv2_plugin.cc +++ b/libs/ardour/lv2_plugin.cc @@ -1624,24 +1624,10 @@ LV2Plugin::set_state(const XMLNode& node, int version) plugin_dir(), Glib::build_filename(prop->value(), "state.ttl")); - 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 { - - LilvState* state = lilv_state_new_from_file( - _world.world, _uri_map.urid_map(), NULL, state_file.c_str()); + 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); - } + lilv_state_restore(state, _impl->instance, NULL, NULL, 0, NULL); } latency_compute_run(); |