aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AUTHORS3
-rw-r--r--LICENCE25
-rw-r--r--README43
3 files changed, 41 insertions, 30 deletions
diff --git a/AUTHORS b/AUTHORS
index 66fca12..53e6556 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -22,4 +22,7 @@ Matthias P. Braendli <matthias [at] mpb [dot] li>
Refactoring of configuration input for command line.
Creation of a configuration file format.
ZeroMQ ETI output.
+ ZeroMQ DAB+ input with buffer monitoring (munin)
+ Remote Control
+ Improved logging (syslog)
diff --git a/LICENCE b/LICENCE
new file mode 100644
index 0000000..b028656
--- /dev/null
+++ b/LICENCE
@@ -0,0 +1,25 @@
+LICENSING
+=========
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Her Majesty
+the Queen in Right of Canada (Communications Research Center Canada)
+
+Copyright (C) 2013, 2014
+Matthias P. Braendli, http://mpb.li
+
+This file is part of ODR-DabMux. ODR-DabMux is a fork of CRC-DabMux,
+which was developed by the Communications Research Center Canada.
+
+ODR-DabMux is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+ODR-DabMux is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>.
+
+
diff --git a/README b/README
index 8db597e..b1a65e0 100644
--- a/README
+++ b/README
@@ -1,35 +1,12 @@
-LICENSING
-=========
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Her Majesty
-the Queen in Right of Canada (Communications Research Center Canada)
-
-Copyright (C) 2013, 2014
-Matthias P. Braendli, http://mpb.li
-
-This file is part of ODR-DabMux.
-
-ODR-DabMux is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-ODR-DabMux is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>.
-
OVERVIEW
========
-This is ODR-DabMux 0.4.0
+ODR-DabMux is a fork of CRC-DabMux, which was developed by the Communications
+Research Center Canada. It has been forked by the Opendigitalradio project.
ODR-DabMux is a DAB (Digital Audio Broadcasting) multiplexer compliant to
ETSI EN 300 401.
-This version has been modified, and contains additional features compared
-to the official one:
+In addition to the features of CRC-DabMux, this fork contains:
- configuration file support, see doc/example.mux
- timestamping support required for SFN
- a ZeroMQ ETI output that can be used with ODR-DABMOD
@@ -41,19 +18,25 @@ to the official one:
The src/ directory contains the source code of ODR-DabMux.
-The doc/ directory contains the ODR-DabMux documentation.
+The doc/ directory contains the ODR-DabMux documentation, and an example
+configuration file.
-The lib/ directory contains source code of libraries need to build ODR-DabMux.
+The lib/ directory contains source code of libraries needed to build
+ODR-DabMux.
INSTALL
=======
See the INSTALL file for installation instructions.
+LICENCE
+=======
+See the files LICENCE and COPYING
+
CONTACT
=======
-Pascal Charest <pascal [dot] charest [at] crc [dot] ca>
Matthias P. Braendli <matthias [at] mpb [dot] li>
+Pascal Charest <pascal [dot] charest [at] crc [dot] ca>
http://opendigitalradio.org/
-http://mpb.li/
http://mmbtools.crc.ca/
+http://mpb.li/