Improve plugin Ccategory consistency somewhat

diff --git a/libs/ardour/audio_unit.cc b/libs/ardour/audio_unit.cc
index ae84eb5dd99ebf03203b52cdcf7e808777ad6e5d..4bf0b0187a0abfe73a4dc3001b101f0f7a99b655 100644 (file)
--- a/libs/ardour/audio_unit.cc
+++ b/libs/ardour/audio_unit.cc
@@ -2901,24 +2901,24 @@ AUPluginInfo::discover_by_description (PluginInfoList& plugs, CAComponentDescrip
                        continue;
 
                case kAudioUnitType_Output:
-                       info->category = _("AudioUnit Outputs");
+                       info->category = _("AudioUnit Output");
                        break;
                case kAudioUnitType_MusicDevice:
-                       info->category = _("AudioUnit Instruments");
+                       info->category = _("Instrument");
                        has_midi_in = true;
                        break;
                case kAudioUnitType_MusicEffect:
-                       info->category = _("AudioUnit MusicEffects");
+                       info->category = _("Music Effect");
                        has_midi_in = true;
                        break;
                case kAudioUnitType_Effect:
-                       info->category = _("AudioUnit Effects");
+                       info->category = _("Effect");
                        break;
                case kAudioUnitType_Mixer:
-                       info->category = _("AudioUnit Mixers");
+                       info->category = _("Mixer");
                        break;
                case kAudioUnitType_Generator:
-                       info->category = _("AudioUnit Generators");
+                       info->category = _("Generator");
                        break;
                default:
                        info->category = _("AudioUnit (Unknown)");

diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc
index c137efff2aa6acf466869f7408b393f0e64851bd..76dc734978e7522b68ecce9b2073d885c404fbaf 100644 (file)
--- a/libs/ardour/lv2_plugin.cc
+++ b/libs/ardour/lv2_plugin.cc
@@ -3356,7 +3356,7 @@ LV2PluginInfo::in_category (const std::string &c) const
 {
        // TODO use untranslated lilv_plugin_get_class()
        // match gtk2_ardour/plugin_selector.cc
-       return category.find(c) != string::npos;
+       return category == c;
 }
 
 bool

diff --git a/libs/ardour/vst_info_file.cc b/libs/ardour/vst_info_file.cc
index dc780975b349f42717b9f7085d98c0d43ef04b95..77be57e8d8caf7db26842fc056c9db8ba4b1f1f3 100644 (file)
--- a/libs/ardour/vst_info_file.cc
+++ b/libs/ardour/vst_info_file.cc
@@ -649,10 +649,10 @@ vstfx_parse_vst_state (VSTState* vstfx)
        switch (plugin->dispatcher (plugin, effGetPlugCategory, 0, 0, 0, 0))
        {
                case kPlugCategEffect:         info->Category = strdup ("Effect"); break;
-               case kPlugCategSynth:          info->Category = strdup ("Synth"); break;
-               case kPlugCategAnalysis:       info->Category = strdup ("Anaylsis"); break;
+               case kPlugCategSynth:          info->Category = strdup ("Instrument"); break;
+               case kPlugCategAnalysis:       info->Category = strdup ("Analyser"); break;
                case kPlugCategMastering:      info->Category = strdup ("Mastering"); break;
-               case kPlugCategSpacializer:    info->Category = strdup ("Spacializer"); break;
+               case kPlugCategSpacializer:    info->Category = strdup ("Spatial"); break;
                case kPlugCategRoomFx:         info->Category = strdup ("RoomFx"); break;
                case kPlugSurroundFx:          info->Category = strdup ("SurroundFx"); break;
                case kPlugCategRestoration:    info->Category = strdup ("Restoration"); break;