From 1eccbe4355685b322194df72b5de2382d5290b3b Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 7 Jul 2022 18:59:32 -0400 Subject: Rearrange source tree to be directly usable by dependants This allows the LV2 source distribution to be used as an include path for compilers and an LV2_PATH for applications, at the expense of self-contained bundles. That's a nice idea, but it made LV2 itself weird and annoying to depend on. This rearranges things so that directories in the source tree correspond more closely to installation directories. To make this possible, the "aux" directory in the documentation output has been changed to "style", to avoid the reserved name "aux" on Windows. --- lv2/urid/manifest.ttl | 9 ---- lv2/urid/meson.build | 40 -------------- lv2/urid/urid.h | 140 ------------------------------------------------- lv2/urid/urid.meta.ttl | 84 ----------------------------- lv2/urid/urid.ttl | 23 -------- 5 files changed, 296 deletions(-) delete mode 100644 lv2/urid/manifest.ttl delete mode 100644 lv2/urid/meson.build delete mode 100644 lv2/urid/urid.h delete mode 100644 lv2/urid/urid.meta.ttl delete mode 100644 lv2/urid/urid.ttl (limited to 'lv2/urid') diff --git a/lv2/urid/manifest.ttl b/lv2/urid/manifest.ttl deleted file mode 100644 index 772e2b6..0000000 --- a/lv2/urid/manifest.ttl +++ /dev/null @@ -1,9 +0,0 @@ -@prefix lv2: . -@prefix rdfs: . - - - a lv2:Specification ; - lv2:minorVersion 1 ; - lv2:microVersion 4 ; - rdfs:seeAlso . - diff --git a/lv2/urid/meson.build b/lv2/urid/meson.build deleted file mode 100644 index 38efe4b..0000000 --- a/lv2/urid/meson.build +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 2022 David Robillard -# SPDX-License-Identifier: CC0-1.0 OR ISC - -name = 'urid' -path = 'ns' / 'ext' / 'urid' - -urid_data = files( - 'urid.meta.ttl', - 'urid.ttl', - 'manifest.ttl', -) - -headers = files( - 'urid.h', -) - -# Install specification bundle -install_data(urid_data, install_dir: lv2dir / name + '.lv2') -install_headers(headers, subdir: 'lv2' / name) -if get_option('old_headers') - install_headers(headers, subdir: 'lv2' / 'lv2plug.in' / path) -endif - -# Build documentation -if build_docs - lv2_urid_docs = custom_target( - name + '.html', - command: lv2specgen_command_prefix + [ - '--docdir=../../html', - '--style-uri=../../aux/style.css', - '@INPUT@', - '@OUTPUT@', - ], - depends: doc_deps, - input: files('urid.ttl'), - install: true, - install_dir: lv2_docdir / 'ns' / 'ext', - output: name + '.html', - ) -endif diff --git a/lv2/urid/urid.h b/lv2/urid/urid.h deleted file mode 100644 index b537d14..0000000 --- a/lv2/urid/urid.h +++ /dev/null @@ -1,140 +0,0 @@ -/* - Copyright 2008-2016 David Robillard - Copyright 2011 Gabriel M. Beddingfield - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -*/ - -#ifndef LV2_URID_H -#define LV2_URID_H - -/** - @defgroup urid URID - @ingroup lv2 - - Features for mapping URIs to and from integers. - - See for details. - - @{ -*/ - -// clang-format off - -#define LV2_URID_URI "http://lv2plug.in/ns/ext/urid" ///< http://lv2plug.in/ns/ext/urid -#define LV2_URID_PREFIX LV2_URID_URI "#" ///< http://lv2plug.in/ns/ext/urid# - -#define LV2_URID__map LV2_URID_PREFIX "map" ///< http://lv2plug.in/ns/ext/urid#map -#define LV2_URID__unmap LV2_URID_PREFIX "unmap" ///< http://lv2plug.in/ns/ext/urid#unmap - -#define LV2_URID_MAP_URI LV2_URID__map ///< Legacy -#define LV2_URID_UNMAP_URI LV2_URID__unmap ///< Legacy - -// clang-format on - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -/** - Opaque pointer to host data for LV2_URID_Map. -*/ -typedef void* LV2_URID_Map_Handle; - -/** - Opaque pointer to host data for LV2_URID_Unmap. -*/ -typedef void* LV2_URID_Unmap_Handle; - -/** - URI mapped to an integer. -*/ -typedef uint32_t LV2_URID; - -/** - URID Map Feature (LV2_URID__map) -*/ -typedef struct { - /** - Opaque pointer to host data. - - This MUST be passed to map_uri() whenever it is called. - Otherwise, it must not be interpreted in any way. - */ - LV2_URID_Map_Handle handle; - - /** - Get the numeric ID of a URI. - - If the ID does not already exist, it will be created. - - This function is referentially transparent; any number of calls with the - same arguments is guaranteed to return the same value over the life of a - plugin instance. Note, however, that several URIs MAY resolve to the - same ID if the host considers those URIs equivalent. - - This function is not necessarily very fast or RT-safe: plugins SHOULD - cache any IDs they might need in performance critical situations. - - The return value 0 is reserved and indicates that an ID for that URI - could not be created for whatever reason. However, hosts SHOULD NOT - return 0 from this function in non-exceptional circumstances (i.e. the - URI map SHOULD be dynamic). - - @param handle Must be the callback_data member of this struct. - @param uri The URI to be mapped to an integer ID. - */ - LV2_URID (*map)(LV2_URID_Map_Handle handle, const char* uri); -} LV2_URID_Map; - -/** - URI Unmap Feature (LV2_URID__unmap) -*/ -typedef struct { - /** - Opaque pointer to host data. - - This MUST be passed to unmap() whenever it is called. - Otherwise, it must not be interpreted in any way. - */ - LV2_URID_Unmap_Handle handle; - - /** - Get the URI for a previously mapped numeric ID. - - Returns NULL if `urid` is not yet mapped. Otherwise, the corresponding - URI is returned in a canonical form. This MAY not be the exact same - string that was originally passed to LV2_URID_Map::map(), but it MUST be - an identical URI according to the URI syntax specification (RFC3986). A - non-NULL return for a given `urid` will always be the same for the life - of the plugin. Plugins that intend to perform string comparison on - unmapped URIs SHOULD first canonicalise URI strings with a call to - map_uri() followed by a call to unmap_uri(). - - @param handle Must be the callback_data member of this struct. - @param urid The ID to be mapped back to the URI string. - */ - const char* (*unmap)(LV2_URID_Unmap_Handle handle, LV2_URID urid); -} LV2_URID_Unmap; - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -/** - @} -*/ - -#endif /* LV2_URID_H */ diff --git a/lv2/urid/urid.meta.ttl b/lv2/urid/urid.meta.ttl deleted file mode 100644 index b2a74fa..0000000 --- a/lv2/urid/urid.meta.ttl +++ /dev/null @@ -1,84 +0,0 @@ -@prefix dcs: . -@prefix doap: . -@prefix foaf: . -@prefix lv2: . -@prefix rdfs: . -@prefix urid: . - - - a doap:Project ; - doap:license ; - doap:name "LV2 URID" ; - doap:shortdesc "Features for mapping URIs to and from integers." ; - doap:created "2011-07-22" ; - doap:developer ; - doap:maintainer ; - doap:release [ - doap:revision "1.4" ; - doap:created "2012-10-14" ; - doap:file-release ; - dcs:blame ; - dcs:changeset [ - dcs:item [ - rdfs:label "Fix typo in urid:unmap documentation." - ] - ] - ] , [ - doap:revision "1.2" ; - doap:created "2012-04-17" ; - doap:file-release ; - dcs:blame ; - dcs:changeset [ - dcs:item [ - rdfs:label "Add feature struct names." - ] , [ - rdfs:label "Merge with unified LV2 package." - ] - ] - ] , [ - doap:revision "1.0" ; - doap:created "2011-11-21" ; - doap:file-release ; - dcs:blame ; - dcs:changeset [ - dcs:item [ - rdfs:label "Initial release." - ] - ] - ] ; - lv2:documentation """ - -This extension defines a simple mechanism for plugins to map URIs to and from -integers. This is usually used for performance reasons, for example for -processing events with URI types in real-time audio code). Typically, plugins -map URIs to integers for things they "understand" at instantiation time, and -store those values for use in the audio thread without doing any string -comparison. This allows for the extensibility of RDF but with the performance -of integers. - -This extension is intended as an improved and simplified replacement for the -[uri-map](uri-map.html) extension, since the `map` context parameter there has -proven problematic. This extension is functionally equivalent to the uri-map -extension with a NULL context. New implementations are encouraged to use this -extension for URI mapping. - -"""^^lv2:Markdown . - -urid:map - lv2:documentation """ - -To support this feature, the host must pass an LV2_Feature to -LV2_Descriptor::instantiate() with URI LV2_URID__map and data pointed to an -instance of LV2_URID_Map. - -"""^^lv2:Markdown . - -urid:unmap - lv2:documentation """ - -To support this feature, the host must pass an LV2_Feature to -LV2_Descriptor::instantiate() with URI LV2_URID__unmap and data pointed to an -instance of LV2_URID_Unmap. - -"""^^lv2:Markdown . - diff --git a/lv2/urid/urid.ttl b/lv2/urid/urid.ttl deleted file mode 100644 index 53aa1e5..0000000 --- a/lv2/urid/urid.ttl +++ /dev/null @@ -1,23 +0,0 @@ -@prefix lv2: . -@prefix owl: . -@prefix rdfs: . -@prefix urid: . - - - a owl:Ontology ; - rdfs:label "LV2 URID" ; - rdfs:comment "Features for mapping URIs to and from integers." ; - rdfs:seeAlso , - ; - owl:imports . - -urid:map - a lv2:Feature ; - rdfs:label "map" ; - rdfs:comment "A feature to map URI strings to integer URIDs." . - -urid:unmap - a lv2:Feature ; - rdfs:label "unmap" ; - rdfs:comment "A feature to unmap URIDs back to strings." . - -- cgit v1.2.1