From 629607e308fa913eea600c7c57b60625baa6aee7 Mon Sep 17 00:00:00 2001 From: Johannes Wienke Date: Wed, 26 Aug 2015 18:15:16 +0200 Subject: [PATCH] Move copied timestamps to namespace in user times While preserving original timing information, prefix all timestamps with rsbag: inside the user times of the metadata to prevent name clashes. This commit also adds the receive time to the copied timestamps. --- rsbag/__init__.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/rsbag/__init__.py b/rsbag/__init__.py index a54f590..c173439 100644 --- a/rsbag/__init__.py +++ b/rsbag/__init__.py @@ -197,11 +197,16 @@ class Bag (Connection): for channel in channels: channelOptions += [ '-c', channel ] + adjustments = [ '(:original_send (:copy :send))', + '(:|rsbag:original_send| (:copy :send))', + '(:|rsbag:original_receive| (:copy :receive))' ] command = [ rsbag, 'play', '--show-progress', 'none', '--on-error=continue', '--replay-strategy', - 'remote-controlled :uri "%s" :adjustments ((:original_send (:copy :send)))' % self.__controlURI ] \ + 'remote-controlled :uri "%s" :adjustments (%s)' + % (self.__controlURI, + ' '.join(adjustments)) ] \ + channelOptions \ + [ file, self.__listenURI ] self.__logger.debug('Executing command %s', command) -- 1.9.1