move assignments out of assert() in editor_drag (thanks lincoln); change mouse mode...

[ardour.git] / gtk2_ardour / plugin_selector.cc

diff --git a/gtk2_ardour/plugin_selector.cc b/gtk2_ardour/plugin_selector.cc
index 89325855449a2db5d01dcc7958dbceeb849c265d..7ebe778ecb689dc2a9a670bafc8c04499aa7d645 100644 (file)
--- a/gtk2_ardour/plugin_selector.cc
+++ b/gtk2_ardour/plugin_selector.cc
@@ -16,6 +16,9 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
+#ifdef WAF_BUILD
+#include "gtk2ardour-config.h"
+#endif
 
 #include <cstdio>
 #include <lrdf.h>
@@ -303,25 +306,15 @@ PluginSelector::refiller (const PluginInfoList& plugs, const::std::string& filte
 
                        newrow[plugin_columns.creator] = creator;
 
-                       if ((*i)->n_inputs.n_total() < 0) { // FIXME: Impossible (unsigned)
-                               newrow[plugin_columns.audio_ins] = "various";
-                               newrow[plugin_columns.midi_ins] = "various";
-                       } else {
-                               snprintf (buf, sizeof(buf), "%d", (*i)->n_inputs.n_audio());
-                               newrow[plugin_columns.audio_ins] = buf;
-                               snprintf (buf, sizeof(buf), "%d", (*i)->n_inputs.n_midi());
-                               newrow[plugin_columns.midi_ins] = buf;
-                       }
-
-                       if ((*i)->n_outputs.n_total() < 0) { // FIXME: Impossible (unsigned)
-                               newrow[plugin_columns.audio_outs] = "various";
-                               newrow[plugin_columns.midi_outs] = "various";
-                       } else {
-                               snprintf (buf, sizeof(buf), "%d", (*i)->n_outputs.n_audio());           
-                               newrow[plugin_columns.audio_outs] = buf;
-                               snprintf (buf, sizeof(buf), "%d", (*i)->n_outputs.n_midi());            
-                               newrow[plugin_columns.midi_outs] = buf;
-                       }
+                       snprintf (buf, sizeof(buf), "%d", (*i)->n_inputs.n_audio());
+                       newrow[plugin_columns.audio_ins] = buf;
+                       snprintf (buf, sizeof(buf), "%d", (*i)->n_inputs.n_midi());
+                       newrow[plugin_columns.midi_ins] = buf;
+                       
+                       snprintf (buf, sizeof(buf), "%d", (*i)->n_outputs.n_audio());           
+                       newrow[plugin_columns.audio_outs] = buf;
+                       snprintf (buf, sizeof(buf), "%d", (*i)->n_outputs.n_midi());            
+                       newrow[plugin_columns.midi_outs] = buf;
 
                        newrow[plugin_columns.plugin] = *i;
                }
@@ -343,7 +336,11 @@ PluginSelector::lv2_refiller (const std::string& filterstr)
 }
 
 void
+#ifdef VST_SUPPORT
 PluginSelector::vst_refiller (const std::string& filterstr)
+#else
+PluginSelector::vst_refiller (const std::string&)
+#endif
 {
 #ifdef VST_SUPPORT
        refiller (manager->vst_plugin_info(), filterstr, "VST");
@@ -351,7 +348,11 @@ PluginSelector::vst_refiller (const std::string& filterstr)
 }
 
 void
+#ifdef HAVE_AUDIOUNITS
 PluginSelector::au_refiller (const std::string& filterstr)
+#else
+PluginSelector::au_refiller (const std::string&)
+#endif 
 {
 #ifdef HAVE_AUDIOUNITS
        refiller (manager->au_plugin_info(), filterstr, "AU");