merge from FLAC 1.1.1 maintenance branch (-j FLAC_RELEASE_1_1_1__2004_10_01 -j FLAC_RELEASE_1_1_1_MAINTENANCE_BRANCH (AKA FLAC_RELEASE_1_1_1_MAINTENANCE__MERGE_TO_TRUNK))
diff --git a/doc/html/Makefile.am b/doc/html/Makefile.am
index 05cbede..eb8f453 100644
--- a/doc/html/Makefile.am
+++ b/doc/html/Makefile.am
@@ -28,6 +28,7 @@
documentation.html \
download.html \
faq.html \
+ favicon.ico \
features.html \
format.html \
goals.html \
diff --git a/doc/html/documentation.html b/doc/html/documentation.html
index 496c7f3..61ef026 100644
--- a/doc/html/documentation.html
+++ b/doc/html/documentation.html
@@ -383,7 +383,7 @@
<TT>-o filename</TT>,<BR><TT>--output-name=filename</TT>
</TD>
<TD>
- Force the output file name (usually <TT><B>flac</B></TT> just changes the extension). May only be used when encoding a single file. May not be used in conjunction with <TT>--output-prefix</T>.
+ Force the output file name (usually <TT><B>flac</B></TT> just changes the extension). May only be used when encoding a single file. May not be used in conjunction with <TT><A HREF="#flac_options_output_prefix">--output-prefix</A></TT>.
</TD>
</TR>
<TR>
@@ -519,7 +519,7 @@
<TR>
<TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
<A NAME="flac_options_apply_replaygain_which_is_not_lossless">
- <TT>--apply-replaygain_which_is_not_lossless[=<specification>]</TT>
+ <TT>--apply-replaygain-which-is-not-lossless[=<specification>]</TT>
</TD>
<TD>
Applies ReplayGain values while decoding.
diff --git a/doc/html/download.html b/doc/html/download.html
index 430753e..0e26661 100644
--- a/doc/html/download.html
+++ b/doc/html/download.html
@@ -87,7 +87,7 @@
<LI>
<B>Linux</B>
<UL>
- <LI><A HREF="http://prdownloads.sourceforge.net/flac/flac-1.1.1-rh7-i386.tar.gz?download">FLAC 1.1.1 for RedHat 7.x</A></LI>
+ <LI><A HREF="http://prdownloads.sourceforge.net/flac/flac-1.1.1-linux-i386.tar.gz?download">FLAC 1.1.1 for RedHat 7.x</A></LI>
<LI><A HREF="http://packages.debian.org/cgi-bin/search_packages.pl?keywords=flac+libflac+1.&searchon=all&subword=1&version=all&release=all">FLAC 1.x Debian packages</A>
<LI>RPMs can be found on <A HREF="http://ccrma-www.stanford.edu/planetccrma/software/soundapps.html">Planet CCRMA</A> and <A HREF="http://rpmfind.net/linux/rpm2html/search.php?query=flac">rpmfind.net</A>
</UL>
@@ -95,10 +95,11 @@
<LI>
<B>Mac OS X</B>
<UL>
- <LI><A HREF="http://www.danrules.com/macflac/">MacFLAC with installer and GUI front-end</A></LI>
- <LI><A HREF="http://software.emuscene.com/flacer.html">FLACer</A> (source not available)</LI>
+ <LI><A HREF="http://www.danrules.com/macflac/">MacFLAC with installer and GUI front-end</A> (source code not available)</LI>
+ <LI><A HREF="http://software.emuscene.com/view.php?softid=10">FLACer</A> (source code not available)</LI>
+ <LI><A HREF="http://www.versiontracker.com/dyn/moreinfo/macosx/21952">xACT with installer and GUI front-end</A> (source code included)</LI>
<LI><A HREF="http://fink.sourceforge.net/pdb/package.php/flac">FLAC Fink package</A> for use with <A HREF="http://fink.sourceforge.net/">Fink</A>
- <LI><A HREF="http://prdownloads.sourceforge.net/flac/flac-1.1.1-darwin-ppc.tar.gz?download">FLAC 1.1.1 for OS X (no installer)</A></LI>
+ <LI><A HREF="http://prdownloads.sourceforge.net/flac/flac-1.1.1-osx-ppc.tar.gz?download">FLAC 1.1.1 for OS X (no installer)</A></LI>
</UL>
</LI>
<LI>
@@ -166,6 +167,7 @@
<B>Windows</B>
<UL>
<LI><A HREF="http://www.dbpoweramp.com/">dBpowerAMP</A>, a swiss army knife that can convert and play many formats, including FLAC.</LI>
+ <LI><A HREF="http://www.uninformative.com/flacattack/">Flacattack</A>: an all-in-one tool that works with ExactAudioCopy to encode a CD image to FLAC, embed the cuesheet, add ReplayGain, create lossy files, etc. all in a customizable directory structure.</LI>
<LI><A HREF="http://www.rarewares.org/lossless.html">FLACdrop</A>, an Oggdrop-like frontend for Windows, or the even more versatile <A HREF="http://homepage.ntlworld.com/jfe1205/">oggdropXPd</A>.</LI>
<LI><A HREF="http://home.wanadoo.nl/~w.speek/flac.htm">FLAC frontend</A>, a Windows GUI, or the even more versatile <A HREF="http://home.wanadoo.nl/~w.speek/multi.htm">Multi frontend</A>.</LI>
<LI><A HREF="http://home.vxu.se/mdati00/frontah/">Frontah</A>, a new frontend to many codecs, including FLAC. Still in beta but has good reviews.</LI>
@@ -186,6 +188,7 @@
<UL>
<LI><A HREF="http://www.danrules.com/macflac/">MacFLAC</A>, a FLAC distribution which also includes nice graphical front-end.</LI>
<LI><A HREF="http://members.rogers.com/beamsplitter/">RipBeak</A> is a nice GUI encoding frond-end that supports FLAC as well as Vorbis and MP3.</LI>
+ <LI><A HREF="http://www.versiontracker.com/dyn/moreinfo/macosx/21952">xACT</A>, another FLAC distribution with a graphical front-end to FLAC and other formats.</LI>
</UL>
</LI>
</UL>
@@ -224,8 +227,9 @@
-->
<LI><A HREF="http://www.hydrogenaudio.org/index.php?showtopic=20145&">Cooledit FLAC filter</A>.</LI>
<LI><A HREF="http://corecodec.org/projects/coreflac">CoreFLAC</A>: DirectShow filters for encoding to/decoding from FLAC.</LI>
- <LI><A HREF="http://www.illiminable.com/ogg/">DirectShow filters</A> for encoding to/decoding from Ogg FLAC (and Vorbis, Speex, and Theora).</LI>
+ <LI><A HREF="http://www.illiminable.com/ogg/">DirectShow filters</A> for encoding to/decoding from FLAC and Ogg FLAC (as well as Ogg Vorbis/Speex/Theora).</LI>
<LI><A HREF="http://www.monsterfang.com/MCinFLAC/">Media Center/Media Jukebox FLAC plugin</A> currently still beta, but promising. Source is also available.</LI>
+ <LI><A HREF="http://www.phsoft.nl/?id=flacplginf">Mp3CoolPlay-X FLAC plugin</A>.</LI>
<LI><A HREF="http://neroplugins.cd-rw.org/">Nero FLAC plugin</A> allows you to burn FLAC files directly to audio CDs.</LI>
<LI><A HREF="http://www.quinnware.com/plugins/in_qcdflac.exe">QCD FLAC plugin</A>.</LI>
<LI><A HREF="http://www.winamp.com/plugins/details.php?id=131643">FLAC Winamp3 plugin</A> by Giacomo Margarito.</LI>
diff --git a/doc/html/faq.html b/doc/html/faq.html
index 0f9b686..6d2a6d0 100644
--- a/doc/html/faq.html
+++ b/doc/html/faq.html
@@ -109,6 +109,9 @@
<A HREF="#general__no_cuesheet_tags"><B>Why aren't PERFORMER/TITLE/etc tags stored in the FLAC CUESHEET block?</B></A>
</LI>
<LI>
+ <A HREF="#general__no_wave_metadata"><B>Why doesn't FLAC store all WAVE metadata?</B></A>
+ </LI>
+ <LI>
<A HREF="#general__asymmetry"><B>Why do the encoder settings have a big effect on the encoding time but not the decoding time?</B></A>
</LI>
<LI>
@@ -247,9 +250,6 @@
The short answer right now is probably "native FLAC". If all you are doing is compressing audio to be played back later, native FLAC will do everything you need, is more widely supported, and will yield smaller files. If you plan to edit the compressed audio, or want to multiplex the audio with video later in an Ogg container, Ogg FLAC is a better choice.
</P>
<P>
- Note that seeking in Ogg FLAC is not yet supported but will be in the next release.
- </P>
- <P>
<A NAME="general__no_cuesheet_tags"><B>Why aren't PERFORMER/TITLE/etc tags stored in the FLAC CUESHEET block?</B></A>
</P>
<P>
@@ -265,6 +265,18 @@
Some players (for example Foobar2000) allow you to store the CDDB data as FLAC tags and can parse that.
</P>
<P>
+ <A NAME="general__no_wave_metadata"><B>Why doesn't FLAC store all WAVE metadata?</B></A>
+ </P>
+ <P>
+ FLAC is a general-purpose audio format, not just a compressed WAVE file format. There's a subtle difference. WAVE is a complicated standard; many kinds of data besides audio data can be put in it. FLAC's purpose is not to reproduce a WAVE file, including all the non-audio data that is in it, it is to losslessly compress the audio.
+ </P>
+ <P>
+ People have asked for that in FLAC, but if it were added, then what about similar formats like AIFF? <B><TT>flac</TT></B> can extract and compress audio data in an AIFF file also. AIFF is widely used on the Mac. AIFF users have asked that all AIFF metadata be stored for the same reasons. And it doesn't end there, other uncompressed formats exist.
+ </P>
+ <P>
+ Also, it would add a lot of complexity to FLAC because non-audio data has to go in the metadata section which is at the beginning of the FLAC file. But in WAVE and AIFF it can go before or after the audio, so the encoding would have to make multiple passes and also store the chunk hierarchy to be able to reproduce it.
+ </P>
+ <P>
<A NAME="general__asymmetry"><B>Why do the encoder settings have a big effect on the encoding time but not the decoding time?</B></A>
</P>
<P>
@@ -363,6 +375,9 @@
For the more technically inclined, FLAC only stores what is in the 'fmt ' and 'data' sub-chunks of a WAVE file.
</P>
<P>
+ <A HREF="#general__no_wave_metadata">(see also)</A>
+ </P>
+ <P>
<A NAME="tools__two_bytes_short"><B>I decoded a FLAC file and the WAVE is 2 bytes shorter than the original. Why?</B></A>
</P>
<P>
diff --git a/doc/html/favicon.ico b/doc/html/favicon.ico
new file mode 100644
index 0000000..594fe38
--- /dev/null
+++ b/doc/html/favicon.ico
Binary files differ
diff --git a/doc/html/id.html b/doc/html/id.html
index 0e4e46d..58292e7 100644
--- a/doc/html/id.html
+++ b/doc/html/id.html
@@ -137,7 +137,7 @@
<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="#D3D4C5">
<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
- <B><FONT SIZE="+2">id directory</FONT></B>
+ <A NAME="directory"><B><FONT SIZE="+2">id directory</FONT></B>
</FONT></TD></TR>
</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>
@@ -159,6 +159,14 @@
</TR>
<TR>
<TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <TT>43756573 - "Cues"</TT>
+ </TD>
+ <TD>
+ <A HREF="http://www.goldwave.com">GoldWave</A> cue points (<A HREF="http://www.goldwave.com/developer.php">specification</A>)
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
<TT>46746F6C - "Ftol"</TT>
</TD>
<TD>
diff --git a/doc/html/index.html b/doc/html/index.html
index 34126b6..6c5b37e 100644
--- a/doc/html/index.html
+++ b/doc/html/index.html
@@ -11,6 +11,7 @@
<META NAME="description" CONTENT="An open source codec for lossless audio compression and decompression">
<META NAME="keywords" CONTENT="lossless,audio,codec,encoder,decoder,compression,compressor,archive,archiving,backup">
<TITLE>FLAC - Free Lossless Audio Codec</TITLE>
+ <LINK REL="SHORTCUT ICON" HREF="favicon.ico">
</HEAD>
<BODY MARGINWIDTH="0" MARGINHEIGHT="0" LEFTMARGIN="0" RIGHTMARGIN="0" TOPMARGIN="0" BGCOLOR="#99CC99" TEXT="#000000" LINK="#336699" VLINK="#336699" ALINK="#336699">
@@ -85,16 +86,16 @@
<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>Another handful of devices that support FLAC are out or announced: <!--the A HREF="http://www.planetminidisc.com/chroma-20gb.html"@Rio Chroma@/A, -->the <A HREF="http://www.zensonic.com/press_z500.php">Zensonic Z500 Networked DVD Media Player</A>, Escient's <A HREF="http://www.escient.com/releases/escient_jan0605_2.html">new FireBall E2-40, E2-160, and DVDM-300</A>, the <A HREF="http://www.digitaltechniques.com/M300A_Overview.html">M300A Digital Music Player</A> from Digital Techniques (see <A HREF="http://www.digitaltechniques.com/QuickStart.html">manual</A>), Meda Systems' <A HREF="http://www.medainc.com/">Bravo servers</A> (<A HREF="http://www.stereophile.com/news/092704medasystems/">more info</A>), and the <A HREF="http://www.cesweb.org/attendees/show_floor/product_locator/product_details.asp?prodid=5181">MS300 Music Server</A> by McIntosh Laboratory.</P>
+ <P>We just found out that <A HREF="http://www.skipjam.com/">SkipJam</A>'s line of networked audio/video components supports FLAC. (Even though it's not mentioned on their site, I'm assured that's just because the site hasn't been updated yet.)</P>
+ <P><A HREF="http://www.escient.com/">Escient</A> has a new home stereo component that supports FLAC, the <A HREF="http://www.escient.com/fireballe2300.html">FireBall E2-300</A>.</P>
+ <P><A HREF="http://www.mindawn.com/">Mindawn</A>, a new online music service offering FLAC and Ogg Vorbis, is now open. They also have a multi-platform (Windows, Linux, Mac OS X) CD ripper/encoder and are finishing up a multi-platform player.</P>
+ <P>Illiminable has updated his excellent <A HREF="http://www.illiminable.com/ogg/">Directshow filters</A> to support native FLAC (in addition to Ogg FLAC/Vorbis/Speex/Theora).</P>
<P>FLAC 1.1.1 has been released. There is a new <A HREF="changelog.html">changelog</A> with a complete list of changes/fixes/improvements, but the main ones include: almost 2x decoding speedup on Macintosh, better Ogg FLAC support, and several new options to <B><TT>flac</TT></B> and <B><TT>metaflac</TT></B>. Available now on the <A HREF="download.html">download page</A>.</P>
<P>Also, the mailing lists have been migrated to <A HREF="http://xiph.org/">Xiph.org</A>. This should cut down on the abuse and response time. If you abandoned the lists because of spam problems, now is the time to sign back up: <A HREF="http://lists.xiph.org/mailman/listinfo/announce">announce</A> <A HREF="http://lists.xiph.org/mailman/listinfo/flac">flac</A> <A HREF="http://lists.xiph.org/mailman/listinfo/flac-dev">flac-dev</A></P>
<P>There are some new hardware players out that support FLAC, the <A HREF="http://www.hermstedt.com/english/hifidelio/hifidelio.html">Hifidelio</A>, a wireless home stereo component, and the <A HREF="http://www.jetaudio.com/products/iaudio/m3/">iAUDIO M3</A> portable HDD digital audio player (<A HREF="http://eng.iaudio.com/zeroboard/zboard.php?id=A02&no=47&bmenu=A">firmware</A>).</P>
- <P>The <A HREF="http://www.furthurnet.org/">Furthur Network</A>, a legal-live music sharing P2P network, <A HREF="http://www.furthurnet.org/presspit/">now supports FLAC</A>.</P>
- <P><A HREF="http://www.livebonnaroo.com/catalog.html">Several sets</A> from the Bonnaroo Music Festival are available in FLAC, including <A HREF="http://stores.musictoday.com/store/product.asp?dept%5Fid=3045&pf%5Fid=FEDD17&band%5Fid=741&sfid=2">Dave Matthews & Friends</A> and <A HREF="http://stores.musictoday.com/store/product.asp?dept%5Fid=3045&pf%5Fid=FEDD67&band%5Fid=741&sfid=2">String Cheese Incident</A>, with more to follow as the soundboard recordings are approved by the bands.</P>
- <P><A HREF="http://digitalsoundboard.net/">DigitalSoundboard.net</A> has begun <A HREF="http://app1.dsbd.net/dsb/24-bitPrimer.jsp">offering 24-bit recordings in FLAC format</A>.</P>
- <P>We've just discovered that the <A HREF="http://www.rokulabs.com/">Roku Soundbridge</A> now supports FLAC.</P>
- <P>A Java native FLAC decoder is now available through the <A HREF="http://jflac.sourceforge.net/">jFLAC project</A>.</P>
<P>Metallica is offering <A HREF="http://www.livemetallica.com/">soundboard recordings of live shows in FLAC format</A>.</P>
- <P><I>last updated 2004-Oct-01</I></P><!-- @@@ remember to update the date after changes -->
+ <P><I>last updated 2005-Jan-20</I></P><!-- @@@ remember to update the date after changes -->
</FONT>
</TD></TR>
</TABLE>
@@ -232,6 +233,9 @@
</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#20050117">17-Jan-2005</A> :<BR> Several new devices support FLAC<BR></FONT></SMALL></TD></TR>
+ <TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><A HREF="news.html#20041112">12-Nov-2004</A> :<BR> Escient's new FireBall E2-300 supports FLAC<BR></FONT></SMALL></TD></TR>
+ <TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><A HREF="news.html#20041102">02-Nov-2004</A> :<BR> New Mindawn music store offers FLAC and Vorbis<BR></FONT></SMALL></TD></TR>
<TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><A HREF="news.html#20041001">01-Oct-2004</A> :<BR> Version 1.1.1 released<BR></FONT></SMALL></TD></TR>
<TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><A HREF="news.html#20040727">27-Jul-2004</A> :<BR> The Furthur network now supports FLAC<BR></FONT></SMALL></TD></TR>
<TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><A HREF="news.html#20040621">21-Jun-2004</A> :<BR> Bonnaroo soundboard recordings available in FLAC<BR></FONT></SMALL></TD></TR>
diff --git a/doc/html/links.html b/doc/html/links.html
index 6c4ce00..14a9797 100644
--- a/doc/html/links.html
+++ b/doc/html/links.html
@@ -103,7 +103,7 @@
<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#EEEED4">
<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
<P>
- Below is a list of devices that support the FLAC format.
+ Below is a list of devices that support the FLAC format. So far we only have experience with the Rio Reciever. Manufacturers, if you would like your product reviewed here, feel free to <A HREF="mailto:jcoalson@users.sourceforge.net">send a unit</A>.
</P>
<P>
@@ -111,15 +111,18 @@
</P>
<UL>
<LI><A HREF="http://www.request.com/us/">AudioReQuest</A> music servers</LI>
+ <LI>Digital Techniques' "iStereo" <A HREF="http://www.digitaltechniques.com/M300A_Overview.html">M300A Digital Music Player</A></LI>
+ <LI>Escient's <A HREF="http://www.escient.com/">FireBall servers (E2-40/160/300, DVDM-300)</A>, networked home stereo components with hard-drives</LI>
<LI><A HREF="http://www.hermstedt.com/english/hifidelio/hifidelio.html">Hifidelio</A>, a wireless home stereo component</LI>
+ <LI>Meda Systems' <A HREF="http://www.medainc.com/">Bravo servers</A></LI>
+ <LI>The <A HREF="http://www.cesweb.org/attendees/show_floor/product_locator/product_details.asp?prodid=5181">MS300 Music Server</A> by McIntosh Laboratory</LI>
<LI><A HREF="http://www.phatnoise.com/products/homeplayer/index.php">PhatNoise Home Digital Media Player</A></LI>
- <LI><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</LI>
+ <LI><A HREF="http://www.mock.com/receiver/">Rio Reciever</A> and Dell Digital Audio Receiver via <A HREF="http://sourceforge.net/projects/rioplay/">RioPlay</A> or <A HREF="http://www.reza.net/rio/rrr.html">RRR</A> clients<BR>This little device is a hacker's dream. There are several open source clients available and since it boots its Linux distro over NFS you can write your own client. They're not made anymore but you can still find them on ebay.</LI>
<LI><A HREF="http://www.rokulabs.com/">Roku Soundbridge</A></LI>
- <!-- wait for formal announcement:
- <LI><A HREF="http://www.skipjam.com/">SkipJam</A></LI>
- -->
+ <LI><A HREF="http://www.skipjam.com/">SkipJam</A>'s networked audio/video devices</LI>
<LI><A HREF="http://www.slimdevices.com/">Squeezebox and SliMP3</A> networked audio players</LI>
<LI>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></LI>
+ <LI><A HREF="http://www.z500series.com/">Zensonic Z500 Networked DVD Media Player</A></LI>
</UL>
</P>
@@ -136,8 +139,8 @@
<B>Portable/Handheld:</B>
</P>
<UL>
- <LI><A HREF="http://www.jetaudio.com/products/iaudio/m3/">iAUDIO M3</A> (<A HREF="http://eng.iaudio.com/zeroboard/zboard.php?id=A02&no=47&bmenu=A">firmware</A>)</LI>
- <LI><A HREF="http://www.digitalnetworksna.com/shop/_templates/item_main_Rio.asp?model=220&cat=53">Rio Karma</A></LI>
+ <LI><A HREF="http://www.jetaudio.com/products/iaudio/m3/">iAUDIO M3</A></LI>
+ <LI><A HREF="http://www.digitalnetworksna.com/shop/_templates/item_main_Rio.asp?model=220&cat=53">Rio Karma</A><!-- and Rio Chroma--></LI>
</UL>
</P>
@@ -171,6 +174,7 @@
<UL>
<LI><A HREF="http://www.bucketheadslivewedges.com/">Buckethead</A></LI>
<LI><A HREF="http://www.charliehunter.com/news/main.htm">Charlie Hunter</A></LI>
+ <LI><A HREF="http://www.c2b3live.com/">Colonel Claypool's Bucket of Bernie Brains</A></LI>
<LI><A HREF="http://stores.musictoday.com/store/dept.asp?band_id=1&dept_id=2640">Dave Matthews Band</A></LI>
<LI><A HREF="http://www.livemetallica.com/">Metallica</A></LI>
<LI><A HREF="http://www.livephish.com/">Phish</A></LI>
@@ -185,11 +189,14 @@
<LI><A HREF="http://www.aliveaudio.net/">AliveAudio</A></LI>
<LI><A HREF="http://www.atorecords.com/">ATO Records</A> (<A HREF="http://stores.musictoday.com/store/dept.asp?dept_id=2654&band_id=154">Store</A>)</LI>
<LI><A HREF="http://digitalsoundboard.net/">DigitalSoundboard.net</A></LI>
+ <LI><A HREF="http://www.disclogic.com/">DiscLogic</A></LI>
<LI><A HREF="http://www.edmdigital.com/catalog/index.php?ref=13">EDM Digital</A></LI>
<LI><A HREF="http://fastatmosphere.com/">Fast Atmosphere</A></LI>
<LI><A HREF="http://magnatune.com/">Magnatune</A></LI>
+ <LI><A HREF="http://www.mindawn.com/">Mindawn</A></LI>
<LI><A HREF="http://morganleahrecords.com">morgan leah records</A></LI>
<LI><A HREF="http://stores.musictoday.com">Musictoday</A></LI>
+ <LI><A HREF="http://www.opsound.org/">Opsound</A></LI>
</UL>
</P>
@@ -212,6 +219,7 @@
<LI><A HREF="http://www.archive.org/audio/collection.php?collection=opensource_audio">Open Source Audio</A></LI>
</UL>
</LI>
+ <LI><A HREF="http://www.dxdt.org/archive/">dxdt.org</A></LI>
<LI><A HREF="http://wiki.etree.org/">etree.org</A></LI>
<LI>The <A HREF="http://www.furthurnet.org/">Furthur Network</A></LI>
</UL>
@@ -248,6 +256,7 @@
<LI><A HREF="http://easytag.sourceforge.net/">EasyTAG</A> versatile tagger</LI>
<LI><A HREF="http://entagged.sourceforge.net/">Entagged</A>, a Java audio file tagger</LI>
<LI><A HREF="http://etree-scripts.sourceforge.net/">etree-scripts</A>: command-line tools for verifying, tagging, converting, and burning lossless audio files</LI>
+ <LI><A HREF="http://www.uninformative.com/flacattack/">Flacattack</A>: an all-in-one tool that works with ExactAudioCopy to encode a CD image to FLAC, embed the cuesheet, add ReplayGain, create lossy files, etc. all in a customizable directory structure.</LI>
<LI><A HREF="http://home.wanadoo.nl/~w.speek/flac.htm">FLAC frontend</A> (Windows GUI)</LI>
<LI><A HREF="http://www.danrules.com/macflac/">MacFLAC</A> Mac OS X FLAC distribution</LI>
<LI><A HREF="http://rawrec.sourceforge.net/">rawrec/rawplay</A> recording/playback tools</LI>
@@ -283,6 +292,7 @@
<LI><A HREF="http://www.monsterfang.com/MCinFLAC/">Media Center FLAC plugin</A></LI>
<LI><A HREF="http://musicpd.sourceforge.net/">MPD</A>, Music Player Daemon</LI>
<LI><A HREF="http://www.mplayerhq.hu/">MPlayer</A></LI>
+ <LI><A HREF="http://musik.berlios.de/">Musik</A>: an open-source, cross-platform multimedia player and library</LI>
<LI><A HREF="http://www.mythtv.org/">MythTV</A>: Linux PVR and more</LI>
<LI><A HREF="http://ripperx.sourceforge.net/">ripperX</A>: X-based ripper/encoder</LI>
<LI><A HREF="http://www.lammerts.org/software/soepkiptng/">Soepkip TNG</A> music playing daemon + web interface</LI>
@@ -302,6 +312,7 @@
<LI><A HREF="http://bach.dynet.com/crip/index.html">crip</A>: console ripper/encoder/tagger</LI>
<LI><A HREF="http://mareo.netfirms.com/">MAREO</A> multi-format encoder for EAC</LI>
<LI><A HREF="http://rip.sourceforge.net/">rip</A> command-line ripper/encoder</LI>
+ <LI><A HREF="http://www.suwald.com/ripit/ripit.html">RipIT</A>, a console-based front-end to several ripping and encoding tools</LI>
</UL>
</P>
@@ -324,6 +335,7 @@
<LI><A HREF="http://search.cpan.org/~daniel/Audio-FLAC-0.8/FLAC.pm">Audio::FLAC</A> perl module</LI>
<LI><A HREF="http://search.cpan.org/author/DANIEL/Audio-FLAC-Decoder-0.2/Decoder.pm">Audio::FLAC::Decoder</A> perl module</LI>
<LI><A HREF="http://corecodec.org/projects/coreflac">CoreFLAC</A>: FLAC DirectShow filters</LI>
+ <LI><A HREF="http://www.illiminable.com/ogg/">DirectShow filters</A> for encoding to/decoding from FLAC and Ogg FLAC (as well as Ogg Vorbis/Speex/Theora).</LI>
<LI><A HREF="http://getid3.sourceforge.net/">getID3()</A>: a PHP4 script for extracting metadata</LI>
<LI><A HREF="http://www.gstreamer.net/">GStreamer</A> streaming media framework</LI>
<LI><A HREF="http://jflac.sourceforge.net/">jFLAC</A>: Java native FLAC decoder</LI>
diff --git a/doc/html/news.html b/doc/html/news.html
index 9e47e9e..ef75813 100644
--- a/doc/html/news.html
+++ b/doc/html/news.html
@@ -81,7 +81,46 @@
<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
<P>
- <A NAME="20041001">1-Oct-2004:</A>
+ <A NAME="20050117">17-Jan-2005:</A>
+ </P>
+ <P>
+ <UL>
+ <LI>
+ <B>Several new devices support FLAC</B>
+ <P>
+ Another handful of devices that support FLAC are out or announced: <!--the A HREF="http://www.planetminidisc.com/chroma-20gb.html"@Rio Chroma@/A, -->the <A HREF="http://www.zensonic.com/press_z500.php">Zensonic Z500 Networked DVD Media Player</A>, Escient's <A HREF="http://www.escient.com/releases/escient_jan0605_2.html">new FireBall E2-40, E2-160, and DVDM-300</A>, the <A HREF="http://www.digitaltechniques.com/M300A_Overview.html">M300A Digital Music Player</A> from Digital Techniques (see <A HREF="http://www.digitaltechniques.com/QuickStart.html">manual</A>), Meda Systems' <A HREF="http://www.medainc.com/">Bravo servers</A> (<A HREF="http://www.stereophile.com/news/092704medasystems/">more info</A>), and the <A HREF="http://www.cesweb.org/attendees/show_floor/product_locator/product_details.asp?prodid=5181">MS300 Music Server</A> by McIntosh Laboratory.</P>
+ </LI>
+ </UL>
+ </P>
+
+ <P>
+ <A NAME="20041112">12-Nov-2004:</A>
+ </P>
+ <P>
+ <UL>
+ <LI>
+ <B>Escient's new FireBall E2-300 supports FLAC</B>
+ <P>
+ <A HREF="http://www.escient.com/">Escient</A> has a new home stereo component that supports FLAC, the <A HREF="http://www.escient.com/fireballe2300.html">FireBall E2-300</A>.</P>
+ </LI>
+ </UL>
+ </P>
+
+ <P>
+ <A NAME="20041102">02-Nov-2004:</A>
+ </P>
+ <P>
+ <UL>
+ <LI>
+ <B>New Mindawn music store offers FLAC and Vorbis</B>
+ <P>
+ <A HREF="http://www.mindawn.com/">Mindawn</A>, a new online music service offering FLAC and Ogg Vorbis, is now open. They also have a multi-platform (Windows, Linux, Mac OS X) CD ripper/encoder and are finishing up a multi-platform player.
+ </LI>
+ </UL>
+ </P>
+
+ <P>
+ <A NAME="20041001">01-Oct-2004:</A>
</P>
<P>
<UL>
diff --git a/doc/html/ogg_mapping.html b/doc/html/ogg_mapping.html
index 92863ae..6b1fd47 100644
--- a/doc/html/ogg_mapping.html
+++ b/doc/html/ogg_mapping.html
@@ -33,7 +33,7 @@
<TD BGCOLOR="#D3D4C5" ALIGN=CENTER NOWRAP> <A CLASS="topnav" HREF="download.html">download</A> </TD><TD BGCOLOR="#D3D4C5" ALIGN=CENTER>|</TD>
<TD BGCOLOR="#D3D4C5" ALIGN=CENTER NOWRAP> <A CLASS="topnav" HREF="features.html">features</A> </TD><TD BGCOLOR="#D3D4C5" ALIGN=CENTER>|</TD>
<TD BGCOLOR="#D3D4C5" ALIGN=CENTER NOWRAP> <A CLASS="topnav" HREF="goals.html">goals</A> </TD><TD BGCOLOR="#D3D4C5" ALIGN=CENTER>|</TD>
- <TD BGCOLOR="#D3D4C5" ALIGN=CENTER NOWRAP> <A CLASS="topnav" HREF="format,html">format</A> </TD><TD BGCOLOR="#D3D4C5" ALIGN=CENTER>|</TD>
+ <TD BGCOLOR="#D3D4C5" ALIGN=CENTER NOWRAP> <A CLASS="topnav" HREF="format.html">format</A> </TD><TD BGCOLOR="#D3D4C5" ALIGN=CENTER>|</TD>
<TD BGCOLOR="#D3D4C5" ALIGN=CENTER NOWRAP> <A CLASS="topnav" HREF="id.html">id</A> </TD><TD BGCOLOR="#D3D4C5" ALIGN=CENTER>|</TD>
<TD BGCOLOR="#D3D4C5" ALIGN=CENTER NOWRAP> <A CLASS="topnav" HREF="comparison.html">comparison</A> </TD><TD BGCOLOR="#D3D4C5" ALIGN=CENTER>|</TD>
<TD BGCOLOR="#D3D4C5" ALIGN=CENTER NOWRAP> <A CLASS="topnav" HREF="documentation.html">documentation</A> </TD><TD BGCOLOR="#D3D4C5" ALIGN=CENTER>|</TD>
@@ -110,7 +110,7 @@
<LI>The four-byte ASCII signature "FLAC", i.e. 0x46, 0x4C, 0x41, 0x43</LI>
<LI>A one-byte binary major version number for the mapping, e.g. 0x01 for mapping version 1.0</LI>
<LI>A one-byte binary minor version number for the mapping, e.g. 0x00 for mapping version 1.0</LI>
- <LI>A two-byte, big-endian binary number signifying the number of header (non-audio) packets, including this one. This number may be zero (0x0000) to signify 'unknown' but be aware that some decoders may not be able to handle such streams.<!--@@@verify--></LI>
+ <LI>A two-byte, big-endian binary number signifying the number of header (non-audio) packets, not including this one. This number may be zero (0x0000) to signify 'unknown' but be aware that some decoders may not be able to handle such streams.</LI>
<LI>The four-byte ASCII native FLAC signature "fLaC" according to the <A HREF="format.html#stream">FLAC format specification</A></LI>
<LI>The <A HREF="format.html#metadata_block">STREAMINFO</A> metadata block for the stream.</LI>
</UL>
diff --git a/include/FLAC/stream_decoder.h b/include/FLAC/stream_decoder.h
index 086c8ca..6cd59d4 100644
--- a/include/FLAC/stream_decoder.h
+++ b/include/FLAC/stream_decoder.h
@@ -838,7 +838,7 @@
*
* This function, when used from the higher FLAC__SeekableStreamDecoder
* layer, can be used in more quickly determining FLAC frame boundaries
- * when decoding of the actual data is not needed, for example when a
+ * when decoding of the actual data is not needed, for example when an
* application is separating a FLAC stream into frames for editing or
* storing in a container. To do this, the application can use
* FLAC__seekable_stream_decoder_skip_single_frame() to quickly advance
diff --git a/src/test_seeking/main.c b/src/test_seeking/main.c
index d981d03..0c7c8ef 100644
--- a/src/test_seeking/main.c
+++ b/src/test_seeking/main.c
@@ -16,6 +16,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
@@ -27,7 +31,9 @@
#endif
#include "FLAC/assert.h"
#include "FLAC/file_decoder.h"
+#ifdef FLAC__HAS_OGG
#include "OggFLAC/file_decoder.h"
+#endif
typedef struct {
FLAC__uint64 total_samples;
@@ -73,6 +79,7 @@
return false;
}
+#ifdef FLAC__HAS_OGG
static FLAC__bool die_of_(const char *msg, const OggFLAC__FileDecoder *decoder)
{
OggFLAC__FileDecoderState state = OggFLAC__file_decoder_get_state(decoder);
@@ -98,6 +105,7 @@
return false;
}
+#endif
static FLAC__StreamDecoderWriteStatus file_decoder_write_callback_(const FLAC__FileDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
{
@@ -252,6 +260,7 @@
return true;
}
+#ifdef FLAC__HAS_OGG
static FLAC__bool seek_barrage_ogg_flac(const char *filename, unsigned count)
{
OggFLAC__FileDecoder *decoder;
@@ -341,6 +350,7 @@
return true;
}
+#endif
int main(int argc, char *argv[])
{
@@ -380,10 +390,17 @@
{
FLAC__bool ok;
- if (strlen(filename) > 4 && 0 == strcmp(filename+strlen(filename)-4, ".ogg"))
+ if (strlen(filename) > 4 && 0 == strcmp(filename+strlen(filename)-4, ".ogg")) {
+#ifdef FLAC__HAS_OGG
ok = seek_barrage_ogg_flac(filename, count);
- else
+#else
+ fprintf(stderr, "ERROR: Ogg FLAC not supported\n");
+ ok = false;
+#endif
+ }
+ else {
ok = seek_barrage_native_flac(filename, count);
+ }
return ok? 0 : 2;
}
}