From bce2e7d71d509afda146cb44524b03a3b78ae8bb Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 12 Feb 2013 15:18:06 +0000 Subject: [PATCH] From Stephan Huber, fixed bug in setting _numMessagesPerEvent and added more debug information --- src/osgPlugins/osc/OscSendingDevice.cpp | 4 ++-- src/osgPlugins/osc/ReaderWriterOscDevice.cpp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/osgPlugins/osc/OscSendingDevice.cpp b/src/osgPlugins/osc/OscSendingDevice.cpp index 1c2ab4f4c..fd9cf5a55 100755 --- a/src/osgPlugins/osc/OscSendingDevice.cpp +++ b/src/osgPlugins/osc/OscSendingDevice.cpp @@ -25,7 +25,7 @@ OscSendingDevice::OscSendingDevice(const std::string& address, int port, unsigne , _transmitSocket(IpEndpointName(address.c_str(), port)) , _buffer(new char[BUFFER_SIZE]) , _oscStream(_buffer, BUFFER_SIZE) - , _numMessagesPerEvent(osg::minimum(1u,num_messages_per_event)) + , _numMessagesPerEvent(osg::maximum(1u,num_messages_per_event)) , _delayBetweenSendsInMilliSecs( (_numMessagesPerEvent > 1) ? delay_between_sends_in_millisecs : 0) { setCapabilities(SEND_EVENTS); @@ -36,7 +36,7 @@ OscSendingDevice::OscSendingDevice(const std::string& address, int port, unsigne #elif OSC_HOST_BIG_ENDIAN OSG_NOTICE << "(big endian)"; #endif - OSG_NOTICE << " (" << num_messages_per_event << "msgs/event)"; + OSG_NOTICE << " (" << _numMessagesPerEvent << "msgs/event, " << _delayBetweenSendsInMilliSecs << "ms delay between msgs)"; OSG_NOTICE << std::endl; } diff --git a/src/osgPlugins/osc/ReaderWriterOscDevice.cpp b/src/osgPlugins/osc/ReaderWriterOscDevice.cpp index dcdd9993b..4972185fc 100755 --- a/src/osgPlugins/osc/ReaderWriterOscDevice.cpp +++ b/src/osgPlugins/osc/ReaderWriterOscDevice.cpp @@ -73,6 +73,7 @@ class ReaderWriterOsc : public osgDB::ReaderWriter supportsExtension("osc", "Virtual Device Integration via a OSC_receiver"); supportsOption("documentRegisteredHandlers", "dump a documentation of all registered REST-handler to the console"); supportsOption("numMessagesPerEvent", "set the number of osc-messages to send for one event (sender-only)"); + supportsOption("delayBetweenSendsInMillisecs", "when sending multiple msgs per event you can specify an optional delay between the sends (sender-only)"); }