Update README

1 files changed, 28 insertions, 23 deletions

diff --git a/README b/README
index fd10a8f..cd977f1 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 
 tooLAME - an optimized mpeg 1/2 layer 2 audio encoder with
-ODR-DabMux compatible ZeroMQ output
+ODR-DabMux compatible ZeroMQ output and JACK input
 
 Copyright (C) 2002, 2003 Michael Cheng [mikecheng at NOT planckenergy.com] remove the NOT
 http://www.planckenergy.com/
@@ -8,7 +8,7 @@ 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  
+All changes to the ISO source are licensed under the LGPL
 (see LGPL.txt for details)
 
 tooLAME is free software; you can redistribute it and/or
@@ -33,7 +33,7 @@ INTRODUCTION
 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)
+    - work by Mike Cheng 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
@@ -42,7 +42,7 @@ See http://opendigitalradio.org
 INSTALLATION
 *********************
 
-0. install zeromq 4.0.3
+0. install zeromq 4.0.3 and JACK
 1. edit Makefile
    maybe change the architecture type (ARCH) to suit your machine.
 2. 'make'
@@ -53,12 +53,14 @@ USAGE
 
          ./toolame [options] <input> <output>
 
-Input File
+Input
 	tooLAME parses AIFF and WAV files for file info
 	raw PCM is assumed if no header is found
 	for stdin use a -
+	for JACK input, use -j option, and specify the name
+	of the JACK port with <input>
 
-Output File
+Output
 	file is automatically renamed from *.* to *.mp2
 	for stdout use a -
     for zeromq use tcp://<hostname>:<port> pointing to
@@ -69,13 +71,13 @@ Input Options
 		if inputting raw PCM sound, you must specify the sample rate
 		default sample rate is 44.1khz.
 
-	-a	
+	-a
 		downmix from stereo to mono
-		if the incoming file is stereo, combine the audio into 
+		if the incoming file is stereo, combine the audio into
 		a single channel
 
-	-x 	
-		force byte-swapping of the input.  (current endian detection is dodgy, 
+	-x
+		force byte-swapping of the input.  (current endian detection is dodgy,
 		so if toolame produces only noise, use -x )
 
 	-g
@@ -95,8 +97,8 @@ Output Options
 		Models: -1 to 4
 
 	-b [int]
-		the total bitrate 	
-		For 48/44.1/32kHz default = 192 
+		the total bitrate
+		For 48/44.1/32kHz default = 192
 		For 24/22.05/16kHz default = 96
 
 	-v [int]
@@ -104,10 +106,11 @@ Output Options
 		The higher the number the better the quality.
 		Useful range -10 to 10.
 		See README.VBR for details.
-		
-		
+		Don't use that for DAB encoding.
+
+
 Operation
-	-f 	
+	-f
 		fast mode turns off calculation of the psychoacoustic model.
 		Instead a set of default values are assumed
 
@@ -117,7 +120,7 @@ Operation
 Misc
 	-d emp
 		de-emphasis (default 'n')
-	-c 	
+	-c
 		mark as copyright
 	-o
 		mark as original
@@ -134,17 +137,17 @@ Misc
 EXAMPLES
 *********************
 
-1.	
+1.
 	toolame sound.wav
 
-	This will encode sound.wav to sound.mp2 using the default bitrate of 192 kbps 
+	This will encode sound.wav to sound.mp2 using the default bitrate of 192 kbps
 	and using the default psychoacoustic model (model 1)
 
 2.
 	toolame -p 2 -v 5 sound.wav newfile.mp2
 
 	Encode sound.wav to newfile.mp2 using psychoacoustic model 2 and encoding
-	with variable bitrate. The high value of the "-v" argument means that 
+	with variable bitrate. The high value of the "-v" argument means that
 	the encoding will tend to favour higher bitrates.
 
 3.
@@ -169,10 +172,10 @@ Dist10 code writers
 LAME specific contributions
 	fht routines from Ron Mayer <mayer at acuson.com>
 	fht tweaking by Mathew Hendry <math at vissci.com>
-	window_subband & filter_subband from LAME circa v3.30 
+	window_subband & filter_subband from LAME circa v3.30
 		(multiple LAME authors)
 		(before Takehiro's window/filter/mdct combination)
-	
+
 Oliver Lietz <lietz at nanocosmos.de>
 	Tables now included in the exe!  (yay! :)
 
@@ -203,10 +206,12 @@ Sami Sallinen - sami.sallinen at g-cluster.com
 	 psycho_i fix for "% 1408" calcs)
 
 Mike Cheng <mikecheng at NOT planckenergy.com> (remove the NOT)
-	Most of the rest 
+	Most of the rest
 
 Matthias P. Braendli <matthias@mpb.li>
-    ZeroMQ output for ODR-DabMux
+	ZeroMQ output for ODR-DabMux
+	PAD insertion for DLS and slides
+	JACK input
 
 *********************
 REFERENCE PAPERS