final merge of changes from the end of the flac 1.0.4 maintenance branch

2002-10-23 22:18:37 +00:00 · 2002-10-23 22:18:37 +00:00 · 1ce20b6ac3
parent cd0e322d2d
commit 1ce20b6ac3
7 changed files with 20 additions and 17 deletions
--- a/configure.in
+++ b/configure.in
@ -265,7 +265,7 @@ main ()
 	fclose(output);
 	exit(0);
 }
-], . conftest.id3; echo "${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH}", AC_MSG_WARN(could not determine id3lib version),[echo $ac_n "cross compiling; assuming ${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH} $ac_c"])
+], . ./conftest.id3; echo "${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH}", AC_MSG_WARN(could not determine id3lib version),[echo $ac_n "cross compiling; assuming ${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH} $ac_c"])
 AC_DEFINE_UNQUOTED(ID3LIB_MAJOR, $ID3LIB_MAJOR)
 AC_DEFINE_UNQUOTED(ID3LIB_MINOR, $ID3LIB_MINOR)
 AC_DEFINE_UNQUOTED(ID3LIB_PATCH, $ID3LIB_PATCH)
--- a/doc/html/comparison.html
+++ b/doc/html/comparison.html
@ -193,7 +193,7 @@
 				YES (<A HREF="http://www.winamp.com/">Winamp</A>, <A HREF="http://www.macamplite.com/addons/plugins.php">MacAmp Lite</A>, <A HREF="http://www.xmms.org/">XMMS</A>, <A HREF="http://www.hut.fi/~hylinen/apollo/Plug-ins.html">Apollo</A>, <A HREF="http://www.dbpoweramp.com/">dBpowerAMP</A>, <A HREF="http://alsaplayer.org/">AlsaPlayer</A>)
 			</TD>
 			<TD>
-				YES (<A HREF="http://www.phatnoise.com/forum/showthread.php?threadid=74">PhatBox</A>, Kenwood MusicKeg, Rio Receiver, Dell Digital Audio Receiver)
+				YES (<A HREF="http://www.phatnoise.com/technology/encoding.php">PhatBox</A>, Kenwood MusicKeg, Rio Receiver, Dell Digital Audio Receiver)
 			</TD>
 			<TD>
 				YES
--- a/doc/html/documentation.html
+++ b/doc/html/documentation.html
@ -490,9 +490,9 @@
 				</LI>
 				</UL>
 				You may use many -S options; the resulting SEEKTABLE will be the unique-ified union of all such values.<BR>
-				With no -S options, flac defaults to '-S 100x'.  Use -S- for no SEEKTABLE.<BR>
+				With no -S options, flac defaults to '-S 100x'.  Use --no-seektable for no SEEKTABLE.<BR>
 				<B>NOTE:</B> -S #x will not work if the encoder can't determine the input size before starting.<BR>
-				<B>NOTE:</B> if you use -S # and # is >= samples in the input, there will be either no seek point entered (if the input size is determinable before encoding starts) or a placeholder point (if input size is not determinable).<BR>
+				<B>NOTE:</B> if you use -S # and # is &gt;= samples in the input, there will be either no seek point entered (if the input size is determinable before encoding starts) or a placeholder point (if input size is not determinable).<BR>
 			</TD>
 		</TR>
 		<TR>
@ -500,7 +500,7 @@
 				<TT>-P #</TT>, <TT>--padding=#</TT>
 			</TD>
 			<TD>
