X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=web%2Fmanual.m4;h=7eecdbb31ad09169666f4d2e353f215432e12961;hp=7163bb7b8d700788795ce23ef8110fb90a1154a5;hb=8c8a5e12c09147d5fdd8976eaba7154391e2fe07;hpb=12db97b44ab84de5021f9a40760ccf5931aae347

diff --git a/web/manual.m4 b/web/manual.m4
index 7163bb7b..7eecdbb3 100644
--- a/web/manual.m4
+++ b/web/manual.m4
@@ -223,6 +223,10 @@ In any case you'll need
 	distro, but you might have to install the development package
 	(libssl-dev or libgcrypt-dev on debian systems) as well.
 
+	- XREFERENCE(ftp://ftp.gnu.org/pub/gnu/gengetopt/, gengetopt)
+	is needed to generate the C code for the command line parsers
+	of all paraslash executables.
+
 	- XREFERENCE(ftp://ftp.gnu.org/pub/gnu/help2man, help2man)
 	is used to create the man pages.
 
@@ -250,6 +254,10 @@ Optional:
 	- XREFERENCE(http://www.speex.org/, speex). In order to stream
 	or decode speex files, libspeex (libspeex-dev) is required.
 
+	- XREFERENCE(http://flac.sourceforge.net/, flac). To stream
+	or decode files encoded with the _Free Lossless Audio Codec_,
+	libFLAC (libFLAC-dev) must be installed.
+
 	- XREFERENCE(ftp://ftp.alsa-project.org/pub/lib/, alsa-lib). On
 	Linux, you'll need to have ALSA's development package
 	libasound2-dev installed.
@@ -1107,6 +1115,15 @@ how meta data about the file is to be encoded. The bit stream of WMA
 is composed of superframes, each containing one or more frames of
 2048 samples. For 16 bit stereo a WMA superframe is about 8K large.
 
+*FLAC*
+
+The Free Lossless Audio Codec (FLAC) compresses audio without quality
+loss. It gives better compression ratios than a general purpose
+compressor like zip or bzip2 because FLAC is designed specifically
+for audio. A FLAC-encoded file consits of frames of varying size, up
+to 16K. Each frame starts with a header that contains all information
+necessary to decode the frame.
+
 Meta data
 ~~~~~~~~~
 
@@ -1119,10 +1136,10 @@ title, album, year and comment tags. Each of these can only be at most
 32 characters long. ID3, version 2 is much more flexible but requires
 a separate library being installed for paraslash to support it.
 
-Ogg vorbis files contain meta data as Vorbis comments, which are
-typically implemented as strings of the form "[TAG]=[VALUE]". Unlike
-ID3 version 1 tags, one may use whichever tags are appropriate for
-the content.
+Ogg vorbis, ogg speex and flac files contain meta data as Vorbis
+comments, which are typically implemented as strings of the form
+"[TAG]=[VALUE]". Unlike ID3 version 1 tags, one may use whichever
+tags are appropriate for the content.
 
 AAC files usually use the MPEG-4 container format for storing meta
 data while WMA files wrap meta data as special objects within the
@@ -1140,7 +1157,7 @@ paraslash uses the word "chunk" as common term for the building blocks
 of an audio file. For MP3 files, a chunk is the same as an MP3 frame,
 while for OGG files a chunk is an OGG page, etc.  Therefore the chunk
 size varies considerably between audio formats, from a few hundred
-bytes (MP3) up to 8K (WMA).
+bytes (MP3) up to 16K (FLAC).
 
 The chunk table contains the offsets within the audio file that
 correspond to the chunk boundaries of the file. Like the meta data,
@@ -1804,11 +1821,6 @@ branches, below), the git source code management tool is used for
 paraslash development. It is necessary for cloning the git repository
 and for getting updates.
 
-ftp://ftp.gnu.org/pub/gnu/gengetopt/ (gengetopt). The C code for
-the command line parsers of all paraslash executables is generated
-by gengetopt. The generated C files are shipped in the tarballs but
-are not contained in the git repository.
-
 ftp://ftp.gnu.org/pub/gnu/m4/ (m4). Some input files for gengetopt
 are generated from templates by the m4 macro processor.