final merge of changes from the end of the flac 1.1.0 maintenance branch (FLAC_RELEAS...

diff --git a/doc/html/developers.html b/doc/html/developers.html
index 2be0c70..e8f7b4c 100644 (file)
--- a/doc/html/developers.html
+++ b/doc/html/developers.html
@@ -133,8 +133,9 @@
        <TABLE WIDTH="100%" CELLPADDING="0" CELLSPACING="0" BORDER="0"><TR BGCOLOR="#000000"><TD><IMG SRC="images/1x1.gif" WIDTH="1" HEIGHT="1" ALT=""></TD></TR></TABLE>
        <TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#EEEED4">
        <TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
+       <!-- @@@@ need link to license info on xiph.org -->
        <P>
-               FLAC is open to third-party developers who want to add support for FLAC into their programs.  All the necessary functionality is contained the libraries libFLAC or libFLAC++ which are licensed under the <A HREF="http://www.gnu.org/copyleft/lesser.html">LGPL</A>.  The relevant documentation here is:
+               FLAC is open to third-party developers who want to add support for FLAC into their programs.  All the necessary functionality is contained the libraries libFLAC or libFLAC++ which are licensed under Xiph.Org's BSD license.  The relevant documentation here is:
                <UL>
                        <LI>The <A HREF="api/index.html">libFLAC and libFLAC++ API documentation</A></LI>
                        <LI>The <A HREF="format.html">formal description</A> of the FLAC format.</LI>

diff --git a/doc/html/download.html b/doc/html/download.html
index 95adb0d..8d80f7c 100644 (file)
--- a/doc/html/download.html
+++ b/doc/html/download.html
@@ -75,9 +75,10 @@
        </TABLE>
        <TABLE WIDTH="100%" CELLPADDING="0" CELLSPACING="0" BORDER="0"><TR BGCOLOR="#000000"><TD><IMG SRC="images/1x1.gif" WIDTH="1" HEIGHT="1" ALT=""></TD></TR></TABLE>
        <TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#EEEED4">
+       <!-- @@@@ need link to license info on xiph.org -->
        <TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
        <P>
-               All source code and binaries are distributed under open-source licenses.  The libraries are distributed under the <A HREF="http://www.opensource.org/licenses/lgpl-license.html">LGPL</A>, and the plugins and command-line utilites (<B><TT>flac</TT></B> and <B><TT>metaflac</TT></B>) are distributed under the <A HREF="http://www.opensource.org/licenses/gpl-license.html">GPL</A>.  If you would like to redistribute parts or all of FLAC under different terms, <A HREF="mailto:jcoalson@users.sourceforge.net">contact me</A>.
+               All source code and binaries are distributed under open-source licenses.  The codec libraries are distributed under Xiph.Org's BSD license, and the plugins and command-line utilites (<B><TT>flac</TT></B> and <B><TT>metaflac</TT></B>) are distributed under the <A HREF="http://www.opensource.org/licenses/gpl-license.html">GPL</A>.  If you would like to redistribute parts or all of FLAC under different terms, <A HREF="mailto:jcoalson@users.sourceforge.net">contact me</A>.
        </P>
        <P>
                Releases are first made through SourceForge and can be found <A HREF="http://sourceforge.net/project/showfiles.php?group_id=13478">here</A>.  For each version there is a source release and binary releases for Linux, Windows, Solaris, and Darwin (includes OS X).  <B>Winamp 3 note:</B> the FLAC plugin for Winamp 3 is currently broken but you may have luck getting the <A HREF="http://www.inf.ufpr.br/~rja00/files/flacbundle.zip">version on RareWares</A> to work.

diff --git a/doc/html/format.html b/doc/html/format.html
index 3c6361e..012ebe8 100644 (file)
--- a/doc/html/format.html
+++ b/doc/html/format.html
@@ -782,7 +782,7 @@
                                <12*8>
                        </TD>
                        <TD>
-                               Track ISRC.  This is a 12-digit alphanumeric code; see <A HREF="http://www.ifpi.org/isrc/isrc_handbook.html">here</A> and <A HREF="http://www.discusa.com/cdref/cdaudio/isrc.htm">here</A>.  A value of 12 ASCII NUL characters may be used to denote absence of an ISRC.
+                               Track ISRC.  This is a 12-digit alphanumeric code; see <A HREF="http://www.ifpi.org/isrc/isrc_handbook.html">here</A> and <A HREF="http://www.disctronics.co.uk/technology/cdaudio/cdaud_isrc.htm">here</A>.  A value of 12 ASCII NUL characters may be used to denote absence of an ISRC.
                        </TD>
                </TR>
                <TR>

diff --git a/doc/html/goals.html b/doc/html/goals.html
index 1b0620f..c9d0276 100644 (file)
--- a/doc/html/goals.html
+++ b/doc/html/goals.html
@@ -85,7 +85,7 @@
        <P>
        <UL>
                <LI>
-                       FLAC should be and stay an open format.  The source code is all either LGPL'd or GPL'd.
+                       FLAC should be and stay an open format with an open-source reference implementation.
                </LI>
                <LI>
                        FLAC should be lossless.  This seems obvious but lossy compression seems to creep into every audio codec.  This goal also means that flac should stay archival quality and be truly lossless for all input.  Testing of releases should be thorough.

diff --git a/doc/html/index.html b/doc/html/index.html
index 4f22b8b..429ecbe 100644 (file)
--- a/doc/html/index.html
+++ b/doc/html/index.html
@@ -82,11 +82,15 @@
        <TABLE WIDTH="100%" CELLPADDING="0" CELLSPACING="0" BORDER="0"><TR BGCOLOR="#000000"><TD><IMG SRC="images/1x1.gif" WIDTH="1" HEIGHT="1" ALT=""></TD></TR></TABLE>
        <TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#EEEED4">
        <TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
-       <P>FLAC 1.1.0 is out.  New features include ReplayGain and cue sheet support, improved 24-bit compression, and tag editing in the plugins.  See <A HREF="news.html#20030126">here</A> for the full list.</P>
-       <P>Note that the minor version has incremented, meaning forward compatibility was broken (forward compatibility means an earlier decoder can play all streams made by a later decoder).  This is only because of a bug in 1.0.4 and prior where the decoder could not properly skip unknown metadata.  The stream format itself has not changed and FLAC is still fully backward-compatible.  All it means is that a FLAC file containing cue sheet metadata will not decode in older decoders.  This bug is fixed in 1.1.0.</P>
-       <P>Attention <A HREF="http://www.turtlebeach.com/site/products/audiotron/producthome.asp">AudioTron</A> users: Bery Rinaldo has released his <A HREF="http://file-ext-map.sourceforge.net/">Samba File Extension Mapping VFS Module</A> that allows FLAC files to be played on the AudioTron.</P>
+       <P><B>Just in:</B> <A HREF="http://www.livephish.com/">livephish.com</A> is now offering recordings in FLAC format in addition to MP3.</P>
+       <P><B>Neuros:</B> Neuros and Xiph.org are <A HREF="http://www.neurosaudio.com/press/news_item.aspx?itemID=80">collaborating</A> to bring Vorbis support to Neuros Digital Audio Computers.  Now that FLAC is part of Xiph, Neuros is <A HREF="http://www.neurosaudio.com/support/GeneralFunctionsfaq.asp#a8">considering FLAC support</A>.  You can follow some of the Vorbis and FLAC discussions <A HREF="http://www.neurosaudio.com/community/forum/topic.asp?TOPIC_ID=114&SearchTerms=flac">here</A> and <A HREF="http://www.neurosaudio.com/community/forum/topic.asp?TOPIC_ID=17">here</A>.</P>
+       <P>FLAC has joined the Xiph project; see <A HREF="http://xiph.org/ogg/flac.html">here</A> for the press release.</P>
+       <P><A HREF="http://xiph.org/">Xiph.org</A> is behind other free codecs such as <A HREF="http://www.vorbis.com/">Vorbis</A>, <A HREF="http://www.theora.org/">Theora</A>, and <A HREF="http://www.speex.org/">Speex</A>.  Our merger with Xiph will bring FLAC into the ranks and lead to better integration with the <A HREF="http://www.xiph.org/ogg/">Ogg multimedia framework</A>.</P>
+       <P>Note that the FLAC format is not changing, native FLAC will continue to exist, and the command-line tools and plugins will continue to work as before.  The codec libraries will now be available under Xiph's BSD-like license.</P>
+<!-- @@@
        <P>If you use FLAC and have suggestions or patches, please <A HREF="http://sourceforge.net/mail/?group_id=13478">join the mailing list</A>.  Bugs can be filed <A HREF="http://sourceforge.net/bugs/?func=addbug&group_id=13478">here</A>, but make sure to check the <A HREF="documentation.html#bugs">known bugs</A> section first.</P>
-       <P><I>last updated 2003-Jan-26</I></P><!-- @@@ remember to update the date after changes -->
+-->
+       <P><I>last updated 2003-Jun-23</I></P><!-- @@@ remember to update the date after changes -->
        </FONT>
        </TD></TR>
        </TABLE>
@@ -221,6 +225,7 @@
        </TABLE>
        <TABLE WIDTH="100%" CELLPADDING="0" CELLSPACING="0" BORDER="0"><TR BGCOLOR="#000000"><TD><IMG SRC="images/1x1.gif" WIDTH="1" HEIGHT="1" ALT=""></TD></TR></TABLE>
        <TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#EEEED4">
+               <TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><A HREF="news.html#20030129">29-Jan-2003</A> :<BR>&nbsp;&nbsp;FLAC joins Xiph.org!<BR></FONT></SMALL></TD></TR>
                <TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><A HREF="news.html#20030126">26-Jan-2003</A> :<BR>&nbsp;&nbsp;Version 1.1.0 released<BR></FONT></SMALL></TD></TR>
                <TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><A HREF="news.html#20020924">24-Sep-2002</A> :<BR>&nbsp;&nbsp;Version 1.0.4 released<BR></FONT></SMALL></TD></TR>
                <TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><A HREF="news.html#20020822">22-Aug-2002</A> :<BR>&nbsp;&nbsp;FLAC support for Rio Receiver<BR></FONT></SMALL></TD></TR>
@@ -248,11 +253,13 @@
                <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.request.com/us/">AudioReQuest</A> music servers<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">Turtle Beach's <A HREF="http://www.turtlebeach.com/site/products/audiotron/producthome.asp">AudioTron</A> via Bery Rinaldo's <A HREF="http://file-ext-map.sourceforge.net/">Samba VFS Module</A><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.hispalinux.es/~data/abcde.php">abcde</A> (A Better CD Encoder)<BR></FONT></SMALL></TD></TR>
+               <TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><A HREF="http://alsaplayer.org/">AlsaPlayer</A><BR></FONT></SMALL></TD></TR>
                <TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><A HREF="http://arson.sourceforge.net/">Arson</A>: KDE ripper/burner<BR></FONT></SMALL></TD></TR>
                <TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><A HREF="http://bossogg.sourceforge.net/">Boss Ogg</A>: Audio client/server<BR></FONT></SMALL></TD></TR>
                <TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><A HREF="http://www.saunalahti.fi/~cse/files/cool_flac.zip">Cooledit FLAC filter</A> (source code <A HREF="http://www.saunalahti.fi/~cse/files/cool_flac_src.zip">here</A>)<BR></FONT></SMALL></TD></TR>
@@ -260,6 +267,7 @@
                <TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><A HREF="http://easytag.sourceforge.net/">EasyTAG</A> versatile tagger<BR></FONT></SMALL></TD></TR>
                <TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><A HREF="http://home.wanadoo.nl/~w.speek/flac.htm">FLAC frontend</A> (Windows GUI)<BR></FONT></SMALL></TD></TR>
                <TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><A HREF="http://flac-tools.sourceforge.net/">flac-tools</A><BR></FONT></SMALL></TD></TR>
+               <TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><A HREF="http://getid3.sourceforge.net/">getID3()</A>: a PHP4 script for extracting metadata<BR></FONT></SMALL></TD></TR>
                <TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><A HREF="http://www.gstreamer.net/">GStreamer</A> streaming media framework<BR></FONT></SMALL></TD></TR>
                <TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><A HREF="http://hasas.sourceforge.net/">HASAS</A> HydroAcoustical Signal Analysis System<BR></FONT></SMALL></TD></TR>
                <TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><A HREF="http://www.j-ogg.de/">J-Ogg</A> Java libraries for Ogg decoding<BR></FONT></SMALL></TD></TR>
@@ -277,6 +285,9 @@
                <TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><A HREF="http://www.cyclooctane.com/sonice/">sonice</A> FLAC to Vorbis transcoder<BR></FONT></SMALL></TD></TR>
                <TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><A HREF="http://www.lameb.fsnet.co.uk/">Split_wav</A> WAV+CUE splitter<BR></FONT></SMALL></TD></TR>
                <TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><A HREF="http://www.saunalahti.fi/~cse/html/tag.html">Tag</A> comprehensive tagger (<A HREF="http://home.wanadoo.nl/~w.speek/tag.htm">frontend</A> available)<BR></FONT></SMALL></TD></TR>
+               <TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><A HREF="http://www.videolan.org/">VideoLAN</A> client<BR></FONT></SMALL></TD></TR>
+               <TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><A HREF="http://xine.sourceforge.net/">Xine</A> multimedia player<BR></FONT></SMALL></TD></TR>
+               <TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><A HREF="http://www.xmms.org/">XMMS</A>: X MultiMedia System<BR></FONT></SMALL></TD></TR>
 <!-- not released yet...
 -->
 <!-- no official FLAC support yet...

diff --git a/doc/html/news.html b/doc/html/news.html
index 74fd07f..c5d060c 100644 (file)
--- a/doc/html/news.html
+++ b/doc/html/news.html
@@ -78,6 +78,23 @@
        <TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
 
        <P>
+               <A NAME="20030129">29-Jan-2003:</A>
+       </P>
+       <P>
+       <UL>
+               <LI>
+                       <B>FLAC has joined the Xiph project</B>&nbsp;&nbsp;See <A HREF="http://xiph.org/ogg/flac.html">here</A> for the press release.
+                       <P>
+                       <A HREF="http://xiph.org/">Xiph.org</A> is behind other free codecs such as <A HREF="http://www.vorbis.com/">Vorbis</A>, <A HREF="http://www.theora.org/">Theora</A>, and <A HREF="http://www.speex.org/">Speex</A>.  Our merger with Xiph will bring FLAC into the ranks and lead to better integration with the <A HREF="http://www.xiph.org/ogg/">Ogg multimedia framework</A>.
+                       <P>
+                       Note that the FLAC format is not changing, native FLAC will continue to exist, and the command-line tools and plugins will continue to work as before.  The codec libraries will now be available under Xiph's BSD-like license.
+                       <P>
+                       Over the next few days we will be transitioning normal operations off SourceForge and over to Xiph.org; first will be CVS and the web pages, followed by the mailing lists, bug tracker, and file release area.  We will keep a mirror here until the transition is complete.  It's OK to send patches to the flac-dev list but they won't be able to be integrated until CVS is fully moved over.
+               </LI>
+       </UL>
+       </P>
+
+       <P>
                <A NAME="20030126">26-Jan-2003:</A>
        </P>
        <P>