DPF

commit b84a40b4f84a090ae7d85f043f63c3128023c47d
parent 597d7f3ee5364970623310305f2d82034fb86348
Author: falkTX <falktx@falktx.com>
Date:   Sat,  5 Jun 2021 11:28:34 +0100

LV2: Fix rounded scalepoints, dont triple-quote unless needed

Signed-off-by: falkTX <falktx@falktx.com>

Diffstat:
M
distrho/src/DistrhoPluginLV2export.cpp
 | 
44
++++++++++++++++++++++++++++++++++++--------

1 file changed, 36 insertions(+), 8 deletions(-)
diff --git a/distrho/src/DistrhoPluginLV2export.cpp b/distrho/src/DistrhoPluginLV2export.cpp
@@ -641,7 +641,12 @@ void lv2_generate_ttl(const char* const basename)
                 if (! designated)
                 {
                     // name and symbol
-                    pluginString += "        lv2:name \"\"\"" + plugin.getParameterName(i) + "\"\"\" ;\n";
+                    const String& paramName(plugin.getParameterName(i));
+
+                    if (paramName.contains('"'))
+                        pluginString += "        lv2:name \"\"\"" + paramName + "\"\"\" ;\n";
+                    else
+                        pluginString += "        lv2:name \"" + paramName + "\" ;\n";
 
                     String symbol(plugin.getParameterSymbol(i));
 
@@ -691,12 +696,15 @@ void lv2_generate_ttl(const char* const basename)
                             else
                                 pluginString += "        [\n";
 
-                            pluginString += "            rdfs:label  \"\"\"" + enumValue.label + "\"\"\" ;\n";
+                            if (enumValue.label.contains('"'))
+                                pluginString += "            rdfs:label  \"\"\"" + enumValue.label + "\"\"\" ;\n";
+                            else
+                                pluginString += "            rdfs:label  \"" + enumValue.label + "\" ;\n";
 
                             if (plugin.getParameterHints(i) & kParameterIsInteger)
                             {
-                                const int roundedValue = (int)(enumValue.value + enumValue.value < 0.0f ? -0.5f : 0.5f);
-                                pluginString += "            rdf:value " + String(roundedValue) + " ;\n";
+                                const int rounded = (int)(enumValue.value + (enumValue.value < 0.0f ? -0.5f : 0.5f));
+                                pluginString += "            rdf:value " + String(rounded) + " ;\n";
                             }
                             else
                             {
@@ -795,7 +803,12 @@ void lv2_generate_ttl(const char* const basename)
             const String comment(plugin.getDescription());
 
             if (comment.isNotEmpty())
-                pluginString += "    rdfs:comment \"\"\"" + comment + "\"\"\" ;\n\n";
+            {
+                if (comment.contains('"'))
+                    pluginString += "    rdfs:comment \"" + comment + "\" ;\n\n";
+                else
+                    pluginString += "    rdfs:comment \"" + comment + "\" ;\n\n";
+            }
         }
 
 #ifdef DISTRHO_PLUGIN_BRAND
@@ -805,24 +818,39 @@ void lv2_generate_ttl(const char* const basename)
 #endif
 
         // name
-        pluginString += "    doap:name \"\"\"" + String(plugin.getName()) + "\"\"\" ;\n";
+        {
+            const String name(plugin.getName());
+
+            if (name.contains('"'))
+                pluginString += "    doap:name \"\"\"" + name + "\"\"\" ;\n";
+            else
+                pluginString += "    doap:name \"" + name + "\" ;\n";
+        }
 
         // license
         {
             const String license(plugin.getLicense());
 
+            // TODO always convert to URL, do best-guess based on known licenses
             if (license.contains("://"))
                 pluginString += "    doap:license <" +  license + "> ;\n\n";
-            else
+            else if (license.contains('"'))
                 pluginString += "    doap:license \"\"\"" +  license + "\"\"\" ;\n\n";
+            else
+                pluginString += "    doap:license \"" +  license + "\" ;\n\n";
         }
 
         // developer
         {
             const String homepage(plugin.getHomePage());
+            const String maker(plugin.getMaker());
 
             pluginString += "    doap:maintainer [\n";
-            pluginString += "        foaf:name \"\"\"" + String(plugin.getMaker()) + "\"\"\" ;\n";
+
+            if (maker.contains('"'))
+                pluginString += "        foaf:name \"\"\"" + maker + "\"\"\" ;\n";
+            else
+                pluginString += "        foaf:name \"" + maker + "\" ;\n";
 
             if (homepage.isNotEmpty())
                 pluginString += "        foaf:homepage <" + homepage + "> ;\n";