1 files changed, 35 insertions, 10 deletions

diff --git a/src/engine/ClientBroadcaster.cpp b/src/engine/ClientBroadcaster.cpp
index fcae666f..1da56af6 100644
--- a/src/engine/ClientBroadcaster.cpp
+++ b/src/engine/ClientBroadcaster.cpp
@@ -105,12 +105,29 @@ ClientBroadcaster::bundle_end()
 
 
 void
-ClientBroadcaster::send_error(const string& msg)
+ClientBroadcaster::transfer_begin()
+{
+	for (Clients::const_iterator i = _clients.begin(); i != _clients.end(); ++i)
+		(*i).second->transfer_begin();
+}
+
+
+void
+ClientBroadcaster::transfer_end()
+{
+	for (Clients::const_iterator i = _clients.begin(); i != _clients.end(); ++i)
+		(*i).second->transfer_end();
+}
+
+
+void
+ClientBroadcaster::error(const string& msg)
 {
 	for (Clients::const_iterator i = _clients.begin(); i != _clients.end(); ++i)
 		(*i).second->error(msg);
 }
 
+
 void
 ClientBroadcaster::send_plugins_to(ClientInterface* client, const NodeFactory::Plugins& plugins)
 {
@@ -134,7 +151,7 @@ ClientBroadcaster::send_plugins(const NodeFactory::Plugins& plugins)
 
 
 void
-ClientBroadcaster::send_deleted(const Path& path)
+ClientBroadcaster::del(const Path& path)
 {
 	for (Clients::const_iterator i = _clients.begin(); i != _clients.end(); ++i)
 		(*i).second->del(path);
@@ -142,15 +159,15 @@ ClientBroadcaster::send_deleted(const Path& path)
 
 
 void
-ClientBroadcaster::send_connection(const SharedPtr<const ConnectionImpl> c)
+ClientBroadcaster::connect(const Path& src_port_path, const Path& dst_port_path)
 {
 	for (Clients::const_iterator i = _clients.begin(); i != _clients.end(); ++i)
-		(*i).second->connect(c->src_port()->path().str(), c->dst_port()->path().str());
+		(*i).second->connect(src_port_path, dst_port_path);
 }
 
 
 void
-ClientBroadcaster::send_disconnection(const Path& src_port_path, const Path& dst_port_path)
+ClientBroadcaster::disconnect(const Path& src_port_path, const Path& dst_port_path)
 {
 	for (Clients::const_iterator i = _clients.begin(); i != _clients.end(); ++i)
 		(*i).second->disconnect(src_port_path, dst_port_path);
@@ -158,7 +175,7 @@ ClientBroadcaster::send_disconnection(const Path& src_port_path, const Path& dst
 
 
 void
-ClientBroadcaster::send_put(const Raul::URI& subject, const Shared::Resource::Properties& properties)
+ClientBroadcaster::put(const Raul::URI& subject, const Shared::Resource::Properties& properties)
 {
 	for (Clients::const_iterator i = _clients.begin(); i != _clients.end(); ++i)
 		(*i).second->put(subject, properties);
@@ -170,7 +187,7 @@ ClientBroadcaster::send_put(const Raul::URI& subject, const Shared::Resource::Pr
  * Like control changes, does not send update to client that set the property, if applicable.
  */
 void
-ClientBroadcaster::send_property_change(const URI& subject, const URI& key, const Atom& value)
+ClientBroadcaster::set_property(const URI& subject, const URI& key, const Atom& value)
 {
 	for (Clients::const_iterator i = _clients.begin(); i != _clients.end(); ++i)
 		(*i).second->set_property(subject, key, value);
@@ -184,7 +201,7 @@ ClientBroadcaster::send_property_change(const URI& subject, const URI& key, cons
  * forcing clients to ignore things to avoid feedback loops etc).
  */
 void
-ClientBroadcaster::send_port_value(const Path& port_path, const Raul::Atom& value)
+ClientBroadcaster::set_port_value(const Path& port_path, const Raul::Atom& value)
 {
 	for (Clients::const_iterator i = _clients.begin(); i != _clients.end(); ++i)
 		(*i).second->set_port_value(port_path, value);
@@ -192,7 +209,15 @@ ClientBroadcaster::send_port_value(const Path& port_path, const Raul::Atom& valu
 
 
 void
-ClientBroadcaster::send_activity(const Path& path)
+ClientBroadcaster::set_voice_value(const Path& port_path, uint32_t voice, const Raul::Atom& value)
+{
+	for (Clients::const_iterator i = _clients.begin(); i != _clients.end(); ++i)
+		(*i).second->set_voice_value(port_path, voice, value);
+}
+
+
+void
+ClientBroadcaster::activity(const Path& path)
 {
 	for (Clients::const_iterator i = _clients.begin(); i != _clients.end(); ++i)
 		(*i).second->activity(path);
@@ -215,7 +240,7 @@ ClientBroadcaster::send_object(const GraphObjectImpl* p, bool recursive)
 /** Sends notification of an GraphObject's renaming
  */
 void
-ClientBroadcaster::send_move(const Path& old_path, const Path& new_path)
+ClientBroadcaster::move(const Path& old_path, const Path& new_path)
 {
 	for (Clients::const_iterator i = _clients.begin(); i != _clients.end(); ++i)
 		(*i).second->move(old_path, new_path);