Somewhat uncertain fix to playhead misbehaviour in rewind.

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

diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc
index 8315397fe85bbaa30f0243175b8c21b9e0d404a2..8227d5869f2f4da5b315435b58a5cee665122e89 100644 (file)
--- a/libs/ardour/plugin_manager.cc
+++ b/libs/ardour/plugin_manager.cc
@@ -21,7 +21,6 @@
 #include "libardour-config.h"
 #endif
 
-#define __STDC_FORMAT_MACROS 1
 #include <stdint.h>
 
 #include <sys/types.h>
@@ -40,6 +39,7 @@
 #include <glibmm/miscutils.h>
 
 #include "pbd/pathscanner.h"
+#include "pbd/whitespace.h"
 
 #include "ardour/ladspa.h"
 #include "ardour/session.h"
@@ -82,7 +82,7 @@ PluginManager::PluginManager ()
        char* s;
        string lrdf_path;
 
-       load_favorites ();
+       load_statuses ();
 
 #ifdef HAVE_AUDIOUNITS
        ProcessSerialNumber psn = { 0, kCurrentProcess };
@@ -141,6 +141,15 @@ PluginManager::PluginManager ()
        BootMessage (_("Discovering Plugins"));
 }
 
+
+PluginManager::~PluginManager()
+{
+#ifdef HAVE_SLV2
+       delete _lv2_world;
+#endif
+}
+
+
 void
 PluginManager::refresh ()
 {
@@ -156,6 +165,8 @@ PluginManager::refresh ()
 #ifdef HAVE_AUDIOUNITS
        au_refresh ();
 #endif
+
+       PluginListChanged (); /* EMIT SIGNAL */
 }
 
 void
@@ -189,7 +200,7 @@ PluginManager::ladspa_refresh ()
                                case ':' :
                                case '\0':
                                        continue;
