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

1 files changed, 1 insertions, 9 deletions

diff --git a/src/shared/OSCSender.hpp b/src/shared/OSCSender.hpp
index 8571edd0..1085f2ae 100644
--- a/src/shared/OSCSender.hpp
+++ b/src/shared/OSCSender.hpp
@@ -31,22 +31,14 @@ public:
 
 	lo_address address() const { return _address; }
 
-	// Message bundling
 	void bundle_begin();
 	void bundle_end();
 
-	// Transfers (loose bundling)
-	void transfer_begin();
-	void transfer_end();
-
 protected:
 	int  send(const char *path, const char *types, ...);
 	void send_message(const char* path, lo_message m);
 
-	enum SendState { Immediate, SendingBundle, SendingTransfer };
-
-	SendState  _send_state;
-	lo_bundle  _transfer;
+	lo_bundle  _bundle;
 	lo_address _address;
 	bool       _enabled;
 };