diff options
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/ClientBroadcaster.hpp | 5 | ||||
| -rw-r--r-- | src/server/Notification.cpp | 12 |
2 files changed, 7 insertions, 10 deletions
diff --git a/src/server/ClientBroadcaster.hpp b/src/server/ClientBroadcaster.hpp index c406bc49..c9c56d56 100644 --- a/src/server/ClientBroadcaster.hpp +++ b/src/server/ClientBroadcaster.hpp @@ -119,11 +119,6 @@ public: void error(const std::string& msg) { BROADCAST(error, msg); } - void activity(const Raul::Path& path, - const Raul::Atom& value) { - BROADCAST(activity, path, value); - } - private: typedef std::map<Raul::URI, ClientInterface*> Clients; Clients _clients; diff --git a/src/server/Notification.cpp b/src/server/Notification.cpp index 7a44062f..44d21a2f 100644 --- a/src/server/Notification.cpp +++ b/src/server/Notification.cpp @@ -29,23 +29,25 @@ void Notification::post_process(Notification& note, Engine& engine) { - Raul::Forge& forge = engine.world()->forge(); + const Ingen::Shared::URIs& uris = *engine.world()->uris().get(); + Raul::Forge& forge = engine.world()->forge(); switch (note.type) { case PORT_VALUE: engine.broadcaster()->set_property(note.port->path(), - engine.world()->uris()->ingen_value, + uris.ingen_value, note.value); break; case PORT_ACTIVITY: - engine.broadcaster()->activity(note.port->path(), note.value); + engine.broadcaster()->set_property(note.port->path(), + uris.ingen_activity, + note.value); break; case PORT_BINDING: { - const Ingen::Shared::URIs& uris = *engine.world()->uris().get(); Raul::Atom::DictValue dict; switch (note.binding_type) { case ControlBindings::MIDI_CC: dict[uris.rdf_type] = uris.midi_Controller; - dict[uris.midi_controllerNumber] = forge.make(note.value.get_int32()); + dict[uris.midi_controllerNumber] = note.value; break; case ControlBindings::MIDI_BENDER: dict[uris.rdf_type] = uris.midi_Bender; |