Remove subject parameter.

2 files changed, 2 insertions, 10 deletions

diff --git a/ext/persist.lv2/persist.h b/ext/persist.lv2/persist.h
index e7c1078..f0c0907 100644
--- a/ext/persist.lv2/persist.h
+++ b/ext/persist.lv2/persist.h
@@ -70,7 +70,6 @@ typedef enum {
 /**
    A host-provided function to store a property.
    @param callback_data Must be the callback_data passed to LV2_Persist.save().
-   @param subject The subject of this property (URI), or 0 for plugin instance.
    @param key The key (predicate) to store @a value under (URI mapped integer).
    @param value Pointer to the value (object) to be stored.
    @param size The size of the data at @a value in bytes.
@@ -82,7 +81,7 @@ typedef enum {
    is called repeatedly by the plugin within LV2_Persist.save() to store all
    the statements that describe its current state.
 
-   The host MAY fail to store a statement if the type is not understood and is
+   The host MAY fail to store a property if the type is not understood and is
    not LV2_PERSIST_IS_POD and/or LV2_PERSIST_IS_PORTABLE. Implementations are
    encouraged to use POD and portable values (e.g. string literals) wherever
    possible, and use common types (e.g. types from
@@ -97,7 +96,6 @@ typedef enum {
 */
 typedef int (*LV2_Persist_Store_Function)(
 	void*       callback_data,
-	uint32_t    subject,
 	uint32_t    key,
 	const void* value,
 	size_t      size,
@@ -107,7 +105,6 @@ typedef int (*LV2_Persist_Store_Function)(
 /**
    A host-provided function to retrieve a property.
    @param callback_data Must be the callback_data passed to LV2_Persist.restore().
-   @param subject The subject of the property (URI), or 0 for plugin instance.
    @param key The key (predicate) of the property to retrieve (URI).
    @param size (Output) If non-NULL, set to the size of the restored value.
    @param type (Output) If non-NULL, set to the type of the restored value.
@@ -129,7 +126,6 @@ typedef int (*LV2_Persist_Store_Function)(
 */
 typedef const void* (*LV2_Persist_Retrieve_Function)(
 	void*     callback_data,
-	uint32_t  subject,
 	uint32_t  key,
 	size_t*   size,
 	uint32_t* type,
diff --git a/ext/persist.lv2/persist.ttl b/ext/persist.lv2/persist.ttl
index fcd03dc..e5f6417 100644
--- a/ext/persist.lv2/persist.ttl
+++ b/ext/persist.lv2/persist.ttl
@@ -112,7 +112,6 @@ void my_save(LV2_Handle                 instance,
     const char* greeting = plugin->state->greeting;
 
     store(callback_data,
-          0,
           plugin->uri_greeting_key,
           greeting,
           strlen(greeting) + 1,
@@ -130,7 +129,6 @@ void my_restore(LV2_Handle                    instance,
     uint32_t    type;
     uint32_t    flags;
     const char* greeting = retrieve(callback_data,
-                                    0
                                     plugin->uri_greeting_key,
                                     &size,
                                     &type,
@@ -148,7 +146,6 @@ void my_restore(LV2_Handle                    instance,
 <p>Similarly, a typical use case in a host is:</p>
 <pre>
 int store_callback(void*       callback_data,
-                   uint32_t    subject,
                    uint32_t    key,
                    const void* value,
                    size_t      size,
@@ -160,8 +157,7 @@ int store_callback(void*       callback_data,
            LV2_PERSIST_IS_PORTABLE would have to be checked as well.
         */
         Map* state_map = (Map*)callback_data;
-        state_map->insert(Key(subject, key),
-                          Value(copy(value), size, type, pod));
+        state_map->insert(key, Value(copy(value), size, type, pod));
         return 0;
     } else {
         return 1; /* Non-POD events are unsupported. */