diff options
Diffstat (limited to 'src/engine/events')
| -rw-r--r-- | src/engine/events/Connect.cpp | 2 | ||||
| -rw-r--r-- | src/engine/events/Delete.cpp | 4 | ||||
| -rw-r--r-- | src/engine/events/Disconnect.cpp | 2 | ||||
| -rw-r--r-- | src/engine/events/Move.cpp | 2 | ||||
| -rw-r--r-- | src/engine/events/SendPortActivity.cpp | 2 | ||||
| -rw-r--r-- | src/engine/events/SendPortValue.cpp | 4 | ||||
| -rw-r--r-- | src/engine/events/SetMetadata.cpp | 2 | ||||
| -rw-r--r-- | src/engine/events/SetPortValue.cpp | 5 |
8 files changed, 13 insertions, 10 deletions
diff --git a/src/engine/events/Connect.cpp b/src/engine/events/Connect.cpp index a120aee4..a79fe243 100644 --- a/src/engine/events/Connect.cpp +++ b/src/engine/events/Connect.cpp @@ -186,7 +186,7 @@ Connect::post_process() std::ostringstream ss; if (_error == NO_ERROR) { _responder->respond_ok(); - _engine.broadcaster()->send_connection(_connection); + _engine.broadcaster()->connect(_src_port_path, _dst_port_path); return; } diff --git a/src/engine/events/Delete.cpp b/src/engine/events/Delete.cpp index 91e18dd0..956253d6 100644 --- a/src/engine/events/Delete.cpp +++ b/src/engine/events/Delete.cpp @@ -184,7 +184,7 @@ Delete::post_process() _engine.broadcaster()->bundle_begin(); if (_disconnect_event) _disconnect_event->post_process(); - _engine.broadcaster()->send_deleted(_path); + _engine.broadcaster()->del(_path); _engine.broadcaster()->bundle_end(); _engine.maid()->push(_patch_node_listnode); } else if (_patch_port_listnode) { @@ -193,7 +193,7 @@ Delete::post_process() _engine.broadcaster()->bundle_begin(); if (_disconnect_event) _disconnect_event->post_process(); - _engine.broadcaster()->send_deleted(_path); + _engine.broadcaster()->del(_path); _engine.broadcaster()->bundle_end(); _engine.maid()->push(_patch_port_listnode); } else { diff --git a/src/engine/events/Disconnect.cpp b/src/engine/events/Disconnect.cpp index c0fc9656..007886f1 100644 --- a/src/engine/events/Disconnect.cpp +++ b/src/engine/events/Disconnect.cpp @@ -207,7 +207,7 @@ Disconnect::post_process() { if (_error == NO_ERROR) { _responder->respond_ok(); - _engine.broadcaster()->send_disconnection(_src_port->path(), _dst_port->path()); + _engine.broadcaster()->disconnect(_src_port->path(), _dst_port->path()); } else { string msg = "Unable to disconnect "; msg.append(_src_port_path.str() + " -> " + _dst_port_path.str()); diff --git a/src/engine/events/Move.cpp b/src/engine/events/Move.cpp index d8e119f5..42ae88ca 100644 --- a/src/engine/events/Move.cpp +++ b/src/engine/events/Move.cpp @@ -117,7 +117,7 @@ Move::post_process() if (_error == NO_ERROR) { _responder->respond_ok(); - _engine.broadcaster()->send_move(_old_path, _new_path); + _engine.broadcaster()->move(_old_path, _new_path); } else { if (_error == OBJECT_EXISTS) msg.append("Object already exists at ").append(_new_path.str()); diff --git a/src/engine/events/SendPortActivity.cpp b/src/engine/events/SendPortActivity.cpp index bf927da7..17bae7e5 100644 --- a/src/engine/events/SendPortActivity.cpp +++ b/src/engine/events/SendPortActivity.cpp @@ -27,7 +27,7 @@ namespace Events { void SendPortActivity::post_process() { - _engine.broadcaster()->send_activity(_port->path()); + _engine.broadcaster()->activity(_port->path()); } diff --git a/src/engine/events/SendPortValue.cpp b/src/engine/events/SendPortValue.cpp index dbf0073f..4088568f 100644 --- a/src/engine/events/SendPortValue.cpp +++ b/src/engine/events/SendPortValue.cpp @@ -33,9 +33,9 @@ SendPortValue::post_process() // FIXME... if (_omni) { - _engine.broadcaster()->send_port_value(_port->path(), _value); + _engine.broadcaster()->set_port_value(_port->path(), _value); } else { - _engine.broadcaster()->send_port_value(_port->path(), _value); + _engine.broadcaster()->set_port_value(_port->path(), _value); } } diff --git a/src/engine/events/SetMetadata.cpp b/src/engine/events/SetMetadata.cpp index 6c8c25f3..5669b63d 100644 --- a/src/engine/events/SetMetadata.cpp +++ b/src/engine/events/SetMetadata.cpp @@ -257,7 +257,7 @@ SetMetadata::post_process() switch (_error) { case NO_ERROR: _responder->respond_ok(); - _engine.broadcaster()->send_put(_subject, _properties); + _engine.broadcaster()->put(_subject, _properties); if (_create_event) _create_event->post_process(); break; diff --git a/src/engine/events/SetPortValue.cpp b/src/engine/events/SetPortValue.cpp index de1190fb..6c87ef94 100644 --- a/src/engine/events/SetPortValue.cpp +++ b/src/engine/events/SetPortValue.cpp @@ -230,7 +230,10 @@ SetPortValue::post_process() case NO_ERROR: assert(_port != NULL); _responder->respond_ok(); - _engine.broadcaster()->send_port_value(_port_path, _value); + if (_omni) + _engine.broadcaster()->set_port_value(_port_path, _value); + else + _engine.broadcaster()->set_voice_value(_port_path, _voice_num, _value); break; case TYPE_MISMATCH: ss << "Illegal value type " << _value.type() |