Add support for instance-access and data-access

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5815 a436a847-0d15-0410-975c-d299462d15a1

6 files changed, 122 insertions, 2 deletions

diff --git a/ingen/DataAccess.hpp b/ingen/DataAccess.hpp
new file mode 100644
index 00000000..149daec9
--- /dev/null
+++ b/ingen/DataAccess.hpp
@@ -0,0 +1,61 @@
+/*
+  This file is part of Ingen.
+  Copyright 2007-2015 David Robillard <http://drobilla.net/>
+
+  Ingen is free software: you can redistribute it and/or modify it under the
+  terms of the GNU Affero General Public License as published by the Free
+  Software Foundation, either version 3 of the License, or any later version.
+
+  Ingen is distributed in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+  A PARTICULAR PURPOSE.  See the GNU Affero General Public License for details.
+
+  You should have received a copy of the GNU Affero General Public License
+  along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef INGEN_ENGINE_DATAACCESS_HPP
+#define INGEN_ENGINE_DATAACCESS_HPP
+
+#include "ingen/LV2Features.hpp"
+#include "ingen/Store.hpp"
+#include "ingen/World.hpp"
+
+#include "lv2/lv2plug.in/ns/ext/data-access/data-access.h"
+
+namespace Ingen {
+
+struct DataAccess : public Ingen::LV2Features::Feature
+{
+	static void delete_feature(LV2_Feature* feature) {
+		free(feature->data);
+		delete feature;
+	}
+
+	const char* uri() const { return "http://lv2plug.in/ns/ext/data-access"; }
+
+	SPtr<LV2_Feature> feature(World* world, Node* node) {
+		Node* store_node = world->store()->get(node->path());
+		if (!store_node) {
+			return SPtr<LV2_Feature>();
+		}
+
+		LilvInstance* inst = store_node->instance();
+		if (!inst) {
+			return SPtr<LV2_Feature>();
+		}
+
+		const LV2_Descriptor*       desc = lilv_instance_get_descriptor(inst);
+		LV2_Extension_Data_Feature* data = (LV2_Extension_Data_Feature*)
+			malloc(sizeof(LV2_Extension_Data_Feature));
+
+		data->data_access = desc->extension_data;
+
+		return SPtr<LV2_Feature>(
+			new LV2_Feature{ "http://lv2plug.in/ns/ext/data-access", data });
+	}
+};
+
+} // namespace Ingen
+
+#endif // INGEN_ENGINE_DATAACCESS_HPP
diff --git a/ingen/InstanceAccess.hpp b/ingen/InstanceAccess.hpp
new file mode 100644
index 00000000..443f5f55
--- /dev/null
+++ b/ingen/InstanceAccess.hpp
@@ -0,0 +1,49 @@
+/*
+  This file is part of Ingen.
+  Copyright 2007-2015 David Robillard <http://drobilla.net/>
+
+  Ingen is free software: you can redistribute it and/or modify it under the
+  terms of the GNU Affero General Public License as published by the Free
+  Software Foundation, either version 3 of the License, or any later version.
+
+  Ingen is distributed in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+  A PARTICULAR PURPOSE.  See the GNU Affero General Public License for details.
+
+  You should have received a copy of the GNU Affero General Public License
+  along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef INGEN_ENGINE_INSTANCEACCESS_HPP
+#define INGEN_ENGINE_INSTANCEACCESS_HPP
+
+#include "ingen/LV2Features.hpp"
+#include "ingen/Store.hpp"
+#include "ingen/World.hpp"
+
+namespace Ingen {
+
+struct InstanceAccess : public Ingen::LV2Features::Feature
+{
+	const char* uri() const { return "http://lv2plug.in/ns/ext/instance-access"; }
+
+	SPtr<LV2_Feature> feature(World* world, Node* node) {
+		Node* store_node = world->store()->get(node->path());
+		if (!store_node) {
+			return SPtr<LV2_Feature>();
+		}
+
+		LilvInstance* instance = store_node->instance();
+		if (!instance) {
+			return SPtr<LV2_Feature>();
+		}
+
+		return SPtr<LV2_Feature>(
+			new LV2_Feature{ "http://lv2plug.in/ns/ext/instance-access",
+			                 lilv_instance_get_handle(instance) });
+	}
+};
+
+} // namespace Ingen
+
+#endif // INGEN_ENGINE_INSTANCEACCESS_HPP
diff --git a/ingen/Node.hpp b/ingen/Node.hpp
index 4c7c453a..fd001897 100644
--- a/ingen/Node.hpp
+++ b/ingen/Node.hpp
@@ -20,6 +20,7 @@
 #include "ingen/Resource.hpp"
 #include "ingen/ingen.h"
 #include "ingen/types.hpp"
+#include "lilv/lilv.h"
 #include "raul/Path.hpp"
 
 namespace Raul {
@@ -66,6 +67,9 @@ public:
 	virtual Node*           port(uint32_t index) const { return NULL; }
 	virtual const Resource* plugin()             const { return NULL; }
 
+	// Plugin blocks only
+	virtual LilvInstance* instance() { return NULL; }
+
 	// All objects
 	virtual GraphType           graph_type()   const = 0;
 	virtual const Raul::Path&   path()         const = 0;
diff --git a/src/World.cpp b/src/World.cpp
index 9d4410eb..21a7043e 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -22,7 +22,9 @@
 #include <glibmm/module.h>
 
 #include "ingen/Configuration.hpp"
+#include "ingen/DataAccess.hpp"
 #include "ingen/EngineBase.hpp"
+#include "ingen/InstanceAccess.hpp"
 #include "ingen/LV2Features.hpp"
 #include "ingen/Log.hpp"
 #include "ingen/Module.hpp"
@@ -125,6 +127,8 @@ public:
 		lv2_features = new LV2Features();
 		lv2_features->add_feature(uri_map->urid_map_feature());
 		lv2_features->add_feature(uri_map->urid_unmap_feature());
+		lv2_features->add_feature(SPtr<InstanceAccess>(new InstanceAccess()));
+		lv2_features->add_feature(SPtr<DataAccess>(new DataAccess()));
 		lilv_world_load_all(lilv_world);
 
 		// Set up RDF namespaces
diff --git a/src/server/LV2Block.hpp b/src/server/LV2Block.hpp
index ffb86d0a..e5d41006 100644
--- a/src/server/LV2Block.hpp
+++ b/src/server/LV2Block.hpp
@@ -48,6 +48,8 @@ public:
 
 	bool instantiate(BufferFactory& bufs);
 
+	LilvInstance* instance() { return instance(0); }
+
 	BlockImpl* duplicate(Engine&             engine,
 	                     const Raul::Symbol& symbol,
 	                     GraphImpl*          parent);
diff --git a/wscript b/wscript
index 161d06f5..465f6387 100644
--- a/wscript
+++ b/wscript
@@ -74,8 +74,8 @@ def configure(conf):
                       atleast_version='0.2.0', mandatory=True)
     autowaf.check_pkg(conf, 'sratom-0', uselib_store='SRATOM',
                       atleast_version='0.4.6', mandatory=True)
-    autowaf.check_pkg(conf, 'raul', uselib_store='RAUL',
-                      atleast_version='0.8.6', mandatory=True)
+    autowaf.check_pkg(conf, 'raul-1', uselib_store='RAUL',
+                      atleast_version='1.0.0', mandatory=True)
     autowaf.check_pkg(conf, 'serd-0', uselib_store='SERD',
                       atleast_version='0.18.0', mandatory=False)
     autowaf.check_pkg(conf, 'sord-0', uselib_store='SORD',