Merge branch 'maint'

[paraslash.git] / README

diff --git a/README b/README
index 0e1e5cb4df4a5853e340c4fb96cb2af05d6ca6db..883eeee10885f24ad90382091badb8d6bc558360 100644 (file)
--- a/README
+++ b/README
@@ -12,13 +12,13 @@ It contains the following programs:
 para_server
 -----------
 
-para_server streams binary audio data (mp3/oggvorbis/m4a files)
+para_server streams binary audio data (mp3/oggvorbis/m4a/wma files)
 over local and/or remote networks. It listens on a tcp port and
 accepts commands such as play, stop, pause, next from authenticated
 clients. However, there are many more commands.
 
 It supports three built-in network streaming methods (senders): http, dccp,
-or rtp.
+or udp.
 
        * The http sender is recommended for public streams that can be played
          by any player like mpg123, xmms, itunes, winamp...
@@ -26,7 +26,7 @@ or rtp.
        * The dccp sender requires kernel support for the datagram congestion
          control protocol.
 
-       * The ortp sender is recommended for multicast LAN streaming.
+       * The udp sender is recommended for multicast LAN streaming.
 
 It is possible to activate more than one sender simultaneously.
 
@@ -56,11 +56,6 @@ Its features include
        * rename detection. If files are moved or renamed, afs will
          recognize them despite of this change.
 
-Despite of all these features, paraslash is lightweight. The
-stripped binary of para_server with all its features compiled in
-mp3/ogg/aac support, http/dccp/ortp support) is about 160K on i386
-under Linux. para_audiod (see below) is even smaller.
-
 -----------
 para_client
 -----------
@@ -79,7 +74,7 @@ encrypted with a symmetric rc4 session key.
 para_recv
 ---------
 
-A command line http/dccp/ortp stream grabber. The http mode of this
+A command line http/dccp/udp stream grabber. The http mode of this
 tool can be used to receive data from any http streaming source.
 
 -----------
@@ -88,9 +83,10 @@ para_filter
 
 A filter program that converts from stdin and writes to stdout.
 
-para_filter combines several decoders (mp3, oggvorbis, aac) and a
-volume normalizer. New filters can be added easily. It is possible
-to "chain" any number of filters, like UNIX pipes.
+para_filter combines several decoders (mp3, oggvorbis, aac, wma),
+a volume normalizer and a cpuple of other filters. New filters can
+be added easily. It is possible to "chain" any number of filters,
+like UNIX pipes.
 
 para_filter does not depend on other parts of paraslash, so it can
 be used as a stand-alone command line tool for audio decoding and
@@ -102,10 +98,12 @@ para_afh
 
 A small stand-alone program that prints tech info about the given
 audio file to stdout. It can be instructed to print a "chunk table",
-an array of offsets within the audio file. This allows third-party
-streaming software that is unaware of the particular audio format
-to send complete frames in real time. Currently, mp3, ogg vorbis and
-aac are supported.
+an array of offsets within the audio file or to write the content of
+the audio file in complete chunks 'just in time'.
+
+This allows third-party streaming software that is unaware of
+the particular audio format to send complete frames in real
+time. Currently, mp3, ogg vorbis, aac and wma are supported.
 
 ----------
 para_write
@@ -156,7 +154,7 @@ be added easily.
 para_fade
 ---------
 
-A (Linux-only) alarm clock and volume-fader.
+A (oss-only) alarm clock and volume-fader.
 
 ---------------
 bash_completion