[SCM] calf/master: + LV2: update of URI map extension

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 517f03d37d48c3eda827e41e33a6e18aa83b1d89
Author: kfoltman <kfoltman at 78b06b96-2940-0410-b7fc-879d825d01d8>
Date:   Wed Mar 19 20:10:45 2008 +0000

    + LV2: update of URI map extension
    
    
    
    git-svn-id: https://calf.svn.sourceforge.net/svnroot/calf/trunk@133 78b06b96-2940-0410-b7fc-879d825d01d8

diff --git a/src/calf/lv2_uri_map.h b/src/calf/lv2_uri_map.h
index edcb49a..1c2f5b0 100644
--- a/src/calf/lv2_uri_map.h
+++ b/src/calf/lv2_uri_map.h
@@ -50,6 +50,13 @@ typedef void* LV2_URI_Map_Callback_Data;
  */
 typedef struct {
 	
+	/** Opaque pointer to host data.
+	 *
+	 * The plugin MUST pass this to any call to functions in this struct.
+	 * Otherwise, it must not be interpreted in any way.
+	 */
+	LV2_URI_Map_Callback_Data callback_data;
+	
 	/** Get the numeric ID of a URI from the host.
 	 *
 	 * @param callback_data Must be the callback_data member of this struct.
@@ -65,18 +72,14 @@ typedef struct {
 	 * with a different map parameter).  However, this function is not
 	 * necessarily very fast: plugins should cache any IDs they might need in
 	 * performance critical situations.
+	 * The return value 0 is reserved and means an ID for that URI could not
+	 * be created for whatever reason.  Extensions may define more precisely
+	 * what this means, but in general plugins should gracefully handle 0
+	 * and consider whatever they wanted the URI for "unsupported".
 	 */
 	uint32_t (*uri_to_id)(LV2_URI_Map_Callback_Data callback_data,
 	                      const char*               map,
 	                      const char*               uri);
-	
-
-	/** Opaque pointer to host data.
-	 *
-	 * The plugin MUST pass this to any call to functions in this struct.
-	 * Otherwise, it must not be interpreted in any way.
-	 */
-	LV2_URI_Map_Callback_Data callback_data;
 
 } LV2_URI_Map_Feature;
 

-- 
calf audio plugins packaging