aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-11-06 17:44:39 +0000
committerDavid Robillard <d@drobilla.net>2011-11-06 17:44:39 +0000
commita0320122b94a8c92cd780f8d3c9da7260ec400e6 (patch)
tree9bba3c0dda4b08f491392416630b63377583a328
parent09e404f50bcf96c8942d73b5b68baa2f0d6f3d02 (diff)
downloadlv2-a0320122b94a8c92cd780f8d3c9da7260ec400e6.tar.xz
Typedef void* callback_data parameter.
-rw-r--r--ext/atom.lv2/atom.h2
-rw-r--r--ext/atom.lv2/atom.ttl22
-rw-r--r--ext/atom.lv2/manifest.ttl2
-rw-r--r--ext/state.lv2/state.h30
4 files changed, 29 insertions, 27 deletions
diff --git a/ext/atom.lv2/atom.h b/ext/atom.lv2/atom.h
index 4f803ba..ed5ddd8 100644
--- a/ext/atom.lv2/atom.h
+++ b/ext/atom.lv2/atom.h
@@ -208,6 +208,6 @@ typedef struct {
*/
uint32_t size;
-} LV2_Atom_Event_Buffer;
+} LV2_Atom_Buffer;
#endif /* LV2_ATOM_H */
diff --git a/ext/atom.lv2/atom.ttl b/ext/atom.lv2/atom.ttl
index 139155f..d999518 100644
--- a/ext/atom.lv2/atom.ttl
+++ b/ext/atom.lv2/atom.ttl
@@ -25,9 +25,10 @@
a lv2:Specification ;
doap:name "LV2 Atom" ;
doap:shortdesc "A generic value container and several data types." ;
+ rdfs:seeAlso <atom-buffer.h> ;
doap:release [
- doap:revision "0.1" ;
- doap:created "2011-04-05"
+ doap:revision "0.2" ;
+ doap:created "2011-11-05"
] ;
doap:maintainer [
a foaf:Person ;
@@ -66,15 +67,16 @@ to a single Atom: <a href="#ValuePort">ValuePort</a> and <a href="#MessagePort"
>MessagePort</a>, which both have the same buffer format but different
semantics (with respect to how the run() callback interprets the Atom).</p>
-<p>This extension requires the host to support the <a
-href="http://lv2plug.in/ns/ext/uri-map">LV2 URI Map</a> extension.</p>
+<p>Implementing this extension requires a facility for mapping URIs to
+integers, such as the <a href="http://lv2plug.in/ns/ext/urid">LV2 URID</a>
+extension.</p>
""" .
atom:Atom
a rdfs:Class ;
rdfs:label "Atom" ;
lv2:documentation """
-<p>Abstract base class for all atoms. An LV2_Atom has a 16-bit
+<p>Abstract base class for all atoms. An LV2_Atom has a 32-bit
<code>type</code> and <code>size</code> followed by a <code>body</code> of
<code>size</code> bytes.</p>
@@ -407,11 +409,11 @@ atom:EventPort
rdfs:label "Event port" ;
rdfs:subClassOf lv2:Port ;
lv2:documentation """
-Ports of this type will be connected to an LV2_Atom_Event_Buffer. These ports
-contain a sequence of atom:Event (i.e. time stamped atoms). These ports are
-used to send and receive atoms in the audio context
-(i.e. LV2_Descriptor::run()), and are intended as a simpler, more generic, and
-atom compatible successor to <a
+A port used for communicating time-stamped atoms in the audio context. Ports
+of this type are connected to an LV2_Atom_Buffer, which contains a flat
+time-stamped sequence of <a href="#Event">Events</a>.
+
+This port type is intended as a simpler and atom compatible successor to <a
href="http://lv2plug.in/ns/ext/event#EventPort">ev:EventPort</a>.
""" .
diff --git a/ext/atom.lv2/manifest.ttl b/ext/atom.lv2/manifest.ttl
index d8488b1..adb10e5 100644
--- a/ext/atom.lv2/manifest.ttl
+++ b/ext/atom.lv2/manifest.ttl
@@ -4,6 +4,6 @@
<http://lv2plug.in/ns/ext/atom>
a lv2:Specification ;
lv2:minorVersion 0 ;
- lv2:microVersion 1 ;
+ lv2:microVersion 2 ;
rdfs:seeAlso <atom.ttl> .
diff --git a/ext/state.lv2/state.h b/ext/state.lv2/state.h
index 56ebfda..f52b375 100644
--- a/ext/state.lv2/state.h
+++ b/ext/state.lv2/state.h
@@ -35,6 +35,8 @@ extern "C" {
#define LV2_STATE_URI "http://lv2plug.in/ns/ext/state"
+typedef void* LV2_State_Handle;
+
/**
Flags describing value characteristics.
@@ -106,13 +108,12 @@ typedef enum {
The plugin MUST NOT attempt to use this function outside of the
LV2_State_Interface.restore() context.
*/
-typedef int (*LV2_State_Store_Function)(
- void* callback_data,
- uint32_t key,
- const void* value,
- size_t size,
- uint32_t type,
- uint32_t flags);
+typedef int (*LV2_State_Store_Function)(LV2_State_Handle* handle,
+ uint32_t key,
+ const void* value,
+ size_t size,
+ uint32_t type,
+ uint32_t flags);
/**
A host-provided function to retrieve a property.
@@ -138,12 +139,11 @@ typedef int (*LV2_State_Store_Function)(
copied for later use if necessary, assuming the plugin knows how to do so
correctly (e.g. the value is POD, or the plugin understands the type).
*/
-typedef const void* (*LV2_State_Retrieve_Function)(
- void* callback_data,
- uint32_t key,
- size_t* size,
- uint32_t* type,
- uint32_t* flags);
+typedef const void* (*LV2_State_Retrieve_Function)(LV2_State_Handle handle,
+ uint32_t key,
+ size_t* size,
+ uint32_t* type,
+ uint32_t* flags);
/**
State Extension Data.
@@ -207,7 +207,7 @@ typedef struct _LV2_State_Interface {
*/
void (*save)(LV2_Handle instance,
LV2_State_Store_Function store,
- void* callback_data,
+ LV2_State_Handle handle,
uint32_t flags);
/**
@@ -236,7 +236,7 @@ typedef struct _LV2_State_Interface {
*/
void (*restore)(LV2_Handle instance,
LV2_State_Retrieve_Function retrieve,
- void* callback_data,
+ LV2_State_Handle handle,
uint32_t flags);
} LV2_State_Interface;