-				Tell the encoder to write a <TT>PADDING</TT> metadata block of the given length (in bytes) after the <TT>STREAMINFO</TT> block.  This is useful if you plan to tag the file later with an <TT>APPLICATION</TT> block; instead of having to rewrite the entire file later just to insert your block, you can write directly over the <TT>PADDING</TT> block.  Note that the total length of the <TT>PADDING</TT> block will be 4 bytes longer than the length given because of the 4 metadata block header bytes.  You can force no <TT>PADDING</TT> block at all to be written with <TT>-P-</TT>, which is the default.
+				Tell the encoder to write a <TT>PADDING</TT> metadata block of the given length (in bytes) after the <TT>STREAMINFO</TT> block.  This is useful if you plan to tag the file later with an <TT>APPLICATION</TT> block; instead of having to rewrite the entire file later just to insert your block, you can write directly over the <TT>PADDING</TT> block.  Note that the total length of the <TT>PADDING</TT> block will be 4 bytes longer than the length given because of the 4 metadata block header bytes.  You can force no <TT>PADDING</TT> block at all to be written with <TT>--no-padding</TT>, which is the default.
 			</TD>
 		</TR>
 		<TR>
@ -524,7 +524,7 @@
 				<TT>-m</TT>, <TT>--mid-side</TT>
 			</TD>
 			<TD>
-				Enable mid-side coding (only for stereo streams).  Tends to increase compression by a few percent on average.  For each block both the stereo pair and mid-side versions of the block will be encoded, and smallest resulting frame will be stored.  Currently mid-side encoding is only available when bits-per-sample <= 16.
+				Enable mid-side coding (only for stereo streams).  Tends to increase compression by a few percent on average.  For each block both the stereo pair and mid-side versions of the block will be encoded, and smallest resulting frame will be stored.  Currently mid-side encoding is only available when bits-per-sample &lt;= 16.
 			</TD>
 		</TR>
 		<TR>
@ -644,7 +644,7 @@
 				<TT>-l #</TT>, <TT>--max-lpc-order=#</TT>
 			</TD>
 			<TD>
-				Specifies the maximum LPC order.  This number must be <= 32.  If 0, the encoder will not attempt generic linear prediction, and use only fixed predictors.  Using fixed predictors is faster but usually results in files being 5-10% larger.
+				Specifies the maximum LPC order.  This number must be &lt;= 32.  If 0, the encoder will not attempt generic linear prediction, and use only fixed predictors.  Using fixed predictors is faster but usually results in files being 5-10% larger.
 			</TD>
 		</TR>
 		<TR>
@ -888,7 +888,10 @@
 	<P>
 		<UL>
 			<LI>
-				None.
+				<B><TT>metaflac</TT></B> has a bug where, if --import-vc-from is used on a FLAC file that has no Vorbis comment block, the FLAC file can be corrupted.  All FLAC files generated by 1.0.4 have a Vorbis comment block added automatically but files from 1.0.3 and before do not.  This is fixed in CVS.
+			</LI>
+			<LI>
+				There is an odd bug in <B><TT>metaflac</TT></B> such that you must always use the <TT>--dont-use-padding</TT> option with <TT>--add-padding</TT> or the padding block won't be written.  This is fixed in CVS.
 			</LI>
 		</UL>
 	</P>
--- a/doc/html/index.html
+++ b/doc/html/index.html
@ -243,7 +243,7 @@
 		<TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><A HREF="http://www.sourceforge.net/projects/flac/">SourceForge project page</A><BR></FONT></SMALL></TD></TR>
 		<TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><A HREF="http://freshmeat.net/projects/flac">Freshmeat page</A><BR></FONT></SMALL></TD></TR>
 		<TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><B>Hardware supporting FLAC:</B><BR></FONT></SMALL></TD></TR>
-		<TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><A HREF="http://www.phatnoise.com/">PhatNoise</A> car audio system: <A HREF="http://www.phatnoise.com/forum/showthread.php?threadid=74">Phatbox + FLAC</A><BR></FONT></SMALL></TD></TR>
+		<TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><A HREF="http://www.phatnoise.com/">PhatNoise</A> car audio system: <A HREF="http://www.phatnoise.com/technology/encoding.php">Phatbox + FLAC</A><BR></FONT></SMALL></TD></TR>
 		<TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><A HREF="http://www.sonicblue.com/audio/rio/rio_receiver.asp">Rio Reciever</A> and Dell Digital Audio Receiver via <A HREF="http://sourceforge.net/projects/rioplay/">RioPlay</A> client<BR></FONT></SMALL></TD></TR>
 		<TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><B>Software supporting FLAC:</B><BR></FONT></SMALL></TD></TR>
 		<TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><A HREF="http://www.bagu.dhs.org/flac.html">Patch</A> for <A HREF="http://lly.org/~rcw/abcde/page/">abcde</A> (A Better CD Encoder)<BR></FONT></SMALL></TD></TR>