-                               case '/' :
+                               case G_DIR_SEPARATOR :
                                        if (ladspa_path[found + strlen(standard_paths[i]) + 1] == ':' ||
                                            ladspa_path[found + strlen(standard_paths[i]) + 1] == '\0') {
                                                continue;
@@ -299,13 +310,12 @@ PluginManager::add_lrdf_data (const string &path)
        PathScanner scanner;
        vector<string *>* rdf_files;
        vector<string *>::iterator x;
-       string uri;
 
        rdf_files = scanner (path, rdf_filter, 0, true, true);
 
        if (rdf_files) {
                for (x = rdf_files->begin(); x != rdf_files->end (); ++x) {
-                       uri = "file://" + **x;
+                       const string uri(string("file://") + **x);
 
                        if (lrdf_read_file(uri.c_str())) {
                                warning << "Could not parse rdf file: " << uri << endmsg;
@@ -414,7 +424,7 @@ PluginManager::get_ladspa_category (uint32_t plugin_id)
        lrdf_statement* matches1 = lrdf_matches (&pattern);
 
        if (!matches1) {
-               return "";
+               return "Unknown";
        }
 
        pattern.subject = matches1->object;
@@ -426,7 +436,7 @@ PluginManager::get_ladspa_category (uint32_t plugin_id)
        lrdf_free_statements(matches1);
 
        if (!matches2) {
-               return ("");
+               return ("Unknown");
        }
 
        string label = matches2->object;
@@ -547,6 +557,7 @@ PluginManager::vst_discover (string path)
        info->index = 0;
        info->n_inputs.set_audio (finfo->numInputs);
        info->n_outputs.set_audio (finfo->numOutputs);
+       info->n_inputs.set_midi (finfo->wantMidi ? 1 : 0);
        info->type = ARDOUR::VST;
 
        _vst_plugin_info->push_back (info);
@@ -557,19 +568,24 @@ PluginManager::vst_discover (string path)
 
 #endif // VST_SUPPORT
 
-bool
-PluginManager::is_a_favorite_plugin (const PluginInfoPtr& pi)
+PluginManager::PluginStatusType
+PluginManager::get_status (const PluginInfoPtr& pi)
 {
-       FavoritePlugin fp (pi->type, pi->unique_id);
-       return find (favorites.begin(), favorites.end(), fp) !=  favorites.end();
+       PluginStatus ps (pi->type, pi->unique_id);
+       PluginStatusList::const_iterator i =  find (statuses.begin(), statuses.end(), ps);
+       if (i ==  statuses.end() ) {
+               return Normal;
+       } else {
+               return i->status;
+       }
 }
 
 void
-PluginManager::save_favorites ()
+PluginManager::save_statuses ()
 {
        ofstream ofs;
        sys::path path = user_config_directory();
-       path /= "favorite_plugins";
+       path /= "plugin_statuses";
 
        ofs.open (path.to_string().c_str(), ios_base::openmode (ios::out|ios::trunc));
 
@@ -577,7 +593,7 @@ PluginManager::save_favorites ()
                return;
        }
 
-       for (FavoritePluginList::iterator i = favorites.begin(); i != favorites.end(); ++i) {
+       for (PluginStatusList::iterator i = statuses.begin(); i != statuses.end(); ++i) {
                switch ((*i).type) {
                case LADSPA:
                        ofs << "LADSPA";
@@ -593,26 +609,45 @@ PluginManager::save_favorites ()
                        break;
                }
 
-               ofs << ' ' << (*i).unique_id << endl;
+               ofs << ' ';
+
+               switch ((*i).status) {
+               case Normal:
+                       ofs << "Normal";
+                       break;
+               case Favorite:
+                       ofs << "Favorite";
+                       break;
+               case Hidden:
+                       ofs << "Hidden";
+                       break;
+               }
+       
+               ofs << ' ';
+               ofs << (*i).unique_id;;
+               ofs << endl;
        }
 
        ofs.close ();
 }
 
 void
-PluginManager::load_favorites ()
+PluginManager::load_statuses ()
 {
        sys::path path = user_config_directory();
-       path /= "favorite_plugins";
+       path /= "plugin_statuses";
        ifstream ifs (path.to_string().c_str());
 
        if (!ifs) {
                return;
        }
-
+       
        std::string stype;
+       std::string sstatus;
        std::string id;
        PluginType type;
+       PluginStatusType status;
+       char buf[1024];
 
        while (ifs) {
 
@@ -621,9 +656,31 @@ PluginManager::load_favorites ()
                        break;
 
                }
-               ifs >> id;
+
+               ifs >> sstatus;
                if (!ifs) {
                        break;
+
+               }
+
+               /* rest of the line is the plugin ID */
+
+               ifs.getline (buf, sizeof (buf), '\n');
+               if (!ifs) {
+                       break;
+               }
+
+               if (sstatus == "Normal") {
+                       status = Normal;
+               } else if (sstatus == "Favorite") {
+                       status = Favorite;
+               } else if (sstatus == "Hidden") {
+                       status = Hidden;
+               } else {
+                       error << string_compose (_("unknown plugin status type \"%1\" - all entries ignored"), sstatus)
+                                 << endmsg;
+                       statuses.clear ();
+                       break;
                }
 
                if (stype == "LADSPA") {
@@ -635,30 +692,31 @@ PluginManager::load_favorites ()
                } else if (stype == "VST") {
                        type = VST;
                } else {
-                       error << string_compose (_("unknown favorite plugin type \"%1\" - ignored"), stype)
+                       error << string_compose (_("unknown plugin type \"%1\" - ignored"), stype)
                              << endmsg;
                        continue;
                }
-
-               add_favorite (type, id);
+               
+               id = buf;
+               strip_whitespace_edges (id);
+               set_status (type, id, status);
        }
-
+       
        ifs.close ();
 }
 
 void
-PluginManager::add_favorite (PluginType t, string id)
+PluginManager::set_status (PluginType t, string id, PluginStatusType status)
 {
-       FavoritePlugin fp (t, id);
-       pair<FavoritePluginList::iterator,bool> res = favorites.insert (fp);
-       //cerr << "Added " << t << " " << id << " success ? " << res.second << endl;
-}
+       PluginStatus ps (t, id, status);
+       statuses.erase (ps);
 
-void
-PluginManager::remove_favorite (PluginType t, string id)
-{
-       FavoritePlugin fp (t, id);
-       favorites.erase (fp);
+       if (status == Normal) {
+               return;
+       }
+
+       pair<PluginStatusList::iterator, bool> res = statuses.insert (ps);
+       //cerr << "Added " << t << " " << id << " " << status << " success ? " << res.second << endl;
 }
 
 ARDOUR::PluginInfoList&