comparison rdf/generator/vamp-rdf-template-generator.cpp @ 264:91ac8f5e52ea

* don't output bin names if there are none provided

 
         // FIXME ? Bin names may vary based on plugin setup, so including them here might be misleading...
         if (o.hasFixedBinCount)
         {
             res+="    vamp:bin_count        "+to_string(o.binCount)+" ;\n";
-            res+="    vamp:bin_names        (";
-
-            unsigned int i;
-            for (i=0; i+1 < o.binNames.size(); i++)
-                res+=" \""+o.binNames[i]+"\"";
-            if (i < o.binNames.size())
-                res+=" \""+o.binNames[i]+"\"";
-            res+=");\n";
+
+            bool haveBinNames = false;
+            for (int i=0; i < o.binNames.size(); i++) {
+                if (o.binNames[i] != "") {
+                    haveBinNames = true;
+                    break;
+                }
+            }
+            
+            if (haveBinNames) {
+                res+="    vamp:bin_names        (";
+
+                unsigned int i;
+                for (i=0; i+1 < o.binNames.size(); i++)
+                    res+=" \""+o.binNames[i]+"\"";
+                if (i < o.binNames.size())
+                    res+=" \""+o.binNames[i]+"\"";
+                res+=");\n";
+            }
         }
        
         res+="    vamp:sample_type      vamp:VariableSampleRate ;\n";
         if (o.sampleRate > 0.0f)
             res+="    vamp:sample_rate      "+to_string(o.sampleRate)+" ;\n";

 
         // FIXME ? Bin names may vary based on plugin setup, so including them here might be misleading...
         if (o.hasFixedBinCount)
         {
             res+="    vamp:bin_count        "+to_string(o.binCount)+" ;\n";
-            res+="    vamp:bin_names        (";
-
-            unsigned int i;
-            for (i=0; i+1 < o.binNames.size(); i++)
-                res+=" \""+o.binNames[i]+"\"";
-            if (i < o.binNames.size())
-                res+=" \""+o.binNames[i]+"\"";
-            res+=");\n";
+
+            bool haveBinNames = false;
+            for (int i=0; i < o.binNames.size(); i++) {
+                if (o.binNames[i] != "") {
+                    haveBinNames = true;
+                    break;
+                }
+            }
+
+            if (haveBinNames) {
+                res+="    vamp:bin_names        (";
+
+                unsigned int i;
+                for (i=0; i+1 < o.binNames.size(); i++)
+                    res+=" \""+o.binNames[i]+"\"";
+                if (i < o.binNames.size())
+                    res+=" \""+o.binNames[i]+"\"";
+                res+=");\n";
+            }
         }
 
         else if (o.sampleType == Plugin::OutputDescriptor::FixedSampleRate)
         {
             res+="    vamp:sample_type      vamp:FixedSampleRate ;\n";