Merge branch 'master' into next

[paraslash.git] / README

diff --git a/README b/README
index 7a564f9214318aaf5e15bc4da8f61d1a26cc35d0..6cf34f2751332c82e630c6c53a3fe887e089129c 100644 (file)
--- a/README
+++ b/README
@@ -18,7 +18,7 @@ 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,
 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...
 
        * 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 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.
 
 
 It is possible to activate more than one sender simultaneously.
 


@@ -58,7 +58,7 @@ Its features include
 
 Despite of all these features, paraslash is lightweight. The
 stripped binary of para_server with all its features compiled in
 
 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
+mp3/ogg/aac support, http/dccp/udp support) is about 160K on i386

 under Linux. para_audiod (see below) is even smaller.
 
 -----------
 under Linux. para_audiod (see below) is even smaller.
 
 -----------


@@ -79,7 +79,7 @@ encrypted with a symmetric rc4 session key.
 para_recv
 ---------
 
 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.
 
 -----------
 tool can be used to receive data from any http streaming source.
 
 -----------


@@ -96,6 +96,19 @@ 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
 volume normalization.
 
 be used as a stand-alone command line tool for audio decoding and
 volume normalization.
 

+--------
+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 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 and aac are supported.
+

 ----------
 para_write
 ----------
 ----------
 para_write
 ----------


@@ -145,7 +158,7 @@ be added easily.
 para_fade
 ---------
 
 para_fade
 ---------
 

-A (Linux-only) alarm clock and volume-fader.
+A (oss-only) alarm clock and volume-fader.

 
 ---------------
 bash_completion
 
 ---------------
 bash_completion