diff options
| author | David Robillard <d@drobilla.net> | 2011-04-19 19:37:12 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-04-19 19:37:12 +0000 |
| commit | 375e57574e08d746c6c12255836face2066ebf4c (patch) | |
| tree | a2681f6302b835c81ea74ee849227d7b9c66e3b4 /src/client | |
| parent | 338ebbcd23747d3274f100b1c78caeb1d157dde0 (diff) | |
| download | ingen-375e57574e08d746c6c12255836face2066ebf4c.tar.gz ingen-375e57574e08d746c6c12255836face2066ebf4c.tar.bz2 ingen-375e57574e08d746c6c12255836face2066ebf4c.zip | |
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
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/HTTPEngineSender.hpp | 7 | ||||
| -rw-r--r-- | src/client/OSCEngineSender.hpp | 2 | ||||
| -rw-r--r-- | src/client/SigClientInterface.hpp | 3 | ||||
| -rw-r--r-- | src/client/ThreadedSigClientInterface.hpp | 3 |
4 files changed, 2 insertions, 13 deletions
diff --git a/src/client/HTTPEngineSender.hpp b/src/client/HTTPEngineSender.hpp index 19742498..3a0b1a40 100644 --- a/src/client/HTTPEngineSender.hpp +++ b/src/client/HTTPEngineSender.hpp @@ -65,11 +65,8 @@ public: void enable() { _enabled = true; } void disable() { _enabled = false; } - void bundle_begin() { transfer_begin(); } - void bundle_end() { transfer_end(); } - - void transfer_begin() {} - void transfer_end() {} + void bundle_begin() {} + void bundle_end() {} // Client registration void register_client(ClientInterface* client); diff --git a/src/client/OSCEngineSender.hpp b/src/client/OSCEngineSender.hpp index bc05a393..e5a2fc9f 100644 --- a/src/client/OSCEngineSender.hpp +++ b/src/client/OSCEngineSender.hpp @@ -60,8 +60,6 @@ public: void bundle_begin() { OSCSender::bundle_begin(); } void bundle_end() { OSCSender::bundle_end(); } - void transfer_begin() { OSCSender::transfer_begin(); } - void transfer_end() { OSCSender::transfer_end(); } // Client registration void register_client(ClientInterface* client); diff --git a/src/client/SigClientInterface.hpp b/src/client/SigClientInterface.hpp index 57a972f6..26a64f85 100644 --- a/src/client/SigClientInterface.hpp +++ b/src/client/SigClientInterface.hpp @@ -78,9 +78,6 @@ protected: void bundle_end() { EMIT(bundle_end); } - void transfer_begin() {} - void transfer_end() {} - void response_ok(int32_t id) { EMIT(response_ok, id); } diff --git a/src/client/ThreadedSigClientInterface.hpp b/src/client/ThreadedSigClientInterface.hpp index e7dc336d..84f9c009 100644 --- a/src/client/ThreadedSigClientInterface.hpp +++ b/src/client/ThreadedSigClientInterface.hpp @@ -72,9 +72,6 @@ public: void bundle_end() { push_sig(bundle_end_slot); } - void transfer_begin() {} - void transfer_end() {} - void response_ok(int32_t id) { push_sig(sigc::bind(response_ok_slot, id)); } |