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 5b3a4658a80fd55e2658038ad0acda9c3b06ab78..dac8a9eead4060f752df94daa4c69e4587a38ee0 100644 (file)
--- a/libs/ardour/plugin_manager.cc
+++ b/libs/ardour/plugin_manager.cc
@@ -15,9 +15,11 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
+#define __STDC_FORMAT_MACROS 1
+#include <stdint.h>
+
 #include <sys/types.h>
 #include <cstdio>
 #include <lrdf.h>
@@ -83,7 +85,6 @@ PluginManager::PluginManager ()
        }
 
        refresh ();
-
        if (_manager == 0) {
                _manager = this;
        }
@@ -106,7 +107,7 @@ PluginManager::ladspa_refresh ()
        _ladspa_plugin_info.clear ();
 
        if (ladspa_path.length() == 0) {
-               ladspa_path = "/usr/local/lib/ladspa:/usr/lib/ladspa";
+               ladspa_path = "/usr/local/lib64/ladspa:/usr/local/lib/ladspa:/usr/lib64/ladspa:/usr/lib/ladspa:/Library/Audio/Plug-Ins/LADSPA";
        }
 
        ladspa_discover_from_path (ladspa_path);
@@ -250,20 +251,21 @@ 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 = 0;
-               info->n_outputs = 0;
+               info->n_inputs = ChanCount();
+               info->n_outputs = ChanCount();
                info->type = ARDOUR::LADSPA;
                info->unique_id = descriptor->UniqueID;
                
                for (uint32_t n=0; n < descriptor->PortCount; ++n) {
                        if ( LADSPA_IS_PORT_AUDIO (descriptor->PortDescriptors[n]) ) {
                                if ( LADSPA_IS_PORT_INPUT (descriptor->PortDescriptors[n]) ) {
-                                       info->n_inputs++;
+                                       info->n_inputs.set_audio(info->n_inputs.n_audio() + 1);
                                }
                                else if ( LADSPA_IS_PORT_OUTPUT (descriptor->PortDescriptors[n]) ) {
-                                       info->n_outputs++;
+                                       info->n_outputs.set_audio(info->n_outputs.n_audio() + 1);
                                }
                        }
                }
@@ -285,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;
 
@@ -296,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;
 
@@ -341,7 +343,7 @@ PluginManager::add_vst_directory (string path)
 static bool vst_filter (const string& str, void *arg)
 {
        /* Not a dotfile, has a prefix before a period, suffix is "dll" */
-       
+
        return str[0] != '.' && (str.length() > 4 && str.find (".dll") == (str.length() - 4));
 }
 
@@ -373,6 +375,7 @@ PluginManager::vst_discover (string path)
        FSTInfo* finfo;
 
        if ((finfo = fst_get_info (const_cast<char *> (path.c_str()))) == 0) {
+               warning << "Cannot get VST information from " << path << endmsg;
                return -1;
        }
 
@@ -394,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;