From 174bd3e0314785a1a885877a9efe7a7eef31e0fa Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 19 Aug 2008 20:09:49 +0000 Subject: Slightly more reliable OSC comms. Still not really up to the task of receiving massive patches... git-svn-id: http://svn.drobilla.net/lad/ingen@1448 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/shared/OSCSender.cpp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'src/libs/shared/OSCSender.cpp') diff --git a/src/libs/shared/OSCSender.cpp b/src/libs/shared/OSCSender.cpp index 3936cf96..f0cd76f2 100644 --- a/src/libs/shared/OSCSender.cpp +++ b/src/libs/shared/OSCSender.cpp @@ -18,6 +18,7 @@ #include "OSCSender.hpp" #include #include +#include using namespace std; @@ -37,7 +38,9 @@ void OSCSender::bundle_begin() { assert(!_transfer); - _transfer = lo_bundle_new(LO_TT_IMMEDIATE); + lo_timetag t; + lo_timetag_now(&t); + _transfer = lo_bundle_new(t); _send_state = SendingBundle; } @@ -53,7 +56,9 @@ void OSCSender::transfer_begin() { assert(!_transfer); - _transfer = lo_bundle_new(LO_TT_IMMEDIATE); + lo_timetag t; + lo_timetag_now(&t); + _transfer = lo_bundle_new(t); _send_state = SendingTransfer; } @@ -99,13 +104,15 @@ OSCSender::send_message(const char* path, lo_message msg) if (!_enabled) return; - + if (_transfer) { + lo_timetag t; if (lo_bundle_length(_transfer) + lo_message_length(msg, path) > MAX_BUNDLE_SIZE) { - if (_send_state == SendingBundle) + //if (_send_state == SendingBundle) cerr << "WARNING: Maximum bundle size reached, bundle split" << endl; lo_send_bundle(_address, _transfer); - _transfer = lo_bundle_new(LO_TT_IMMEDIATE); + lo_timetag_now(&t); + _transfer = lo_bundle_new(t); } lo_bundle_add_message(_transfer, path, msg); -- cgit v1.2.1