Prepare v3.0.0v3.0.0

5 files changed, 37 insertions, 32 deletions

diff --git a/ChangeLog b/ChangeLog
index 307023f..9448749 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,21 @@
 This file contains information about the changes done to
 ODR-DabMux in this repository
 
+2019-10-29: Matthias P. Braendli <matthias@mpb.li>
+	(v3.0.0):
+		Add EDI input with support for timestamps, which requires a change
+		in the configuration file format for the input specification. This
+		marks the beginning of a transition away from the ZMQ contribution
+		protocol towards the standard EDI, including EDI-over-TCP.
+		Move code shared with other mmbTools into a separate `common`
+		repository.
+		Change default TAI clock cache storage location to
+		`/var/tmp/odr-leap-seconds.cache`.
+		Add encoder version and uptime to stats if available (carried over
+		EDI, not ZMQ).
+		Fix nonblocking file input.
+		Modify ODR-zmq2edi and ODR-zmq2farsync timeout behaviour.
+
 2019-06-25: Matthias P. Braendli <matthias@mpb.li>
 	(v2.4.1):
 		Fix bug when odr-zmq2edi is used with more than one destination.
diff --git a/LICENCE b/LICENCE
index 9b313b8..d8049da 100644
--- a/LICENCE
+++ b/LICENCE
@@ -28,3 +28,14 @@ KA9Q FEC routines
 
 src/fec/ contains code from KA9Q's fec library. Please see
 src/fec/README.md and src/fec/LICENSING
+
+Other parts
+-----------
+
+lib/edi/PFT.{hpp,cpp} are APACHE 2.0 licensed.
+
+lib/charset contains a BSD-licensed UTF-8 library.
+
+lib/zmq.hpp is BSD-licensed.
+
+The farsync driver in lib/farsync is GPLv2+ licensed.
diff --git a/README.md b/README.md
index 91401ad..9289eef 100644
--- a/README.md
+++ b/README.md
@@ -15,23 +15,23 @@ Features of ODR-DabMux:
 - Standards-compliant DAB multiplexer
 - Configuration file, see doc/example.mux
 - Timestamping support required for SFN
-- ZeroMQ and TCP ETI outputs that can be used with ODR-DabMod
-- ZeroMQ input that can be used with ODR-AudioEnc
-  which supports CURVE authentication
-- Experimental STI-D(PI, X)/RTP input intended to be compatible
-  with compliant encoders.
 - Logging to syslog
 - Monitoring using munin tool
 - Includes a Telnet and ZMQ Remote Control for setting/getting parameters
-- EDI output
+- EDI input and output, both over UDP and TCP
 - Support for FarSync TE1 and TE1e cards (G.703)
 - Something that will (with your help?) one day become a nice GUI for
   configuration, see `gui/README.md`
+- Experimental STI-D(PI, X)/RTP input intended to be compatible
+  with compliant encoders.
+- ZeroMQ and TCP ETI outputs that can be used with ODR-DabMod
+- ZeroMQ input that can be used with ODR-AudioEnc
+  which supports CURVE authentication
 
-Additional tools: 
+Additional tools:
 
 `odr-zmq2edi`, a tool that can convert a ZeroMQ ETI stream
-to an EDI stream. 
+to an EDI stream.
 
 `odr-zmq2farsync`, a tool that can drive a FarSync card from
 a ZeroMQ ETI stream.
diff --git a/TODO.md b/TODO.md
index 12a4a40..13ed2c6 100644
--- a/TODO.md
+++ b/TODO.md
@@ -5,23 +5,6 @@ to some degree.
 Unless written, no activity has been started on the topics.
 
 
-EDI/STI-D Input
----------------
-Add support for EDI input, so that third-party encoders can be interfaced
-to the multiplexer. Relevant spec: ETSI TS 102 693
-
-It would be beneficial to write and EDI decoding library that can be re-used in
-ODR-DabMod to add EDI input there too.
-
-Stuff in http://git.mpb.li/git/odr-edilib/ could be helpful.
-
-There is experimental support for STI(PI, X)/RTP using UDP, which is used by
-AVT encoders. It does not properly reorder incoming UDP packets nor align
-STI frames with ETI frames.
-
-Also, it doesn't print out nice messages (like ZMQ's "prebuffering complete").
-
-
 Explicit Service Linking
 ------------------------
 It is impossible to activate/deactive linkage sets. Commit 5c3c6d7 added
@@ -48,16 +31,12 @@ Add statistics to UDP input, in a similar way that ZeroMQ offers statistics.
 This would mean we have to move the packet buffer from the operating system
 into our own buffer, so that we can actually get the statistics.
 
-Also see the STI-D over EDI topic above.
-
-For error handling, there are parts of the code that use return values, parts
-use exceptions. While it works, we could clean it up a bit.
-
 
 Fix DMB input
 -------------
 The code that does interleaving and reed-solomon encoding for DMB is not used
-anymore, and is untested. The relevant parts are src/dabInputDmb* and src/Dmb.cpp
+anymore, and is untested. The relevant parts are `src/dabInputDmb*` and
+`src/Dmb.cpp`
 
 
 Communicate Leap Seconds
diff --git a/configure.ac b/configure.ac
index 196780c..7bda65b 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], [2.4.1], [matthias.braendli@mpb.li])
+AC_INIT([ODR-DabMux], [3.0.0], [matthias.braendli@mpb.li])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_SYSTEM