diff options
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/Context.cpp | 8 | ||||
| -rw-r--r-- | src/server/events/Delta.cpp | 11 | ||||
| -rw-r--r-- | src/server/internals/Controller.cpp | 2 | ||||
| -rw-r--r-- | src/server/internals/Trigger.cpp | 6 |
4 files changed, 20 insertions, 7 deletions
diff --git a/src/server/Context.cpp b/src/server/Context.cpp index 20d78c0e..1be69fe4 100644 --- a/src/server/Context.cpp +++ b/src/server/Context.cpp @@ -18,9 +18,10 @@ #include "ingen/Log.hpp" #include "ingen/URIMap.hpp" +#include "Broadcaster.hpp" +#include "BufferFactory.hpp" #include "Context.hpp" #include "Engine.hpp" -#include "Broadcaster.hpp" #include "PortImpl.hpp" namespace Ingen { @@ -78,6 +79,7 @@ Context::notify(LV2_URID key, void Context::emit_notifications(FrameTime end) { + const URIs& uris = _engine.buffer_factory()->uris(); const uint32_t read_space = _event_sink.read_space(); Notification note; for (uint32_t i = 0; i < read_space; i += sizeof(note)) { @@ -94,6 +96,10 @@ Context::emit_notifications(FrameTime end) if (key) { _engine.broadcaster()->set_property( note.port->uri(), Raul::URI(key), value); + if (note.port->is_input() && note.key == uris.ingen_value) { + // FIXME: not thread safe + note.port->set_property(uris.ingen_value, value); + } } else { _engine.log().error("Error unmapping notification key URI\n"); } diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp index 6c935ce2..1c823cdd 100644 --- a/src/server/events/Delta.cpp +++ b/src/server/events/Delta.cpp @@ -166,9 +166,12 @@ Delta::pre_process() SpecialType op = NONE; if (obj) { Resource& resource = *obj; - resource.add_property(key, value, value.context()); + if (value != uris.wildcard) { + resource.add_property(key, value, value.context()); + } - PortImpl* port = dynamic_cast<PortImpl*>(_object); + BlockImpl* block = NULL; + PortImpl* port = dynamic_cast<PortImpl*>(_object); if (port) { if (key == uris.ingen_broadcast) { if (value.type() == uris.forge.Bool) { @@ -194,6 +197,10 @@ Delta::pre_process() _status = BAD_OBJECT_TYPE; } } + } else if ((block = dynamic_cast<BlockImpl*>(_object))) { + if (key == uris.ingen_controlBinding && value == uris.wildcard) { + op = CONTROL_BINDING; // Internal block learn + } } else if ((_graph = dynamic_cast<GraphImpl*>(_object))) { if (key == uris.ingen_enabled) { if (value.type() == uris.forge.Bool) { diff --git a/src/server/internals/Controller.cpp b/src/server/internals/Controller.cpp index f38545d3..e65319a0 100644 --- a/src/server/internals/Controller.cpp +++ b/src/server/internals/Controller.cpp @@ -62,7 +62,7 @@ ControllerNode::ControllerNode(InternalPlugin* plugin, PortType::CONTROL, 0, bufs.forge().make(0.0f)); _param_port->set_property(uris.lv2_minimum, bufs.forge().make(0.0f)); _param_port->set_property(uris.lv2_maximum, bufs.forge().make(127.0f)); - _param_port->set_property(uris.lv2_integer, bufs.forge().make(true)); + _param_port->set_property(uris.lv2_portProperty, uris.lv2_integer); _param_port->set_property(uris.lv2_name, bufs.forge().alloc("Controller")); _ports->at(1) = _param_port; diff --git a/src/server/internals/Trigger.cpp b/src/server/internals/Trigger.cpp index cdc09a98..41e1800f 100644 --- a/src/server/internals/Trigger.cpp +++ b/src/server/internals/Trigger.cpp @@ -62,7 +62,7 @@ TriggerNode::TriggerNode(InternalPlugin* plugin, PortType::CONTROL, 0, bufs.forge().make(60.0f)); _note_port->set_property(uris.lv2_minimum, bufs.forge().make(0.0f)); _note_port->set_property(uris.lv2_maximum, bufs.forge().make(127.0f)); - _note_port->set_property(uris.lv2_integer, bufs.forge().make(true)); + _note_port->set_property(uris.lv2_portProperty, uris.lv2_integer); _note_port->set_property(uris.lv2_name, bufs.forge().alloc("Note")); _ports->at(1) = _note_port; @@ -131,8 +131,8 @@ TriggerNode::note_on(ProcessContext& context, uint8_t note_num, uint8_t velocity if (_learning) { // FIXME: not thread safe - _note_port->set_value(context.engine().world()->forge().make(note_num)); - _note_port->set_control_value(context, time, note_num); + _note_port->set_value(context.engine().world()->forge().make((float)note_num)); + _note_port->set_control_value(context, time, (float)note_num); _note_port->broadcast_value(context, true); _learning = false; } |