expose more info from plugin-strip (for GUI display)

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

diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc
index cbf6994d6595f8486d79d36e9f60deb881d9e3b3..89ddc5ff19f303fb204bd979f96be89e362a3426 100644 (file)
--- a/libs/ardour/plugin_manager.cc
+++ b/libs/ardour/plugin_manager.cc
@@ -276,7 +276,11 @@ PluginManager::refresh (bool cache_only)
                        if (Glib::file_test (fn, Glib::FILE_TEST_EXISTS)) {
                                gchar *bl = NULL;
                                if (g_file_get_contents(fn.c_str (), &bl, NULL, NULL)) {
-                                       PBD::info << _("VST Blacklist:") << "\n" << bl << "-----" << endmsg;
+                                       if (Config->get_verbose_plugin_scan()) {
+                                               PBD::info << _("VST Blacklist: ") << fn << "\n" << bl << "-----" << endmsg;
+                                       } else {
+                                               PBD::info << _("VST Blacklist:") << "\n" << bl << "-----" << endmsg;
+                                       }
                                        g_free (bl);
                                }
                        }
@@ -794,55 +798,56 @@ static std::string dll_info (std::string path) {
        uint16_t type = 0;
        off_t pe_hdr_off = 0;
 
-       int fd = open(path.c_str(), O_RDONLY, 0444);
+       int fd = g_open(path.c_str(), O_RDONLY, 0444);
 
        if (fd < 0) {
-               return _("- cannot open dll"); // TODO strerror()
+               return _("cannot open dll"); // TODO strerror()
        }
 
        if (68 != read (fd, buf, 68)) {
-               rv = _("- invalid dll, file too small");
+               rv = _("invalid dll, file too small");
                goto errorout;
        }
        if (buf[0] != 'M' && buf[1] != 'Z') {
-               rv = _("- not a dll");
+               rv = _("not a dll");
                goto errorout;
        }
 
        pe_hdr_off = *((int32_t*) &buf[60]);
        if (pe_hdr_off !=lseek (fd, pe_hdr_off, SEEK_SET)) {
-               rv = _("- cannot determine dll type");
+               rv = _("cannot determine dll type");
                goto errorout;
        }
        if (6 != read (fd, buf, 6)) {
-               rv = _("- cannot read dll PE header");
+               rv = _("cannot read dll PE header");
                goto errorout;
        }
 
        if (buf[0] != 'P' && buf[1] != 'E') {
-               rv = _("- invalid dll PE header");
+               rv = _("invalid dll PE header");
                goto errorout;
        }
 
        type = *((uint16_t*) &buf[4]);
        switch (type) {
                case 0x014c:
-                       rv = _("- i386 (32bit)");
+                       rv = _("i386 (32-bit)");
                        break;
                case  0x0200:
-                       rv = _("- Itanium");
+                       rv = _("Itanium");
                        break;
                case 0x8664:
-                       rv = _("- x64 (64bit)");
+                       rv = _("x64 (64-bit)");
                        break;
                case 0:
-                       rv = _("- Native Architecture");
+                       rv = _("Native Architecture");
                        break;
                default:
-                       rv = _("- Unknown Architecture");
+                       rv = _("Unknown Architecture");
                        break;
        }
 errorout:
+       assert (rv.length() > 0);
        close (fd);
        return rv;
 }
@@ -853,7 +858,11 @@ PluginManager::windows_vst_discover (string path, bool cache_only)
        DEBUG_TRACE (DEBUG::PluginManager, string_compose ("windows_vst_discover '%1'\n", path));
 
        if (Config->get_verbose_plugin_scan()) {
-               info << string_compose (_(" *  %1 %2 %3"), path, (cache_only ? _(" (cache only)") : "", dll_info (path))) << endmsg;
+               if (cache_only) {
+                       info << string_compose (_(" *  %1 (cache only)"), path) << endmsg;
+               } else {
+                       info << string_compose (_(" *  %1 - %2"), path, dll_info (path)) << endmsg;
+               }
        }
 
        _cancel_timeout = false;
@@ -1093,6 +1102,10 @@ PluginManager::save_statuses ()
                case LXVST:
                        ofs << "LXVST";
                        break;
+               case Lua:
+                       assert (0);
+                       continue;
+                       break;
                }
 
                ofs << ' ';
@@ -1114,6 +1127,7 @@ PluginManager::save_statuses ()
                ofs << endl;
        }
        g_file_set_contents (path.c_str(), ofs.str().c_str(), -1, NULL);
+       PluginStatusesChanged (); /* EMIT SIGNAL */
 }
 
 void