--- a/doc/html/news.html
+++ b/doc/html/news.html
@ -112,8 +112,8 @@
 				<LI>UTF-8 support in Vorbis comments.</LI>
 				<LI>New --import-vc-from and --export-vc-to commands for importing/exporting Vorbis comments from/to a file.  For example, the following can be used to copy tags back and forth:<BR>
 					<TT>
-					metaflac --export-vc-to=- --no-utf8-convert file.flac | vorbiscomment --raw -w -c file.ogg<BR>
-					vorbiscomment -l --raw file.ogg | metaflac --import-vc-from=- --no-utf8-convert file.flac<BR>
+					metaflac --export-vc-to=- --no-utf8-convert file.flac | vorbiscomment --raw -w file.ogg<BR>
+					vorbiscomment --raw -l file.ogg | metaflac --import-vc-from=- --no-utf8-convert file.flac<BR>
 					</TT>
 				</LI>
 				<LI>Fixed <A HREF="http://sourceforge.net/tracker/index.php?func=detail&aid=606796&group_id=13478&atid=113478">bug #606796</A> where <B><TT>metaflac</TT></B> was failing on read-only files.</LI>
@ -199,7 +199,7 @@
 	<P>
 	<UL>
 		<LI>
-			<B>FLAC goes hardware!</B>&nbsp;&nbsp;<A HREF="http://www.phatnoise.com/">Phatnoise</A> has become the first commercial hardware platform to support FLAC.  Firmware is now available for the Phatbox player to play FLAC files.  See <A HREF="http://www.phatnoise.com/forum/showthread.php?threadid=74">here</A> for details.
+			<B>FLAC goes hardware!</B>&nbsp;&nbsp;<A HREF="http://www.phatnoise.com/">Phatnoise</A> has become the first commercial hardware platform to support FLAC.  Firmware is now available for the Phatbox player to play FLAC files.  See <A HREF="http://www.phatnoise.com/technology/encoding.php">here</A> for details.
 		</LI>
 	</UL>
 	</P>
--- a/include/FLAC/all.h
+++ b/include/FLAC/all.h
@ -78,7 +78,7 @@
 * to their counterparts in libFLAC.  libOggFLAC is also licensed under
 * the LGPL.
 *
- * \section cpp_api FLAC C API
+ * \section cpp_api FLAC C++ API
 *
 * The FLAC C++ API is a set of classes that encapsulate the
 * structures and functions in libFLAC.  They provide slightly more
--- a/man/flac.sgml
+++ b/man/flac.sgml
@ -305,8 +305,8 @@
 		    be added, the first being at sample 0.  You may use
 		    many -S options; the resulting SEEKTABLE will be the
 		    unique-ified union of all such values.  With no -S
-		    options, flac defaults to '-S 100x'.  Use -S- for
-		    no SEEKTABLE.  Note: '-S #x' will not work if the
+		    options, flac defaults to '-S 100x'.  Use --no-seektable
+		    for no SEEKTABLE.  Note: '-S #x' will not work if the
 		    encoder can't determine the input size before
 		    starting.  Note: if you use '-S #' and # is >=
 		    samples in the input, there will be either no seek
@ -330,8 +330,8 @@
 		    of the PADDING block will be 4 bytes longer than
 		    the length given because of the 4 metadata block
 		    header bytes.  You can force no PADDING block at
-		    all to be written with -P-, which is the default.
-		    </para>
+		    all to be written with --no-padding, which is the
+		    default.</para>
 		</listitem>
 	      </varlistentry>