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

2 files changed, 15 insertions, 5 deletions

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