From 17ad0ca1ad23b336b0fa5952f42dfad95397fc47 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 1 Aug 2016 15:44:14 -0400 Subject: Rename main graph and control/notify ports --- src/server/events/CreateGraph.cpp | 7 ++++--- src/server/events/Delete.cpp | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src/server/events') diff --git a/src/server/events/CreateGraph.cpp b/src/server/events/CreateGraph.cpp index d14e2f1f..b5cffcb0 100644 --- a/src/server/events/CreateGraph.cpp +++ b/src/server/events/CreateGraph.cpp @@ -51,7 +51,6 @@ CreateGraph::build_child_events() // Properties common to both ports Resource::Properties control_properties; - control_properties.put(uris.lv2_name, uris.forge.alloc("Control")); control_properties.put(uris.rdf_type, uris.atom_AtomPort); control_properties.put(uris.atom_bufferType, uris.atom_Sequence); control_properties.put(uris.atom_supports, uris.patch_Message); @@ -60,6 +59,7 @@ CreateGraph::build_child_events() // Add control input Resource::Properties in_properties(control_properties); + in_properties.put(uris.lv2_name, uris.forge.alloc("Control")); in_properties.put(uris.rdf_type, uris.lv2_InputPort); in_properties.put(uris.lv2_index, uris.forge.make(0)); in_properties.put(uris.ingen_canvasX, uris.forge.make(32.0f), @@ -71,11 +71,12 @@ CreateGraph::build_child_events() SPtr( new Events::CreatePort( _engine, _request_client, -1, _time, - _path.child(Raul::Symbol("control_in")), + _path.child(Raul::Symbol("control")), in_properties))); // Add control out Resource::Properties out_properties(control_properties); + out_properties.put(uris.lv2_name, uris.forge.alloc("Notify")); out_properties.put(uris.rdf_type, uris.lv2_OutputPort); out_properties.put(uris.lv2_index, uris.forge.make(1)); out_properties.put(uris.ingen_canvasX, uris.forge.make(128.0f), @@ -86,7 +87,7 @@ CreateGraph::build_child_events() _child_events.push_back( SPtr( new Events::CreatePort(_engine, _request_client, -1, _time, - _path.child(Raul::Symbol("control_out")), + _path.child(Raul::Symbol("notify")), out_properties))); } diff --git a/src/server/events/Delete.cpp b/src/server/events/Delete.cpp index 7b27e11f..915c56fc 100644 --- a/src/server/events/Delete.cpp +++ b/src/server/events/Delete.cpp @@ -59,7 +59,7 @@ Delete::~Delete() bool Delete::pre_process() { - if (_path.is_root() || _path == "/control_in" || _path == "/control_out") { + if (_path.is_root() || _path == "/control" || _path == "/notify") { return Event::pre_process_done(Status::NOT_DELETABLE, _path); } -- cgit v1.2.1