comparison vampyhost.cpp @ 47:1cb0ed230b71

Add plugin loader adapter flags

     string pluginKey = toPluginKey(pyPluginKey);
     if (pluginKey == "") return 0;
 
     PluginLoader *loader = PluginLoader::getInstance();
 
-    Plugin *plugin = loader->loadPlugin
-        (pluginKey, 48000, PluginLoader::ADAPT_ALL_SAFE);
+    Plugin *plugin = loader->loadPlugin(pluginKey, 48000, 0);
     if (!plugin) {
         string pyerr("Failed to load plugin: "); pyerr += pluginKey;
         PyErr_SetString(PyExc_TypeError,pyerr.c_str());
         return 0;
     }

 static PyObject *
 loadPlugin(PyObject *self, PyObject *args)
 {
     PyObject *pyPluginKey;
     float inputSampleRate;
-
-    if (!PyArg_ParseTuple(args, "Sf",
+    int adapterFlags;
+
+    if (!PyArg_ParseTuple(args, "Sfn",
                           &pyPluginKey,
-                          &inputSampleRate)) {
-        PyErr_SetString(PyExc_TypeError,
-                        "loadPlugin() takes plugin key (string) and sample rate (float) arguments");
-        return 0; }
-
-    string pluginKey = toPluginKey(pyPluginKey);
-    if (pluginKey == "") return 0;
-
-    PluginLoader *loader = PluginLoader::getInstance();
-
-    Plugin *plugin = loader->loadPlugin(pluginKey, inputSampleRate,
-                                        PluginLoader::ADAPT_ALL_SAFE);
+                          &inputSampleRate,
+                          &adapterFlags)) {
+        PyErr_SetString(PyExc_TypeError,
+                        "loadPlugin() takes plugin key (string), sample rate (float), and adapter flags (int) arguments");
+        return 0; }
+
+    string pluginKey = toPluginKey(pyPluginKey);
+    if (pluginKey == "") return 0;
+
+    PluginLoader *loader = PluginLoader::getInstance();
+
+    Plugin *plugin = loader->loadPlugin(pluginKey,
+                                        inputSampleRate,
+                                        adapterFlags);
     if (!plugin) {
         string pyerr("Failed to load plugin: "); pyerr += pluginKey;
         PyErr_SetString(PyExc_TypeError,pyerr.c_str());
         return 0;
     }

         setint(dict, "VariableSampleRate",
                Plugin::OutputDescriptor::VariableSampleRate) < 0 ||
         setint(dict, "TimeDomain",
                Plugin::TimeDomain) < 0 ||
         setint(dict, "FrequencyDomain",
-               Plugin::FrequencyDomain) < 0) {
+               Plugin::FrequencyDomain) < 0 ||
+        setint(dict, "AdaptNone",
+               0) < 0 ||
+        setint(dict, "AdaptChannelCount",
+               PluginLoader::ADAPT_CHANNEL_COUNT) < 0 ||
+        setint(dict, "AdaptBufferSize",
+               PluginLoader::ADAPT_BUFFER_SIZE) < 0 ||
+        setint(dict, "AdaptAllSafe",
+               PluginLoader::ADAPT_ALL_SAFE) < 0 ||
+        setint(dict, "AdaptAll",
+               PluginLoader::ADAPT_ALL) < 0) {
         cerr << "ERROR: initvampyhost: Failed to add enums to module dictionary" << endl;
         return;
     }
 }