From 375e57574e08d746c6c12255836face2066ebf4c Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Tue, 19 Apr 2011 19:37:12 +0000
Subject: Merge "transfer" stuff with "bundle" stuff (functionally equivalent
 anyway).

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3166 a436a847-0d15-0410-975c-d299462d15a1
---
 src/engine/ClientBroadcaster.cpp | 4 ++--
 src/engine/ClientBroadcaster.hpp | 2 --
 src/engine/HTTPClientSender.hpp  | 6 ++----
 src/engine/OSCClientSender.hpp   | 6 ++----
 src/engine/ObjectSender.cpp      | 8 ++++----
 5 files changed, 10 insertions(+), 16 deletions(-)

(limited to 'src/engine')

diff --git a/src/engine/ClientBroadcaster.cpp b/src/engine/ClientBroadcaster.cpp
index 85c23f3f..46c50ea6 100644
--- a/src/engine/ClientBroadcaster.cpp
+++ b/src/engine/ClientBroadcaster.cpp
@@ -90,14 +90,14 @@ ClientBroadcaster::send_plugins(const NodeFactory::Plugins& plugins)
 void
 ClientBroadcaster::send_plugins_to(ClientInterface* client, const NodeFactory::Plugins& plugins)
 {
-	client->transfer_begin();
+	client->bundle_begin();
 
 	for (NodeFactory::Plugins::const_iterator i = plugins.begin(); i != plugins.end(); ++i) {
 		const PluginImpl* const plugin = i->second;
 		client->put(plugin->uri(), plugin->properties());
 	}
 
-	client->transfer_end();
+	client->bundle_end();
 }
 
 /** Send an object to all clients.
diff --git a/src/engine/ClientBroadcaster.hpp b/src/engine/ClientBroadcaster.hpp
index 1c77c46b..989ed41b 100644
--- a/src/engine/ClientBroadcaster.hpp
+++ b/src/engine/ClientBroadcaster.hpp
@@ -111,8 +111,6 @@ public:
 	void response_ok(int32_t id) {} ///< N/A
 	void response_error(int32_t id, const std::string& msg) {} ///< N/A
 
-	void transfer_begin()                 { BROADCAST(transfer_begin); }
-	void transfer_end()                   { BROADCAST(transfer_end); }
 	void error(const std::string& msg)    { BROADCAST(error, msg); }
 	void activity(const Raul::Path& path) { BROADCAST(activity, path); }
 
diff --git a/src/engine/HTTPClientSender.hpp b/src/engine/HTTPClientSender.hpp
index 274d54cd..aa7baf88 100644
--- a/src/engine/HTTPClientSender.hpp
+++ b/src/engine/HTTPClientSender.hpp
@@ -54,10 +54,8 @@ public:
 	void enable()  { _enabled = true; }
 	void disable() { _enabled = false; }
 
-	void bundle_begin()   { HTTPSender::bundle_begin(); }
-	void bundle_end()     { HTTPSender::bundle_end(); }
-	void transfer_begin() { HTTPSender::transfer_begin(); }
-	void transfer_end()   { HTTPSender::transfer_end(); }
+	void bundle_begin() { HTTPSender::bundle_begin(); }
+	void bundle_end()   { HTTPSender::bundle_end(); }
 
 	Raul::URI uri() const { return "http://example.org/"; }
 
diff --git a/src/engine/OSCClientSender.hpp b/src/engine/OSCClientSender.hpp
index 147c0779..a30deb15 100644
--- a/src/engine/OSCClientSender.hpp
+++ b/src/engine/OSCClientSender.hpp
@@ -55,10 +55,8 @@ public:
 	void enable()  { _enabled = true; }
 	void disable() { _enabled = false; }
 
-	void bundle_begin()   { OSCSender::bundle_begin(); }
-	void bundle_end()     { OSCSender::bundle_end(); }
-	void transfer_begin() { OSCSender::transfer_begin(); }
-	void transfer_end()   { OSCSender::transfer_end(); }
+	void bundle_begin() { OSCSender::bundle_begin(); }
+	void bundle_end()   { OSCSender::bundle_end(); }
 
 	Raul::URI uri() const { return _url; }
 
diff --git a/src/engine/ObjectSender.cpp b/src/engine/ObjectSender.cpp
index ae2383d6..77b6c5e3 100644
--- a/src/engine/ObjectSender.cpp
+++ b/src/engine/ObjectSender.cpp
@@ -61,7 +61,7 @@ void
 ObjectSender::send_patch(ClientInterface* client, const PatchImpl* patch, bool recursive, bool bundle)
 {
 	if (bundle)
-		client->transfer_begin();
+		client->bundle_begin();
 
 	client->put(patch->path(),
 	            patch->properties(Resource::INTERNAL),
@@ -92,7 +92,7 @@ ObjectSender::send_patch(ClientInterface* client, const PatchImpl* patch, bool r
 	}
 
 	if (bundle)
-		client->transfer_end();
+		client->bundle_end();
 }
 
 /** Sends a node or a patch */
@@ -112,7 +112,7 @@ ObjectSender::send_node(ClientInterface* client, const NodeImpl* node, bool recu
 	}
 
 	if (bundle)
-		client->transfer_begin();
+		client->bundle_begin();
 
 	client->put(node->path(), node->properties());
 
@@ -123,7 +123,7 @@ ObjectSender::send_node(ClientInterface* client, const NodeImpl* node, bool recu
 	}
 
 	if (bundle)
-		client->transfer_end();
+		client->bundle_end();
 }
 
 void
-- 
cgit v1.2.1