From 9fd71908b6a95decd509f3db37cfa6ba0216be17 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Fri, 11 May 2012 13:05:45 +0100
Subject: [PATCH] Carla: Don't define lv2 state types we don't yet support

---
 src/carla.py              | 20 ++------------------
 src/carla/carla_backend.h | 10 +++-------
 src/carla/lv2.cpp         |  2 ++
 src/carla_backend.py      | 10 +++-------
 4 files changed, 10 insertions(+), 32 deletions(-)

diff --git a/src/carla.py b/src/carla.py
index 85e2eb5..fbd047a 100755
--- a/src/carla.py
+++ b/src/carla.py
@@ -89,15 +89,7 @@ setDefaultProjectFolder(DEFAULT_PROJECT_FOLDER)
 setDefaultPluginsPaths(LADSPA_PATH, DSSI_PATH, LV2_PATH, VST_PATH, SF2_PATH)
 
 def CustomDataType2String(dtype):
-    if dtype == CUSTOM_DATA_BOOL:
-        return "bool"
-    elif dtype == CUSTOM_DATA_INT:
-        return "int"
-    elif dtype == CUSTOM_DATA_LONG:
-        return "long"
-    elif dtype == CUSTOM_DATA_FLOAT:
-        return "float"
-    elif dtype == CUSTOM_DATA_STRING:
+    if dtype == CUSTOM_DATA_STRING:
         return "string"
     elif dtype == CUSTOM_DATA_PATH:
         return "path"
@@ -107,15 +99,7 @@ def CustomDataType2String(dtype):
         return "null"
 
 def CustomDataString2Type(stype):
-    if stype == "bool":
-        return CUSTOM_DATA_BOOL
-    elif stype == "int":
-        return CUSTOM_DATA_INT
-    elif stype == "long":
-        return CUSTOM_DATA_LONG
-    elif stype == "float":
-        return CUSTOM_DATA_FLOAT
-    elif stype == "string":
+    if stype == "string":
         return CUSTOM_DATA_STRING
     elif stype == "path":
         return CUSTOM_DATA_PATH
diff --git a/src/carla/carla_backend.h b/src/carla/carla_backend.h
index f3173ae..e493bb3 100644
--- a/src/carla/carla_backend.h
+++ b/src/carla/carla_backend.h
@@ -95,13 +95,9 @@ enum InternalParametersIndex {
 
 enum CustomDataType {
     CUSTOM_DATA_INVALID = 0,
-    CUSTOM_DATA_BOOL    = 1,
-    CUSTOM_DATA_INT     = 2,
-    CUSTOM_DATA_LONG    = 3,
-    CUSTOM_DATA_FLOAT   = 4,
-    CUSTOM_DATA_STRING  = 5,
-    CUSTOM_DATA_PATH    = 6,
-    CUSTOM_DATA_BINARY  = 7
+    CUSTOM_DATA_STRING  = 1,
+    CUSTOM_DATA_PATH    = 2,
+    CUSTOM_DATA_BINARY  = 3
 };
 
 enum GuiType {
diff --git a/src/carla/lv2.cpp b/src/carla/lv2.cpp
index 7fa20e8..fcdcf63 100644
--- a/src/carla/lv2.cpp
+++ b/src/carla/lv2.cpp
@@ -2937,11 +2937,13 @@ public:
 
                     if (dtype == CUSTOM_DATA_STRING)
                     {
+                        *size = strlen(string_data);
                         *type = CARLA_URI_MAP_ID_ATOM_STRING;
                         return string_data;
                     }
                     else if (dtype == CUSTOM_DATA_PATH)
                     {
+                        *size = strlen(string_data);
                         *type = CARLA_URI_MAP_ID_ATOM_PATH;
                         return string_data;
                     }
diff --git a/src/carla_backend.py b/src/carla_backend.py
index 502de62..57cc580 100644
--- a/src/carla_backend.py
+++ b/src/carla_backend.py
@@ -565,13 +565,9 @@ PARAMETER_BALANCE_RIGHT = -5
 
 # enum CustomDataType
 CUSTOM_DATA_INVALID = 0
-CUSTOM_DATA_BOOL    = 1
-CUSTOM_DATA_INT     = 2
-CUSTOM_DATA_LONG    = 3
-CUSTOM_DATA_FLOAT   = 4
-CUSTOM_DATA_STRING  = 5
-CUSTOM_DATA_PATH    = 6
-CUSTOM_DATA_BINARY  = 7
+CUSTOM_DATA_STRING  = 1
+CUSTOM_DATA_PATH    = 2
+CUSTOM_DATA_BINARY  = 3
 
 # enum GuiType
 GUI_NONE = 0