From 1cc561bf74c4e3376b5631a530754078e8ff8772 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Wed, 19 Oct 2016 19:45:35 +0200 Subject: Use official LV2 state:StateChanged URI http://lv2plug.in/git/cgit.cgi/lv2.git/commit/?id=dbb18d82136d43eec435e321bffa835ba5776d6e --- libs/ardour/ardour/uri_map.h | 2 +- libs/ardour/lv2_plugin.cc | 5 ++--- libs/ardour/uri_map.cc | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/libs/ardour/ardour/uri_map.h b/libs/ardour/ardour/uri_map.h index 9b831bea6a..3b5f5be307 100644 --- a/libs/ardour/ardour/uri_map.h +++ b/libs/ardour/ardour/uri_map.h @@ -84,6 +84,7 @@ public: uint32_t patch_Set; uint32_t patch_property; uint32_t patch_value; + uint32_t state_Changed; #ifdef LV2_EXTENDED uint32_t auto_event; uint32_t auto_setup; @@ -92,7 +93,6 @@ public: uint32_t auto_end; uint32_t auto_parameter; uint32_t auto_value; - uint32_t state_Dirty; #endif }; diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc index 717e933ebf..91ab6b43a4 100644 --- a/libs/ardour/lv2_plugin.cc +++ b/libs/ardour/lv2_plugin.cc @@ -2692,19 +2692,18 @@ LV2Plugin::connect_and_run(BufferSet& bufs, } } } - +#endif // Intercept state dirty message if (_has_state_interface /* && (flags & PORT_DIRTYMSG)*/) { LV2_Atom* atom = (LV2_Atom*)(data - sizeof(LV2_Atom)); if (atom->type == _uri_map.urids.atom_Blank || atom->type == _uri_map.urids.atom_Object) { LV2_Atom_Object* obj = (LV2_Atom_Object*)atom; - if (obj->body.otype == _uri_map.urids.state_Dirty) { + if (obj->body.otype == _uri_map.urids.state_Changed) { _session.set_dirty (); } } } -#endif // Intercept patch change messages to emit PropertyChanged signal if ((flags & PORT_PATCHMSG)) { diff --git a/libs/ardour/uri_map.cc b/libs/ardour/uri_map.cc index c8af409506..4fcbb24df3 100644 --- a/libs/ardour/uri_map.cc +++ b/libs/ardour/uri_map.cc @@ -62,6 +62,7 @@ URIMap::URIDs::init(URIMap& uri_map) patch_Set = uri_map.uri_to_id("http://lv2plug.in/ns/ext/patch#Set"); patch_property = uri_map.uri_to_id("http://lv2plug.in/ns/ext/patch#property"); patch_value = uri_map.uri_to_id("http://lv2plug.in/ns/ext/patch#value"); + state_Changed = uri_map.uri_to_id("http://lv2plug.in/ns/ext/state/#StateChanged"); // since LV2 1.15.1 #ifdef LV2_EXTENDED auto_event = uri_map.uri_to_id(LV2_AUTOMATE_URI__event); auto_setup = uri_map.uri_to_id(LV2_AUTOMATE_URI__setup); @@ -70,7 +71,6 @@ URIMap::URIDs::init(URIMap& uri_map) auto_end = uri_map.uri_to_id(LV2_AUTOMATE_URI__end); auto_parameter = uri_map.uri_to_id(LV2_AUTOMATE_URI__parameter); auto_value = uri_map.uri_to_id(LV2_AUTOMATE_URI__value); - state_Dirty = uri_map.uri_to_id("http://ardour.org/lv2/state#Dirty"); // XXX http://lv2plug.in/ns/ext/state/#dirty #endif } -- cgit v1.2.3