Changeset 2092

Timestamp:

06/03/09 17:47:48 (15 months ago)

Author:

drobilla

Message:

Don't treat non-plugin metadata as plugin data.

Location:

trunk/ingen/src

Files:

• client/ClientStore.cpp (modified) (1 diff)
• common/interface/Plugin.hpp (modified) (2 diffs)
• gui/LoadPluginWindow.cpp (modified) (1 diff)

trunk/ingen/src/client/ClientStore.cpp

@@ -275 +275 @@
 
         bool is_path = Path::is_valid(uri.str());
-        bool is_meta = uri.substr(0, 8) == "meta:#";
+        bool is_meta = uri.substr(0, 6) == "meta:#";
 
         if (!(is_path || is_meta)) {
                 const URI& type_uri = properties.find("rdf:type")->second.get_uri();
-                SharedPtr<PluginModel> p(new PluginModel(uri, type_uri, properties));
-                add_plugin(p);
+                if (Plugin::type_from_uri(type_uri.str()) != Plugin::NIL) {
+                        SharedPtr<PluginModel> p(new PluginModel(uri, type_uri, properties));
+                        add_plugin(p);
+                        return;
+                }
+        }
+
+        string path_str = is_meta ? (string("/") + uri.chop_start("#")) : uri.str();
+        if (!Path::is_valid(path_str)) {
+                cerr << "ERROR: Bad path: " << uri.str() << " - " << path_str << endl;
                 return;
         }

trunk/ingen/src/common/interface/Plugin.hpp

@@ -30 +30 @@
 {
 public:
-        enum Type { LV2, LADSPA, Internal, Patch };
+        enum Type { NIL, LV2, LADSPA, Internal, Patch };
 
         virtual Type type() const = 0;
@@ -53 +53 @@
                 else if (uri == "ingen:Patch")
                         return Patch;
-                else
-                        std::cerr << "WARNING: Unknown plugin type " << uri << std::endl;
-                return Internal;
+                return NIL;
         }
 };

trunk/ingen/src/gui/LoadPluginWindow.cpp

@@ -246 +246 @@
         case Plugin::Patch:
                 row[_plugins_columns._col_type] = "Patch";
+                break;
+        case Plugin::NIL:
+                row[_plugins_columns._col_type] = "?";
                 break;
         }