merged with 2.0-ongoing changes 2582-2605 (not thoroughly tested but it compiles...

[ardour.git] / libs / ardour / plugin_manager.cc

diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc
index 02cba7dd9413b70f36477407d740b18899553ed8..dac8a9eead4060f752df94daa4c69e4587a38ee0 100644 (file)
--- a/libs/ardour/plugin_manager.cc
+++ b/libs/ardour/plugin_manager.cc
@@ -251,6 +251,7 @@ PluginManager::ladspa_discover (string path)
                PluginInfoPtr info(new LadspaPluginInfo);
                info->name = descriptor->Name;
                info->category = get_ladspa_category(descriptor->UniqueID);
+               info->creator = descriptor->Maker;
                info->path = path;
                info->index = i;
                info->n_inputs = ChanCount();
@@ -286,7 +287,7 @@ PluginManager::get_ladspa_category (uint32_t plugin_id)
 
        snprintf(buf, sizeof(buf), "%s%" PRIu32, LADSPA_BASE, plugin_id);
        pattern.subject = buf;
-       pattern.predicate = RDF_TYPE;
+       pattern.predicate = (char*)RDF_TYPE;
        pattern.object = 0;
        pattern.object_type = lrdf_uri;
 
@@ -297,7 +298,7 @@ PluginManager::get_ladspa_category (uint32_t plugin_id)
        }
 
        pattern.subject = matches1->object;
-       pattern.predicate = LADSPA_BASE "hasLabel";
+       pattern.predicate = (char*)LADSPA_BASE "hasLabel";
        pattern.object = 0;
        pattern.object_type = lrdf_literal;
 
@@ -396,6 +397,7 @@ PluginManager::vst_discover (string path)
 
        info->category = "VST";
        info->path = path;
+       // need to set info->creator but FST doesn't provide it
        info->index = 0;
        info->n_inputs = finfo->numInputs;
        info->n_outputs = finfo->numOutputs;