aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2024-05-05 21:35:37 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2024-05-05 21:35:37 +0200
commitb6d001cc5c586313deba7f5eae48274f26c0e5d3 (patch)
tree45129e3af2235f750ed7337aed0a2415c458c570
parentaaa415b62f6d1b815aa9a8954d2cf1ddb6a8317d (diff)
downloaddabmux-b6d001cc5c586313deba7f5eae48274f26c0e5d3.tar.gz
dabmux-b6d001cc5c586313deba7f5eae48274f26c0e5d3.tar.bz2
dabmux-b6d001cc5c586313deba7f5eae48274f26c0e5d3.zip
Prepare v4.5.0HEADv4.5.0nextmaster
-rw-r--r--ChangeLog9
-rw-r--r--configure.ac2
-rw-r--r--man/odr-dabmux.12
-rw-r--r--man/odr-zmq2edi.18
4 files changed, 17 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 241c305..1169fe2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,15 @@
This file contains information about the changes done to
ODR-DabMux in this repository
+2024-05-05: Matthias P. Braendli <matthias@mpb.li>
+ (v4.5.0):
+ Switch project to C++17.
+ Update common code, with ClockTAI improvements among others.
+ Add uatype journaline to config.
+ Add ZMQ output to odr-zmq2edi.
+ Increase repetition rate for labels.
+ Add showjson to remote control.
+
2024-03-23: Matthias P. Braendli <matthias@mpb.li>
(v2.3.2):
This is a patch version for v2.3.1
diff --git a/configure.ac b/configure.ac
index 875c56f..b60a492 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@
# along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ([2.69])
-AC_INIT([ODR-DabMux],[4.4.1],[matthias.braendli@mpb.li])
+AC_INIT([ODR-DabMux],[4.5.0],[matthias.braendli@mpb.li])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_TARGET
diff --git a/man/odr-dabmux.1 b/man/odr-dabmux.1
index 23b4c28..1dca3cf 100644
--- a/man/odr-dabmux.1
+++ b/man/odr-dabmux.1
@@ -1,4 +1,4 @@
-.TH ODR-DABMUX "1" "May 2023" "odr-dabmux 4.4.1" "User Commands"
+.TH ODR-DABMUX "1" "May 2024" "odr-dabmux 4.5.0" "User Commands"
.SH NAME
\fBodr\-dabmux\fR \- A software DAB multiplexer
.SH SYNOPSIS
diff --git a/man/odr-zmq2edi.1 b/man/odr-zmq2edi.1
index f6f74f6..d06e34b 100644
--- a/man/odr-zmq2edi.1
+++ b/man/odr-zmq2edi.1
@@ -1,4 +1,4 @@
-.TH ODR-ZMQ2EDI "1" "May 2023" "odr-zmq2edi" "User Commands"
+.TH ODR-ZMQ2EDI "1" "May 2024" "odr-zmq2edi" "User Commands"
.SH NAME
\fBodr-zmq2edi\fR \- Convert an ZeroMQ stream to EDI
.SH SYNOPSIS
@@ -6,7 +6,8 @@ odr\-zmq2edi [options] <source>
.PP
<source> is a ZMQ URL that points to a ODR\-DabMux ZMQ output.
.SH DESCRIPTION
-zmq2edi can receive a ZMQ ETI stream from ODR-DabMux and generate an EDI stream.
+zmq2edi can receive a ZMQ ETI stream from ODR-DabMux and generate an EDI or ZMQ stream.
+It buffers and releases frames according to their timestamp.
This is quite useful if your modulator wants EDI input, and your network is not
good enough making you want to use something based on TCP.
.PP
@@ -64,6 +65,9 @@ Select the source IP in case we want to use multicast.
.TP
\fB\-t\fR <ttl>
Set the packet's TTL.
+.TP
+\fB\-Z\fR <url>
+Add a zmq output to URL, e.g. tcp:*:9876 to listen for connections on port 9876
.SH SEE ALSO
odr\-dabmux(1), odr\-audioenc(1), odr\-dabmod(1)