From a1921a1a967b65c99a830141e9faaecd77b0f317 Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Fri, 28 Jul 2017 11:54:32 +0200 Subject: Add new zeromq config format This gives the choice for the transmission of the metadata, and the enabling of the TAI downloader is also triggered appropriately --- doc/advanced.mux | 4 ++-- doc/example.mux | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) (limited to 'doc') diff --git a/doc/advanced.mux b/doc/advanced.mux index 801857b..c3e216a 100644 --- a/doc/advanced.mux +++ b/doc/advanced.mux @@ -342,8 +342,8 @@ outputs { ; Please see doc/dab_output_formats.txt stdout "fifo:///dev/stdout?type=raw" - ; ZeroMQ output example - ; Listen on all interfaces, on port 9100 + ; Legacy format for ZeroMQ output example. See example.mux + ; for newer format. ;zmq "zmq+tcp://*:9100" ; Throttle output to real-time (one ETI frame every 24ms) diff --git a/doc/example.mux b/doc/example.mux index d764be3..ad2f3c8 100644 --- a/doc/example.mux +++ b/doc/example.mux @@ -167,10 +167,20 @@ outputs { ; Output RAW ETI NI to standard output stdout "fifo:///dev/stdout?type=raw" - ; ZeroMQ output example + ; ZeroMQ output example, new configuration format. Several + ; zeromq blocks can be added here. ; This output does not back-pressure the multiplexer. - ; Listen on all interfaces, on port 9100 - ;zmq "zmq+tcp://*:9100" + zeromq { + ; Listen on all interfaces, on port 9100 + endpoint "tcp://*:9100" + + ; Transmit backward compatible metadata containing + ; EDI time and UTC offset when TIST is enabled. + ; WARNING! requires ODR-DabMux to be compiled with + ; EDI output, and this will enable leap second download + ; as for the EDI output! + allowmetadata true + } ; Output ETI-over-TCP. This is like piping a RAW ETI NI data stream ; into a TCP socket, except that the output can handle simultaneous -- cgit v1.2.3