Changeset 4287

Timestamp:

2012-04-27 16:50:08 (13 months ago)

Author:

drobilla

Message:

Disconnect via atom interface.

Location:

trunk/ingen

Files:

• ingen/shared/AtomWriter.hpp (modified) (1 diff)
• src/shared/AtomReader.cpp (modified) (2 diffs)
• src/shared/AtomWriter.cpp (modified) (3 diffs)

trunk/ingen/ingen/shared/AtomWriter.hpp

@@ -79 +79 @@
     void forge_uri(const Raul::URI& uri);
     void forge_properties(const Resource::Properties& properties);
+    void forge_edge(const Raul::URI& tail, const Raul::URI& head);
 
     void    finish_msg();

trunk/ingen/src/shared/AtomReader.cpp

@@ -36 +36 @@
 AtomReader::get_uri(const LV2_Atom* in, Raul::Atom& out)
 {
-    if (in->type == _uris.atom_URID) {
-        const LV2_Atom_URID* urid = (const LV2_Atom_URID*)in;
-        out = _forge.alloc_uri(_map.unmap_uri(urid->body));
-    } else {
-        out = _forge.alloc(in->size, in->type, LV2_ATOM_BODY(in));
+    if (in) {
+        if (in->type == _uris.atom_URID) {
+            const LV2_Atom_URID* urid = (const LV2_Atom_URID*)in;
+            out = _forge.alloc_uri(_map.unmap_uri(urid->body));
+        } else {
+            out = _forge.alloc(in->size, in->type, LV2_ATOM_BODY(in));
+        }
     }
 }
@@ -77 +79 @@
         _iface.set_response_id(obj->body.id);
         _iface.get(subject_uri);
+    } else if (obj->body.otype == _uris.patch_Delete) {
+        if (subject_uri) {
+            _iface.del(subject_uri);
+            return;
+        }
+
+        const LV2_Atom_Object* body = NULL;
+        lv2_atom_object_get(obj, (LV2_URID)_uris.patch_body, &body, 0);
+        if (body && body->body.otype == _uris.ingen_Edge) {
+            const LV2_Atom* tail = NULL;
+            const LV2_Atom* head = NULL;
+            lv2_atom_object_get(body,
+                                (LV2_URID)_uris.ingen_tail, &tail,
+                                (LV2_URID)_uris.ingen_head, &head,
+                                NULL);
+
+            Raul::Atom tail_atom;
+            Raul::Atom head_atom;
+            get_uri(tail, tail_atom);
+            get_uri(head, head_atom);
+            if (tail_atom.is_valid() && head_atom.is_valid()) {
+                _iface.disconnect(Raul::Path(tail_atom.get_uri()),
+                                  Raul::Path(head_atom.get_uri()));
+            } else {
+                Raul::warn << "Delete of unknown object." << std::endl;
+            }
+        }
     } else if (obj->body.otype == _uris.patch_Put) {
         const LV2_Atom_Object* body = NULL;

trunk/ingen/src/shared/AtomWriter.cpp

@@ -106 +106 @@
 
 void
+AtomWriter::forge_edge(const Raul::URI& tail, const Raul::URI& head)
+{
+    LV2_Atom_Forge_Frame edge;
+    lv2_atom_forge_blank(&_forge, &edge, 0, _uris.ingen_Edge);
+    lv2_atom_forge_property_head(&_forge, _uris.ingen_tail, 0);
+    forge_uri(tail);
+    lv2_atom_forge_property_head(&_forge, _uris.ingen_head, 0);
+    forge_uri(head);
+    lv2_atom_forge_pop(&_forge, &edge);
+}
+
+void
 AtomWriter::put(const Raul::URI&            uri,
                 const Resource::Properties& properties,
@@ -181 +193 @@
     forge_uri(Raul::Path::lca(src, dst));
     lv2_atom_forge_property_head(&_forge, _uris.patch_body, 0);
-
-    LV2_Atom_Forge_Frame body;
-    lv2_atom_forge_blank(&_forge, &body, 0, _uris.ingen_Edge);
-    lv2_atom_forge_property_head(&_forge, _uris.ingen_tail, 0);
-    forge_uri(src);
-    lv2_atom_forge_property_head(&_forge, _uris.ingen_head, 0);
-    forge_uri(dst);
-    lv2_atom_forge_pop(&_forge, &body);
-
-    lv2_atom_forge_pop(&_forge, &msg);
-
+    forge_edge(src, dst);
+    lv2_atom_forge_pop(&_forge, &msg);
     finish_msg();
 }
@@ -199 +202 @@
                        const Raul::URI& dst)
 {
+    LV2_Atom_Forge_Frame msg;
+    lv2_atom_forge_blank(&_forge, &msg, next_id(), _uris.patch_Delete);
+    lv2_atom_forge_property_head(&_forge, _uris.patch_body, 0);
+    forge_edge(src, dst);
+    lv2_atom_forge_pop(&_forge, &msg);
+    finish_msg();
 }