update README and such

3 files changed, 30 insertions, 9 deletions

diff --git a/HISTORY b/HISTORY
index 5b08d76..c7ce554 100644
--- a/HISTORY
+++ b/HISTORY
@@ -119,5 +119,8 @@ v0.2l	- Released 3 March 2003
 	- Rewrote the bitstream encoding routines
         - Sped up the sin/cos/atan stuff in psymodel 4 (using tables now)
          
+v0.2l with ZMQ output - February 2014
+    - added outputzmq.{h, c}
+      Matthias P. Braendli
 
 mike (mikecheng at NOT planckenergy.com) [remove the NOT]
diff --git a/README b/README
index 935e2c3..fd10a8f 100644
--- a/README
+++ b/README
@@ -1,8 +1,13 @@
-                                                                                
-tooLAME - an optimized mpeg 1/2 layer 2 audio encoder
+
+tooLAME - an optimized mpeg 1/2 layer 2 audio encoder with
+ODR-DabMux compatible ZeroMQ output
+
 Copyright (C) 2002, 2003 Michael Cheng [mikecheng at NOT planckenergy.com] remove the NOT
 http://www.planckenergy.com/
 
+Copyright (C) 2014 Matthias P. Braendli [matthias@mpb.li]
+http://opendigitalradio.org/
+
 All changes to the ISO source are licensed under the LGPL  
 (see LGPL.txt for details)
 
@@ -25,17 +30,21 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 INTRODUCTION
 *********************
 
-tooLAME is an optimized Mpeg Audio 1/2 Layer 2 encoder.  It is based heavily on 
-    - the ISO dist10 code 
+tooLAME is an optimized Mpeg Audio 1/2 Layer 2 encoder.  It is based heavily on
+    - the ISO dist10 code
     - improvement to algorithms as part of the LAME project (www.sulaco.org/mp3)
     - work by myself and other contributors (see CONTRIBUTORS)
 
+It can encode to a file, and also to a zeromq socket that can connect to ODR-DabMux
+See http://opendigitalradio.org
+
 *********************
 INSTALLATION
 *********************
 
-1. edit Makefile 
-   at least change the architecture type (ARCH) to suit your machine.
+0. install zeromq 4.0.3
+1. edit Makefile
+   maybe change the architecture type (ARCH) to suit your machine.
 2. 'make'
 
 *********************
@@ -52,6 +61,8 @@ Input File
 Output File
 	file is automatically renamed from *.* to *.mp2
 	for stdout use a -
+    for zeromq use tcp://<hostname>:<port> pointing to
+        a ODR-DabMux
 
 Input Options
 	-s [int]
@@ -194,6 +205,9 @@ Sami Sallinen - sami.sallinen at g-cluster.com
 Mike Cheng <mikecheng at NOT planckenergy.com> (remove the NOT)
 	Most of the rest 
 
+Matthias P. Braendli <matthias@mpb.li>
+    ZeroMQ output for ODR-DabMux
+
 *********************
 REFERENCE PAPERS
 *********************
@@ -222,3 +236,5 @@ Hans, M & Bhaskaran, V., A compliant MPEG-1 layer II audio decoder with 16-B
 arithmetic operations, IEEE Signal Proc Letters v4 n5 1997 p121
 
 [mikecheng at NOT planckenergy.com] remove the NOT
+and
+[matthias@mpb.li]
diff --git a/toolame.c b/toolame.c
index b8fb776..27899d4 100644
--- a/toolame.c
+++ b/toolame.c
@@ -521,8 +521,8 @@ void usage (void)
 {				/* print syntax & exit */
     /* FIXME: maybe have an option to display better definitions of help codes, and
        long equivalents of the flags */
-    fprintf (stdout, "\ntooLAME version %s (http://toolame.sourceforge.net)\n",
-            toolameversion);
+    fprintf (stdout, "\ntooLAME version %s with ZMQ support for ODR-DabMux\n"
+            "   (http://www.opendigitalradio.org)\n", toolameversion);
     fprintf (stdout, "MPEG Audio Layer II encoder\n\n");
     fprintf (stdout, "usage: \n");
     fprintf (stdout, "\t%s [options] <input> <output>\n\n", programName);
@@ -559,7 +559,9 @@ void usage (void)
     fprintf (stdout, "Files\n");
     fprintf (stdout,
             "\tinput    input sound file. (WAV,AIFF,PCM or use '/dev/stdin')\n");
-    fprintf (stdout, "\toutput   output bit stream of encoded audio\n");
+    fprintf (stdout, "\toutput   output file name for encoded bitstream\n");
+    fprintf (stdout, "\t    -or- output URI for ZeroMQ output,\n");
+    fprintf (stdout, "\t         format: tcp://<hostname>:<port>\n");
     fprintf (stdout,
             "\n\tAllowable bitrates for 16, 22.05 and 24kHz sample input\n");
     fprintf (stdout,