diff options
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/LV2Plugin.cpp | 2 | ||||
| -rw-r--r-- | src/server/events/CreateGraph.cpp | 7 | ||||
| -rw-r--r-- | src/server/events/Delete.cpp | 2 | ||||
| -rw-r--r-- | src/server/ingen_lv2.cpp | 6 |
4 files changed, 9 insertions, 8 deletions
diff --git a/src/server/LV2Plugin.cpp b/src/server/LV2Plugin.cpp index ce920f4e..9450373f 100644 --- a/src/server/LV2Plugin.cpp +++ b/src/server/LV2Plugin.cpp @@ -69,7 +69,7 @@ const Raul::Symbol LV2Plugin::symbol() const { string working = uri(); - if (working[working.length() - 1] == '/') + if (working.back() == '/') working = working.substr(0, working.length() - 1); while (working.length() > 0) { 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<Events::CreatePort>( 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<Events::CreatePort>( 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); } diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp index 217833bc..dbbc8a55 100644 --- a/src/server/ingen_lv2.cpp +++ b/src/server/ingen_lv2.cpp @@ -127,7 +127,7 @@ public: graph_port->set_driver_buffer(lv2_buf, nframes * sizeof(float)); } else if (graph_port->buffer_type() == uris.atom_Sequence) { graph_port->set_driver_buffer(lv2_buf, lv2_atom_total_size((LV2_Atom*)lv2_buf)); - if (graph_port->symbol() == "control_in") { // TODO: Safe to use index? + if (graph_port->symbol() == "control") { // TODO: Safe to use index? LV2_Atom_Sequence* seq = (LV2_Atom_Sequence*)lv2_buf; bool enqueued = false; LV2_ATOM_SEQUENCE_FOREACH(seq, ev) { @@ -687,7 +687,7 @@ ingen_save(LV2_Handle instance, LV2_URID atom_Path = plugin->map->map(plugin->map->handle, LV2_ATOM__Path); - char* real_path = make_path->path(make_path->handle, "graph.ttl"); + char* real_path = make_path->path(make_path->handle, "main.ttl"); char* state_path = map_path->abstract_path(map_path->handle, real_path); Ingen::Store::iterator root = plugin->world->store()->find(Raul::Path("/")); @@ -755,7 +755,7 @@ ingen_restore(LV2_Handle instance, const uint32_t n_ports = engine->root_graph()->num_ports_non_rt(); for (int32_t i = n_ports - 1; i >= 0; --i) { PortImpl* port = engine->root_graph()->port_impl(i); - if (port->symbol() != "control_in" && port->symbol() != "control_out") { + if (port->symbol() != "control" && port->symbol() != "notify") { plugin->world->interface()->del(port->uri()); } } |