[xiph-commits] r10204 - in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac: . build doc
doc/html doc/html/api doc/html/images doc/html/ru flac.pbproj
include include/FLAC include/FLAC++ include/OggFLAC
include/OggFLAC++ include/share include/share/grabbag man obj
src src/flac src/libFLAC src/libFLAC/ia32 src/libFLAC/include
src/libFLAC/include/private src/libFLAC/include/protected
src/libFLAC/ppc src/libFLAC/ppc/as src/libFLAC/ppc/gas
src/libFLAC++ src/libOggFLAC src/libOggFLAC/include
src/libOggFLAC/include/private
src/libOggFLAC/include/protected src/libOggFLAC++
src/metaflac src/monkeys_audio_utilities
src/monkeys_audio_utilities/flac_mac
src/monkeys_audio_utilities/flac_ren src/plugin_common
src/plugin_winamp2 src/plugin_winamp2/include
src/plugin_winamp2/include/winamp2 src/plugin_xmms src/share
src/share/getopt src/share/grabbag
src/share/replaygain_analysis src/share/replaygain_synthesis
src/share/replaygain_synthesis/include
src/share/replaygain_synthesis/include/private src/share/utf8
src/test_grabbag src/test_grabbag/cuesheet src/test_libFLAC
src/test_libFLAC++ src/test_libOggFLAC src/test_libOggFLAC++
src/test_seeking src/test_streams test test/cuesheets
illiminable at svn.xiph.org
illiminable at svn.xiph.org
Thu Oct 20 06:07:42 PDT 2005
Author: illiminable
Date: 2005-10-20 05:55:24 -0700 (Thu, 20 Oct 2005)
New Revision: 10204
Added:
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/favicon.ico
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/float.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/float.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ppc/as/
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ppc/as/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ppc/as/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ppc/as/lpc_asm.s
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ppc/gas/
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ppc/gas/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ppc/gas/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ppc/gas/lpc_asm.s
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/tags.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/tags.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/http.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/http.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/plugin.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/format.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/format.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_seeking.sh
Modified:
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/AUTHORS
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/COPYING.Xiph
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/Makefile.lite
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/README
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/build/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/build/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/build/config.mk
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/build/exe.mk
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/build/lib.mk
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/config.h.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/configure
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/configure.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/Doxyfile
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/FLAC.tag
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/Makefile.lite
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/+_2metadata_8h-source.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/+_2metadata_8h.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC++_2all_8h-source.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC++_2decoder_8h-source.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC++_2decoder_8h.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC++_2encoder_8h-source.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC++_2encoder_8h.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC++_2export_8h-source.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2all_8h-source.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2export_8h-source.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2file__encoder_8h-source.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2file__encoder_8h.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2seekable__stream__encoder_8h-source.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2seekable__stream__encoder_8h.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2stream__decoder_8h-source.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2stream__decoder_8h.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2stream__encoder_8h-source.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2stream__encoder_8h.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC++_2all_8h-source.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC++_2decoder_8h-source.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC++_2decoder_8h.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC++_2encoder_8h-source.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC++_2encoder_8h.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC++_2export_8h-source.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2all_8h-source.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2export_8h-source.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2file__encoder_8h-source.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2file__encoder_8h.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2seekable__stream__encoder_8h-source.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2seekable__stream__encoder_8h.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2stream__decoder_8h-source.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2stream__decoder_8h.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2stream__encoder_8h-source.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2stream__encoder_8h.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/annotated.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/assert_8h-source.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/callback_8h-source.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/callback_8h.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Decoder_1_1File-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Decoder_1_1File.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Decoder_1_1SeekableStream-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Decoder_1_1SeekableStream.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Decoder_1_1Stream-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Decoder_1_1Stream.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Encoder_1_1File-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Encoder_1_1File.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Encoder_1_1SeekableStream-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Encoder_1_1SeekableStream.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Encoder_1_1Stream-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Encoder_1_1Stream.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Application-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Application.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Chain-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Chain.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1CueSheet-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1CueSheet.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Iterator-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Iterator.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Padding-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Padding.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Prototype-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Prototype.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SeekTable-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SeekTable.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SimpleIterator-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SimpleIterator.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1StreamInfo-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1StreamInfo.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Unknown-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Unknown.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1VorbisComment-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1VorbisComment.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Decoder_1_1File-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Decoder_1_1File.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Decoder_1_1SeekableStream-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Decoder_1_1SeekableStream.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Decoder_1_1Stream-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Decoder_1_1Stream.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Encoder_1_1File-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Encoder_1_1File.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Encoder_1_1SeekableStream-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Encoder_1_1SeekableStream.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Encoder_1_1Stream-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Encoder_1_1Stream.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classes.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/file__decoder_8h-source.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/file__decoder_8h.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/files.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/format_8h-source.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/format_8h.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/functions.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/globals.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__callbacks.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__decoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__encoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__file__decoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__file__encoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__format.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__metadata.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__metadata__level0.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__metadata__level1.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__metadata__level2.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__metadata__object.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__seekable__stream__decoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__seekable__stream__encoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__stream__decoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__stream__encoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__decoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__encoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__file__decoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__file__encoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__metadata.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__metadata__level0.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__metadata__level1.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__metadata__level2.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__metadata__object.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__seekable__stream__decoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__seekable__stream__encoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__stream__decoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__stream__encoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflac.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflac__decoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflac__encoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflac__file__encoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflac__seekable__stream__encoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflac__stream__decoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflac__stream__encoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp__decoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp__encoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp__file__decoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp__file__encoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp__seekable__stream__decoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp__seekable__stream__encoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp__stream__decoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp__stream__encoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/hierarchy.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/index.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/metadata_8h-source.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/metadata_8h.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/modules.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/ordinals_8h-source.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/seekable__stream__decoder_8h-source.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/seekable__stream__decoder_8h.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____EntropyCodingMethod-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____EntropyCodingMethod.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____EntropyCodingMethod__PartitionedRice-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____EntropyCodingMethod__PartitionedRice.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____FileDecoder-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____FileDecoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____FileEncoder-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____FileEncoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Frame-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Frame.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____FrameFooter-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____FrameFooter.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____FrameHeader-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____FrameHeader.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____IOCallbacks-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____IOCallbacks.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____SeekableStreamDecoder-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____SeekableStreamDecoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____SeekableStreamEncoder-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____SeekableStreamEncoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamDecoder-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamDecoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamEncoder-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamEncoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__Application-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__Application.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet__Index-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet__Index.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet__Track-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet__Track.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__Padding-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__Padding.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__SeekPoint-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__SeekPoint.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__SeekTable-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__SeekTable.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__StreamInfo-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__StreamInfo.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__Unknown-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__Unknown.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__VorbisComment-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__VorbisComment.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__VorbisComment__Entry-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__VorbisComment__Entry.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe__Constant-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe__Constant.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe__Fixed-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe__Fixed.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe__LPC-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe__LPC.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe__Verbatim-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe__Verbatim.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structOggFLAC____FileEncoder-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structOggFLAC____FileEncoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structOggFLAC____SeekableStreamEncoder-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structOggFLAC____SeekableStreamEncoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structOggFLAC____StreamDecoder-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structOggFLAC____StreamDecoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structOggFLAC____StreamEncoder-members.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structOggFLAC____StreamEncoder.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/changelog.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/comparison.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/developers.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/documentation.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/download.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/faq.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/features.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/format.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/goals.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/id.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/images/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/images/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/index.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/license.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/links.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/news.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ogg_mapping.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/authors.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/comparison.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/developers.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/documentation.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/download.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/features.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/format.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/goals.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/id.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/index.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/links.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/news.html
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/flac.pbproj/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/flac.pbproj/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/flac.pbproj/project.pbxproj
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC++/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC++/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC++/all.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC++/decoder.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC++/encoder.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC++/export.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC++/metadata.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/all.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/assert.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/callback.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/export.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/file_decoder.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/file_encoder.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/format.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/metadata.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/seekable_stream_decoder.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/seekable_stream_encoder.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/stream_decoder.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/stream_encoder.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC++/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC++/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC++/all.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC++/decoder.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC++/encoder.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC++/export.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/all.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/export.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/file_decoder.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/file_encoder.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/seekable_stream_decoder.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/seekable_stream_encoder.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/stream_decoder.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/stream_encoder.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/share/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/share/grabbag.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/share/grabbag/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/share/grabbag/cuesheet.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/share/grabbag/file.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/share/grabbag/replaygain.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/share/grabbag/seektable.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/share/replaygain_synthesis.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/ltmain.sh
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/man/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/man/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/man/flac.1
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/man/flac.sgml
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/man/metaflac.1
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/man/metaflac.sgml
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/obj/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/obj/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/Makefile.lite
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/Makefile.lite
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/analyze.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/analyze.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/decode.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/decode.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/encode.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/encode.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/local_string_utils.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/main.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/utils.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/utils.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/vorbiscomment.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/vorbiscomment.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/Makefile.lite
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/file_decoder.cpp
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/file_encoder.cpp
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/metadata.cpp
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/seekable_stream_decoder.cpp
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/seekable_stream_encoder.cpp
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/stream_decoder.cpp
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/stream_encoder.cpp
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/Makefile.lite
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/bitbuffer.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/bitmath.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/cpu.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/crc.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/file_decoder.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/file_encoder.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/fixed.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/format.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ia32/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ia32/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ia32/cpu_asm.nasm
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ia32/fixed_asm.nasm
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ia32/lpc_asm.nasm
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ia32/nasm.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/all.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/bitbuffer.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/bitmath.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/cpu.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/crc.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/fixed.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/format.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/lpc.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/memory.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/metadata.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/stream_encoder_framing.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/all.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/file_decoder.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/file_encoder.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/seekable_stream_decoder.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/seekable_stream_encoder.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/stream_decoder.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/stream_encoder.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/libFLAC_dynamic.dsp
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/libFLAC_static.dsp
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/lpc.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/memory.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/metadata_iterators.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/metadata_object.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ppc/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ppc/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/seekable_stream_decoder.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/seekable_stream_encoder.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/stream_decoder.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/stream_encoder.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/stream_encoder_framing.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/Makefile.lite
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/file_decoder.cpp
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/file_encoder.cpp
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/seekable_stream_decoder.cpp
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/seekable_stream_encoder.cpp
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/stream_decoder.cpp
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/stream_encoder.cpp
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/Makefile.lite
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/file_decoder.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/file_encoder.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/private/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/private/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/private/all.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/private/ogg_decoder_aspect.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/private/ogg_encoder_aspect.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/private/ogg_helper.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/private/ogg_mapping.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/all.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/file_decoder.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/file_encoder.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/seekable_stream_decoder.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/seekable_stream_encoder.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/stream_decoder.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/stream_encoder.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/ogg_decoder_aspect.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/ogg_encoder_aspect.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/ogg_helper.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/ogg_mapping.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/seekable_stream_decoder.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/seekable_stream_encoder.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/stream_decoder.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/stream_encoder.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/Makefile.lite
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/main.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/operations.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/operations.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/operations_shorthand_cuesheet.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/operations_shorthand_seektable.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/operations_shorthand_streaminfo.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/operations_shorthand_vorbiscomment.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/options.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/options.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/usage.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/usage.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/utils.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/utils.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/monkeys_audio_utilities/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/monkeys_audio_utilities/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/monkeys_audio_utilities/flac_mac/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/monkeys_audio_utilities/flac_mac/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/monkeys_audio_utilities/flac_mac/main.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/monkeys_audio_utilities/flac_ren/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/monkeys_audio_utilities/flac_ren/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/monkeys_audio_utilities/flac_ren/main.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/Makefile.lite
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/all.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/charset.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/charset.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/defs.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/dither.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/dither.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/locale_hack.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/plugin_common_static.dsp
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/config.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/config.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/in_flac.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/in_flac.dsp
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/include/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/include/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/include/winamp2/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/include/winamp2/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/infobox.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/infobox.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/playback.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/playback.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/tagz.cpp
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/tagz.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/Makefile.lite
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/charset.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/charset.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/configure.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/configure.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/fileinfo.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/plugin.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/tag.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/tag.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/Makefile.lite
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/getopt/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/getopt/getopt.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/grabbag/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/grabbag/cuesheet.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/grabbag/file.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/grabbag/replaygain.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/grabbag/seektable.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/replaygain_analysis/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/replaygain_synthesis/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/replaygain_synthesis/include/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/replaygain_synthesis/include/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/replaygain_synthesis/include/private/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/replaygain_synthesis/include/private/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/replaygain_synthesis/replaygain_synthesis.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/utf8/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/utf8/Makefile.lite
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_grabbag/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_grabbag/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_grabbag/Makefile.lite
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_grabbag/cuesheet/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_grabbag/cuesheet/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_grabbag/cuesheet/Makefile.lite
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_grabbag/cuesheet/main.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/Makefile.lite
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/decoders.cpp
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/decoders.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/encoders.cpp
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/encoders.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/file_utils.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/file_utils.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/main.cpp
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/metadata.cpp
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/metadata.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/metadata_manip.cpp
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/metadata_object.cpp
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/metadata_utils.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/metadata_utils.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/Makefile.lite
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/bitbuffer.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/bitbuffer.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/decoders.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/decoders.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/encoders.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/encoders.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/file_utils.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/file_utils.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/main.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/metadata.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/metadata.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/metadata_manip.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/metadata_object.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/metadata_utils.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/metadata_utils.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/test_libFLAC.dsp
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/Makefile.lite
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/decoders.cpp
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/decoders.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/encoders.cpp
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/encoders.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/file_utils.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/file_utils.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/main.cpp
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/metadata_utils.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/metadata_utils.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/Makefile.lite
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/decoders.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/decoders.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/encoders.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/encoders.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/file_utils.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/file_utils.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/main.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/metadata_utils.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/metadata_utils.h
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_seeking/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_seeking/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_seeking/Makefile.lite
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_seeking/main.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_seeking/test_seeking.dsp
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_streams/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_streams/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_streams/Makefile.lite
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_streams/main.c
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/Makefile.lite
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/cuesheets/Makefile.am
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/cuesheets/Makefile.in
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_bins.sh
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_flac.sh
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_grabbag.sh
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_libFLAC++.sh
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_libFLAC.sh
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_libOggFLAC++.sh
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_libOggFLAC.sh
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_metaflac.sh
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_streams.sh
Log:
* Update flac
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/AUTHORS
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/AUTHORS 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/AUTHORS 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* FLAC - Free Lossless Audio Codec
- * Copyright (C) 2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
*
* This file is part the FLAC project. FLAC is comprised of several
* components distributed under difference licenses. The codec libraries
@@ -24,7 +24,7 @@
"Andrey Astafiev" <andrei at tvcell.ru>
* Russian translation of the HTML documentation
-"Miroslav Lichvar" <mirator at upcase.inf.upol.cz>
+"Miroslav Lichvar" <lichvarm at phoenix.inf.upol.cz>
* IA-32 assembly versions of several libFLAC routines
"Brady Patterson" <bpat at users.sourceforge.net>
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/COPYING.Xiph
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/COPYING.Xiph 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/COPYING.Xiph 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,4 +1,4 @@
-Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
@@ -104,6 +104,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -139,10 +140,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -155,12 +164,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/Makefile.lite
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/Makefile.lite 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/Makefile.lite 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/README
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/README 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/README 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* FLAC - Free Lossless Audio Codec
- * Copyright (C) 2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
*
* This file is part the FLAC project. FLAC is comprised of several
* components distributed under difference licenses. The codec libraries
@@ -40,7 +40,7 @@
===============================================================================
-FLAC - 1.1.1 - Contents
+FLAC - 1.1.2 - Contents
===============================================================================
- Introduction
@@ -81,7 +81,8 @@
libogg 1.1.2 or greater, or there will be seeking problems with Ogg FLAC.
If you are building on x86 and want the assembly optimizations, you will
-need to have NASM installed according to the specific instructions below.
+need to have NASM >= 0.98.30 installed according to the specific instructions
+below.
===============================================================================
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/build/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/build/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/build/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
@@ -18,5 +18,4 @@
EXTRA_DIST = \
config.mk \
exe.mk \
- lib.mk \
- project_builder_prebuild_phase.sh
+ lib.mk
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/build/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/build/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/build/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
@@ -67,6 +67,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -102,10 +103,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -118,12 +127,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -210,8 +224,7 @@
EXTRA_DIST = \
config.mk \
exe.mk \
- lib.mk \
- project_builder_prebuild_phase.sh
+ lib.mk
all: all-am
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/build/config.mk
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/build/config.mk 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/build/config.mk 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
@@ -25,9 +25,14 @@
valgrind : BUILD = debug
release : BUILD = release
+# override LINKAGE on OS X until we figure out how to get 'cc -static' to work
+ifeq ($(DARWIN_BUILD),yes)
+LINKAGE =
+else
debug : LINKAGE = -static
valgrind : LINKAGE = -dynamic
release : LINKAGE = -static
+endif
all default: $(DEFAULT_BUILD)
@@ -35,6 +40,12 @@
# GNU makefile fragment for emulating stuff normally done by configure
#
-VERSION=\"1.1.1\"
+VERSION=\"1.1.2\"
-CONFIG_CFLAGS=-D_GNU_SOURCE -DHAVE_INTTYPES_H -DHAVE_WCSDUP -DHAVE_WCSCASECMP
+CONFIG_CFLAGS=-DHAVE_INTTYPES_H -DHAVE_ICONV -DHAVE_SOCKLEN_T -DFLAC__HAS_OGG
+
+ICONV_INCLUDE_DIR=$(HOME)/local.i18n/include
+ICONV_LIB_DIR=$(HOME)/local.i18n/lib
+
+OGG_INCLUDE_DIR=$(HOME)/local/include
+OGG_LIB_DIR=$(HOME)/local/lib
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/build/exe.mk
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/build/exe.mk 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/build/exe.mk 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
@@ -29,10 +29,6 @@
CCC = g++
endif
NASM = nasm
-# override to -dynamic on OSX
-ifeq ($(DARWIN_BUILD),yes)
-LINKAGE = -dynamic
-endif
LINK = $(CC) $(LINKAGE)
OBJPATH = $(topdir)/obj
BINPATH = $(OBJPATH)/$(BUILD)/bin
@@ -54,15 +50,25 @@
DEBUG_OBJS = $(SRCS_C:%.c=%.debug.o) $(SRCS_CC:%.cc=%.debug.o) $(SRCS_CPP:%.cpp=%.debug.o) $(SRCS_NASM:%.nasm=%.debug.o)
RELEASE_OBJS = $(SRCS_C:%.c=%.release.o) $(SRCS_CC:%.cc=%.release.o) $(SRCS_CPP:%.cpp=%.release.o) $(SRCS_NASM:%.nasm=%.release.o)
-debug : $(ORDINALS_H) $(DEBUG_PROGRAM)
-valgrind: $(ORDINALS_H) $(DEBUG_PROGRAM)
-release : $(ORDINALS_H) $(RELEASE_PROGRAM)
+debug : $(DEBUG_PROGRAM)
+valgrind: $(DEBUG_PROGRAM)
+release : $(RELEASE_PROGRAM)
+# by default on OS X we link with static libs as much as possible
+
$(DEBUG_PROGRAM) : $(DEBUG_OBJS)
+ifeq ($(DARWIN_BUILD),yes)
+ $(LINK) -o $@ $(DEBUG_OBJS) $(EXPLICIT_LIBS)
+else
$(LINK) -o $@ $(DEBUG_OBJS) $(LFLAGS) $(LIBS)
+endif
$(RELEASE_PROGRAM) : $(RELEASE_OBJS)
+ifeq ($(DARWIN_BUILD),yes)
+ $(LINK) -o $@ $(RELEASE_OBJS) $(EXPLICIT_LIBS)
+else
$(LINK) -o $@ $(RELEASE_OBJS) $(LFLAGS) $(LIBS)
+endif
%.debug.o %.release.o : %.c
$(CC) $(CFLAGS) -c $< -o $@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/build/lib.mk
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/build/lib.mk 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/build/lib.mk 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
@@ -28,6 +28,7 @@
CC = gcc
CCC = g++
endif
+AS = as
NASM = nasm
LINK = ar cru
OBJPATH = $(topdir)/obj
@@ -56,17 +57,17 @@
endif
debug : CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -Wall -W -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
-valgrind: CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) -DFLAC__VALGRIND_TESTING -Wall -W -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
+valgrind: CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -DFLAC__VALGRIND_TESTING -Wall -W -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(CONFIG_CFLAGS) $(RELEASE_CFLAGS) -Wall -W -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
LFLAGS = -L$(LIBPATH)
-DEBUG_OBJS = $(SRCS_C:%.c=%.debug.o) $(SRCS_CC:%.cc=%.debug.o) $(SRCS_CPP:%.cpp=%.debug.o) $(SRCS_NASM:%.nasm=%.debug.o)
-RELEASE_OBJS = $(SRCS_C:%.c=%.release.o) $(SRCS_CC:%.cc=%.release.o) $(SRCS_CPP:%.cpp=%.release.o) $(SRCS_NASM:%.nasm=%.release.o)
+DEBUG_OBJS = $(SRCS_C:%.c=%.debug.o) $(SRCS_CC:%.cc=%.debug.o) $(SRCS_CPP:%.cpp=%.debug.o) $(SRCS_NASM:%.nasm=%.debug.o) $(SRCS_S:%.s=%.debug.o)
+RELEASE_OBJS = $(SRCS_C:%.c=%.release.o) $(SRCS_CC:%.cc=%.release.o) $(SRCS_CPP:%.cpp=%.release.o) $(SRCS_NASM:%.nasm=%.release.o) $(SRCS_S:%.s=%.release.o)
-debug : $(ORDINALS_H) $(DEBUG_STATIC_LIB) $(DEBUG_DYNAMIC_LIB)
-valgrind: $(ORDINALS_H) $(DEBUG_STATIC_LIB) $(DEBUG_DYNAMIC_LIB)
-release : $(ORDINALS_H) $(RELEASE_STATIC_LIB) $(RELEASE_DYNAMIC_LIB)
+debug : $(DEBUG_STATIC_LIB) $(DEBUG_DYNAMIC_LIB)
+valgrind: $(DEBUG_STATIC_LIB) $(DEBUG_DYNAMIC_LIB)
+release : $(RELEASE_STATIC_LIB) $(RELEASE_DYNAMIC_LIB)
$(DEBUG_STATIC_LIB): $(DEBUG_OBJS)
$(LINK) $@ $(DEBUG_OBJS) && ranlib $@
@@ -76,14 +77,14 @@
$(DEBUG_DYNAMIC_LIB) : $(DEBUG_OBJS)
ifeq ($(DARWIN_BUILD),yes)
- $(LINKD) -o $@ $(DEBUG_OBJS) $(LFLAGS) $(LIBS) -lc
+ echo Not building dynamic lib, command is: $(LINKD) -o $@ $(DEBUG_OBJS) $(LFLAGS) $(LIBS) -lc
else
$(LINKD) -o $@ $(DEBUG_OBJS) $(LFLAGS) $(LIBS)
endif
$(RELEASE_DYNAMIC_LIB) : $(RELEASE_OBJS)
ifeq ($(DARWIN_BUILD),yes)
- $(LINKD) -o $@ $(RELEASE_OBJS) $(LFLAGS) $(LIBS) -lc
+ echo Not building dynamic lib, command is: $(LINKD) -o $@ $(RELEASE_OBJS) $(LFLAGS) $(LIBS) -lc
else
$(LINKD) -o $@ $(RELEASE_OBJS) $(LFLAGS) $(LIBS)
endif
@@ -101,12 +102,20 @@
%.debug.i %.release.i : %.cpp
$(CCC) $(CFLAGS) -E $< -o $@
+%.debug.o %.release.o : %.s
+ifeq ($(DARWIN_BUILD),yes)
+ #$(CC) -c -arch ppc -Wall -force_cpusubtype_ALL $< -o $@
+ $(AS) -arch ppc -force_cpusubtype_ALL $< -o $@
+else
+ $(AS) $< -o $@
+endif
+
%.debug.o %.release.o : %.nasm
$(NASM) -f elf -d OBJ_FORMAT_elf -i ia32/ $< -o $@
.PHONY : clean
clean :
- -rm -f $(DEBUG_OBJS) $(RELEASE_OBJS) $(OBJPATH)/*/lib/$(STATIC_LIB_NAME) $(OBJPATH)/*/lib/$(DYNAMIC_LIB_NAME) $(ORDINALS_H)
+ -rm -f $(DEBUG_OBJS) $(RELEASE_OBJS) $(OBJPATH)/*/lib/$(STATIC_LIB_NAME) $(OBJPATH)/*/lib/$(DYNAMIC_LIB_NAME)
.PHONY : depend
depend:
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/config.h.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/config.h.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/config.h.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,13 +15,19 @@
/* define to run even more tests */
#undef FLAC__EXHAUSTIVE_TESTS
+/* define if you are compiling for PowerPC and have the 'as' assembler */
+#undef FLAC__HAS_AS
+
/* define if you have docbook-to-man or docbook2man */
#undef FLAC__HAS_DOCBOOK_TO_MAN
/* define if you have Doxygen */
#undef FLAC__HAS_DOXYGEN
-/* define if you have the NASM assembler */
+/* define if you are compiling for PowerPC and have the 'gas' assembler */
+#undef FLAC__HAS_GAS
+
+/* define if you are compiling for x86 and have the NASM assembler */
#undef FLAC__HAS_NASM
/* define if you have the ogg library */
@@ -33,6 +39,12 @@
/* define if your operating system supports SSE instructions */
#undef FLAC__SSE_OS
+/* define if building for Darwin / MacOS X */
+#undef FLAC__SYS_DARWIN
+
+/* define if building for Linux */
+#undef FLAC__SYS_LINUX
+
/* define to enable use of 3Dnow! instructions */
#undef FLAC__USE_3DNOW
@@ -60,6 +72,9 @@
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
+/* Define to 1 if the system has the type `socklen_t'. */
+#undef HAVE_SOCKLEN_T
+
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
@@ -81,9 +96,6 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
-/* Define to 1 if you have the `wcsdup' function. */
-#undef HAVE_WCSDUP
-
/* Define as const if the declaration of iconv() needs const. */
#undef ICONV_CONST
@@ -110,8 +122,3 @@
/* Version number of package */
#undef VERSION
-
-/* Enable GNU extensions on systems that have them. */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/configure
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/configure 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/configure 2005-10-20 12:55:24 UTC (rev 10204)
@@ -468,7 +468,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL CCAS CCASFLAGS CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE FLaC__CPU_IA32_TRUE FLaC__CPU_IA32_FALSE FLaC__CPU_PPC_TRUE FLaC__CPU_PPC_FALSE FLaC__CPU_SPARC_TRUE FLaC__CPU_SPARC_FALSE OBJ_FORMAT FLaC__NO_ASM_TRUE FLaC__NO_ASM_FALSE DEBUG_TRUE DEBUG_FALSE FLaC__SSE_OS_TRUE FLaC__SSE_OS_FALSE FLaC__USE_3DNOW_TRUE FLaC__USE_3DNOW_FALSE FLaC__USE_ALTIVEC_TRUE FLaC__USE_ALTIVEC_FALSE FLaC__INSTALL_XMMS_PLUGIN_LOCALLY_TRUE FLaC__INSTALL_XMMS_PLUGIN_LOCALLY_FALSE FLaC__EXHAUSTIVE_TESTS_TRUE FLaC__EXHAUSTIVE_TESTS_FALSE FLaC__VALGRIND_TESTING_TRUE FLaC__VALGRIND_TESTING_FALSE OGG_CFLAGS OGG_LIBS FLaC__HAS_OGG_TRUE FLaC__HAS_OGG_FALSE XMMS_CONFIG XMMS_CFLAGS XMMS_LIBS XMMS_VERSION XMMS_DATA_DIR XMMS_PLUGIN_DIR XMMS_VISUALIZATION_PLUGIN_DIR XMMS_INPUT_PLUGIN_DIR XMMS_OUTPUT_PLUGIN_DIR XMMS_GENERAL_PLUGIN_DIR XMMS_EFFECT_PLUGIN_DIR FLaC__HAS_XMMS_TRUE FLaC__HAS_XMMS_FALSE LIBICONV LTLIBICONV DOXYGEN FLaC__HAS_DOXYGEN_TRUE FLaC__HAS_DOXYGEN_FALSE DOCBOOK_TO_MAN FLaC__HAS_DOCBOOK_TO_MAN_TRUE FLaC__HAS_DOCBOOK_TO_MAN_FALSE NASM FLaC__HAS_NASM_TRUE FLaC__HAS_NASM_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL CCAS CCASFLAGS CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE FLaC__CPU_IA32_TRUE FLaC__CPU_IA32_FALSE FLaC__CPU_PPC_TRUE FLaC__CPU_PPC_FALSE FLaC__CPU_SPARC_TRUE FLaC__CPU_SPARC_FALSE OBJ_FORMAT FLaC__SYS_DARWIN_TRUE FLaC__SYS_DARWIN_FALSE FLaC__SYS_LINUX_TRUE FLaC__SYS_LINUX_FALSE FLaC__NO_ASM_TRUE FLaC__NO_ASM_FALSE DEBUG_TRUE DEBUG_FALSE FLaC__SSE_OS_TRUE FLaC__SSE_OS_FALSE FLaC__USE_3DNOW_TRUE FLaC__USE_3DNOW_FALSE FLaC__USE_ALTIVEC_TRUE FLaC__USE_ALTIVEC_FALSE FLaC__INSTALL_XMMS_PLUGIN_LOCALLY_TRUE FLaC__INSTALL_XMMS_PLUGIN_LOCALLY_FALSE FLaC__EXHAUSTIVE_TESTS_TRUE FLaC__EXHAUSTIVE_TESTS_FALSE FLaC__VALGRIND_TESTING_TRUE FLaC__VALGRIND_TESTING_FALSE OGG_CFLAGS OGG_LIBS FLaC__HAS_OGG_TRUE FLaC__HAS_OGG_FALSE XMMS_CONFIG XMMS_CFLAGS XMMS_LIBS XMMS_VERSION XMMS_DATA_DIR XMMS_PLUGIN_DIR XMMS_VISUALIZATION_PLUGIN_DIR XMMS_INPUT_PLUGIN_DIR XMMS_OUTPUT_PLUGIN_DIR XMMS_GENERAL_PLUGIN_DIR XMMS_EFFECT_PLUGIN_DIR FLaC__HAS_XMMS_TRUE FLaC__HAS_XMMS_FALSE LIBICONV LTLIBICONV DOXYGEN FLaC__HAS_DOXYGEN_TRUE FLaC__HAS_DOXYGEN_FALSE DOCBOOK_TO_MAN FLaC__HAS_DOCBOOK_TO_MAN_TRUE FLaC__HAS_DOCBOOK_TO_MAN_FALSE NASM FLaC__HAS_NASM_TRUE FLaC__HAS_NASM_FALSE AS GAS FLaC__HAS_AS_TRUE FLaC__HAS_AS_FALSE FLaC__HAS_GAS_TRUE FLaC__HAS_GAS_FALSE FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1806,7 +1806,7 @@
# Define the identity of the package.
PACKAGE=flac
- VERSION=1.1.1
+ VERSION=1.1.2
cat >>confdefs.h <<_ACEOF
@@ -1933,13 +1933,6 @@
-
-cat >>confdefs.h <<\_ACEOF
-#define _GNU_SOURCE 1
-_ACEOF
-
-
-
# Don't automagically regenerate autoconf/automake generated files unless
# explicitly requested. Eases autobuilding -mdz
echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
@@ -4709,7 +4702,7 @@
case $host in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4712 "configure"' > conftest.$ac_ext
+ echo '#line 4705 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5271,7 +5264,7 @@
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
-if { (eval echo configure:5274: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:5267: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
if test -s out/conftest.err; then
@@ -7168,7 +7161,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 7171 "configure"
+#line 7164 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -7266,7 +7259,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 7269 "configure"
+#line 7262 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -8494,13 +8487,9 @@
fi
-
-for ac_func in getopt_long
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+echo "$as_me:$LINENO: checking for socklen_t" >&5
+echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
+if test "${ac_cv_type_socklen_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -8509,54 +8498,21 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
+$ac_includes_default
int
main ()
{
-return f != $ac_func;
+if ((socklen_t *) 0)
+ return 0;
+if (sizeof (socklen_t))
+ return 0;
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
@@ -8570,35 +8526,35 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- eval "$as_ac_var=yes"
+ ac_cv_type_socklen_t=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
+ac_cv_type_socklen_t=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5
+echo "${ECHO_T}$ac_cv_type_socklen_t" >&6
+if test $ac_cv_type_socklen_t = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SOCKLEN_T 1
_ACEOF
+
fi
-done
-for ac_func in wcsdup
+for ac_func in getopt_long
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -8695,12 +8651,11 @@
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
- wcscasecmp
+
fi
done
-
case "$host_cpu" in
i*86) cpu_ia32=true ; cat >>confdefs.h <<\_ACEOF
#define FLAC__CPU_IA32 1
@@ -8750,7 +8705,37 @@
*) OBJ_FORMAT=elf ;;
esac
+case "$host" in
+ *-pc-linux-gnu) sys_linux=true ; cat >>confdefs.h <<\_ACEOF
+#define FLAC__SYS_LINUX 1
+_ACEOF
+ ;;
+ *-*-darwin*) sys_darwin=true ; cat >>confdefs.h <<\_ACEOF
+#define FLAC__SYS_DARWIN 1
+_ACEOF
+ ;;
+esac
+
+if test x$sys_darwin = xtrue; then
+ FLaC__SYS_DARWIN_TRUE=
+ FLaC__SYS_DARWIN_FALSE='#'
+else
+ FLaC__SYS_DARWIN_TRUE='#'
+ FLaC__SYS_DARWIN_FALSE=
+fi
+
+
+
+if test x$sys_linux = xtrue; then
+ FLaC__SYS_LINUX_TRUE=
+ FLaC__SYS_LINUX_FALSE='#'
+else
+ FLaC__SYS_LINUX_TRUE='#'
+ FLaC__SYS_LINUX_FALSE=
+fi
+
+
if test x$cpu_ia32 = xtrue ; then
cat >>confdefs.h <<\_ACEOF
#define FLAC__ALIGN_MALLOC_DATA 1
@@ -10379,6 +10364,7 @@
fi
+# only matters for x86
for ac_prog in nasm
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -10436,6 +10422,121 @@
fi
+# only matters for PowerPC
+for ac_prog in as
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_AS+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$AS"; then
+ ac_cv_prog_AS="$AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_AS="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+fi
+fi
+AS=$ac_cv_prog_AS
+if test -n "$AS"; then
+ echo "$as_me:$LINENO: result: $AS" >&5
+echo "${ECHO_T}$AS" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ test -n "$AS" && break
+done
+
+for ac_prog in gas
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_GAS+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$GAS"; then
+ ac_cv_prog_GAS="$GAS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_GAS="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+fi
+fi
+GAS=$ac_cv_prog_GAS
+if test -n "$GAS"; then
+ echo "$as_me:$LINENO: result: $GAS" >&5
+echo "${ECHO_T}$GAS" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ test -n "$GAS" && break
+done
+
+
+
+if test -n "$AS"; then
+ FLaC__HAS_AS_TRUE=
+ FLaC__HAS_AS_FALSE='#'
+else
+ FLaC__HAS_AS_TRUE='#'
+ FLaC__HAS_AS_FALSE=
+fi
+
+
+
+if test -n "$GAS"; then
+ FLaC__HAS_GAS_TRUE=
+ FLaC__HAS_GAS_FALSE='#'
+else
+ FLaC__HAS_GAS_TRUE='#'
+ FLaC__HAS_GAS_FALSE=
+fi
+
+if test -n "$AS" ; then
+cat >>confdefs.h <<\_ACEOF
+#define FLAC__HAS_AS 1
+_ACEOF
+
+fi
+if test -n "$GAS" ; then
+# funniest. macro. ever.
+cat >>confdefs.h <<\_ACEOF
+#define FLAC__HAS_GAS 1
+_ACEOF
+
+fi
+
OUR_CFLAGS_HEAD='-I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include'
if test x$debug = xtrue; then
OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -g -O0 -DDEBUG"
@@ -10448,6 +10549,28 @@
CFLAGS="$OUR_CFLAGS_HEAD $CFLAGS"
CXXFLAGS="$OUR_CFLAGS_HEAD $CXXFLAGS"
+#@@@@@@
+
+
+if test "yes" = "no"; then
+ FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE=
+ FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE='#'
+else
+ FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE='#'
+ FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE=
+fi
+
+
+
+if test "yes" = "no"; then
+ FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE=
+ FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE='#'
+else
+ FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE='#'
+ FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE=
+fi
+
+
ac_config_headers="$ac_config_headers config.h"
@@ -10479,7 +10602,15 @@
- ac_config_files="$ac_config_files Makefile src/Makefile src/libFLAC/Makefile src/libFLAC/ia32/Makefile src/libFLAC/ppc/Makefile src/libFLAC/include/Makefile src/libFLAC/include/private/Makefile src/libFLAC/include/protected/Makefile src/libFLAC++/Makefile src/libOggFLAC/Makefile src/libOggFLAC/include/Makefile src/libOggFLAC/include/private/Makefile src/libOggFLAC/include/protected/Makefile src/libOggFLAC++/Makefile src/flac/Makefile src/metaflac/Makefile src/monkeys_audio_utilities/Makefile src/monkeys_audio_utilities/flac_mac/Makefile src/monkeys_audio_utilities/flac_ren/Makefile src/plugin_common/Makefile src/plugin_winamp2/Makefile src/plugin_winamp2/include/Makefile src/plugin_winamp2/include/winamp2/Makefile src/plugin_xmms/Makefile src/share/Makefile src/share/getopt/Makefile src/share/grabbag/Makefile src/share/replaygain_analysis/Makefile src/share/replaygain_synthesis/Makefile src/share/replaygain_synthesis/include/Makefile src/share/replaygain_synthesis/include/private/Makefile src/share/utf8/Makefile src/test_grabbag/Makefile src/test_grabbag/cuesheet/Makefile src/test_libFLAC/Makefile src/test_libFLAC++/Makefile src/test_libOggFLAC/Makefile src/test_libOggFLAC++/Makefile src/test_seeking/Makefile src/test_streams/Makefile include/Makefile include/FLAC/Makefile include/FLAC++/Makefile include/OggFLAC/Makefile include/OggFLAC++/Makefile include/share/Makefile include/share/grabbag/Makefile doc/Makefile doc/html/Makefile doc/html/images/Makefile doc/html/ru/Makefile man/Makefile test/Makefile test/cuesheets/Makefile build/Makefile obj/Makefile obj/debug/Makefile obj/debug/bin/Makefile obj/debug/lib/Makefile obj/release/Makefile obj/release/bin/Makefile obj/release/lib/Makefile flac.pbproj/Makefile"
+
+
+
+
+
+
+
+
+ ac_config_files="$ac_config_files Makefile src/Makefile src/libFLAC/Makefile src/libFLAC/ia32/Makefile src/libFLAC/ppc/Makefile src/libFLAC/ppc/as/Makefile src/libFLAC/ppc/gas/Makefile src/libFLAC/include/Makefile src/libFLAC/include/private/Makefile src/libFLAC/include/protected/Makefile src/libFLAC++/Makefile src/libOggFLAC/Makefile src/libOggFLAC/include/Makefile src/libOggFLAC/include/private/Makefile src/libOggFLAC/include/protected/Makefile src/libOggFLAC++/Makefile src/flac/Makefile src/metaflac/Makefile src/monkeys_audio_utilities/Makefile src/monkeys_audio_utilities/flac_mac/Makefile src/monkeys_audio_utilities/flac_ren/Makefile src/plugin_common/Makefile src/plugin_winamp2/Makefile src/plugin_winamp2/include/Makefile src/plugin_winamp2/include/winamp2/Makefile src/plugin_xmms/Makefile src/share/Makefile src/share/getopt/Makefile src/share/grabbag/Makefile src/share/replaygain_analysis/Makefile src/share/replaygain_synthesis/Makefile src/share/replaygain_synthesis/include/Makefile src/share/replaygain_synthesis/include/private/Makefile src/share/utf8/Makefile src/test_grabbag/Makefile src/test_grabbag/cuesheet/Makefile src/test_libFLAC/Makefile src/test_libFLAC++/Makefile src/test_libOggFLAC/Makefile src/test_libOggFLAC++/Makefile src/test_seeking/Makefile src/test_streams/Makefile include/Makefile include/FLAC/Makefile include/FLAC++/Makefile include/OggFLAC/Makefile include/OggFLAC++/Makefile include/share/Makefile include/share/grabbag/Makefile doc/Makefile doc/html/Makefile doc/html/images/Makefile doc/html/ru/Makefile man/Makefile test/Makefile test/cuesheets/Makefile build/Makefile obj/Makefile obj/debug/Makefile obj/debug/bin/Makefile obj/debug/lib/Makefile obj/release/Makefile obj/release/bin/Makefile obj/release/lib/Makefile flac.pbproj/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -10620,6 +10751,20 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${FLaC__SYS_DARWIN_TRUE}" && test -z "${FLaC__SYS_DARWIN_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"FLaC__SYS_DARWIN\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"FLaC__SYS_DARWIN\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${FLaC__SYS_LINUX_TRUE}" && test -z "${FLaC__SYS_LINUX_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"FLaC__SYS_LINUX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"FLaC__SYS_LINUX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${FLaC__NO_ASM_TRUE}" && test -z "${FLaC__NO_ASM_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"FLaC__NO_ASM\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -10711,6 +10856,34 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${FLaC__HAS_AS_TRUE}" && test -z "${FLaC__HAS_AS_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"FLaC__HAS_AS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"FLaC__HAS_AS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${FLaC__HAS_GAS_TRUE}" && test -z "${FLaC__HAS_GAS_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"FLaC__HAS_GAS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"FLaC__HAS_GAS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE}" && test -z "${FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"FLaC__HAS_AS__TEMPORARILY_DISABLED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"FLaC__HAS_AS__TEMPORARILY_DISABLED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE}" && test -z "${FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"FLaC__HAS_GAS__TEMPORARILY_DISABLED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"FLaC__HAS_GAS__TEMPORARILY_DISABLED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
@@ -11160,6 +11333,8 @@
"src/libFLAC/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/libFLAC/Makefile" ;;
"src/libFLAC/ia32/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/libFLAC/ia32/Makefile" ;;
"src/libFLAC/ppc/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/libFLAC/ppc/Makefile" ;;
+ "src/libFLAC/ppc/as/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/libFLAC/ppc/as/Makefile" ;;
+ "src/libFLAC/ppc/gas/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/libFLAC/ppc/gas/Makefile" ;;
"src/libFLAC/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/libFLAC/include/Makefile" ;;
"src/libFLAC/include/private/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/libFLAC/include/private/Makefile" ;;
"src/libFLAC/include/protected/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/libFLAC/include/protected/Makefile" ;;
@@ -11374,6 +11549,10 @@
s, at FLaC__CPU_SPARC_TRUE@,$FLaC__CPU_SPARC_TRUE,;t t
s, at FLaC__CPU_SPARC_FALSE@,$FLaC__CPU_SPARC_FALSE,;t t
s, at OBJ_FORMAT@,$OBJ_FORMAT,;t t
+s, at FLaC__SYS_DARWIN_TRUE@,$FLaC__SYS_DARWIN_TRUE,;t t
+s, at FLaC__SYS_DARWIN_FALSE@,$FLaC__SYS_DARWIN_FALSE,;t t
+s, at FLaC__SYS_LINUX_TRUE@,$FLaC__SYS_LINUX_TRUE,;t t
+s, at FLaC__SYS_LINUX_FALSE@,$FLaC__SYS_LINUX_FALSE,;t t
s, at FLaC__NO_ASM_TRUE@,$FLaC__NO_ASM_TRUE,;t t
s, at FLaC__NO_ASM_FALSE@,$FLaC__NO_ASM_FALSE,;t t
s, at DEBUG_TRUE@,$DEBUG_TRUE,;t t
@@ -11418,6 +11597,16 @@
s, at NASM@,$NASM,;t t
s, at FLaC__HAS_NASM_TRUE@,$FLaC__HAS_NASM_TRUE,;t t
s, at FLaC__HAS_NASM_FALSE@,$FLaC__HAS_NASM_FALSE,;t t
+s, at AS@,$AS,;t t
+s, at GAS@,$GAS,;t t
+s, at FLaC__HAS_AS_TRUE@,$FLaC__HAS_AS_TRUE,;t t
+s, at FLaC__HAS_AS_FALSE@,$FLaC__HAS_AS_FALSE,;t t
+s, at FLaC__HAS_GAS_TRUE@,$FLaC__HAS_GAS_TRUE,;t t
+s, at FLaC__HAS_GAS_FALSE@,$FLaC__HAS_GAS_FALSE,;t t
+s, at FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@,$FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE,;t t
+s, at FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@,$FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE,;t t
+s, at FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@,$FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE,;t t
+s, at FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@,$FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE,;t t
s, at LIBOBJS@,$LIBOBJS,;t t
s, at LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/configure.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/configure.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/configure.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
@@ -19,11 +19,8 @@
# instead of FLAC__ since autoconf triggers off 'AC_' in strings
AC_INIT(src/flac/main.c)
-AM_INIT_AUTOMAKE(flac, 1.1.1)
+AM_INIT_AUTOMAKE(flac, 1.1.2)
-dnl In order to have access to any available wcsdup() and wcscasecmp()
-AC_GNU_SOURCE
-
# Don't automagically regenerate autoconf/automake generated files unless
# explicitly requested. Eases autobuilding -mdz
AM_MAINTAINER_MODE
@@ -39,14 +36,12 @@
AC_PROG_CXX
AC_PROG_MAKE_SET
+AC_CHECK_TYPES(socklen_t, [], [])
+
dnl check for getopt in standard library
dnl AC_CHECK_FUNCS(getopt_long , , [LIBOBJS="$LIBOBJS getopt.o getopt1.o"] )
AC_CHECK_FUNCS(getopt_long, [], [])
-dnl Check for uncommon wide char functions
-AC_CHECK_FUNCS(wcsdup, wcscasecmp, [], [])
-
-AC_CANONICAL_HOST
case "$host_cpu" in
i*86) cpu_ia32=true ; AC_DEFINE(FLAC__CPU_IA32) ;;
powerpc) cpu_ppc=true ; AC_DEFINE(FLAC__CPU_PPC) ;;
@@ -60,6 +55,12 @@
*) OBJ_FORMAT=elf ;;
esac
AC_SUBST(OBJ_FORMAT)
+case "$host" in
+ *-pc-linux-gnu) sys_linux=true ; AC_DEFINE(FLAC__SYS_LINUX) ;;
+ *-*-darwin*) sys_darwin=true ; AC_DEFINE(FLAC__SYS_DARWIN) ;;
+esac
+AM_CONDITIONAL(FLaC__SYS_DARWIN, test x$sys_darwin = xtrue)
+AM_CONDITIONAL(FLaC__SYS_LINUX, test x$sys_linux = xtrue)
if test x$cpu_ia32 = xtrue ; then
AC_DEFINE(FLAC__ALIGN_MALLOC_DATA)
@@ -175,12 +176,26 @@
AC_DEFINE(FLAC__HAS_DOCBOOK_TO_MAN)
fi
+# only matters for x86
AC_CHECK_PROGS(NASM, nasm)
AM_CONDITIONAL(FLaC__HAS_NASM, test -n "$NASM")
if test -n "$NASM" ; then
AC_DEFINE(FLAC__HAS_NASM)
fi
+# only matters for PowerPC
+AC_CHECK_PROGS(AS, as)
+AC_CHECK_PROGS(GAS, gas)
+AM_CONDITIONAL(FLaC__HAS_AS, test -n "$AS")
+AM_CONDITIONAL(FLaC__HAS_GAS, test -n "$GAS")
+if test -n "$AS" ; then
+AC_DEFINE(FLAC__HAS_AS)
+fi
+if test -n "$GAS" ; then
+# funniest. macro. ever.
+AC_DEFINE(FLAC__HAS_GAS)
+fi
+
OUR_CFLAGS_HEAD='-I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include'
if test x$debug = xtrue; then
OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -g -O0 -DDEBUG"
@@ -193,16 +208,24 @@
CFLAGS="$OUR_CFLAGS_HEAD $CFLAGS"
CXXFLAGS="$OUR_CFLAGS_HEAD $CXXFLAGS"
+#@@@@@@
+AM_CONDITIONAL(FLaC__HAS_AS__TEMPORARILY_DISABLED, test "yes" = "no")
+AM_CONDITIONAL(FLaC__HAS_GAS__TEMPORARILY_DISABLED, test "yes" = "no")
+
AM_CONFIG_HEADER(config.h)
AH_TEMPLATE(FLAC__ALIGN_MALLOC_DATA, [define to align allocated memory on 32-byte boundaries])
AH_TEMPLATE(FLAC__CPU_IA32, [define if building for ia32/i386])
AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC])
AH_TEMPLATE(FLAC__CPU_SPARC, [define if building for SPARC])
+AH_TEMPLATE(FLAC__SYS_DARWIN, [define if building for Darwin / MacOS X])
+AH_TEMPLATE(FLAC__SYS_LINUX, [define if building for Linux])
AH_TEMPLATE(FLAC__EXHAUSTIVE_TESTS, [define to run even more tests])
AH_TEMPLATE(FLAC__VALGRIND_TESTING, [define to enable use of Valgrind in testers])
AH_TEMPLATE(FLAC__HAS_DOXYGEN, [define if you have Doxygen])
AH_TEMPLATE(FLAC__HAS_DOCBOOK_TO_MAN, [define if you have docbook-to-man or docbook2man])
-AH_TEMPLATE(FLAC__HAS_NASM, [define if you have the NASM assembler])
+AH_TEMPLATE(FLAC__HAS_NASM, [define if you are compiling for x86 and have the NASM assembler])
+AH_TEMPLATE(FLAC__HAS_AS, [define if you are compiling for PowerPC and have the 'as' assembler])
+AH_TEMPLATE(FLAC__HAS_GAS, [define if you are compiling for PowerPC and have the 'gas' assembler])
AH_TEMPLATE(FLAC__HAS_OGG, [define if you have the ogg library])
AH_TEMPLATE(FLAC__NO_ASM, [define to disable use of assembly code])
AH_TEMPLATE(FLAC__SSE_OS, [define if your operating system supports SSE instructions])
@@ -215,6 +238,8 @@
src/libFLAC/Makefile \
src/libFLAC/ia32/Makefile \
src/libFLAC/ppc/Makefile \
+ src/libFLAC/ppc/as/Makefile \
+ src/libFLAC/ppc/gas/Makefile \
src/libFLAC/include/Makefile \
src/libFLAC/include/private/Makefile \
src/libFLAC/include/protected/Makefile \
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/Doxyfile
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/Doxyfile 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/Doxyfile 2005-10-20 12:55:24 UTC (rev 10204)
@@ -23,7 +23,7 @@
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 1.1.1
+PROJECT_NUMBER = 1.1.2
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/FLAC.tag
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/FLAC.tag 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/FLAC.tag 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1112,224 +1112,224 @@
<member kind="define">
<type>#define</type>
<name>FLAC__MAX_METADATA_TYPE_CODE</name>
- <anchor>a72</anchor>
+ <anchor>a75</anchor>
<arglist></arglist>
</member>
<member kind="define">
<type>#define</type>
<name>FLAC__MIN_BLOCK_SIZE</name>
- <anchor>a73</anchor>
+ <anchor>a76</anchor>
<arglist></arglist>
</member>
<member kind="define">
<type>#define</type>
<name>FLAC__MAX_BLOCK_SIZE</name>
- <anchor>a74</anchor>
+ <anchor>a77</anchor>
<arglist></arglist>
</member>
<member kind="define">
<type>#define</type>
<name>FLAC__MAX_CHANNELS</name>
- <anchor>a75</anchor>
+ <anchor>a78</anchor>
<arglist></arglist>
</member>
<member kind="define">
<type>#define</type>
<name>FLAC__MIN_BITS_PER_SAMPLE</name>
- <anchor>a76</anchor>
+ <anchor>a79</anchor>
<arglist></arglist>
</member>
<member kind="define">
<type>#define</type>
<name>FLAC__MAX_BITS_PER_SAMPLE</name>
- <anchor>a77</anchor>
+ <anchor>a80</anchor>
<arglist></arglist>
</member>
<member kind="define">
<type>#define</type>
<name>FLAC__REFERENCE_CODEC_MAX_BITS_PER_SAMPLE</name>
- <anchor>a78</anchor>
+ <anchor>a81</anchor>
<arglist></arglist>
</member>
<member kind="define">
<type>#define</type>
<name>FLAC__MAX_SAMPLE_RATE</name>
- <anchor>a79</anchor>
+ <anchor>a82</anchor>
<arglist></arglist>
</member>
<member kind="define">
<type>#define</type>
<name>FLAC__MAX_LPC_ORDER</name>
- <anchor>a80</anchor>
+ <anchor>a83</anchor>
<arglist></arglist>
</member>
<member kind="define">
<type>#define</type>
<name>FLAC__MIN_QLP_COEFF_PRECISION</name>
- <anchor>a81</anchor>
+ <anchor>a84</anchor>
<arglist></arglist>
</member>
<member kind="define">
<type>#define</type>
<name>FLAC__MAX_QLP_COEFF_PRECISION</name>
- <anchor>a82</anchor>
+ <anchor>a85</anchor>
<arglist></arglist>
</member>
<member kind="define">
<type>#define</type>
<name>FLAC__MAX_FIXED_ORDER</name>
- <anchor>a83</anchor>
+ <anchor>a86</anchor>
<arglist></arglist>
</member>
<member kind="define">
<type>#define</type>
<name>FLAC__MAX_RICE_PARTITION_ORDER</name>
- <anchor>a84</anchor>
+ <anchor>a87</anchor>
<arglist></arglist>
</member>
<member kind="define">
<type>#define</type>
<name>FLAC__SUBSET_MAX_RICE_PARTITION_ORDER</name>
- <anchor>a85</anchor>
+ <anchor>a88</anchor>
<arglist></arglist>
</member>
<member kind="define">
<type>#define</type>
<name>FLAC__STREAM_SYNC_LENGTH</name>
- <anchor>a86</anchor>
+ <anchor>a89</anchor>
<arglist></arglist>
</member>
<member kind="define">
<type>#define</type>
<name>FLAC__STREAM_METADATA_STREAMINFO_LENGTH</name>
- <anchor>a87</anchor>
+ <anchor>a90</anchor>
<arglist></arglist>
</member>
<member kind="define">
<type>#define</type>
<name>FLAC__STREAM_METADATA_SEEKPOINT_LENGTH</name>
- <anchor>a88</anchor>
+ <anchor>a91</anchor>
<arglist></arglist>
</member>
<member kind="define">
<type>#define</type>
<name>FLAC__STREAM_METADATA_HEADER_LENGTH</name>
- <anchor>a89</anchor>
+ <anchor>a92</anchor>
<arglist></arglist>
</member>
<member kind="enumeration">
<name>FLAC__EntropyCodingMethodType</name>
- <anchor>a90</anchor>
+ <anchor>a93</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE</name>
- <anchor>a90a86</anchor>
+ <anchor>a93a86</anchor>
<arglist></arglist>
</member>
<member kind="enumeration">
<name>FLAC__SubframeType</name>
- <anchor>a91</anchor>
+ <anchor>a94</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__SUBFRAME_TYPE_CONSTANT</name>
- <anchor>a91a87</anchor>
+ <anchor>a94a87</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__SUBFRAME_TYPE_VERBATIM</name>
- <anchor>a91a88</anchor>
+ <anchor>a94a88</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__SUBFRAME_TYPE_FIXED</name>
- <anchor>a91a89</anchor>
+ <anchor>a94a89</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__SUBFRAME_TYPE_LPC</name>
- <anchor>a91a90</anchor>
+ <anchor>a94a90</anchor>
<arglist></arglist>
</member>
<member kind="enumeration">
<name>FLAC__ChannelAssignment</name>
- <anchor>a92</anchor>
+ <anchor>a95</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__CHANNEL_ASSIGNMENT_INDEPENDENT</name>
- <anchor>a92a91</anchor>
+ <anchor>a95a91</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__CHANNEL_ASSIGNMENT_LEFT_SIDE</name>
- <anchor>a92a92</anchor>
+ <anchor>a95a92</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__CHANNEL_ASSIGNMENT_RIGHT_SIDE</name>
- <anchor>a92a93</anchor>
+ <anchor>a95a93</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__CHANNEL_ASSIGNMENT_MID_SIDE</name>
- <anchor>a92a94</anchor>
+ <anchor>a95a94</anchor>
<arglist></arglist>
</member>
<member kind="enumeration">
<name>FLAC__FrameNumberType</name>
- <anchor>a93</anchor>
+ <anchor>a96</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER</name>
- <anchor>a93a95</anchor>
+ <anchor>a96a95</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER</name>
- <anchor>a93a96</anchor>
+ <anchor>a96a96</anchor>
<arglist></arglist>
</member>
<member kind="enumeration">
<name>FLAC__MetadataType</name>
- <anchor>a94</anchor>
+ <anchor>a97</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__METADATA_TYPE_STREAMINFO</name>
- <anchor>a94a97</anchor>
+ <anchor>a97a97</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__METADATA_TYPE_PADDING</name>
- <anchor>a94a98</anchor>
+ <anchor>a97a98</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__METADATA_TYPE_APPLICATION</name>
- <anchor>a94a99</anchor>
+ <anchor>a97a99</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__METADATA_TYPE_SEEKTABLE</name>
- <anchor>a94a100</anchor>
+ <anchor>a97a100</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__METADATA_TYPE_VORBIS_COMMENT</name>
- <anchor>a94a101</anchor>
+ <anchor>a97a101</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__METADATA_TYPE_CUESHEET</name>
- <anchor>a94a102</anchor>
+ <anchor>a97a102</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__METADATA_TYPE_UNDEFINED</name>
- <anchor>a94a103</anchor>
+ <anchor>a97a103</anchor>
<arglist></arglist>
</member>
<member kind="function">
@@ -1340,20 +1340,38 @@
</member>
<member kind="function">
<type>FLAC__bool</type>
+ <name>FLAC__format_vorbiscomment_entry_name_is_legal</name>
+ <anchor>a69</anchor>
+ <arglist>(const char *name)</arglist>
+ </member>
+ <member kind="function">
+ <type>FLAC__bool</type>
+ <name>FLAC__format_vorbiscomment_entry_value_is_legal</name>
+ <anchor>a70</anchor>
+ <arglist>(const FLAC__byte *value, unsigned length)</arglist>
+ </member>
+ <member kind="function">
+ <type>FLAC__bool</type>
+ <name>FLAC__format_vorbiscomment_entry_is_legal</name>
+ <anchor>a71</anchor>
+ <arglist>(const FLAC__byte *entry, unsigned length)</arglist>
+ </member>
+ <member kind="function">
+ <type>FLAC__bool</type>
<name>FLAC__format_seektable_is_legal</name>
- <anchor>a69</anchor>
+ <anchor>a72</anchor>
<arglist>(const FLAC__StreamMetadata_SeekTable *seek_table)</arglist>
</member>
<member kind="function">
<type>unsigned</type>
<name>FLAC__format_seektable_sort</name>
- <anchor>a70</anchor>
+ <anchor>a73</anchor>
<arglist>(FLAC__StreamMetadata_SeekTable *seek_table)</arglist>
</member>
<member kind="function">
<type>FLAC__bool</type>
<name>FLAC__format_cuesheet_is_legal</name>
- <anchor>a71</anchor>
+ <anchor>a74</anchor>
<arglist>(const FLAC__StreamMetadata_CueSheet *cue_sheet, FLAC__bool check_cd_da_subset, const char **violation)</arglist>
</member>
<member kind="variable">
@@ -2274,104 +2292,128 @@
</member>
<member kind="function">
<type>FLAC__bool</type>
+ <name>FLAC__metadata_object_vorbiscomment_append_comment</name>
+ <anchor>a19</anchor>
+ <arglist>(FLAC__StreamMetadata *object, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy)</arglist>
+ </member>
+ <member kind="function">
+ <type>FLAC__bool</type>
+ <name>FLAC__metadata_object_vorbiscomment_replace_comment</name>
+ <anchor>a20</anchor>
+ <arglist>(FLAC__StreamMetadata *object, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool all, FLAC__bool copy)</arglist>
+ </member>
+ <member kind="function">
+ <type>FLAC__bool</type>
<name>FLAC__metadata_object_vorbiscomment_delete_comment</name>
- <anchor>a19</anchor>
+ <anchor>a21</anchor>
<arglist>(FLAC__StreamMetadata *object, unsigned comment_num)</arglist>
</member>
<member kind="function">
<type>FLAC__bool</type>
+ <name>FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair</name>
+ <anchor>a22</anchor>
+ <arglist>(FLAC__StreamMetadata_VorbisComment_Entry *entry, const char *field_name, const char *field_value)</arglist>
+ </member>
+ <member kind="function">
+ <type>FLAC__bool</type>
+ <name>FLAC__metadata_object_vorbiscomment_entry_to_name_value_pair</name>
+ <anchor>a23</anchor>
+ <arglist>(const FLAC__StreamMetadata_VorbisComment_Entry entry, char **field_name, char **field_value)</arglist>
+ </member>
+ <member kind="function">
+ <type>FLAC__bool</type>
<name>FLAC__metadata_object_vorbiscomment_entry_matches</name>
- <anchor>a20</anchor>
- <arglist>(const FLAC__StreamMetadata_VorbisComment_Entry *entry, const char *field_name, unsigned field_name_length)</arglist>
+ <anchor>a24</anchor>
+ <arglist>(const FLAC__StreamMetadata_VorbisComment_Entry entry, const char *field_name, unsigned field_name_length)</arglist>
</member>
<member kind="function">
<type>int</type>
<name>FLAC__metadata_object_vorbiscomment_find_entry_from</name>
- <anchor>a21</anchor>
+ <anchor>a25</anchor>
<arglist>(const FLAC__StreamMetadata *object, unsigned offset, const char *field_name)</arglist>
</member>
<member kind="function">
<type>int</type>
<name>FLAC__metadata_object_vorbiscomment_remove_entry_matching</name>
- <anchor>a22</anchor>
+ <anchor>a26</anchor>
<arglist>(FLAC__StreamMetadata *object, const char *field_name)</arglist>
</member>
<member kind="function">
<type>int</type>
<name>FLAC__metadata_object_vorbiscomment_remove_entries_matching</name>
- <anchor>a23</anchor>
+ <anchor>a27</anchor>
<arglist>(FLAC__StreamMetadata *object, const char *field_name)</arglist>
</member>
<member kind="function">
<type>FLAC__StreamMetadata_CueSheet_Track *</type>
<name>FLAC__metadata_object_cuesheet_track_new</name>
- <anchor>a24</anchor>
+ <anchor>a28</anchor>
<arglist>()</arglist>
</member>
<member kind="function">
<type>FLAC__StreamMetadata_CueSheet_Track *</type>
<name>FLAC__metadata_object_cuesheet_track_clone</name>
- <anchor>a25</anchor>
+ <anchor>a29</anchor>
<arglist>(const FLAC__StreamMetadata_CueSheet_Track *object)</arglist>
</member>
<member kind="function">
<type>void</type>
<name>FLAC__metadata_object_cuesheet_track_delete</name>
- <anchor>a26</anchor>
+ <anchor>a30</anchor>
<arglist>(FLAC__StreamMetadata_CueSheet_Track *object)</arglist>
</member>
<member kind="function">
<type>FLAC__bool</type>
<name>FLAC__metadata_object_cuesheet_track_resize_indices</name>
- <anchor>a27</anchor>
+ <anchor>a31</anchor>
<arglist>(FLAC__StreamMetadata *object, unsigned track_num, unsigned new_num_indices)</arglist>
</member>
<member kind="function">
<type>FLAC__bool</type>
<name>FLAC__metadata_object_cuesheet_track_insert_index</name>
- <anchor>a28</anchor>
+ <anchor>a32</anchor>
<arglist>(FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num, FLAC__StreamMetadata_CueSheet_Index index)</arglist>
</member>
<member kind="function">
<type>FLAC__bool</type>
<name>FLAC__metadata_object_cuesheet_track_insert_blank_index</name>
- <anchor>a29</anchor>
+ <anchor>a33</anchor>
<arglist>(FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num)</arglist>
</member>
<member kind="function">
<type>FLAC__bool</type>
<name>FLAC__metadata_object_cuesheet_track_delete_index</name>
- <anchor>a30</anchor>
+ <anchor>a34</anchor>
<arglist>(FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num)</arglist>
</member>
<member kind="function">
<type>FLAC__bool</type>
<name>FLAC__metadata_object_cuesheet_resize_tracks</name>
- <anchor>a31</anchor>
+ <anchor>a35</anchor>
<arglist>(FLAC__StreamMetadata *object, unsigned new_num_tracks)</arglist>
</member>
<member kind="function">
<type>FLAC__bool</type>
<name>FLAC__metadata_object_cuesheet_insert_track</name>
- <anchor>a32</anchor>
+ <anchor>a36</anchor>
<arglist>(FLAC__StreamMetadata *object, unsigned track_num, FLAC__StreamMetadata_CueSheet_Track *track, FLAC__bool copy)</arglist>
</member>
<member kind="function">
<type>FLAC__bool</type>
<name>FLAC__metadata_object_cuesheet_insert_blank_track</name>
- <anchor>a33</anchor>
+ <anchor>a37</anchor>
<arglist>(FLAC__StreamMetadata *object, unsigned track_num)</arglist>
</member>
<member kind="function">
<type>FLAC__bool</type>
<name>FLAC__metadata_object_cuesheet_delete_track</name>
- <anchor>a34</anchor>
+ <anchor>a38</anchor>
<arglist>(FLAC__StreamMetadata *object, unsigned track_num)</arglist>
</member>
<member kind="function">
<type>FLAC__bool</type>
<name>FLAC__metadata_object_cuesheet_is_legal</name>
- <anchor>a35</anchor>
+ <anchor>a39</anchor>
<arglist>(const FLAC__StreamMetadata *object, FLAC__bool check_cd_da_subset, const char **violation)</arglist>
</member>
<member kind="variable">
@@ -6648,224 +6690,224 @@
<member kind="define">
<type>#define</type>
<name>FLAC__MAX_METADATA_TYPE_CODE</name>
- <anchor>a72</anchor>
+ <anchor>a75</anchor>
<arglist></arglist>
</member>
<member kind="define">
<type>#define</type>
<name>FLAC__MIN_BLOCK_SIZE</name>
- <anchor>a73</anchor>
+ <anchor>a76</anchor>
<arglist></arglist>
</member>
<member kind="define">
<type>#define</type>
<name>FLAC__MAX_BLOCK_SIZE</name>
- <anchor>a74</anchor>
+ <anchor>a77</anchor>
<arglist></arglist>
</member>
<member kind="define">
<type>#define</type>
<name>FLAC__MAX_CHANNELS</name>
- <anchor>a75</anchor>
+ <anchor>a78</anchor>
<arglist></arglist>
</member>
<member kind="define">
<type>#define</type>
<name>FLAC__MIN_BITS_PER_SAMPLE</name>
- <anchor>a76</anchor>
+ <anchor>a79</anchor>
<arglist></arglist>
</member>
<member kind="define">
<type>#define</type>
<name>FLAC__MAX_BITS_PER_SAMPLE</name>
- <anchor>a77</anchor>
+ <anchor>a80</anchor>
<arglist></arglist>
</member>
<member kind="define">
<type>#define</type>
<name>FLAC__REFERENCE_CODEC_MAX_BITS_PER_SAMPLE</name>
- <anchor>a78</anchor>
+ <anchor>a81</anchor>
<arglist></arglist>
</member>
<member kind="define">
<type>#define</type>
<name>FLAC__MAX_SAMPLE_RATE</name>
- <anchor>a79</anchor>
+ <anchor>a82</anchor>
<arglist></arglist>
</member>
<member kind="define">
<type>#define</type>
<name>FLAC__MAX_LPC_ORDER</name>
- <anchor>a80</anchor>
+ <anchor>a83</anchor>
<arglist></arglist>
</member>
<member kind="define">
<type>#define</type>
<name>FLAC__MIN_QLP_COEFF_PRECISION</name>
- <anchor>a81</anchor>
+ <anchor>a84</anchor>
<arglist></arglist>
</member>
<member kind="define">
<type>#define</type>
<name>FLAC__MAX_QLP_COEFF_PRECISION</name>
- <anchor>a82</anchor>
+ <anchor>a85</anchor>
<arglist></arglist>
</member>
<member kind="define">
<type>#define</type>
<name>FLAC__MAX_FIXED_ORDER</name>
- <anchor>a83</anchor>
+ <anchor>a86</anchor>
<arglist></arglist>
</member>
<member kind="define">
<type>#define</type>
<name>FLAC__MAX_RICE_PARTITION_ORDER</name>
- <anchor>a84</anchor>
+ <anchor>a87</anchor>
<arglist></arglist>
</member>
<member kind="define">
<type>#define</type>
<name>FLAC__SUBSET_MAX_RICE_PARTITION_ORDER</name>
- <anchor>a85</anchor>
+ <anchor>a88</anchor>
<arglist></arglist>
</member>
<member kind="define">
<type>#define</type>
<name>FLAC__STREAM_SYNC_LENGTH</name>
- <anchor>a86</anchor>
+ <anchor>a89</anchor>
<arglist></arglist>
</member>
<member kind="define">
<type>#define</type>
<name>FLAC__STREAM_METADATA_STREAMINFO_LENGTH</name>
- <anchor>a87</anchor>
+ <anchor>a90</anchor>
<arglist></arglist>
</member>
<member kind="define">
<type>#define</type>
<name>FLAC__STREAM_METADATA_SEEKPOINT_LENGTH</name>
- <anchor>a88</anchor>
+ <anchor>a91</anchor>
<arglist></arglist>
</member>
<member kind="define">
<type>#define</type>
<name>FLAC__STREAM_METADATA_HEADER_LENGTH</name>
- <anchor>a89</anchor>
+ <anchor>a92</anchor>
<arglist></arglist>
</member>
<member kind="enumeration">
<name>FLAC__EntropyCodingMethodType</name>
- <anchor>a90</anchor>
+ <anchor>a93</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE</name>
- <anchor>a90a86</anchor>
+ <anchor>a93a86</anchor>
<arglist></arglist>
</member>
<member kind="enumeration">
<name>FLAC__SubframeType</name>
- <anchor>a91</anchor>
+ <anchor>a94</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__SUBFRAME_TYPE_CONSTANT</name>
- <anchor>a91a87</anchor>
+ <anchor>a94a87</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__SUBFRAME_TYPE_VERBATIM</name>
- <anchor>a91a88</anchor>
+ <anchor>a94a88</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__SUBFRAME_TYPE_FIXED</name>
- <anchor>a91a89</anchor>
+ <anchor>a94a89</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__SUBFRAME_TYPE_LPC</name>
- <anchor>a91a90</anchor>
+ <anchor>a94a90</anchor>
<arglist></arglist>
</member>
<member kind="enumeration">
<name>FLAC__ChannelAssignment</name>
- <anchor>a92</anchor>
+ <anchor>a95</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__CHANNEL_ASSIGNMENT_INDEPENDENT</name>
- <anchor>a92a91</anchor>
+ <anchor>a95a91</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__CHANNEL_ASSIGNMENT_LEFT_SIDE</name>
- <anchor>a92a92</anchor>
+ <anchor>a95a92</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__CHANNEL_ASSIGNMENT_RIGHT_SIDE</name>
- <anchor>a92a93</anchor>
+ <anchor>a95a93</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__CHANNEL_ASSIGNMENT_MID_SIDE</name>
- <anchor>a92a94</anchor>
+ <anchor>a95a94</anchor>
<arglist></arglist>
</member>
<member kind="enumeration">
<name>FLAC__FrameNumberType</name>
- <anchor>a93</anchor>
+ <anchor>a96</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER</name>
- <anchor>a93a95</anchor>
+ <anchor>a96a95</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER</name>
- <anchor>a93a96</anchor>
+ <anchor>a96a96</anchor>
<arglist></arglist>
</member>
<member kind="enumeration">
<name>FLAC__MetadataType</name>
- <anchor>a94</anchor>
+ <anchor>a97</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__METADATA_TYPE_STREAMINFO</name>
- <anchor>a94a97</anchor>
+ <anchor>a97a97</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__METADATA_TYPE_PADDING</name>
- <anchor>a94a98</anchor>
+ <anchor>a97a98</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__METADATA_TYPE_APPLICATION</name>
- <anchor>a94a99</anchor>
+ <anchor>a97a99</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__METADATA_TYPE_SEEKTABLE</name>
- <anchor>a94a100</anchor>
+ <anchor>a97a100</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__METADATA_TYPE_VORBIS_COMMENT</name>
- <anchor>a94a101</anchor>
+ <anchor>a97a101</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__METADATA_TYPE_CUESHEET</name>
- <anchor>a94a102</anchor>
+ <anchor>a97a102</anchor>
<arglist></arglist>
</member>
<member kind="enumvalue">
<name>FLAC__METADATA_TYPE_UNDEFINED</name>
- <anchor>a94a103</anchor>
+ <anchor>a97a103</anchor>
<arglist></arglist>
</member>
<member kind="function">
@@ -6876,20 +6918,38 @@
</member>
<member kind="function">
<type>FLAC__bool</type>
+ <name>FLAC__format_vorbiscomment_entry_name_is_legal</name>
+ <anchor>a69</anchor>
+ <arglist>(const char *name)</arglist>
+ </member>
+ <member kind="function">
+ <type>FLAC__bool</type>
+ <name>FLAC__format_vorbiscomment_entry_value_is_legal</name>
+ <anchor>a70</anchor>
+ <arglist>(const FLAC__byte *value, unsigned length)</arglist>
+ </member>
+ <member kind="function">
+ <type>FLAC__bool</type>
+ <name>FLAC__format_vorbiscomment_entry_is_legal</name>
+ <anchor>a71</anchor>
+ <arglist>(const FLAC__byte *entry, unsigned length)</arglist>
+ </member>
+ <member kind="function">
+ <type>FLAC__bool</type>
<name>FLAC__format_seektable_is_legal</name>
- <anchor>a69</anchor>
+ <anchor>a72</anchor>
<arglist>(const FLAC__StreamMetadata_SeekTable *seek_table)</arglist>
</member>
<member kind="function">
<type>unsigned</type>
<name>FLAC__format_seektable_sort</name>
- <anchor>a70</anchor>
+ <anchor>a73</anchor>
<arglist>(FLAC__StreamMetadata_SeekTable *seek_table)</arglist>
</member>
<member kind="function">
<type>FLAC__bool</type>
<name>FLAC__format_cuesheet_is_legal</name>
- <anchor>a71</anchor>
+ <anchor>a74</anchor>
<arglist>(const FLAC__StreamMetadata_CueSheet *cue_sheet, FLAC__bool check_cd_da_subset, const char **violation)</arglist>
</member>
<member kind="variable">
@@ -7846,104 +7906,128 @@
</member>
<member kind="function">
<type>FLAC__bool</type>
+ <name>FLAC__metadata_object_vorbiscomment_append_comment</name>
+ <anchor>a19</anchor>
+ <arglist>(FLAC__StreamMetadata *object, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy)</arglist>
+ </member>
+ <member kind="function">
+ <type>FLAC__bool</type>
+ <name>FLAC__metadata_object_vorbiscomment_replace_comment</name>
+ <anchor>a20</anchor>
+ <arglist>(FLAC__StreamMetadata *object, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool all, FLAC__bool copy)</arglist>
+ </member>
+ <member kind="function">
+ <type>FLAC__bool</type>
<name>FLAC__metadata_object_vorbiscomment_delete_comment</name>
- <anchor>a19</anchor>
+ <anchor>a21</anchor>
<arglist>(FLAC__StreamMetadata *object, unsigned comment_num)</arglist>
</member>
<member kind="function">
<type>FLAC__bool</type>
+ <name>FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair</name>
+ <anchor>a22</anchor>
+ <arglist>(FLAC__StreamMetadata_VorbisComment_Entry *entry, const char *field_name, const char *field_value)</arglist>
+ </member>
+ <member kind="function">
+ <type>FLAC__bool</type>
+ <name>FLAC__metadata_object_vorbiscomment_entry_to_name_value_pair</name>
+ <anchor>a23</anchor>
+ <arglist>(const FLAC__StreamMetadata_VorbisComment_Entry entry, char **field_name, char **field_value)</arglist>
+ </member>
+ <member kind="function">
+ <type>FLAC__bool</type>
<name>FLAC__metadata_object_vorbiscomment_entry_matches</name>
- <anchor>a20</anchor>
- <arglist>(const FLAC__StreamMetadata_VorbisComment_Entry *entry, const char *field_name, unsigned field_name_length)</arglist>
+ <anchor>a24</anchor>
+ <arglist>(const FLAC__StreamMetadata_VorbisComment_Entry entry, const char *field_name, unsigned field_name_length)</arglist>
</member>
<member kind="function">
<type>int</type>
<name>FLAC__metadata_object_vorbiscomment_find_entry_from</name>
- <anchor>a21</anchor>
+ <anchor>a25</anchor>
<arglist>(const FLAC__StreamMetadata *object, unsigned offset, const char *field_name)</arglist>
</member>
<member kind="function">
<type>int</type>
<name>FLAC__metadata_object_vorbiscomment_remove_entry_matching</name>
- <anchor>a22</anchor>
+ <anchor>a26</anchor>
<arglist>(FLAC__StreamMetadata *object, const char *field_name)</arglist>
</member>
<member kind="function">
<type>int</type>
<name>FLAC__metadata_object_vorbiscomment_remove_entries_matching</name>
- <anchor>a23</anchor>
+ <anchor>a27</anchor>
<arglist>(FLAC__StreamMetadata *object, const char *field_name)</arglist>
</member>
<member kind="function">
<type>FLAC__StreamMetadata_CueSheet_Track *</type>
<name>FLAC__metadata_object_cuesheet_track_new</name>
- <anchor>a24</anchor>
+ <anchor>a28</anchor>
<arglist>()</arglist>
</member>
<member kind="function">
<type>FLAC__StreamMetadata_CueSheet_Track *</type>
<name>FLAC__metadata_object_cuesheet_track_clone</name>
- <anchor>a25</anchor>
+ <anchor>a29</anchor>
<arglist>(const FLAC__StreamMetadata_CueSheet_Track *object)</arglist>
</member>
<member kind="function">
<type>void</type>
<name>FLAC__metadata_object_cuesheet_track_delete</name>
- <anchor>a26</anchor>
+ <anchor>a30</anchor>
<arglist>(FLAC__StreamMetadata_CueSheet_Track *object)</arglist>
</member>
<member kind="function">
<type>FLAC__bool</type>
<name>FLAC__metadata_object_cuesheet_track_resize_indices</name>
- <anchor>a27</anchor>
+ <anchor>a31</anchor>
<arglist>(FLAC__StreamMetadata *object, unsigned track_num, unsigned new_num_indices)</arglist>
</member>
<member kind="function">
<type>FLAC__bool</type>
<name>FLAC__metadata_object_cuesheet_track_insert_index</name>
- <anchor>a28</anchor>
+ <anchor>a32</anchor>
<arglist>(FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num, FLAC__StreamMetadata_CueSheet_Index index)</arglist>
</member>
<member kind="function">
<type>FLAC__bool</type>
<name>FLAC__metadata_object_cuesheet_track_insert_blank_index</name>
- <anchor>a29</anchor>
+ <anchor>a33</anchor>
<arglist>(FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num)</arglist>
</member>
<member kind="function">
<type>FLAC__bool</type>
<name>FLAC__metadata_object_cuesheet_track_delete_index</name>
- <anchor>a30</anchor>
+ <anchor>a34</anchor>
<arglist>(FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num)</arglist>
</member>
<member kind="function">
<type>FLAC__bool</type>
<name>FLAC__metadata_object_cuesheet_resize_tracks</name>
- <anchor>a31</anchor>
+ <anchor>a35</anchor>
<arglist>(FLAC__StreamMetadata *object, unsigned new_num_tracks)</arglist>
</member>
<member kind="function">
<type>FLAC__bool</type>
<name>FLAC__metadata_object_cuesheet_insert_track</name>
- <anchor>a32</anchor>
+ <anchor>a36</anchor>
<arglist>(FLAC__StreamMetadata *object, unsigned track_num, FLAC__StreamMetadata_CueSheet_Track *track, FLAC__bool copy)</arglist>
</member>
<member kind="function">
<type>FLAC__bool</type>
<name>FLAC__metadata_object_cuesheet_insert_blank_track</name>
- <anchor>a33</anchor>
+ <anchor>a37</anchor>
<arglist>(FLAC__StreamMetadata *object, unsigned track_num)</arglist>
</member>
<member kind="function">
<type>FLAC__bool</type>
<name>FLAC__metadata_object_cuesheet_delete_track</name>
- <anchor>a34</anchor>
+ <anchor>a38</anchor>
<arglist>(FLAC__StreamMetadata *object, unsigned track_num)</arglist>
</member>
<member kind="function">
<type>FLAC__bool</type>
<name>FLAC__metadata_object_cuesheet_is_legal</name>
- <anchor>a35</anchor>
+ <anchor>a39</anchor>
<arglist>(const FLAC__StreamMetadata *object, FLAC__bool check_cd_da_subset, const char **violation)</arglist>
</member>
</compound>
@@ -9753,6 +9837,12 @@
<anchor>a1</anchor>
<arglist>(const char *filename, VorbisComment *&tags)</arglist>
</member>
+ <member kind="function">
+ <type>FLACPP_API bool</type>
+ <name>get_tags</name>
+ <anchor>a2</anchor>
+ <arglist>(const char *filename, VorbisComment &tags)</arglist>
+ </member>
</compound>
<compound kind="group">
<name>flacpp_metadata_level1</name>
@@ -12902,10 +12992,16 @@
<anchor>b0</anchor>
<arglist>(::FLAC__StreamMetadata *object, bool copy)</arglist>
</member>
+ <member kind="function" protection="public">
+ <type>Prototype &</type>
+ <name>assign_object</name>
+ <anchor>b1</anchor>
+ <arglist>(::FLAC__StreamMetadata *object, bool copy)</arglist>
+ </member>
<member kind="function" protection="public" virtualness="virtual">
<type>virtual void</type>
<name>clear</name>
- <anchor>b1</anchor>
+ <anchor>b2</anchor>
<arglist>()</arglist>
</member>
<member kind="function" protection="public">
@@ -12927,19 +13023,19 @@
<arglist>(const::FLAC__StreamMetadata *)</arglist>
</member>
<member kind="function" protection="public">
- <type>void</type>
+ <type>Prototype &</type>
<name>operator=</name>
<anchor>z1_0</anchor>
<arglist>(const Prototype &)</arglist>
</member>
<member kind="function" protection="public">
- <type>void</type>
+ <type>Prototype &</type>
<name>operator=</name>
<anchor>z1_1</anchor>
<arglist>(const::FLAC__StreamMetadata &)</arglist>
</member>
<member kind="function" protection="public">
- <type>void</type>
+ <type>Prototype &</type>
<name>operator=</name>
<anchor>z1_2</anchor>
<arglist>(const::FLAC__StreamMetadata *)</arglist>
@@ -12986,6 +13082,12 @@
<arglist>()</arglist>
</member>
<member kind="function">
+ <type>StreamInfo &</type>
+ <name>assign</name>
+ <anchor>a3</anchor>
+ <arglist>(::FLAC__StreamMetadata *object, bool copy)</arglist>
+ </member>
+ <member kind="function">
<type></type>
<name>StreamInfo</name>
<anchor>z4_0</anchor>
@@ -13004,19 +13106,19 @@
<arglist>(const::FLAC__StreamMetadata *object)</arglist>
</member>
<member kind="function">
- <type>void</type>
+ <type>StreamInfo &</type>
<name>operator=</name>
<anchor>z5_0</anchor>
<arglist>(const StreamInfo &object)</arglist>
</member>
<member kind="function">
- <type>void</type>
+ <type>StreamInfo &</type>
<name>operator=</name>
<anchor>z5_1</anchor>
<arglist>(const::FLAC__StreamMetadata &object)</arglist>
</member>
<member kind="function">
- <type>void</type>
+ <type>StreamInfo &</type>
<name>operator=</name>
<anchor>z5_2</anchor>
<arglist>(const::FLAC__StreamMetadata *object)</arglist>
@@ -13189,9 +13291,15 @@
<arglist>()</arglist>
</member>
<member kind="function">
+ <type>Padding &</type>
+ <name>assign</name>
+ <anchor>a3</anchor>
+ <arglist>(::FLAC__StreamMetadata *object, bool copy)</arglist>
+ </member>
+ <member kind="function">
<type>void</type>
<name>set_length</name>
- <anchor>a3</anchor>
+ <anchor>a4</anchor>
<arglist>(unsigned length)</arglist>
</member>
<member kind="function">
@@ -13213,19 +13321,19 @@
<arglist>(const::FLAC__StreamMetadata *object)</arglist>
</member>
<member kind="function">
- <type>void</type>
+ <type>Padding &</type>
<name>operator=</name>
<anchor>z10_0</anchor>
<arglist>(const Padding &object)</arglist>
</member>
<member kind="function">
- <type>void</type>
+ <type>Padding &</type>
<name>operator=</name>
<anchor>z10_1</anchor>
<arglist>(const::FLAC__StreamMetadata &object)</arglist>
</member>
<member kind="function">
- <type>void</type>
+ <type>Padding &</type>
<name>operator=</name>
<anchor>z10_2</anchor>
<arglist>(const::FLAC__StreamMetadata *object)</arglist>
@@ -13290,33 +13398,39 @@
<arglist>()</arglist>
</member>
<member kind="function">
+ <type>Application &</type>
+ <name>assign</name>
+ <anchor>a3</anchor>
+ <arglist>(::FLAC__StreamMetadata *object, bool copy)</arglist>
+ </member>
+ <member kind="function">
<type>const FLAC__byte *</type>
<name>get_id</name>
- <anchor>a3</anchor>
+ <anchor>a4</anchor>
<arglist>() const</arglist>
</member>
<member kind="function">
<type>const FLAC__byte *</type>
<name>get_data</name>
- <anchor>a4</anchor>
+ <anchor>a5</anchor>
<arglist>() const</arglist>
</member>
<member kind="function">
<type>void</type>
<name>set_id</name>
- <anchor>a5</anchor>
+ <anchor>a6</anchor>
<arglist>(const FLAC__byte value[4])</arglist>
</member>
<member kind="function">
<type>bool</type>
<name>set_data</name>
- <anchor>a6</anchor>
+ <anchor>a7</anchor>
<arglist>(const FLAC__byte *data, unsigned length)</arglist>
</member>
<member kind="function">
<type>bool</type>
<name>set_data</name>
- <anchor>a7</anchor>
+ <anchor>a8</anchor>
<arglist>(FLAC__byte *data, unsigned length, bool copy)</arglist>
</member>
<member kind="function">
@@ -13338,19 +13452,19 @@
<arglist>(const::FLAC__StreamMetadata *object)</arglist>
</member>
<member kind="function">
- <type>void</type>
+ <type>Application &</type>
<name>operator=</name>
<anchor>z14_0</anchor>
<arglist>(const Application &object)</arglist>
</member>
<member kind="function">
- <type>void</type>
+ <type>Application &</type>
<name>operator=</name>
<anchor>z14_1</anchor>
<arglist>(const::FLAC__StreamMetadata &object)</arglist>
</member>
<member kind="function">
- <type>void</type>
+ <type>Application &</type>
<name>operator=</name>
<anchor>z14_2</anchor>
<arglist>(const::FLAC__StreamMetadata *object)</arglist>
@@ -13415,39 +13529,45 @@
<arglist>()</arglist>
</member>
<member kind="function">
+ <type>SeekTable &</type>
+ <name>assign</name>
+ <anchor>a3</anchor>
+ <arglist>(::FLAC__StreamMetadata *object, bool copy)</arglist>
+ </member>
+ <member kind="function">
<type>unsigned</type>
<name>get_num_points</name>
- <anchor>a3</anchor>
+ <anchor>a4</anchor>
<arglist>() const</arglist>
</member>
<member kind="function">
<type>::FLAC__StreamMetadata_SeekPoint</type>
<name>get_point</name>
- <anchor>a4</anchor>
+ <anchor>a5</anchor>
<arglist>(unsigned index) const</arglist>
</member>
<member kind="function">
<type>void</type>
<name>set_point</name>
- <anchor>a5</anchor>
+ <anchor>a6</anchor>
<arglist>(unsigned index, const::FLAC__StreamMetadata_SeekPoint &point)</arglist>
</member>
<member kind="function">
<type>bool</type>
<name>insert_point</name>
- <anchor>a6</anchor>
+ <anchor>a7</anchor>
<arglist>(unsigned index, const::FLAC__StreamMetadata_SeekPoint &point)</arglist>
</member>
<member kind="function">
<type>bool</type>
<name>delete_point</name>
- <anchor>a7</anchor>
+ <anchor>a8</anchor>
<arglist>(unsigned index)</arglist>
</member>
<member kind="function">
<type>bool</type>
<name>is_legal</name>
- <anchor>a8</anchor>
+ <anchor>a9</anchor>
<arglist>() const</arglist>
</member>
<member kind="function">
@@ -13469,19 +13589,19 @@
<arglist>(const::FLAC__StreamMetadata *object)</arglist>
</member>
<member kind="function">
- <type>void</type>
+ <type>SeekTable &</type>
<name>operator=</name>
<anchor>z18_0</anchor>
<arglist>(const SeekTable &object)</arglist>
</member>
<member kind="function">
- <type>void</type>
+ <type>SeekTable &</type>
<name>operator=</name>
<anchor>z18_1</anchor>
<arglist>(const::FLAC__StreamMetadata &object)</arglist>
</member>
<member kind="function">
- <type>void</type>
+ <type>SeekTable &</type>
<name>operator=</name>
<anchor>z18_2</anchor>
<arglist>(const::FLAC__StreamMetadata *object)</arglist>
@@ -13546,45 +13666,57 @@
<arglist>()</arglist>
</member>
<member kind="function">
+ <type>VorbisComment &</type>
+ <name>assign</name>
+ <anchor>a3</anchor>
+ <arglist>(::FLAC__StreamMetadata *object, bool copy)</arglist>
+ </member>
+ <member kind="function">
<type>unsigned</type>
<name>get_num_comments</name>
- <anchor>a3</anchor>
+ <anchor>a4</anchor>
<arglist>() const</arglist>
</member>
<member kind="function">
- <type>Entry</type>
+ <type>const FLAC__byte *</type>
<name>get_vendor_string</name>
- <anchor>a4</anchor>
+ <anchor>a5</anchor>
<arglist>() const</arglist>
</member>
<member kind="function">
<type>Entry</type>
<name>get_comment</name>
- <anchor>a5</anchor>
+ <anchor>a6</anchor>
<arglist>(unsigned index) const</arglist>
</member>
<member kind="function">
<type>bool</type>
<name>set_vendor_string</name>
- <anchor>a6</anchor>
- <arglist>(const Entry &entry)</arglist>
+ <anchor>a7</anchor>
+ <arglist>(const FLAC__byte *string)</arglist>
</member>
<member kind="function">
<type>bool</type>
<name>set_comment</name>
- <anchor>a7</anchor>
+ <anchor>a8</anchor>
<arglist>(unsigned index, const Entry &entry)</arglist>
</member>
<member kind="function">
<type>bool</type>
<name>insert_comment</name>
- <anchor>a8</anchor>
+ <anchor>a9</anchor>
<arglist>(unsigned index, const Entry &entry)</arglist>
</member>
<member kind="function">
<type>bool</type>
+ <name>append_comment</name>
+ <anchor>a10</anchor>
+ <arglist>(const Entry &entry)</arglist>
+ </member>
+ <member kind="function">
+ <type>bool</type>
<name>delete_comment</name>
- <anchor>a9</anchor>
+ <anchor>a11</anchor>
<arglist>(unsigned index)</arglist>
</member>
<member kind="function">
@@ -13606,19 +13738,19 @@
<arglist>(const::FLAC__StreamMetadata *object)</arglist>
</member>
<member kind="function">
- <type>void</type>
+ <type>VorbisComment &</type>
<name>operator=</name>
<anchor>z22_0</anchor>
<arglist>(const VorbisComment &object)</arglist>
</member>
<member kind="function">
- <type>void</type>
+ <type>VorbisComment &</type>
<name>operator=</name>
<anchor>z22_1</anchor>
<arglist>(const::FLAC__StreamMetadata &object)</arglist>
</member>
<member kind="function">
- <type>void</type>
+ <type>VorbisComment &</type>
<name>operator=</name>
<anchor>z22_2</anchor>
<arglist>(const::FLAC__StreamMetadata *object)</arglist>
@@ -13679,92 +13811,116 @@
<type></type>
<name>Entry</name>
<anchor>a2</anchor>
+ <arglist>(const char *field)</arglist>
+ </member>
+ <member kind="function">
+ <type></type>
+ <name>Entry</name>
+ <anchor>a3</anchor>
<arglist>(const char *field_name, const char *field_value, unsigned field_value_length)</arglist>
</member>
<member kind="function">
<type></type>
<name>Entry</name>
- <anchor>a3</anchor>
+ <anchor>a4</anchor>
+ <arglist>(const char *field_name, const char *field_value)</arglist>
+ </member>
+ <member kind="function">
+ <type></type>
+ <name>Entry</name>
+ <anchor>a5</anchor>
<arglist>(const Entry &entry)</arglist>
</member>
<member kind="function">
- <type>void</type>
+ <type>Entry &</type>
<name>operator=</name>
- <anchor>a4</anchor>
+ <anchor>a6</anchor>
<arglist>(const Entry &entry)</arglist>
</member>
<member kind="function" virtualness="virtual">
<type>virtual</type>
<name>~Entry</name>
- <anchor>a5</anchor>
+ <anchor>a7</anchor>
<arglist>()</arglist>
</member>
<member kind="function" virtualness="virtual">
<type>virtual bool</type>
<name>is_valid</name>
- <anchor>a6</anchor>
+ <anchor>a8</anchor>
<arglist>() const</arglist>
</member>
<member kind="function">
<type>unsigned</type>
<name>get_field_length</name>
- <anchor>a7</anchor>
+ <anchor>a9</anchor>
<arglist>() const</arglist>
</member>
<member kind="function">
<type>unsigned</type>
<name>get_field_name_length</name>
- <anchor>a8</anchor>
+ <anchor>a10</anchor>
<arglist>() const</arglist>
</member>
<member kind="function">
<type>unsigned</type>
<name>get_field_value_length</name>
- <anchor>a9</anchor>
+ <anchor>a11</anchor>
<arglist>() const</arglist>
</member>
<member kind="function">
<type>::FLAC__StreamMetadata_VorbisComment_Entry</type>
<name>get_entry</name>
- <anchor>a10</anchor>
+ <anchor>a12</anchor>
<arglist>() const</arglist>
</member>
<member kind="function">
<type>const char *</type>
<name>get_field</name>
- <anchor>a11</anchor>
+ <anchor>a13</anchor>
<arglist>() const</arglist>
</member>
<member kind="function">
<type>const char *</type>
<name>get_field_name</name>
- <anchor>a12</anchor>
+ <anchor>a14</anchor>
<arglist>() const</arglist>
</member>
<member kind="function">
<type>const char *</type>
<name>get_field_value</name>
- <anchor>a13</anchor>
+ <anchor>a15</anchor>
<arglist>() const</arglist>
</member>
<member kind="function">
<type>bool</type>
<name>set_field</name>
- <anchor>a14</anchor>
+ <anchor>a16</anchor>
<arglist>(const char *field, unsigned field_length)</arglist>
</member>
<member kind="function">
<type>bool</type>
+ <name>set_field</name>
+ <anchor>a17</anchor>
+ <arglist>(const char *field)</arglist>
+ </member>
+ <member kind="function">
+ <type>bool</type>
<name>set_field_name</name>
- <anchor>a15</anchor>
+ <anchor>a18</anchor>
<arglist>(const char *field_name)</arglist>
</member>
<member kind="function">
<type>bool</type>
<name>set_field_value</name>
- <anchor>a16</anchor>
+ <anchor>a19</anchor>
<arglist>(const char *field_value, unsigned field_value_length)</arglist>
</member>
+ <member kind="function">
+ <type>bool</type>
+ <name>set_field_value</name>
+ <anchor>a20</anchor>
+ <arglist>(const char *field_value)</arglist>
+ </member>
<member kind="variable" protection="public">
<type>bool</type>
<name>is_valid_</name>
@@ -13821,92 +13977,116 @@
<type></type>
<name>Entry</name>
<anchor>a2</anchor>
+ <arglist>(const char *field)</arglist>
+ </member>
+ <member kind="function">
+ <type></type>
+ <name>Entry</name>
+ <anchor>a3</anchor>
<arglist>(const char *field_name, const char *field_value, unsigned field_value_length)</arglist>
</member>
<member kind="function">
<type></type>
<name>Entry</name>
- <anchor>a3</anchor>
+ <anchor>a4</anchor>
+ <arglist>(const char *field_name, const char *field_value)</arglist>
+ </member>
+ <member kind="function">
+ <type></type>
+ <name>Entry</name>
+ <anchor>a5</anchor>
<arglist>(const Entry &entry)</arglist>
</member>
<member kind="function">
- <type>void</type>
+ <type>Entry &</type>
<name>operator=</name>
- <anchor>a4</anchor>
+ <anchor>a6</anchor>
<arglist>(const Entry &entry)</arglist>
</member>
<member kind="function" virtualness="virtual">
<type>virtual</type>
<name>~Entry</name>
- <anchor>a5</anchor>
+ <anchor>a7</anchor>
<arglist>()</arglist>
</member>
<member kind="function" virtualness="virtual">
<type>virtual bool</type>
<name>is_valid</name>
- <anchor>a6</anchor>
+ <anchor>a8</anchor>
<arglist>() const</arglist>
</member>
<member kind="function">
<type>unsigned</type>
<name>get_field_length</name>
- <anchor>a7</anchor>
+ <anchor>a9</anchor>
<arglist>() const</arglist>
</member>
<member kind="function">
<type>unsigned</type>
<name>get_field_name_length</name>
- <anchor>a8</anchor>
+ <anchor>a10</anchor>
<arglist>() const</arglist>
</member>
<member kind="function">
<type>unsigned</type>
<name>get_field_value_length</name>
- <anchor>a9</anchor>
+ <anchor>a11</anchor>
<arglist>() const</arglist>
</member>
<member kind="function">
<type>::FLAC__StreamMetadata_VorbisComment_Entry</type>
<name>get_entry</name>
- <anchor>a10</anchor>
+ <anchor>a12</anchor>
<arglist>() const</arglist>
</member>
<member kind="function">
<type>const char *</type>
<name>get_field</name>
- <anchor>a11</anchor>
+ <anchor>a13</anchor>
<arglist>() const</arglist>
</member>
<member kind="function">
<type>const char *</type>
<name>get_field_name</name>
- <anchor>a12</anchor>
+ <anchor>a14</anchor>
<arglist>() const</arglist>
</member>
<member kind="function">
<type>const char *</type>
<name>get_field_value</name>
- <anchor>a13</anchor>
+ <anchor>a15</anchor>
<arglist>() const</arglist>
</member>
<member kind="function">
<type>bool</type>
<name>set_field</name>
- <anchor>a14</anchor>
+ <anchor>a16</anchor>
<arglist>(const char *field, unsigned field_length)</arglist>
</member>
<member kind="function">
<type>bool</type>
+ <name>set_field</name>
+ <anchor>a17</anchor>
+ <arglist>(const char *field)</arglist>
+ </member>
+ <member kind="function">
+ <type>bool</type>
<name>set_field_name</name>
- <anchor>a15</anchor>
+ <anchor>a18</anchor>
<arglist>(const char *field_name)</arglist>
</member>
<member kind="function">
<type>bool</type>
<name>set_field_value</name>
- <anchor>a16</anchor>
+ <anchor>a19</anchor>
<arglist>(const char *field_value, unsigned field_value_length)</arglist>
</member>
+ <member kind="function">
+ <type>bool</type>
+ <name>set_field_value</name>
+ <anchor>a20</anchor>
+ <arglist>(const char *field_value)</arglist>
+ </member>
<member kind="variable" protection="public">
<type>bool</type>
<name>is_valid_</name>
@@ -13967,93 +14147,99 @@
<arglist>()</arglist>
</member>
<member kind="function">
+ <type>CueSheet &</type>
+ <name>assign</name>
+ <anchor>a3</anchor>
+ <arglist>(::FLAC__StreamMetadata *object, bool copy)</arglist>
+ </member>
+ <member kind="function">
<type>const char *</type>
<name>get_media_catalog_number</name>
- <anchor>a3</anchor>
+ <anchor>a4</anchor>
<arglist>() const</arglist>
</member>
<member kind="function">
<type>FLAC__uint64</type>
<name>get_lead_in</name>
- <anchor>a4</anchor>
+ <anchor>a5</anchor>
<arglist>() const</arglist>
</member>
<member kind="function">
<type>bool</type>
<name>get_is_cd</name>
- <anchor>a5</anchor>
+ <anchor>a6</anchor>
<arglist>() const</arglist>
</member>
<member kind="function">
<type>unsigned</type>
<name>get_num_tracks</name>
- <anchor>a6</anchor>
+ <anchor>a7</anchor>
<arglist>() const</arglist>
</member>
<member kind="function">
<type>Track</type>
<name>get_track</name>
- <anchor>a7</anchor>
+ <anchor>a8</anchor>
<arglist>(unsigned i) const</arglist>
</member>
<member kind="function">
<type>void</type>
<name>set_media_catalog_number</name>
- <anchor>a8</anchor>
+ <anchor>a9</anchor>
<arglist>(const char value[128])</arglist>
</member>
<member kind="function">
<type>void</type>
<name>set_lead_in</name>
- <anchor>a9</anchor>
+ <anchor>a10</anchor>
<arglist>(FLAC__uint64 value)</arglist>
</member>
<member kind="function">
<type>void</type>
<name>set_is_cd</name>
- <anchor>a10</anchor>
+ <anchor>a11</anchor>
<arglist>(bool value)</arglist>
</member>
<member kind="function">
<type>void</type>
<name>set_index</name>
- <anchor>a11</anchor>
+ <anchor>a12</anchor>
<arglist>(unsigned track_num, unsigned index_num, const::FLAC__StreamMetadata_CueSheet_Index &index)</arglist>
</member>
<member kind="function">
<type>bool</type>
<name>insert_index</name>
- <anchor>a12</anchor>
+ <anchor>a13</anchor>
<arglist>(unsigned track_num, unsigned index_num, const::FLAC__StreamMetadata_CueSheet_Index &index)</arglist>
</member>
<member kind="function">
<type>bool</type>
<name>delete_index</name>
- <anchor>a13</anchor>
+ <anchor>a14</anchor>
<arglist>(unsigned track_num, unsigned index_num)</arglist>
</member>
<member kind="function">
<type>bool</type>
<name>set_track</name>
- <anchor>a14</anchor>
+ <anchor>a15</anchor>
<arglist>(unsigned i, const Track &track)</arglist>
</member>
<member kind="function">
<type>bool</type>
<name>insert_track</name>
- <anchor>a15</anchor>
+ <anchor>a16</anchor>
<arglist>(unsigned i, const Track &track)</arglist>
</member>
<member kind="function">
<type>bool</type>
<name>delete_track</name>
- <anchor>a16</anchor>
+ <anchor>a17</anchor>
<arglist>(unsigned i)</arglist>
</member>
<member kind="function">
<type>bool</type>
<name>is_legal</name>
- <anchor>a17</anchor>
+ <anchor>a18</anchor>
<arglist>(bool check_cd_da_subset=false, const char **violation=0) const</arglist>
</member>
<member kind="function">
@@ -14075,19 +14261,19 @@
<arglist>(const::FLAC__StreamMetadata *object)</arglist>
</member>
<member kind="function">
- <type>void</type>
+ <type>CueSheet &</type>
<name>operator=</name>
<anchor>z26_0</anchor>
<arglist>(const CueSheet &object)</arglist>
</member>
<member kind="function">
- <type>void</type>
+ <type>CueSheet &</type>
<name>operator=</name>
<anchor>z26_1</anchor>
<arglist>(const::FLAC__StreamMetadata &object)</arglist>
</member>
<member kind="function">
- <type>void</type>
+ <type>CueSheet &</type>
<name>operator=</name>
<anchor>z26_2</anchor>
<arglist>(const::FLAC__StreamMetadata *object)</arglist>
@@ -14151,7 +14337,7 @@
<arglist>(const Track &track)</arglist>
</member>
<member kind="function">
- <type>void</type>
+ <type>Track &</type>
<name>operator=</name>
<anchor>a3</anchor>
<arglist>(const Track &track)</arglist>
@@ -14281,7 +14467,7 @@
<arglist>(const Track &track)</arglist>
</member>
<member kind="function">
- <type>void</type>
+ <type>Track &</type>
<name>operator=</name>
<anchor>a3</anchor>
<arglist>(const Track &track)</arglist>
@@ -14412,21 +14598,27 @@
<arglist>()</arglist>
</member>
<member kind="function">
+ <type>Unknown &</type>
+ <name>assign</name>
+ <anchor>a3</anchor>
+ <arglist>(::FLAC__StreamMetadata *object, bool copy)</arglist>
+ </member>
+ <member kind="function">
<type>const FLAC__byte *</type>
<name>get_data</name>
- <anchor>a3</anchor>
+ <anchor>a4</anchor>
<arglist>() const</arglist>
</member>
<member kind="function">
<type>bool</type>
<name>set_data</name>
- <anchor>a4</anchor>
+ <anchor>a5</anchor>
<arglist>(const FLAC__byte *data, unsigned length)</arglist>
</member>
<member kind="function">
<type>bool</type>
<name>set_data</name>
- <anchor>a5</anchor>
+ <anchor>a6</anchor>
<arglist>(FLAC__byte *data, unsigned length, bool copy)</arglist>
</member>
<member kind="function">
@@ -14448,19 +14640,19 @@
<arglist>(const::FLAC__StreamMetadata *object)</arglist>
</member>
<member kind="function">
- <type>void</type>
+ <type>Unknown &</type>
<name>operator=</name>
<anchor>z30_0</anchor>
<arglist>(const Unknown &object)</arglist>
</member>
<member kind="function">
- <type>void</type>
+ <type>Unknown &</type>
<name>operator=</name>
<anchor>z30_1</anchor>
<arglist>(const::FLAC__StreamMetadata &object)</arglist>
</member>
<member kind="function">
- <type>void</type>
+ <type>Unknown &</type>
<name>operator=</name>
<anchor>z30_2</anchor>
<arglist>(const::FLAC__StreamMetadata *object)</arglist>
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# flac - Command-line FLAC encoder/decoder
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# flac - Command-line FLAC encoder/decoder
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -80,6 +80,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -115,10 +116,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -131,12 +140,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/Makefile.lite
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/Makefile.lite 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/Makefile.lite 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# flac - Command-line FLAC encoder/decoder
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
@@ -28,6 +28,7 @@
documentation.html \
download.html \
faq.html \
+ favicon.ico \
features.html \
format.html \
goals.html \
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
@@ -80,6 +80,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -115,10 +116,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -131,12 +140,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -230,6 +244,7 @@
documentation.html \
download.html \
faq.html \
+ favicon.ico \
features.html \
format.html \
goals.html \
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/+_2metadata_8h-source.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/+_2metadata_8h-source.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/+_2metadata_8h-source.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,7 +7,7 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>include/FLAC++/metadata.h</h1><a href="+_2metadata_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <font class="comment">/* libFLAC++ - Free Lossless Audio Codec library</font>
-00002 <font class="comment"> * Copyright (C) 2002,2003,2004 Josh Coalson</font>
+00002 <font class="comment"> * Copyright (C) 2002,2003,2004,2005 Josh Coalson</font>
00003 <font class="comment"> *</font>
00004 <font class="comment"> * Redistribution and use in source and binary forms, with or without</font>
00005 <font class="comment"> * modification, are permitted provided that the following conditions</font>
@@ -70,568 +70,597 @@
00125 Prototype(::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">bool</font> copy);
00126
00128
-00129 <font class="keywordtype">void</font> operator=(<font class="keyword">const</font> Prototype &);
-00130 <font class="keywordtype">void</font> operator=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &);
-00131 <font class="keywordtype">void</font> operator=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *);
+00129 Prototype &operator=(<font class="keyword">const</font> Prototype &);
+00130 Prototype &operator=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &);
+00131 Prototype &operator=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *);
00133
-00136 <font class="keyword">virtual</font> <font class="keywordtype">void</font> clear();
-00137
-00138 ::FLAC__StreamMetadata *object_;
-00139 <font class="keyword">public</font>:
-00142 <font class="keyword">virtual</font> ~Prototype();
-00143
-00145
-00146 <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> Prototype &) <font class="keyword">const</font>;
-00147 <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &) <font class="keyword">const</font>;
-00148 <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *) <font class="keyword">const</font>;
+00137 Prototype &assign_object(::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">bool</font> copy);
+00138
+00141 <font class="keyword">virtual</font> <font class="keywordtype">void</font> clear();
+00142
+00143 ::FLAC__StreamMetadata *object_;
+00144 <font class="keyword">public</font>:
+00147 <font class="keyword">virtual</font> ~Prototype();
+00148
00150
-00152
-00153 <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> Prototype &) <font class="keyword">const</font>;
-00154 <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &) <font class="keyword">const</font>;
-00155 <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *) <font class="keyword">const</font>;
+00151 <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> Prototype &) <font class="keyword">const</font>;
+00152 <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &) <font class="keyword">const</font>;
+00153 <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *) <font class="keyword">const</font>;
+00155
00157
-00158 <font class="keyword">friend</font> <font class="keyword">class </font>SimpleIterator;
-00159 <font class="keyword">friend</font> <font class="keyword">class </font>Iterator;
-00160
-00165 <font class="keyword">inline</font> <font class="keywordtype">bool</font> is_valid() <font class="keyword">const</font>;
-00166
-00173 <font class="keywordtype">bool</font> get_is_last() <font class="keyword">const</font>;
-00174
-00180 ::FLAC__MetadataType get_type() <font class="keyword">const</font>;
-00181
-00191 <font class="keywordtype">unsigned</font> get_length() <font class="keyword">const</font>;
-00192
-00199 <font class="keywordtype">void</font> set_is_last(<font class="keywordtype">bool</font>);
-00200
-00208 <font class="keyword">inline</font> operator const ::FLAC__StreamMetadata *() <font class="keyword">const</font>;
-00209 <font class="keyword">private</font>:
-00211 Prototype();
-00212
-00213 <font class="comment">// These are used only by Iterator</font>
-00214 <font class="keywordtype">bool</font> is_reference_;
-00215 <font class="keyword">inline</font> <font class="keywordtype">void</font> set_reference(<font class="keywordtype">bool</font> x) { is_reference_ = x; }
-00216 };
+00158 <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> Prototype &) <font class="keyword">const</font>;
+00159 <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &) <font class="keyword">const</font>;
+00160 <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *) <font class="keyword">const</font>;
+00162
+00163 <font class="keyword">friend</font> <font class="keyword">class </font>SimpleIterator;
+00164 <font class="keyword">friend</font> <font class="keyword">class </font>Iterator;
+00165
+00170 <font class="keyword">inline</font> <font class="keywordtype">bool</font> is_valid() <font class="keyword">const</font>;
+00171
+00178 <font class="keywordtype">bool</font> get_is_last() <font class="keyword">const</font>;
+00179
+00185 ::FLAC__MetadataType get_type() <font class="keyword">const</font>;
+00186
+00196 <font class="keywordtype">unsigned</font> get_length() <font class="keyword">const</font>;
+00197
+00204 <font class="keywordtype">void</font> set_is_last(<font class="keywordtype">bool</font>);
+00205
+00213 <font class="keyword">inline</font> operator const ::FLAC__StreamMetadata *() <font class="keyword">const</font>;
+00214 <font class="keyword">private</font>:
+00216 Prototype();
00217
-00218 <font class="preprocessor">#ifdef _MSC_VER</font>
-00219 <font class="preprocessor"></font><font class="comment">// warning C4800: 'int' : forcing to bool 'true' or 'false' (performance warning)</font>
-00220 <font class="preprocessor">#pragma warning ( disable : 4800 )</font>
-00221 <font class="preprocessor"></font><font class="preprocessor">#endif</font>
-00222 <font class="preprocessor"></font>
-<a name="l00223"></a><a class="code" href="classFLAC_1_1Metadata_1_1Prototype.html#a1">00223</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> Prototype::operator==(<font class="keyword">const</font> Prototype &object)<font class="keyword"> const</font>
-00224 <font class="keyword"> </font>{ <font class="keywordflow">return</font> (bool)::FLAC__metadata_object_is_equal(object_, object.object_); }
-00225
-<a name="l00226"></a><a class="code" href="classFLAC_1_1Metadata_1_1Prototype.html#a2">00226</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> Prototype::operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object)<font class="keyword"> const</font>
-00227 <font class="keyword"> </font>{ <font class="keywordflow">return</font> (bool)::FLAC__metadata_object_is_equal(object_, &object); }
-00228
-<a name="l00229"></a><a class="code" href="classFLAC_1_1Metadata_1_1Prototype.html#a3">00229</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> Prototype::operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)<font class="keyword"> const</font>
-00230 <font class="keyword"> </font>{ <font class="keywordflow">return</font> (bool)::FLAC__metadata_object_is_equal(object_, object); }
-00231
-00232 <font class="preprocessor">#ifdef _MSC_VER</font>
-00233 <font class="preprocessor"></font><font class="comment">// @@@ how to re-enable? the following doesn't work</font>
-00234 <font class="comment">// #pragma warning ( enable : 4800 )</font>
-00235 <font class="preprocessor">#endif</font>
-00236 <font class="preprocessor"></font>
-<a name="l00237"></a><a class="code" href="classFLAC_1_1Metadata_1_1Prototype.html#a4">00237</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> Prototype::operator!=(<font class="keyword">const</font> Prototype &object)<font class="keyword"> const</font>
-00238 <font class="keyword"> </font>{ <font class="keywordflow">return</font> !<a class="code" href="classFLAC_1_1Metadata_1_1Prototype.html#a1">operator==</a>(object); }
-00239
-<a name="l00240"></a><a class="code" href="classFLAC_1_1Metadata_1_1Prototype.html#a5">00240</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> Prototype::operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object)<font class="keyword"> const</font>
-00241 <font class="keyword"> </font>{ <font class="keywordflow">return</font> !<a class="code" href="classFLAC_1_1Metadata_1_1Prototype.html#a1">operator==</a>(object); }
-00242
-<a name="l00243"></a><a class="code" href="classFLAC_1_1Metadata_1_1Prototype.html#a6">00243</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> Prototype::operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)<font class="keyword"> const</font>
-00244 <font class="keyword"> </font>{ <font class="keywordflow">return</font> !<a class="code" href="classFLAC_1_1Metadata_1_1Prototype.html#a1">operator==</a>(object); }
-00245
-<a name="l00246"></a><a class="code" href="classFLAC_1_1Metadata_1_1Prototype.html#a7">00246</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> Prototype::is_valid()<font class="keyword"> const</font>
-00247 <font class="keyword"> </font>{ <font class="keywordflow">return</font> 0 != object_; }
-00248
-<a name="l00249"></a><a class="code" href="classFLAC_1_1Metadata_1_1Prototype.html#a8">00249</a> <font class="keyword">inline</font> Prototype::operator const ::FLAC__StreamMetadata *()<font class="keyword"> const</font>
-00250 <font class="keyword"> </font>{ <font class="keywordflow">return</font> object_; }
-00251
-00253 FLACPP_API Prototype *clone(<font class="keyword">const</font> Prototype *);
-00254
-00255
-<a name="l00259"></a><a class="code" href="classFLAC_1_1Metadata_1_1StreamInfo.html">00259</a> <font class="keyword">class </font>FLACPP_API StreamInfo : <font class="keyword">public</font> Prototype {
-00260 <font class="keyword">public</font>:
-00261 StreamInfo();
-00262
-00264
-<a name="l00267"></a><a class="code" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z4_0">00267</a> <font class="keyword">inline</font> StreamInfo(<font class="keyword">const</font> StreamInfo &object): Prototype(object) { }
-<a name="l00268"></a><a class="code" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z4_1">00268</a> <font class="keyword">inline</font> StreamInfo(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object): Prototype(object) { }
-<a name="l00269"></a><a class="code" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z4_2">00269</a> <font class="keyword">inline</font> StreamInfo(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object): Prototype(object) { }
-00271
-<a name="l00275"></a><a class="code" href="classFLAC_1_1Metadata_1_1StreamInfo.html#a1">00275</a> <font class="keyword">inline</font> StreamInfo(::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">bool</font> copy): Prototype(object, copy) { }
+00218 <font class="comment">// These are used only by Iterator</font>
+00219 <font class="keywordtype">bool</font> is_reference_;
+00220 <font class="keyword">inline</font> <font class="keywordtype">void</font> set_reference(<font class="keywordtype">bool</font> x) { is_reference_ = x; }
+00221 };
+00222
+00223 <font class="preprocessor">#ifdef _MSC_VER</font>
+00224 <font class="preprocessor"></font><font class="comment">// warning C4800: 'int' : forcing to bool 'true' or 'false' (performance warning)</font>
+00225 <font class="preprocessor">#pragma warning ( disable : 4800 )</font>
+00226 <font class="preprocessor"></font><font class="preprocessor">#endif</font>
+00227 <font class="preprocessor"></font>
+<a name="l00228"></a><a class="code" href="classFLAC_1_1Metadata_1_1Prototype.html#a1">00228</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> Prototype::operator==(<font class="keyword">const</font> Prototype &object)<font class="keyword"> const</font>
+00229 <font class="keyword"> </font>{ <font class="keywordflow">return</font> (bool)::FLAC__metadata_object_is_equal(object_, object.object_); }
+00230
+<a name="l00231"></a><a class="code" href="classFLAC_1_1Metadata_1_1Prototype.html#a2">00231</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> Prototype::operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object)<font class="keyword"> const</font>
+00232 <font class="keyword"> </font>{ <font class="keywordflow">return</font> (bool)::FLAC__metadata_object_is_equal(object_, &object); }
+00233
+<a name="l00234"></a><a class="code" href="classFLAC_1_1Metadata_1_1Prototype.html#a3">00234</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> Prototype::operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)<font class="keyword"> const</font>
+00235 <font class="keyword"> </font>{ <font class="keywordflow">return</font> (bool)::FLAC__metadata_object_is_equal(object_, object); }
+00236
+00237 <font class="preprocessor">#ifdef _MSC_VER</font>
+00238 <font class="preprocessor"></font><font class="comment">// @@@ how to re-enable? the following doesn't work</font>
+00239 <font class="comment">// #pragma warning ( enable : 4800 )</font>
+00240 <font class="preprocessor">#endif</font>
+00241 <font class="preprocessor"></font>
+<a name="l00242"></a><a class="code" href="classFLAC_1_1Metadata_1_1Prototype.html#a4">00242</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> Prototype::operator!=(<font class="keyword">const</font> Prototype &object)<font class="keyword"> const</font>
+00243 <font class="keyword"> </font>{ <font class="keywordflow">return</font> !<a class="code" href="classFLAC_1_1Metadata_1_1Prototype.html#a1">operator==</a>(object); }
+00244
+<a name="l00245"></a><a class="code" href="classFLAC_1_1Metadata_1_1Prototype.html#a5">00245</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> Prototype::operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object)<font class="keyword"> const</font>
+00246 <font class="keyword"> </font>{ <font class="keywordflow">return</font> !<a class="code" href="classFLAC_1_1Metadata_1_1Prototype.html#a1">operator==</a>(object); }
+00247
+<a name="l00248"></a><a class="code" href="classFLAC_1_1Metadata_1_1Prototype.html#a6">00248</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> Prototype::operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)<font class="keyword"> const</font>
+00249 <font class="keyword"> </font>{ <font class="keywordflow">return</font> !<a class="code" href="classFLAC_1_1Metadata_1_1Prototype.html#a1">operator==</a>(object); }
+00250
+<a name="l00251"></a><a class="code" href="classFLAC_1_1Metadata_1_1Prototype.html#a7">00251</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> Prototype::is_valid()<font class="keyword"> const</font>
+00252 <font class="keyword"> </font>{ <font class="keywordflow">return</font> 0 != object_; }
+00253
+<a name="l00254"></a><a class="code" href="classFLAC_1_1Metadata_1_1Prototype.html#a8">00254</a> <font class="keyword">inline</font> Prototype::operator const ::FLAC__StreamMetadata *()<font class="keyword"> const</font>
+00255 <font class="keyword"> </font>{ <font class="keywordflow">return</font> object_; }
+00256
+00258 FLACPP_API Prototype *clone(<font class="keyword">const</font> Prototype *);
+00259
+00260
+<a name="l00264"></a><a class="code" href="classFLAC_1_1Metadata_1_1StreamInfo.html">00264</a> <font class="keyword">class </font>FLACPP_API StreamInfo : <font class="keyword">public</font> Prototype {
+00265 <font class="keyword">public</font>:
+00266 StreamInfo();
+00267
+00269
+<a name="l00272"></a><a class="code" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z4_0">00272</a> <font class="keyword">inline</font> StreamInfo(<font class="keyword">const</font> StreamInfo &object): Prototype(object) { }
+<a name="l00273"></a><a class="code" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z4_1">00273</a> <font class="keyword">inline</font> StreamInfo(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object): Prototype(object) { }
+<a name="l00274"></a><a class="code" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z4_2">00274</a> <font class="keyword">inline</font> StreamInfo(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object): Prototype(object) { }
00276
-00277 ~StreamInfo();
-00278
-00280
-<a name="l00281"></a><a class="code" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z5_0">00281</a> <font class="keyword">inline</font> <font class="keywordtype">void</font> operator=(<font class="keyword">const</font> StreamInfo &object) { Prototype::operator=(object); }
-<a name="l00282"></a><a class="code" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z5_1">00282</a> <font class="keyword">inline</font> <font class="keywordtype">void</font> operator=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object) { Prototype::operator=(object); }
-<a name="l00283"></a><a class="code" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z5_2">00283</a> <font class="keyword">inline</font> <font class="keywordtype">void</font> operator=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object) { Prototype::operator=(object); }
+<a name="l00280"></a><a class="code" href="classFLAC_1_1Metadata_1_1StreamInfo.html#a1">00280</a> <font class="keyword">inline</font> StreamInfo(::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">bool</font> copy): Prototype(object, copy) { }
+00281
+00282 ~StreamInfo();
+00283
00285
-00287
-<a name="l00288"></a><a class="code" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z6_0">00288</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> StreamInfo &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
-<a name="l00289"></a><a class="code" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z6_1">00289</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
-<a name="l00290"></a><a class="code" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z6_2">00290</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
-00292
-00294
-<a name="l00295"></a><a class="code" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z7_0">00295</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> StreamInfo &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
-<a name="l00296"></a><a class="code" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z7_1">00296</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
-<a name="l00297"></a><a class="code" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z7_2">00297</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
-00299
-00301
-00302 <font class="keywordtype">unsigned</font> get_min_blocksize() <font class="keyword">const</font>;
-00303 <font class="keywordtype">unsigned</font> get_max_blocksize() <font class="keyword">const</font>;
-00304 <font class="keywordtype">unsigned</font> get_min_framesize() <font class="keyword">const</font>;
-00305 <font class="keywordtype">unsigned</font> get_max_framesize() <font class="keyword">const</font>;
-00306 <font class="keywordtype">unsigned</font> get_sample_rate() <font class="keyword">const</font>;
-00307 <font class="keywordtype">unsigned</font> get_channels() <font class="keyword">const</font>;
-00308 <font class="keywordtype">unsigned</font> get_bits_per_sample() <font class="keyword">const</font>;
-00309 FLAC__uint64 get_total_samples() <font class="keyword">const</font>;
-00310 <font class="keyword">const</font> FLAC__byte *get_md5sum() <font class="keyword">const</font>;
+<a name="l00286"></a><a class="code" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z5_0">00286</a> <font class="keyword">inline</font> StreamInfo &operator=(<font class="keyword">const</font> StreamInfo &object) { Prototype::operator=(object); <font class="keywordflow">return</font> *<font class="keyword">this</font>; }
+<a name="l00287"></a><a class="code" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z5_1">00287</a> <font class="keyword">inline</font> StreamInfo &operator=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object) { Prototype::operator=(object); <font class="keywordflow">return</font> *<font class="keyword">this</font>; }
+<a name="l00288"></a><a class="code" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z5_2">00288</a> <font class="keyword">inline</font> StreamInfo &operator=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object) { Prototype::operator=(object); <font class="keywordflow">return</font> *<font class="keyword">this</font>; }
+00290
+<a name="l00294"></a><a class="code" href="classFLAC_1_1Metadata_1_1StreamInfo.html#a3">00294</a> <font class="keyword">inline</font> StreamInfo &assign(::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">bool</font> copy) { Prototype::assign_object(object, copy); <font class="keywordflow">return</font> *<font class="keyword">this</font>; }
+00295
+00297
+<a name="l00298"></a><a class="code" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z6_0">00298</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> StreamInfo &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
+<a name="l00299"></a><a class="code" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z6_1">00299</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
+<a name="l00300"></a><a class="code" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z6_2">00300</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
+00302
+00304
+<a name="l00305"></a><a class="code" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z7_0">00305</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> StreamInfo &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
+<a name="l00306"></a><a class="code" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z7_1">00306</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
+<a name="l00307"></a><a class="code" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z7_2">00307</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
+00309
00311
-00312 <font class="keywordtype">void</font> set_min_blocksize(<font class="keywordtype">unsigned</font> value);
-00313 <font class="keywordtype">void</font> set_max_blocksize(<font class="keywordtype">unsigned</font> value);
-00314 <font class="keywordtype">void</font> set_min_framesize(<font class="keywordtype">unsigned</font> value);
-00315 <font class="keywordtype">void</font> set_max_framesize(<font class="keywordtype">unsigned</font> value);
-00316 <font class="keywordtype">void</font> set_sample_rate(<font class="keywordtype">unsigned</font> value);
-00317 <font class="keywordtype">void</font> set_channels(<font class="keywordtype">unsigned</font> value);
-00318 <font class="keywordtype">void</font> set_bits_per_sample(<font class="keywordtype">unsigned</font> value);
-00319 <font class="keywordtype">void</font> set_total_samples(FLAC__uint64 value);
-00320 <font class="keywordtype">void</font> set_md5sum(<font class="keyword">const</font> FLAC__byte value[16]);
-00322 };
-00323
-<a name="l00327"></a><a class="code" href="classFLAC_1_1Metadata_1_1Padding.html">00327</a> <font class="keyword">class </font>FLACPP_API Padding : <font class="keyword">public</font> Prototype {
-00328 <font class="keyword">public</font>:
-00329 Padding();
-00330
-00332
-<a name="l00335"></a><a class="code" href="classFLAC_1_1Metadata_1_1Padding.html#z9_0">00335</a> <font class="keyword">inline</font> Padding(<font class="keyword">const</font> Padding &object): Prototype(object) { }
-<a name="l00336"></a><a class="code" href="classFLAC_1_1Metadata_1_1Padding.html#z9_1">00336</a> <font class="keyword">inline</font> Padding(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object): Prototype(object) { }
-<a name="l00337"></a><a class="code" href="classFLAC_1_1Metadata_1_1Padding.html#z9_2">00337</a> <font class="keyword">inline</font> Padding(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object): Prototype(object) { }
-00339
-<a name="l00343"></a><a class="code" href="classFLAC_1_1Metadata_1_1Padding.html#a1">00343</a> <font class="keyword">inline</font> Padding(::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">bool</font> copy): Prototype(object, copy) { }
-00344
-00345 ~Padding();
-00346
-00348
-<a name="l00349"></a><a class="code" href="classFLAC_1_1Metadata_1_1Padding.html#z10_0">00349</a> <font class="keyword">inline</font> <font class="keywordtype">void</font> operator=(<font class="keyword">const</font> Padding &object) { Prototype::operator=(object); }
-<a name="l00350"></a><a class="code" href="classFLAC_1_1Metadata_1_1Padding.html#z10_1">00350</a> <font class="keyword">inline</font> <font class="keywordtype">void</font> operator=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object) { Prototype::operator=(object); }
-<a name="l00351"></a><a class="code" href="classFLAC_1_1Metadata_1_1Padding.html#z10_2">00351</a> <font class="keyword">inline</font> <font class="keywordtype">void</font> operator=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object) { Prototype::operator=(object); }
-00353
-00355
-<a name="l00356"></a><a class="code" href="classFLAC_1_1Metadata_1_1Padding.html#z11_0">00356</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> Padding &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
-<a name="l00357"></a><a class="code" href="classFLAC_1_1Metadata_1_1Padding.html#z11_1">00357</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
-<a name="l00358"></a><a class="code" href="classFLAC_1_1Metadata_1_1Padding.html#z11_2">00358</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
-00360
-00362
-<a name="l00363"></a><a class="code" href="classFLAC_1_1Metadata_1_1Padding.html#z12_0">00363</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> Padding &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
-<a name="l00364"></a><a class="code" href="classFLAC_1_1Metadata_1_1Padding.html#z12_1">00364</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
-<a name="l00365"></a><a class="code" href="classFLAC_1_1Metadata_1_1Padding.html#z12_2">00365</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
-00367
-00368 <font class="keywordtype">void</font> set_length(<font class="keywordtype">unsigned</font> length);
-00369 };
+00312 <font class="keywordtype">unsigned</font> get_min_blocksize() <font class="keyword">const</font>;
+00313 <font class="keywordtype">unsigned</font> get_max_blocksize() <font class="keyword">const</font>;
+00314 <font class="keywordtype">unsigned</font> get_min_framesize() <font class="keyword">const</font>;
+00315 <font class="keywordtype">unsigned</font> get_max_framesize() <font class="keyword">const</font>;
+00316 <font class="keywordtype">unsigned</font> get_sample_rate() <font class="keyword">const</font>;
+00317 <font class="keywordtype">unsigned</font> get_channels() <font class="keyword">const</font>;
+00318 <font class="keywordtype">unsigned</font> get_bits_per_sample() <font class="keyword">const</font>;
+00319 FLAC__uint64 get_total_samples() <font class="keyword">const</font>;
+00320 <font class="keyword">const</font> FLAC__byte *get_md5sum() <font class="keyword">const</font>;
+00321
+00322 <font class="keywordtype">void</font> set_min_blocksize(<font class="keywordtype">unsigned</font> value);
+00323 <font class="keywordtype">void</font> set_max_blocksize(<font class="keywordtype">unsigned</font> value);
+00324 <font class="keywordtype">void</font> set_min_framesize(<font class="keywordtype">unsigned</font> value);
+00325 <font class="keywordtype">void</font> set_max_framesize(<font class="keywordtype">unsigned</font> value);
+00326 <font class="keywordtype">void</font> set_sample_rate(<font class="keywordtype">unsigned</font> value);
+00327 <font class="keywordtype">void</font> set_channels(<font class="keywordtype">unsigned</font> value);
+00328 <font class="keywordtype">void</font> set_bits_per_sample(<font class="keywordtype">unsigned</font> value);
+00329 <font class="keywordtype">void</font> set_total_samples(FLAC__uint64 value);
+00330 <font class="keywordtype">void</font> set_md5sum(<font class="keyword">const</font> FLAC__byte value[16]);
+00332 };
+00333
+<a name="l00337"></a><a class="code" href="classFLAC_1_1Metadata_1_1Padding.html">00337</a> <font class="keyword">class </font>FLACPP_API Padding : <font class="keyword">public</font> Prototype {
+00338 <font class="keyword">public</font>:
+00339 Padding();
+00340
+00342
+<a name="l00345"></a><a class="code" href="classFLAC_1_1Metadata_1_1Padding.html#z9_0">00345</a> <font class="keyword">inline</font> Padding(<font class="keyword">const</font> Padding &object): Prototype(object) { }
+<a name="l00346"></a><a class="code" href="classFLAC_1_1Metadata_1_1Padding.html#z9_1">00346</a> <font class="keyword">inline</font> Padding(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object): Prototype(object) { }
+<a name="l00347"></a><a class="code" href="classFLAC_1_1Metadata_1_1Padding.html#z9_2">00347</a> <font class="keyword">inline</font> Padding(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object): Prototype(object) { }
+00349
+<a name="l00353"></a><a class="code" href="classFLAC_1_1Metadata_1_1Padding.html#a1">00353</a> <font class="keyword">inline</font> Padding(::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">bool</font> copy): Prototype(object, copy) { }
+00354
+00355 ~Padding();
+00356
+00358
+<a name="l00359"></a><a class="code" href="classFLAC_1_1Metadata_1_1Padding.html#z10_0">00359</a> <font class="keyword">inline</font> Padding &operator=(<font class="keyword">const</font> Padding &object) { Prototype::operator=(object); <font class="keywordflow">return</font> *<font class="keyword">this</font>; }
+<a name="l00360"></a><a class="code" href="classFLAC_1_1Metadata_1_1Padding.html#z10_1">00360</a> <font class="keyword">inline</font> Padding &operator=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object) { Prototype::operator=(object); <font class="keywordflow">return</font> *<font class="keyword">this</font>; }
+<a name="l00361"></a><a class="code" href="classFLAC_1_1Metadata_1_1Padding.html#z10_2">00361</a> <font class="keyword">inline</font> Padding &operator=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object) { Prototype::operator=(object); <font class="keywordflow">return</font> *<font class="keyword">this</font>; }
+00363
+<a name="l00367"></a><a class="code" href="classFLAC_1_1Metadata_1_1Padding.html#a3">00367</a> <font class="keyword">inline</font> Padding &assign(::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">bool</font> copy) { Prototype::assign_object(object, copy); <font class="keywordflow">return</font> *<font class="keyword">this</font>; }
+00368
00370
-<a name="l00374"></a><a class="code" href="classFLAC_1_1Metadata_1_1Application.html">00374</a> <font class="keyword">class </font>FLACPP_API Application : <font class="keyword">public</font> Prototype {
-00375 <font class="keyword">public</font>:
-00376 Application();
-00377 <font class="comment">//</font>
-00379 <font class="comment"> /** Constructs a copy of the given object. This form</font>
-00380 * always performs a deep copy.
-00381 */
-<a name="l00382"></a><a class="code" href="classFLAC_1_1Metadata_1_1Application.html#z13_0">00382</a> <font class="keyword">inline</font> Application(<font class="keyword">const</font> Application &object): Prototype(object) { }
-<a name="l00383"></a><a class="code" href="classFLAC_1_1Metadata_1_1Application.html#z13_1">00383</a> <font class="keyword">inline</font> Application(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object): Prototype(object) { }
-<a name="l00384"></a><a class="code" href="classFLAC_1_1Metadata_1_1Application.html#z13_2">00384</a> <font class="keyword">inline</font> Application(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object): Prototype(object) { }
-00386
-<a name="l00390"></a><a class="code" href="classFLAC_1_1Metadata_1_1Application.html#a1">00390</a> <font class="keyword">inline</font> Application(::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">bool</font> copy): Prototype(object, copy) { }
-00391
-00392 ~Application();
-00393
-00395
-<a name="l00396"></a><a class="code" href="classFLAC_1_1Metadata_1_1Application.html#z14_0">00396</a> <font class="keyword">inline</font> <font class="keywordtype">void</font> operator=(<font class="keyword">const</font> Application &object) { Prototype::operator=(object); }
-<a name="l00397"></a><a class="code" href="classFLAC_1_1Metadata_1_1Application.html#z14_1">00397</a> <font class="keyword">inline</font> <font class="keywordtype">void</font> operator=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object) { Prototype::operator=(object); }
-<a name="l00398"></a><a class="code" href="classFLAC_1_1Metadata_1_1Application.html#z14_2">00398</a> <font class="keyword">inline</font> <font class="keywordtype">void</font> operator=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object) { Prototype::operator=(object); }
-00400
-00402
-<a name="l00403"></a><a class="code" href="classFLAC_1_1Metadata_1_1Application.html#z15_0">00403</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> Application &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
-<a name="l00404"></a><a class="code" href="classFLAC_1_1Metadata_1_1Application.html#z15_1">00404</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
-<a name="l00405"></a><a class="code" href="classFLAC_1_1Metadata_1_1Application.html#z15_2">00405</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
-00407
-00409
-<a name="l00410"></a><a class="code" href="classFLAC_1_1Metadata_1_1Application.html#z16_0">00410</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> Application &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
-<a name="l00411"></a><a class="code" href="classFLAC_1_1Metadata_1_1Application.html#z16_1">00411</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
-<a name="l00412"></a><a class="code" href="classFLAC_1_1Metadata_1_1Application.html#z16_2">00412</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
-00414
-00415 <font class="keyword">const</font> FLAC__byte *get_id() <font class="keyword">const</font>;
-00416 <font class="keyword">const</font> FLAC__byte *get_data() <font class="keyword">const</font>;
-00417
-00418 <font class="keywordtype">void</font> set_id(<font class="keyword">const</font> FLAC__byte value[4]);
-00420 <font class="keywordtype">bool</font> set_data(<font class="keyword">const</font> FLAC__byte *data, <font class="keywordtype">unsigned</font> length);
-00421 <font class="keywordtype">bool</font> set_data(FLAC__byte *data, <font class="keywordtype">unsigned</font> length, <font class="keywordtype">bool</font> copy);
-00422 };
-00423
-<a name="l00427"></a><a class="code" href="classFLAC_1_1Metadata_1_1SeekTable.html">00427</a> <font class="keyword">class </font>FLACPP_API SeekTable : <font class="keyword">public</font> Prototype {
-00428 <font class="keyword">public</font>:
-00429 SeekTable();
-00430
-00432
-<a name="l00435"></a><a class="code" href="classFLAC_1_1Metadata_1_1SeekTable.html#z17_0">00435</a> <font class="keyword">inline</font> SeekTable(<font class="keyword">const</font> SeekTable &object): Prototype(object) { }
-<a name="l00436"></a><a class="code" href="classFLAC_1_1Metadata_1_1SeekTable.html#z17_1">00436</a> <font class="keyword">inline</font> SeekTable(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object): Prototype(object) { }
-<a name="l00437"></a><a class="code" href="classFLAC_1_1Metadata_1_1SeekTable.html#z17_2">00437</a> <font class="keyword">inline</font> SeekTable(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object): Prototype(object) { }
-00439
-<a name="l00443"></a><a class="code" href="classFLAC_1_1Metadata_1_1SeekTable.html#a1">00443</a> <font class="keyword">inline</font> SeekTable(::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">bool</font> copy): Prototype(object, copy) { }
-00444
-00445 ~SeekTable();
-00446
-00448
-<a name="l00449"></a><a class="code" href="classFLAC_1_1Metadata_1_1SeekTable.html#z18_0">00449</a> <font class="keyword">inline</font> <font class="keywordtype">void</font> operator=(<font class="keyword">const</font> SeekTable &object) { Prototype::operator=(object); }
-<a name="l00450"></a><a class="code" href="classFLAC_1_1Metadata_1_1SeekTable.html#z18_1">00450</a> <font class="keyword">inline</font> <font class="keywordtype">void</font> operator=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object) { Prototype::operator=(object); }
-<a name="l00451"></a><a class="code" href="classFLAC_1_1Metadata_1_1SeekTable.html#z18_2">00451</a> <font class="keyword">inline</font> <font class="keywordtype">void</font> operator=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object) { Prototype::operator=(object); }
-00453
-00455
-<a name="l00456"></a><a class="code" href="classFLAC_1_1Metadata_1_1SeekTable.html#z19_0">00456</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> SeekTable &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
-<a name="l00457"></a><a class="code" href="classFLAC_1_1Metadata_1_1SeekTable.html#z19_1">00457</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
-<a name="l00458"></a><a class="code" href="classFLAC_1_1Metadata_1_1SeekTable.html#z19_2">00458</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
-00460
-00462
-<a name="l00463"></a><a class="code" href="classFLAC_1_1Metadata_1_1SeekTable.html#z20_0">00463</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> SeekTable &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
-<a name="l00464"></a><a class="code" href="classFLAC_1_1Metadata_1_1SeekTable.html#z20_1">00464</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
-<a name="l00465"></a><a class="code" href="classFLAC_1_1Metadata_1_1SeekTable.html#z20_2">00465</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
-00467
-00468 <font class="keywordtype">unsigned</font> get_num_points() <font class="keyword">const</font>;
-00469 ::FLAC__StreamMetadata_SeekPoint get_point(<font class="keywordtype">unsigned</font> index) <font class="keyword">const</font>;
-00470
-00472 <font class="keywordtype">void</font> set_point(<font class="keywordtype">unsigned</font> index, <font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata__SeekPoint.html">FLAC__StreamMetadata_SeekPoint</a> &point);
+<a name="l00371"></a><a class="code" href="classFLAC_1_1Metadata_1_1Padding.html#z11_0">00371</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> Padding &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
+<a name="l00372"></a><a class="code" href="classFLAC_1_1Metadata_1_1Padding.html#z11_1">00372</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
+<a name="l00373"></a><a class="code" href="classFLAC_1_1Metadata_1_1Padding.html#z11_2">00373</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
+00375
+00377
+<a name="l00378"></a><a class="code" href="classFLAC_1_1Metadata_1_1Padding.html#z12_0">00378</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> Padding &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
+<a name="l00379"></a><a class="code" href="classFLAC_1_1Metadata_1_1Padding.html#z12_1">00379</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
+<a name="l00380"></a><a class="code" href="classFLAC_1_1Metadata_1_1Padding.html#z12_2">00380</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
+00382
+00383 <font class="keywordtype">void</font> set_length(<font class="keywordtype">unsigned</font> length);
+00384 };
+00385
+<a name="l00389"></a><a class="code" href="classFLAC_1_1Metadata_1_1Application.html">00389</a> <font class="keyword">class </font>FLACPP_API Application : <font class="keyword">public</font> Prototype {
+00390 <font class="keyword">public</font>:
+00391 Application();
+00392 <font class="comment">//</font>
+00394 <font class="comment"> /** Constructs a copy of the given object. This form</font>
+00395 * always performs a deep copy.
+00396 */
+<a name="l00397"></a><a class="code" href="classFLAC_1_1Metadata_1_1Application.html#z13_0">00397</a> <font class="keyword">inline</font> Application(<font class="keyword">const</font> Application &object): Prototype(object) { }
+<a name="l00398"></a><a class="code" href="classFLAC_1_1Metadata_1_1Application.html#z13_1">00398</a> <font class="keyword">inline</font> Application(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object): Prototype(object) { }
+<a name="l00399"></a><a class="code" href="classFLAC_1_1Metadata_1_1Application.html#z13_2">00399</a> <font class="keyword">inline</font> Application(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object): Prototype(object) { }
+00401
+<a name="l00405"></a><a class="code" href="classFLAC_1_1Metadata_1_1Application.html#a1">00405</a> <font class="keyword">inline</font> Application(::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">bool</font> copy): Prototype(object, copy) { }
+00406
+00407 ~Application();
+00408
+00410
+<a name="l00411"></a><a class="code" href="classFLAC_1_1Metadata_1_1Application.html#z14_0">00411</a> <font class="keyword">inline</font> Application &operator=(<font class="keyword">const</font> Application &object) { Prototype::operator=(object); <font class="keywordflow">return</font> *<font class="keyword">this</font>; }
+<a name="l00412"></a><a class="code" href="classFLAC_1_1Metadata_1_1Application.html#z14_1">00412</a> <font class="keyword">inline</font> Application &operator=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object) { Prototype::operator=(object); <font class="keywordflow">return</font> *<font class="keyword">this</font>; }
+<a name="l00413"></a><a class="code" href="classFLAC_1_1Metadata_1_1Application.html#z14_2">00413</a> <font class="keyword">inline</font> Application &operator=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object) { Prototype::operator=(object); <font class="keywordflow">return</font> *<font class="keyword">this</font>; }
+00415
+<a name="l00419"></a><a class="code" href="classFLAC_1_1Metadata_1_1Application.html#a3">00419</a> <font class="keyword">inline</font> Application &assign(::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">bool</font> copy) { Prototype::assign_object(object, copy); <font class="keywordflow">return</font> *<font class="keyword">this</font>; }
+00420
+00422
+<a name="l00423"></a><a class="code" href="classFLAC_1_1Metadata_1_1Application.html#z15_0">00423</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> Application &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
+<a name="l00424"></a><a class="code" href="classFLAC_1_1Metadata_1_1Application.html#z15_1">00424</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
+<a name="l00425"></a><a class="code" href="classFLAC_1_1Metadata_1_1Application.html#z15_2">00425</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
+00427
+00429
+<a name="l00430"></a><a class="code" href="classFLAC_1_1Metadata_1_1Application.html#z16_0">00430</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> Application &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
+<a name="l00431"></a><a class="code" href="classFLAC_1_1Metadata_1_1Application.html#z16_1">00431</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
+<a name="l00432"></a><a class="code" href="classFLAC_1_1Metadata_1_1Application.html#z16_2">00432</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
+00434
+00435 <font class="keyword">const</font> FLAC__byte *get_id() <font class="keyword">const</font>;
+00436 <font class="keyword">const</font> FLAC__byte *get_data() <font class="keyword">const</font>;
+00437
+00438 <font class="keywordtype">void</font> set_id(<font class="keyword">const</font> FLAC__byte value[4]);
+00440 <font class="keywordtype">bool</font> set_data(<font class="keyword">const</font> FLAC__byte *data, <font class="keywordtype">unsigned</font> length);
+00441 <font class="keywordtype">bool</font> set_data(FLAC__byte *data, <font class="keywordtype">unsigned</font> length, <font class="keywordtype">bool</font> copy);
+00442 };
+00443
+<a name="l00447"></a><a class="code" href="classFLAC_1_1Metadata_1_1SeekTable.html">00447</a> <font class="keyword">class </font>FLACPP_API SeekTable : <font class="keyword">public</font> Prototype {
+00448 <font class="keyword">public</font>:
+00449 SeekTable();
+00450
+00452
+<a name="l00455"></a><a class="code" href="classFLAC_1_1Metadata_1_1SeekTable.html#z17_0">00455</a> <font class="keyword">inline</font> SeekTable(<font class="keyword">const</font> SeekTable &object): Prototype(object) { }
+<a name="l00456"></a><a class="code" href="classFLAC_1_1Metadata_1_1SeekTable.html#z17_1">00456</a> <font class="keyword">inline</font> SeekTable(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object): Prototype(object) { }
+<a name="l00457"></a><a class="code" href="classFLAC_1_1Metadata_1_1SeekTable.html#z17_2">00457</a> <font class="keyword">inline</font> SeekTable(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object): Prototype(object) { }
+00459
+<a name="l00463"></a><a class="code" href="classFLAC_1_1Metadata_1_1SeekTable.html#a1">00463</a> <font class="keyword">inline</font> SeekTable(::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">bool</font> copy): Prototype(object, copy) { }
+00464
+00465 ~SeekTable();
+00466
+00468
+<a name="l00469"></a><a class="code" href="classFLAC_1_1Metadata_1_1SeekTable.html#z18_0">00469</a> <font class="keyword">inline</font> SeekTable &operator=(<font class="keyword">const</font> SeekTable &object) { Prototype::operator=(object); <font class="keywordflow">return</font> *<font class="keyword">this</font>; }
+<a name="l00470"></a><a class="code" href="classFLAC_1_1Metadata_1_1SeekTable.html#z18_1">00470</a> <font class="keyword">inline</font> SeekTable &operator=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object) { Prototype::operator=(object); <font class="keywordflow">return</font> *<font class="keyword">this</font>; }
+<a name="l00471"></a><a class="code" href="classFLAC_1_1Metadata_1_1SeekTable.html#z18_2">00471</a> <font class="keyword">inline</font> SeekTable &operator=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object) { Prototype::operator=(object); <font class="keywordflow">return</font> *<font class="keyword">this</font>; }
00473
-00475 <font class="keywordtype">bool</font> insert_point(<font class="keywordtype">unsigned</font> index, <font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata__SeekPoint.html">FLAC__StreamMetadata_SeekPoint</a> &point);
-00476
-00478 <font class="keywordtype">bool</font> delete_point(<font class="keywordtype">unsigned</font> index);
-00479
-00481 <font class="keywordtype">bool</font> is_legal() <font class="keyword">const</font>;
-00482 };
-00483
-<a name="l00487"></a><a class="code" href="classFLAC_1_1Metadata_1_1VorbisComment.html">00487</a> <font class="keyword">class </font>FLACPP_API VorbisComment : <font class="keyword">public</font> Prototype {
-00488 <font class="keyword">public</font>:
-<a name="l00513"></a><a class="code" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">00513</a> <font class="keyword">class </font>FLACPP_API Entry {
-00514 <font class="keyword">public</font>:
-00515 Entry();
-00516 Entry(<font class="keyword">const</font> <font class="keywordtype">char</font> *field, <font class="keywordtype">unsigned</font> field_length);
-00517 Entry(<font class="keyword">const</font> <font class="keywordtype">char</font> *field_name, <font class="keyword">const</font> <font class="keywordtype">char</font> *field_value, <font class="keywordtype">unsigned</font> field_value_length);
-00518 Entry(<font class="keyword">const</font> Entry &entry);
-00519 <font class="keywordtype">void</font> operator=(<font class="keyword">const</font> Entry &entry);
-00520
-00521 <font class="keyword">virtual</font> ~Entry();
-00522
-00523 <font class="keyword">virtual</font> <font class="keywordtype">bool</font> is_valid() <font class="keyword">const</font>;
-00524
-00525 <font class="keywordtype">unsigned</font> get_field_length() <font class="keyword">const</font>;
-00526 <font class="keywordtype">unsigned</font> get_field_name_length() <font class="keyword">const</font>;
-00527 <font class="keywordtype">unsigned</font> get_field_value_length() <font class="keyword">const</font>;
-00528
-00529 ::FLAC__StreamMetadata_VorbisComment_Entry get_entry() <font class="keyword">const</font>;
-00530 <font class="keyword">const</font> <font class="keywordtype">char</font> *get_field() <font class="keyword">const</font>;
-00531 <font class="keyword">const</font> <font class="keywordtype">char</font> *get_field_name() <font class="keyword">const</font>;
-00532 <font class="keyword">const</font> <font class="keywordtype">char</font> *get_field_value() <font class="keyword">const</font>;
-00533
-00534 <font class="keywordtype">bool</font> set_field(<font class="keyword">const</font> <font class="keywordtype">char</font> *field, <font class="keywordtype">unsigned</font> field_length);
-00535 <font class="keywordtype">bool</font> set_field_name(<font class="keyword">const</font> <font class="keywordtype">char</font> *field_name);
-00536 <font class="keywordtype">bool</font> set_field_value(<font class="keyword">const</font> <font class="keywordtype">char</font> *field_value, <font class="keywordtype">unsigned</font> field_value_length);
-00537 <font class="keyword">protected</font>:
-00538 <font class="keywordtype">bool</font> is_valid_;
-00539 ::FLAC__StreamMetadata_VorbisComment_Entry entry_;
-00540 <font class="keywordtype">char</font> *field_name_;
-00541 <font class="keywordtype">unsigned</font> field_name_length_;
-00542 <font class="keywordtype">char</font> *field_value_;
-00543 <font class="keywordtype">unsigned</font> field_value_length_;
-00544 <font class="keyword">private</font>:
-00545 <font class="keywordtype">void</font> zero();
-00546 <font class="keywordtype">void</font> clear();
-00547 <font class="keywordtype">void</font> clear_entry();
-00548 <font class="keywordtype">void</font> clear_field_name();
-00549 <font class="keywordtype">void</font> clear_field_value();
-00550 <font class="keywordtype">void</font> construct(<font class="keyword">const</font> <font class="keywordtype">char</font> *field, <font class="keywordtype">unsigned</font> field_length);
-00551 <font class="keywordtype">void</font> construct(<font class="keyword">const</font> <font class="keywordtype">char</font> *field_name, <font class="keyword">const</font> <font class="keywordtype">char</font> *field_value, <font class="keywordtype">unsigned</font> field_value_length);
-00552 <font class="keywordtype">void</font> compose_field();
-00553 <font class="keywordtype">void</font> parse_field();
-00554 };
-00555
-00556 VorbisComment();
-00557
-00559
-<a name="l00562"></a><a class="code" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z21_0">00562</a> <font class="keyword">inline</font> VorbisComment(<font class="keyword">const</font> VorbisComment &object): Prototype(object) { }
-<a name="l00563"></a><a class="code" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z21_1">00563</a> <font class="keyword">inline</font> VorbisComment(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object): Prototype(object) { }
-<a name="l00564"></a><a class="code" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z21_2">00564</a> <font class="keyword">inline</font> VorbisComment(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object): Prototype(object) { }
-00566
-<a name="l00570"></a><a class="code" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a1">00570</a> <font class="keyword">inline</font> VorbisComment(::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">bool</font> copy): Prototype(object, copy) { }
-00571
-00572 ~VorbisComment();
-00573
-00575
-<a name="l00576"></a><a class="code" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z22_0">00576</a> <font class="keyword">inline</font> <font class="keywordtype">void</font> operator=(<font class="keyword">const</font> VorbisComment &object) { Prototype::operator=(object); }
-<a name="l00577"></a><a class="code" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z22_1">00577</a> <font class="keyword">inline</font> <font class="keywordtype">void</font> operator=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object) { Prototype::operator=(object); }
-<a name="l00578"></a><a class="code" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z22_2">00578</a> <font class="keyword">inline</font> <font class="keywordtype">void</font> operator=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object) { Prototype::operator=(object); }
-00580
-00582
-<a name="l00583"></a><a class="code" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z23_0">00583</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> VorbisComment &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
-<a name="l00584"></a><a class="code" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z23_1">00584</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
-<a name="l00585"></a><a class="code" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z23_2">00585</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
-00587
-00589
-<a name="l00590"></a><a class="code" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z24_0">00590</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> VorbisComment &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
-<a name="l00591"></a><a class="code" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z24_1">00591</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
-<a name="l00592"></a><a class="code" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z24_2">00592</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
-00594
-00595 <font class="keywordtype">unsigned</font> get_num_comments() <font class="keyword">const</font>;
-00596 Entry get_vendor_string() <font class="keyword">const</font>; <font class="comment">// only the Entry's field name should be used</font>
-00597 Entry get_comment(<font class="keywordtype">unsigned</font> index) <font class="keyword">const</font>;
-00598
-00601 <font class="keywordtype">bool</font> set_vendor_string(<font class="keyword">const</font> Entry &entry);
-00602
-00604 <font class="keywordtype">bool</font> set_comment(<font class="keywordtype">unsigned</font> index, <font class="keyword">const</font> Entry &entry);
-00605
-00607 <font class="keywordtype">bool</font> insert_comment(<font class="keywordtype">unsigned</font> index, <font class="keyword">const</font> Entry &entry);
-00608
-00610 <font class="keywordtype">bool</font> delete_comment(<font class="keywordtype">unsigned</font> index);
-00611 };
-00612
-<a name="l00616"></a><a class="code" href="classFLAC_1_1Metadata_1_1CueSheet.html">00616</a> <font class="keyword">class </font>FLACPP_API CueSheet : <font class="keyword">public</font> Prototype {
-00617 <font class="keyword">public</font>:
-<a name="l00624"></a><a class="code" href="classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html">00624</a> <font class="keyword">class </font>FLACPP_API Track {
-00625 <font class="keyword">protected</font>:
-00626 ::FLAC__StreamMetadata_CueSheet_Track *object_;
-00627 <font class="keyword">public</font>:
-00628 Track();
-00629 Track(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> *track);
-00630 Track(<font class="keyword">const</font> Track &track);
-00631 <font class="keywordtype">void</font> operator=(<font class="keyword">const</font> Track &track);
+<a name="l00477"></a><a class="code" href="classFLAC_1_1Metadata_1_1SeekTable.html#a3">00477</a> <font class="keyword">inline</font> SeekTable &assign(::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">bool</font> copy) { Prototype::assign_object(object, copy); <font class="keywordflow">return</font> *<font class="keyword">this</font>; }
+00478
+00480
+<a name="l00481"></a><a class="code" href="classFLAC_1_1Metadata_1_1SeekTable.html#z19_0">00481</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> SeekTable &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
+<a name="l00482"></a><a class="code" href="classFLAC_1_1Metadata_1_1SeekTable.html#z19_1">00482</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
+<a name="l00483"></a><a class="code" href="classFLAC_1_1Metadata_1_1SeekTable.html#z19_2">00483</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
+00485
+00487
+<a name="l00488"></a><a class="code" href="classFLAC_1_1Metadata_1_1SeekTable.html#z20_0">00488</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> SeekTable &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
+<a name="l00489"></a><a class="code" href="classFLAC_1_1Metadata_1_1SeekTable.html#z20_1">00489</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
+<a name="l00490"></a><a class="code" href="classFLAC_1_1Metadata_1_1SeekTable.html#z20_2">00490</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
+00492
+00493 <font class="keywordtype">unsigned</font> get_num_points() <font class="keyword">const</font>;
+00494 ::FLAC__StreamMetadata_SeekPoint get_point(<font class="keywordtype">unsigned</font> index) <font class="keyword">const</font>;
+00495
+00497 <font class="keywordtype">void</font> set_point(<font class="keywordtype">unsigned</font> index, <font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata__SeekPoint.html">FLAC__StreamMetadata_SeekPoint</a> &point);
+00498
+00500 <font class="keywordtype">bool</font> insert_point(<font class="keywordtype">unsigned</font> index, <font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata__SeekPoint.html">FLAC__StreamMetadata_SeekPoint</a> &point);
+00501
+00503 <font class="keywordtype">bool</font> delete_point(<font class="keywordtype">unsigned</font> index);
+00504
+00506 <font class="keywordtype">bool</font> is_legal() <font class="keyword">const</font>;
+00507 };
+00508
+<a name="l00512"></a><a class="code" href="classFLAC_1_1Metadata_1_1VorbisComment.html">00512</a> <font class="keyword">class </font>FLACPP_API VorbisComment : <font class="keyword">public</font> Prototype {
+00513 <font class="keyword">public</font>:
+<a name="l00543"></a><a class="code" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">00543</a> <font class="keyword">class </font>FLACPP_API Entry {
+00544 <font class="keyword">public</font>:
+00545 Entry();
+00546
+00547 Entry(<font class="keyword">const</font> <font class="keywordtype">char</font> *field, <font class="keywordtype">unsigned</font> field_length);
+00548 Entry(<font class="keyword">const</font> <font class="keywordtype">char</font> *field); <font class="comment">// assumes \a field is NUL-terminated</font>
+00549
+00550 Entry(<font class="keyword">const</font> <font class="keywordtype">char</font> *field_name, <font class="keyword">const</font> <font class="keywordtype">char</font> *field_value, <font class="keywordtype">unsigned</font> field_value_length);
+00551 Entry(<font class="keyword">const</font> <font class="keywordtype">char</font> *field_name, <font class="keyword">const</font> <font class="keywordtype">char</font> *field_value); <font class="comment">// assumes \a field_value is NUL-terminated</font>
+00552
+00553 Entry(<font class="keyword">const</font> Entry &entry);
+00554
+00555 Entry &operator=(<font class="keyword">const</font> Entry &entry);
+00556
+00557 <font class="keyword">virtual</font> ~Entry();
+00558
+00559 <font class="keyword">virtual</font> <font class="keywordtype">bool</font> is_valid() <font class="keyword">const</font>;
+00560
+00561 <font class="keywordtype">unsigned</font> get_field_length() <font class="keyword">const</font>;
+00562 <font class="keywordtype">unsigned</font> get_field_name_length() <font class="keyword">const</font>;
+00563 <font class="keywordtype">unsigned</font> get_field_value_length() <font class="keyword">const</font>;
+00564
+00565 ::FLAC__StreamMetadata_VorbisComment_Entry get_entry() <font class="keyword">const</font>;
+00566 <font class="keyword">const</font> <font class="keywordtype">char</font> *get_field() <font class="keyword">const</font>;
+00567 <font class="keyword">const</font> <font class="keywordtype">char</font> *get_field_name() <font class="keyword">const</font>;
+00568 <font class="keyword">const</font> <font class="keywordtype">char</font> *get_field_value() <font class="keyword">const</font>;
+00569
+00570 <font class="keywordtype">bool</font> set_field(<font class="keyword">const</font> <font class="keywordtype">char</font> *field, <font class="keywordtype">unsigned</font> field_length);
+00571 <font class="keywordtype">bool</font> set_field(<font class="keyword">const</font> <font class="keywordtype">char</font> *field); <font class="comment">// assumes \a field is NUL-terminated</font>
+00572 <font class="keywordtype">bool</font> set_field_name(<font class="keyword">const</font> <font class="keywordtype">char</font> *field_name);
+00573 <font class="keywordtype">bool</font> set_field_value(<font class="keyword">const</font> <font class="keywordtype">char</font> *field_value, <font class="keywordtype">unsigned</font> field_value_length);
+00574 <font class="keywordtype">bool</font> set_field_value(<font class="keyword">const</font> <font class="keywordtype">char</font> *field_value); <font class="comment">// assumes \a field_value is NUL-terminated</font>
+00575 <font class="keyword">protected</font>:
+00576 <font class="keywordtype">bool</font> is_valid_;
+00577 ::FLAC__StreamMetadata_VorbisComment_Entry entry_;
+00578 <font class="keywordtype">char</font> *field_name_;
+00579 <font class="keywordtype">unsigned</font> field_name_length_;
+00580 <font class="keywordtype">char</font> *field_value_;
+00581 <font class="keywordtype">unsigned</font> field_value_length_;
+00582 <font class="keyword">private</font>:
+00583 <font class="keywordtype">void</font> zero();
+00584 <font class="keywordtype">void</font> clear();
+00585 <font class="keywordtype">void</font> clear_entry();
+00586 <font class="keywordtype">void</font> clear_field_name();
+00587 <font class="keywordtype">void</font> clear_field_value();
+00588 <font class="keywordtype">void</font> construct(<font class="keyword">const</font> <font class="keywordtype">char</font> *field, <font class="keywordtype">unsigned</font> field_length);
+00589 <font class="keywordtype">void</font> construct(<font class="keyword">const</font> <font class="keywordtype">char</font> *field); <font class="comment">// assumes \a field is NUL-terminated</font>
+00590 <font class="keywordtype">void</font> construct(<font class="keyword">const</font> <font class="keywordtype">char</font> *field_name, <font class="keyword">const</font> <font class="keywordtype">char</font> *field_value, <font class="keywordtype">unsigned</font> field_value_length);
+00591 <font class="keywordtype">void</font> construct(<font class="keyword">const</font> <font class="keywordtype">char</font> *field_name, <font class="keyword">const</font> <font class="keywordtype">char</font> *field_value); <font class="comment">// assumes \a field_value is NUL-terminated</font>
+00592 <font class="keywordtype">void</font> compose_field();
+00593 <font class="keywordtype">void</font> parse_field();
+00594 };
+00595
+00596 VorbisComment();
+00597
+00599
+<a name="l00602"></a><a class="code" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z21_0">00602</a> <font class="keyword">inline</font> VorbisComment(<font class="keyword">const</font> VorbisComment &object): Prototype(object) { }
+<a name="l00603"></a><a class="code" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z21_1">00603</a> <font class="keyword">inline</font> VorbisComment(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object): Prototype(object) { }
+<a name="l00604"></a><a class="code" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z21_2">00604</a> <font class="keyword">inline</font> VorbisComment(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object): Prototype(object) { }
+00606
+<a name="l00610"></a><a class="code" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a1">00610</a> <font class="keyword">inline</font> VorbisComment(::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">bool</font> copy): Prototype(object, copy) { }
+00611
+00612 ~VorbisComment();
+00613
+00615
+<a name="l00616"></a><a class="code" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z22_0">00616</a> <font class="keyword">inline</font> VorbisComment &operator=(<font class="keyword">const</font> VorbisComment &object) { Prototype::operator=(object); <font class="keywordflow">return</font> *<font class="keyword">this</font>; }
+<a name="l00617"></a><a class="code" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z22_1">00617</a> <font class="keyword">inline</font> VorbisComment &operator=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object) { Prototype::operator=(object); <font class="keywordflow">return</font> *<font class="keyword">this</font>; }
+<a name="l00618"></a><a class="code" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z22_2">00618</a> <font class="keyword">inline</font> VorbisComment &operator=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object) { Prototype::operator=(object); <font class="keywordflow">return</font> *<font class="keyword">this</font>; }
+00620
+<a name="l00624"></a><a class="code" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a3">00624</a> <font class="keyword">inline</font> VorbisComment &assign(::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">bool</font> copy) { Prototype::assign_object(object, copy); <font class="keywordflow">return</font> *<font class="keyword">this</font>; }
+00625
+00627
+<a name="l00628"></a><a class="code" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z23_0">00628</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> VorbisComment &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
+<a name="l00629"></a><a class="code" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z23_1">00629</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
+<a name="l00630"></a><a class="code" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z23_2">00630</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
00632
-00633 <font class="keyword">virtual</font> ~Track();
00634
-00635 <font class="keyword">virtual</font> <font class="keywordtype">bool</font> is_valid() <font class="keyword">const</font>;
-00636
-00637 <font class="keyword">inline</font> FLAC__uint64 get_offset()<font class="keyword"> const </font>{ <font class="keywordflow">return</font> object_->offset; }
-00638 <font class="keyword">inline</font> FLAC__byte get_number()<font class="keyword"> const </font>{ <font class="keywordflow">return</font> object_->number; }
-00639 <font class="keyword">inline</font> <font class="keyword">const</font> <font class="keywordtype">char</font> *get_isrc()<font class="keyword"> const </font>{ <font class="keywordflow">return</font> object_->isrc; }
-00640 <font class="keyword">inline</font> <font class="keywordtype">unsigned</font> get_type()<font class="keyword"> const </font>{ <font class="keywordflow">return</font> object_->type; }
-00641 <font class="keyword">inline</font> <font class="keywordtype">bool</font> get_pre_emphasis()<font class="keyword"> const </font>{ <font class="keywordflow">return</font> object_->pre_emphasis; }
-00642
-00643 <font class="keyword">inline</font> FLAC__byte get_num_indices()<font class="keyword"> const </font>{ <font class="keywordflow">return</font> object_->num_indices; }
-00644 ::FLAC__StreamMetadata_CueSheet_Index get_index(<font class="keywordtype">unsigned</font> i) <font class="keyword">const</font>;
-00645
-00646 <font class="keyword">inline</font> const ::FLAC__StreamMetadata_CueSheet_Track *get_track()<font class="keyword"> const </font>{ <font class="keywordflow">return</font> object_; }
-00647
-00648 <font class="keyword">inline</font> <font class="keywordtype">void</font> set_offset(FLAC__uint64 value) { object_->offset = value; }
-00649 <font class="keyword">inline</font> <font class="keywordtype">void</font> set_number(FLAC__byte value) { object_->number = value; }
-00650 <font class="keywordtype">void</font> set_isrc(<font class="keyword">const</font> <font class="keywordtype">char</font> value[12]);
-00651 <font class="keywordtype">void</font> set_type(<font class="keywordtype">unsigned</font> value);
-00652 <font class="keyword">inline</font> <font class="keywordtype">void</font> set_pre_emphasis(<font class="keywordtype">bool</font> value) { object_->pre_emphasis = value? 1 : 0; }
-00653
-00654 <font class="keywordtype">void</font> set_index(<font class="keywordtype">unsigned</font> i, <font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata__CueSheet__Index.html">FLAC__StreamMetadata_CueSheet_Index</a> &index);
-00655 <font class="comment">//@@@ It's awkward but to insert/delete index points</font>
-00656 <font class="comment">//@@@ you must use the routines in the CueSheet class.</font>
-00657 };
-00658
-00659 CueSheet();
-00660
-00662
-<a name="l00665"></a><a class="code" href="classFLAC_1_1Metadata_1_1CueSheet.html#z25_0">00665</a> <font class="keyword">inline</font> CueSheet(<font class="keyword">const</font> CueSheet &object): Prototype(object) { }
-<a name="l00666"></a><a class="code" href="classFLAC_1_1Metadata_1_1CueSheet.html#z25_1">00666</a> <font class="keyword">inline</font> CueSheet(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object): Prototype(object) { }
-<a name="l00667"></a><a class="code" href="classFLAC_1_1Metadata_1_1CueSheet.html#z25_2">00667</a> <font class="keyword">inline</font> CueSheet(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object): Prototype(object) { }
-00669
-<a name="l00673"></a><a class="code" href="classFLAC_1_1Metadata_1_1CueSheet.html#a1">00673</a> <font class="keyword">inline</font> CueSheet(::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">bool</font> copy): Prototype(object, copy) { }
-00674
-00675 ~CueSheet();
-00676
-00678
-<a name="l00679"></a><a class="code" href="classFLAC_1_1Metadata_1_1CueSheet.html#z26_0">00679</a> <font class="keyword">inline</font> <font class="keywordtype">void</font> operator=(<font class="keyword">const</font> CueSheet &object) { Prototype::operator=(object); }
-<a name="l00680"></a><a class="code" href="classFLAC_1_1Metadata_1_1CueSheet.html#z26_1">00680</a> <font class="keyword">inline</font> <font class="keywordtype">void</font> operator=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object) { Prototype::operator=(object); }
-<a name="l00681"></a><a class="code" href="classFLAC_1_1Metadata_1_1CueSheet.html#z26_2">00681</a> <font class="keyword">inline</font> <font class="keywordtype">void</font> operator=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object) { Prototype::operator=(object); }
+<a name="l00635"></a><a class="code" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z24_0">00635</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> VorbisComment &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
+<a name="l00636"></a><a class="code" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z24_1">00636</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
+<a name="l00637"></a><a class="code" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z24_2">00637</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
+00639
+00640 <font class="keywordtype">unsigned</font> get_num_comments() <font class="keyword">const</font>;
+00641 <font class="keyword">const</font> FLAC__byte *get_vendor_string() <font class="keyword">const</font>; <font class="comment">// NUL-terminated UTF-8 string</font>
+00642 Entry get_comment(<font class="keywordtype">unsigned</font> index) <font class="keyword">const</font>;
+00643
+00645 <font class="keywordtype">bool</font> set_vendor_string(<font class="keyword">const</font> FLAC__byte *string); <font class="comment">// NUL-terminated UTF-8 string</font>
+00646
+00648 <font class="keywordtype">bool</font> set_comment(<font class="keywordtype">unsigned</font> index, <font class="keyword">const</font> Entry &entry);
+00649
+00651 <font class="keywordtype">bool</font> insert_comment(<font class="keywordtype">unsigned</font> index, <font class="keyword">const</font> Entry &entry);
+00652
+00654 <font class="keywordtype">bool</font> append_comment(<font class="keyword">const</font> Entry &entry);
+00655
+00657 <font class="keywordtype">bool</font> delete_comment(<font class="keywordtype">unsigned</font> index);
+00658 };
+00659
+<a name="l00663"></a><a class="code" href="classFLAC_1_1Metadata_1_1CueSheet.html">00663</a> <font class="keyword">class </font>FLACPP_API CueSheet : <font class="keyword">public</font> Prototype {
+00664 <font class="keyword">public</font>:
+<a name="l00671"></a><a class="code" href="classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html">00671</a> <font class="keyword">class </font>FLACPP_API Track {
+00672 <font class="keyword">protected</font>:
+00673 ::FLAC__StreamMetadata_CueSheet_Track *object_;
+00674 <font class="keyword">public</font>:
+00675 Track();
+00676 Track(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> *track);
+00677 Track(<font class="keyword">const</font> Track &track);
+00678 Track &operator=(<font class="keyword">const</font> Track &track);
+00679
+00680 <font class="keyword">virtual</font> ~Track();
+00681
+00682 <font class="keyword">virtual</font> <font class="keywordtype">bool</font> is_valid() <font class="keyword">const</font>;
00683
-00685
-<a name="l00686"></a><a class="code" href="classFLAC_1_1Metadata_1_1CueSheet.html#z27_0">00686</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> CueSheet &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
-<a name="l00687"></a><a class="code" href="classFLAC_1_1Metadata_1_1CueSheet.html#z27_1">00687</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
-<a name="l00688"></a><a class="code" href="classFLAC_1_1Metadata_1_1CueSheet.html#z27_2">00688</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
-00690
+00684 <font class="keyword">inline</font> FLAC__uint64 get_offset()<font class="keyword"> const </font>{ <font class="keywordflow">return</font> object_->offset; }
+00685 <font class="keyword">inline</font> FLAC__byte get_number()<font class="keyword"> const </font>{ <font class="keywordflow">return</font> object_->number; }
+00686 <font class="keyword">inline</font> <font class="keyword">const</font> <font class="keywordtype">char</font> *get_isrc()<font class="keyword"> const </font>{ <font class="keywordflow">return</font> object_->isrc; }
+00687 <font class="keyword">inline</font> <font class="keywordtype">unsigned</font> get_type()<font class="keyword"> const </font>{ <font class="keywordflow">return</font> object_->type; }
+00688 <font class="keyword">inline</font> <font class="keywordtype">bool</font> get_pre_emphasis()<font class="keyword"> const </font>{ <font class="keywordflow">return</font> object_->pre_emphasis; }
+00689
+00690 <font class="keyword">inline</font> FLAC__byte get_num_indices()<font class="keyword"> const </font>{ <font class="keywordflow">return</font> object_->num_indices; }
+00691 ::FLAC__StreamMetadata_CueSheet_Index get_index(<font class="keywordtype">unsigned</font> i) <font class="keyword">const</font>;
00692
-<a name="l00693"></a><a class="code" href="classFLAC_1_1Metadata_1_1CueSheet.html#z28_0">00693</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> CueSheet &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
-<a name="l00694"></a><a class="code" href="classFLAC_1_1Metadata_1_1CueSheet.html#z28_1">00694</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
-<a name="l00695"></a><a class="code" href="classFLAC_1_1Metadata_1_1CueSheet.html#z28_2">00695</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
-00697
-00698 <font class="keyword">const</font> <font class="keywordtype">char</font> *get_media_catalog_number() <font class="keyword">const</font>;
-00699 FLAC__uint64 get_lead_in() <font class="keyword">const</font>;
-00700 <font class="keywordtype">bool</font> get_is_cd() <font class="keyword">const</font>;
-00701
-00702 <font class="keywordtype">unsigned</font> get_num_tracks() <font class="keyword">const</font>;
-00703 Track get_track(<font class="keywordtype">unsigned</font> i) <font class="keyword">const</font>;
-00704
-00705 <font class="keywordtype">void</font> set_media_catalog_number(<font class="keyword">const</font> <font class="keywordtype">char</font> value[128]);
-00706 <font class="keywordtype">void</font> set_lead_in(FLAC__uint64 value);
-00707 <font class="keywordtype">void</font> set_is_cd(<font class="keywordtype">bool</font> value);
-00708
-00709 <font class="keywordtype">void</font> set_index(<font class="keywordtype">unsigned</font> track_num, <font class="keywordtype">unsigned</font> index_num, <font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata__CueSheet__Index.html">FLAC__StreamMetadata_CueSheet_Index</a> &index);
-00710
-00712 <font class="keywordtype">bool</font> insert_index(<font class="keywordtype">unsigned</font> track_num, <font class="keywordtype">unsigned</font> index_num, <font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata__CueSheet__Index.html">FLAC__StreamMetadata_CueSheet_Index</a> &index);
-00713
-00715 <font class="keywordtype">bool</font> delete_index(<font class="keywordtype">unsigned</font> track_num, <font class="keywordtype">unsigned</font> index_num);
+00693 <font class="keyword">inline</font> const ::FLAC__StreamMetadata_CueSheet_Track *get_track()<font class="keyword"> const </font>{ <font class="keywordflow">return</font> object_; }
+00694
+00695 <font class="keyword">inline</font> <font class="keywordtype">void</font> set_offset(FLAC__uint64 value) { object_->offset = value; }
+00696 <font class="keyword">inline</font> <font class="keywordtype">void</font> set_number(FLAC__byte value) { object_->number = value; }
+00697 <font class="keywordtype">void</font> set_isrc(<font class="keyword">const</font> <font class="keywordtype">char</font> value[12]);
+00698 <font class="keywordtype">void</font> set_type(<font class="keywordtype">unsigned</font> value);
+00699 <font class="keyword">inline</font> <font class="keywordtype">void</font> set_pre_emphasis(<font class="keywordtype">bool</font> value) { object_->pre_emphasis = value? 1 : 0; }
+00700
+00701 <font class="keywordtype">void</font> set_index(<font class="keywordtype">unsigned</font> i, <font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata__CueSheet__Index.html">FLAC__StreamMetadata_CueSheet_Index</a> &index);
+00702 <font class="comment">//@@@ It's awkward but to insert/delete index points</font>
+00703 <font class="comment">//@@@ you must use the routines in the CueSheet class.</font>
+00704 };
+00705
+00706 CueSheet();
+00707
+00709
+<a name="l00712"></a><a class="code" href="classFLAC_1_1Metadata_1_1CueSheet.html#z25_0">00712</a> <font class="keyword">inline</font> CueSheet(<font class="keyword">const</font> CueSheet &object): Prototype(object) { }
+<a name="l00713"></a><a class="code" href="classFLAC_1_1Metadata_1_1CueSheet.html#z25_1">00713</a> <font class="keyword">inline</font> CueSheet(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object): Prototype(object) { }
+<a name="l00714"></a><a class="code" href="classFLAC_1_1Metadata_1_1CueSheet.html#z25_2">00714</a> <font class="keyword">inline</font> CueSheet(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object): Prototype(object) { }
00716
-00718 <font class="keywordtype">bool</font> set_track(<font class="keywordtype">unsigned</font> i, <font class="keyword">const</font> Track &track);
-00719
-00721 <font class="keywordtype">bool</font> insert_track(<font class="keywordtype">unsigned</font> i, <font class="keyword">const</font> Track &track);
-00722
-00724 <font class="keywordtype">bool</font> delete_track(<font class="keywordtype">unsigned</font> i);
+<a name="l00720"></a><a class="code" href="classFLAC_1_1Metadata_1_1CueSheet.html#a1">00720</a> <font class="keyword">inline</font> CueSheet(::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">bool</font> copy): Prototype(object, copy) { }
+00721
+00722 ~CueSheet();
+00723
00725
-00727 <font class="keywordtype">bool</font> is_legal(<font class="keywordtype">bool</font> check_cd_da_subset = <font class="keyword">false</font>, <font class="keyword">const</font> <font class="keywordtype">char</font> **violation = 0) <font class="keyword">const</font>;
-00728 };
-00729
-<a name="l00735"></a><a class="code" href="classFLAC_1_1Metadata_1_1Unknown.html">00735</a> <font class="keyword">class </font>FLACPP_API Unknown : <font class="keyword">public</font> Prototype {
-00736 <font class="keyword">public</font>:
-00737 Unknown();
-00738 <font class="comment">//</font>
-00740 <font class="comment"> /** Constructs a copy of the given object. This form</font>
-00741 * always performs a deep copy.
-00742 */
-<a name="l00743"></a><a class="code" href="classFLAC_1_1Metadata_1_1Unknown.html#z29_0">00743</a> <font class="keyword">inline</font> Unknown(<font class="keyword">const</font> Unknown &object): Prototype(object) { }
-<a name="l00744"></a><a class="code" href="classFLAC_1_1Metadata_1_1Unknown.html#z29_1">00744</a> <font class="keyword">inline</font> Unknown(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object): Prototype(object) { }
-<a name="l00745"></a><a class="code" href="classFLAC_1_1Metadata_1_1Unknown.html#z29_2">00745</a> <font class="keyword">inline</font> Unknown(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object): Prototype(object) { }
-00747
-<a name="l00751"></a><a class="code" href="classFLAC_1_1Metadata_1_1Unknown.html#a1">00751</a> <font class="keyword">inline</font> Unknown(::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">bool</font> copy): Prototype(object, copy) { }
-00752
-00753 ~Unknown();
-00754
+<a name="l00726"></a><a class="code" href="classFLAC_1_1Metadata_1_1CueSheet.html#z26_0">00726</a> <font class="keyword">inline</font> CueSheet &operator=(<font class="keyword">const</font> CueSheet &object) { Prototype::operator=(object); <font class="keywordflow">return</font> *<font class="keyword">this</font>; }
+<a name="l00727"></a><a class="code" href="classFLAC_1_1Metadata_1_1CueSheet.html#z26_1">00727</a> <font class="keyword">inline</font> CueSheet &operator=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object) { Prototype::operator=(object); <font class="keywordflow">return</font> *<font class="keyword">this</font>; }
+<a name="l00728"></a><a class="code" href="classFLAC_1_1Metadata_1_1CueSheet.html#z26_2">00728</a> <font class="keyword">inline</font> CueSheet &operator=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object) { Prototype::operator=(object); <font class="keywordflow">return</font> *<font class="keyword">this</font>; }
+00730
+<a name="l00734"></a><a class="code" href="classFLAC_1_1Metadata_1_1CueSheet.html#a3">00734</a> <font class="keyword">inline</font> CueSheet &assign(::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">bool</font> copy) { Prototype::assign_object(object, copy); <font class="keywordflow">return</font> *<font class="keyword">this</font>; }
+00735
+00737
+<a name="l00738"></a><a class="code" href="classFLAC_1_1Metadata_1_1CueSheet.html#z27_0">00738</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> CueSheet &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
+<a name="l00739"></a><a class="code" href="classFLAC_1_1Metadata_1_1CueSheet.html#z27_1">00739</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
+<a name="l00740"></a><a class="code" href="classFLAC_1_1Metadata_1_1CueSheet.html#z27_2">00740</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
+00742
+00744
+<a name="l00745"></a><a class="code" href="classFLAC_1_1Metadata_1_1CueSheet.html#z28_0">00745</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> CueSheet &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
+<a name="l00746"></a><a class="code" href="classFLAC_1_1Metadata_1_1CueSheet.html#z28_1">00746</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
+<a name="l00747"></a><a class="code" href="classFLAC_1_1Metadata_1_1CueSheet.html#z28_2">00747</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
+00749
+00750 <font class="keyword">const</font> <font class="keywordtype">char</font> *get_media_catalog_number() <font class="keyword">const</font>;
+00751 FLAC__uint64 get_lead_in() <font class="keyword">const</font>;
+00752 <font class="keywordtype">bool</font> get_is_cd() <font class="keyword">const</font>;
+00753
+00754 <font class="keywordtype">unsigned</font> get_num_tracks() <font class="keyword">const</font>;
+00755 Track get_track(<font class="keywordtype">unsigned</font> i) <font class="keyword">const</font>;
00756
-<a name="l00757"></a><a class="code" href="classFLAC_1_1Metadata_1_1Unknown.html#z30_0">00757</a> <font class="keyword">inline</font> <font class="keywordtype">void</font> operator=(<font class="keyword">const</font> Unknown &object) { Prototype::operator=(object); }
-<a name="l00758"></a><a class="code" href="classFLAC_1_1Metadata_1_1Unknown.html#z30_1">00758</a> <font class="keyword">inline</font> <font class="keywordtype">void</font> operator=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object) { Prototype::operator=(object); }
-<a name="l00759"></a><a class="code" href="classFLAC_1_1Metadata_1_1Unknown.html#z30_2">00759</a> <font class="keyword">inline</font> <font class="keywordtype">void</font> operator=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object) { Prototype::operator=(object); }
-00761
-00763
-<a name="l00764"></a><a class="code" href="classFLAC_1_1Metadata_1_1Unknown.html#z31_0">00764</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> Unknown &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
-<a name="l00765"></a><a class="code" href="classFLAC_1_1Metadata_1_1Unknown.html#z31_1">00765</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
-<a name="l00766"></a><a class="code" href="classFLAC_1_1Metadata_1_1Unknown.html#z31_2">00766</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
+00757 <font class="keywordtype">void</font> set_media_catalog_number(<font class="keyword">const</font> <font class="keywordtype">char</font> value[128]);
+00758 <font class="keywordtype">void</font> set_lead_in(FLAC__uint64 value);
+00759 <font class="keywordtype">void</font> set_is_cd(<font class="keywordtype">bool</font> value);
+00760
+00761 <font class="keywordtype">void</font> set_index(<font class="keywordtype">unsigned</font> track_num, <font class="keywordtype">unsigned</font> index_num, <font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata__CueSheet__Index.html">FLAC__StreamMetadata_CueSheet_Index</a> &index);
+00762
+00764 <font class="keywordtype">bool</font> insert_index(<font class="keywordtype">unsigned</font> track_num, <font class="keywordtype">unsigned</font> index_num, <font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata__CueSheet__Index.html">FLAC__StreamMetadata_CueSheet_Index</a> &index);
+00765
+00767 <font class="keywordtype">bool</font> delete_index(<font class="keywordtype">unsigned</font> track_num, <font class="keywordtype">unsigned</font> index_num);
00768
-00770
-<a name="l00771"></a><a class="code" href="classFLAC_1_1Metadata_1_1Unknown.html#z32_0">00771</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> Unknown &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
-<a name="l00772"></a><a class="code" href="classFLAC_1_1Metadata_1_1Unknown.html#z32_1">00772</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
-<a name="l00773"></a><a class="code" href="classFLAC_1_1Metadata_1_1Unknown.html#z32_2">00773</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
-00775
-00776 <font class="keyword">const</font> FLAC__byte *get_data() <font class="keyword">const</font>;
+00770 <font class="keywordtype">bool</font> set_track(<font class="keywordtype">unsigned</font> i, <font class="keyword">const</font> Track &track);
+00771
+00773 <font class="keywordtype">bool</font> insert_track(<font class="keywordtype">unsigned</font> i, <font class="keyword">const</font> Track &track);
+00774
+00776 <font class="keywordtype">bool</font> delete_track(<font class="keywordtype">unsigned</font> i);
00777
-00779 <font class="keywordtype">bool</font> set_data(<font class="keyword">const</font> FLAC__byte *data, <font class="keywordtype">unsigned</font> length);
-00780 <font class="keywordtype">bool</font> set_data(FLAC__byte *data, <font class="keywordtype">unsigned</font> length, <font class="keywordtype">bool</font> copy);
-00781 };
-00782
-00783 <font class="comment">/* \} */</font>
-00784
-00785
-00798
-00799 FLACPP_API <font class="keywordtype">bool</font> get_streaminfo(<font class="keyword">const</font> <font class="keywordtype">char</font> *filename, StreamInfo &streaminfo);
-00800 <font class="comment">//</font>
-00802 <font class="comment"> FLACPP_API bool get_tags(const char *filename, VorbisComment *&tags);</font>
-00803
-00804 <font class="comment">/* \} */</font>
-00805
+00779 <font class="keywordtype">bool</font> is_legal(<font class="keywordtype">bool</font> check_cd_da_subset = <font class="keyword">false</font>, <font class="keyword">const</font> <font class="keywordtype">char</font> **violation = 0) <font class="keyword">const</font>;
+00780 };
+00781
+<a name="l00787"></a><a class="code" href="classFLAC_1_1Metadata_1_1Unknown.html">00787</a> <font class="keyword">class </font>FLACPP_API Unknown : <font class="keyword">public</font> Prototype {
+00788 <font class="keyword">public</font>:
+00789 Unknown();
+00790 <font class="comment">//</font>
+00792 <font class="comment"> /** Constructs a copy of the given object. This form</font>
+00793 * always performs a deep copy.
+00794 */
+<a name="l00795"></a><a class="code" href="classFLAC_1_1Metadata_1_1Unknown.html#z29_0">00795</a> <font class="keyword">inline</font> Unknown(<font class="keyword">const</font> Unknown &object): Prototype(object) { }
+<a name="l00796"></a><a class="code" href="classFLAC_1_1Metadata_1_1Unknown.html#z29_1">00796</a> <font class="keyword">inline</font> Unknown(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object): Prototype(object) { }
+<a name="l00797"></a><a class="code" href="classFLAC_1_1Metadata_1_1Unknown.html#z29_2">00797</a> <font class="keyword">inline</font> Unknown(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object): Prototype(object) { }
+00799
+<a name="l00803"></a><a class="code" href="classFLAC_1_1Metadata_1_1Unknown.html#a1">00803</a> <font class="keyword">inline</font> Unknown(::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">bool</font> copy): Prototype(object, copy) { }
+00804
+00805 ~Unknown();
00806
-<a name="l00839"></a><a class="code" href="classFLAC_1_1Metadata_1_1SimpleIterator.html">00839</a> <font class="keyword">class </font>FLACPP_API SimpleIterator {
-00840 <font class="keyword">public</font>:
-00841 <font class="keyword">class </font>FLACPP_API Status {
-00842 <font class="keyword">public</font>:
-00843 <font class="keyword">inline</font> Status(::<a class="code" href="metadata_8h.html#a14">FLAC__Metadata_SimpleIteratorStatus</a> status): status_(status) { }
-00844 <font class="keyword">inline</font> <a class="code" href="metadata_8h.html#a14">operator ::FLAC__Metadata_SimpleIteratorStatus</a>()<font class="keyword"> const </font>{ <font class="keywordflow">return</font> status_; }
-00845 <font class="keyword">inline</font> <font class="keyword">const</font> <font class="keywordtype">char</font> *as_cstring()<font class="keyword"> const </font>{ return ::FLAC__Metadata_SimpleIteratorStatusString[status_]; }
-00846 <font class="keyword">protected</font>:
-00847 ::FLAC__Metadata_SimpleIteratorStatus status_;
-00848 };
-00849
-00850 SimpleIterator();
-00851 <font class="keyword">virtual</font> ~SimpleIterator();
-00852
-00853 <font class="keywordtype">bool</font> init(<font class="keyword">const</font> <font class="keywordtype">char</font> *filename, <font class="keywordtype">bool</font> read_only, <font class="keywordtype">bool</font> preserve_file_stats);
-00854
-00855 <font class="keywordtype">bool</font> is_valid() <font class="keyword">const</font>;
-00856 Status status();
-00857 <font class="keywordtype">bool</font> is_writable() <font class="keyword">const</font>;
-00858
-00859 <font class="keywordtype">bool</font> next();
-00860 <font class="keywordtype">bool</font> prev();
+00808
+<a name="l00809"></a><a class="code" href="classFLAC_1_1Metadata_1_1Unknown.html#z30_0">00809</a> <font class="keyword">inline</font> Unknown &operator=(<font class="keyword">const</font> Unknown &object) { Prototype::operator=(object); <font class="keywordflow">return</font> *<font class="keyword">this</font>; }
+<a name="l00810"></a><a class="code" href="classFLAC_1_1Metadata_1_1Unknown.html#z30_1">00810</a> <font class="keyword">inline</font> Unknown &operator=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object) { Prototype::operator=(object); <font class="keywordflow">return</font> *<font class="keyword">this</font>; }
+<a name="l00811"></a><a class="code" href="classFLAC_1_1Metadata_1_1Unknown.html#z30_2">00811</a> <font class="keyword">inline</font> Unknown &operator=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object) { Prototype::operator=(object); <font class="keywordflow">return</font> *<font class="keyword">this</font>; }
+00813
+<a name="l00817"></a><a class="code" href="classFLAC_1_1Metadata_1_1Unknown.html#a3">00817</a> <font class="keyword">inline</font> Unknown &assign(::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">bool</font> copy) { Prototype::assign_object(object, copy); <font class="keywordflow">return</font> *<font class="keyword">this</font>; }
+00818
+00820
+<a name="l00821"></a><a class="code" href="classFLAC_1_1Metadata_1_1Unknown.html#z31_0">00821</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> Unknown &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
+<a name="l00822"></a><a class="code" href="classFLAC_1_1Metadata_1_1Unknown.html#z31_1">00822</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
+<a name="l00823"></a><a class="code" href="classFLAC_1_1Metadata_1_1Unknown.html#z31_2">00823</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator==(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator==(object); }
+00825
+00827
+<a name="l00828"></a><a class="code" href="classFLAC_1_1Metadata_1_1Unknown.html#z32_0">00828</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> Unknown &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
+<a name="l00829"></a><a class="code" href="classFLAC_1_1Metadata_1_1Unknown.html#z32_1">00829</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> &object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
+<a name="l00830"></a><a class="code" href="classFLAC_1_1Metadata_1_1Unknown.html#z32_2">00830</a> <font class="keyword">inline</font> <font class="keywordtype">bool</font> operator!=(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)<font class="keyword"> const </font>{ <font class="keywordflow">return</font> Prototype::operator!=(object); }
+00832
+00833 <font class="keyword">const</font> FLAC__byte *get_data() <font class="keyword">const</font>;
+00834
+00836 <font class="keywordtype">bool</font> set_data(<font class="keyword">const</font> FLAC__byte *data, <font class="keywordtype">unsigned</font> length);
+00837 <font class="keywordtype">bool</font> set_data(FLAC__byte *data, <font class="keywordtype">unsigned</font> length, <font class="keywordtype">bool</font> copy);
+00838 };
+00839
+00840 <font class="comment">/* \} */</font>
+00841
+00842
+00855
+00856 FLACPP_API <font class="keywordtype">bool</font> get_streaminfo(<font class="keyword">const</font> <font class="keywordtype">char</font> *filename, StreamInfo &streaminfo);
+00857
+00859 FLACPP_API <font class="keywordtype">bool</font> get_tags(<font class="keyword">const</font> <font class="keywordtype">char</font> *filename, VorbisComment *&tags);
+00860 FLACPP_API <font class="keywordtype">bool</font> get_tags(<font class="keyword">const</font> <font class="keywordtype">char</font> *filename, VorbisComment &tags);
00861
-00862 ::FLAC__MetadataType get_block_type() <font class="keyword">const</font>;
-00863 Prototype *get_block();
-00864 <font class="keywordtype">bool</font> set_block(Prototype *block, <font class="keywordtype">bool</font> use_padding = <font class="keyword">true</font>);
-00865 <font class="keywordtype">bool</font> insert_block_after(Prototype *block, <font class="keywordtype">bool</font> use_padding = <font class="keyword">true</font>);
-00866 <font class="keywordtype">bool</font> delete_block(<font class="keywordtype">bool</font> use_padding = <font class="keyword">true</font>);
-00867
-00868 <font class="keyword">protected</font>:
-00869 ::FLAC__Metadata_SimpleIterator *iterator_;
-00870 <font class="keywordtype">void</font> clear();
-00871 };
-00872
-00873 <font class="comment">/* \} */</font>
-00874
-00875
-<a name="l00916"></a><a class="code" href="classFLAC_1_1Metadata_1_1Chain.html">00916</a> <font class="keyword">class </font>FLACPP_API Chain {
-00917 <font class="keyword">public</font>:
-00918 <font class="keyword">class </font>FLACPP_API Status {
-00919 <font class="keyword">public</font>:
-00920 <font class="keyword">inline</font> Status(::<a class="code" href="metadata_8h.html#a25">FLAC__Metadata_ChainStatus</a> status): status_(status) { }
-00921 <font class="keyword">inline</font> <a class="code" href="metadata_8h.html#a25">operator ::FLAC__Metadata_ChainStatus</a>()<font class="keyword"> const </font>{ <font class="keywordflow">return</font> status_; }
-00922 <font class="keyword">inline</font> <font class="keyword">const</font> <font class="keywordtype">char</font> *as_cstring()<font class="keyword"> const </font>{ return ::FLAC__Metadata_ChainStatusString[status_]; }
-00923 <font class="keyword">protected</font>:
-00924 ::FLAC__Metadata_ChainStatus status_;
-00925 };
-00926
-00927 Chain();
-00928 <font class="keyword">virtual</font> ~Chain();
-00929
-00930 <font class="keyword">friend</font> <font class="keyword">class </font>Iterator;
-00931
-00932 <font class="keywordtype">bool</font> is_valid() <font class="keyword">const</font>;
-00933 Status status();
-00934
-00935 <font class="keywordtype">bool</font> read(<font class="keyword">const</font> <font class="keywordtype">char</font> *filename);
-00936 <font class="keywordtype">bool</font> read(FLAC__IOHandle handle, <a class="code" href="structFLAC____IOCallbacks.html">FLAC__IOCallbacks</a> callbacks);
-00937
-00938 <font class="keywordtype">bool</font> check_if_tempfile_needed(<font class="keywordtype">bool</font> use_padding);
-00939
-00940 <font class="keywordtype">bool</font> write(<font class="keywordtype">bool</font> use_padding = <font class="keyword">true</font>, <font class="keywordtype">bool</font> preserve_file_stats = <font class="keyword">false</font>);
-00941 <font class="keywordtype">bool</font> write(<font class="keywordtype">bool</font> use_padding, ::FLAC__IOHandle handle, ::<a class="code" href="structFLAC____IOCallbacks.html">FLAC__IOCallbacks</a> callbacks);
-00942 <font class="keywordtype">bool</font> write(<font class="keywordtype">bool</font> use_padding, ::FLAC__IOHandle handle, ::<a class="code" href="structFLAC____IOCallbacks.html">FLAC__IOCallbacks</a> callbacks, ::FLAC__IOHandle temp_handle, ::<a class="code" href="structFLAC____IOCallbacks.html">FLAC__IOCallbacks</a> temp_callbacks);
-00943
-00944 <font class="keywordtype">void</font> merge_padding();
-00945 <font class="keywordtype">void</font> sort_padding();
-00946
-00947 <font class="keyword">protected</font>:
-00948 ::FLAC__Metadata_Chain *chain_;
-00949 <font class="keyword">virtual</font> <font class="keywordtype">void</font> clear();
-00950 };
-00951
-<a name="l00955"></a><a class="code" href="classFLAC_1_1Metadata_1_1Iterator.html">00955</a> <font class="keyword">class </font>FLACPP_API Iterator {
-00956 <font class="keyword">public</font>:
-00957 Iterator();
-00958 <font class="keyword">virtual</font> ~Iterator();
-00959
-00960 <font class="keywordtype">bool</font> is_valid() <font class="keyword">const</font>;
-00961
-00962 <font class="keywordtype">void</font> init(Chain &chain);
-00963
-00964 <font class="keywordtype">bool</font> next();
-00965 <font class="keywordtype">bool</font> prev();
-00966
-00967 ::FLAC__MetadataType get_block_type() <font class="keyword">const</font>;
-00968 Prototype *get_block();
-00969 <font class="keywordtype">bool</font> set_block(Prototype *block);
-00970 <font class="keywordtype">bool</font> delete_block(<font class="keywordtype">bool</font> replace_with_padding);
-00971 <font class="keywordtype">bool</font> insert_block_before(Prototype *block);
-00972 <font class="keywordtype">bool</font> insert_block_after(Prototype *block);
-00973
-00974 <font class="keyword">protected</font>:
-00975 ::FLAC__Metadata_Iterator *iterator_;
-00976 <font class="keyword">virtual</font> <font class="keywordtype">void</font> clear();
-00977 };
-00978
-00979 <font class="comment">/* \} */</font>
-00980
-00981 };
-00982 };
-00983
-00984 <font class="preprocessor">#endif</font>
-</pre></div><hr><address><small>Generated on Tue Sep 28 21:19:41 2004 for FLAC by
+00862 <font class="comment">/* \} */</font>
+00863
+00864
+<a name="l00897"></a><a class="code" href="classFLAC_1_1Metadata_1_1SimpleIterator.html">00897</a> <font class="keyword">class </font>FLACPP_API SimpleIterator {
+00898 <font class="keyword">public</font>:
+00899 <font class="keyword">class </font>FLACPP_API Status {
+00900 <font class="keyword">public</font>:
+00901 <font class="keyword">inline</font> Status(::<a class="code" href="metadata_8h.html#a14">FLAC__Metadata_SimpleIteratorStatus</a> status): status_(status) { }
+00902 <font class="keyword">inline</font> <a class="code" href="metadata_8h.html#a14">operator ::FLAC__Metadata_SimpleIteratorStatus</a>()<font class="keyword"> const </font>{ <font class="keywordflow">return</font> status_; }
+00903 <font class="keyword">inline</font> <font class="keyword">const</font> <font class="keywordtype">char</font> *as_cstring()<font class="keyword"> const </font>{ return ::FLAC__Metadata_SimpleIteratorStatusString[status_]; }
+00904 <font class="keyword">protected</font>:
+00905 ::FLAC__Metadata_SimpleIteratorStatus status_;
+00906 };
+00907
+00908 SimpleIterator();
+00909 <font class="keyword">virtual</font> ~SimpleIterator();
+00910
+00911 <font class="keywordtype">bool</font> init(<font class="keyword">const</font> <font class="keywordtype">char</font> *filename, <font class="keywordtype">bool</font> read_only, <font class="keywordtype">bool</font> preserve_file_stats);
+00912
+00913 <font class="keywordtype">bool</font> is_valid() <font class="keyword">const</font>;
+00914 Status status();
+00915 <font class="keywordtype">bool</font> is_writable() <font class="keyword">const</font>;
+00916
+00917 <font class="keywordtype">bool</font> next();
+00918 <font class="keywordtype">bool</font> prev();
+00919
+00920 ::FLAC__MetadataType get_block_type() <font class="keyword">const</font>;
+00921 Prototype *get_block();
+00922 <font class="keywordtype">bool</font> set_block(Prototype *block, <font class="keywordtype">bool</font> use_padding = <font class="keyword">true</font>);
+00923 <font class="keywordtype">bool</font> insert_block_after(Prototype *block, <font class="keywordtype">bool</font> use_padding = <font class="keyword">true</font>);
+00924 <font class="keywordtype">bool</font> delete_block(<font class="keywordtype">bool</font> use_padding = <font class="keyword">true</font>);
+00925
+00926 <font class="keyword">protected</font>:
+00927 ::FLAC__Metadata_SimpleIterator *iterator_;
+00928 <font class="keywordtype">void</font> clear();
+00929 };
+00930
+00931 <font class="comment">/* \} */</font>
+00932
+00933
+<a name="l00974"></a><a class="code" href="classFLAC_1_1Metadata_1_1Chain.html">00974</a> <font class="keyword">class </font>FLACPP_API Chain {
+00975 <font class="keyword">public</font>:
+00976 <font class="keyword">class </font>FLACPP_API Status {
+00977 <font class="keyword">public</font>:
+00978 <font class="keyword">inline</font> Status(::<a class="code" href="metadata_8h.html#a25">FLAC__Metadata_ChainStatus</a> status): status_(status) { }
+00979 <font class="keyword">inline</font> <a class="code" href="metadata_8h.html#a25">operator ::FLAC__Metadata_ChainStatus</a>()<font class="keyword"> const </font>{ <font class="keywordflow">return</font> status_; }
+00980 <font class="keyword">inline</font> <font class="keyword">const</font> <font class="keywordtype">char</font> *as_cstring()<font class="keyword"> const </font>{ return ::FLAC__Metadata_ChainStatusString[status_]; }
+00981 <font class="keyword">protected</font>:
+00982 ::FLAC__Metadata_ChainStatus status_;
+00983 };
+00984
+00985 Chain();
+00986 <font class="keyword">virtual</font> ~Chain();
+00987
+00988 <font class="keyword">friend</font> <font class="keyword">class </font>Iterator;
+00989
+00990 <font class="keywordtype">bool</font> is_valid() <font class="keyword">const</font>;
+00991 Status status();
+00992
+00993 <font class="keywordtype">bool</font> read(<font class="keyword">const</font> <font class="keywordtype">char</font> *filename);
+00994 <font class="keywordtype">bool</font> read(FLAC__IOHandle handle, <a class="code" href="structFLAC____IOCallbacks.html">FLAC__IOCallbacks</a> callbacks);
+00995
+00996 <font class="keywordtype">bool</font> check_if_tempfile_needed(<font class="keywordtype">bool</font> use_padding);
+00997
+00998 <font class="keywordtype">bool</font> write(<font class="keywordtype">bool</font> use_padding = <font class="keyword">true</font>, <font class="keywordtype">bool</font> preserve_file_stats = <font class="keyword">false</font>);
+00999 <font class="keywordtype">bool</font> write(<font class="keywordtype">bool</font> use_padding, ::FLAC__IOHandle handle, ::<a class="code" href="structFLAC____IOCallbacks.html">FLAC__IOCallbacks</a> callbacks);
+01000 <font class="keywordtype">bool</font> write(<font class="keywordtype">bool</font> use_padding, ::FLAC__IOHandle handle, ::<a class="code" href="structFLAC____IOCallbacks.html">FLAC__IOCallbacks</a> callbacks, ::FLAC__IOHandle temp_handle, ::<a class="code" href="structFLAC____IOCallbacks.html">FLAC__IOCallbacks</a> temp_callbacks);
+01001
+01002 <font class="keywordtype">void</font> merge_padding();
+01003 <font class="keywordtype">void</font> sort_padding();
+01004
+01005 <font class="keyword">protected</font>:
+01006 ::FLAC__Metadata_Chain *chain_;
+01007 <font class="keyword">virtual</font> <font class="keywordtype">void</font> clear();
+01008 };
+01009
+<a name="l01013"></a><a class="code" href="classFLAC_1_1Metadata_1_1Iterator.html">01013</a> <font class="keyword">class </font>FLACPP_API Iterator {
+01014 <font class="keyword">public</font>:
+01015 Iterator();
+01016 <font class="keyword">virtual</font> ~Iterator();
+01017
+01018 <font class="keywordtype">bool</font> is_valid() <font class="keyword">const</font>;
+01019
+01020 <font class="keywordtype">void</font> init(Chain &chain);
+01021
+01022 <font class="keywordtype">bool</font> next();
+01023 <font class="keywordtype">bool</font> prev();
+01024
+01025 ::FLAC__MetadataType get_block_type() <font class="keyword">const</font>;
+01026 Prototype *get_block();
+01027 <font class="keywordtype">bool</font> set_block(Prototype *block);
+01028 <font class="keywordtype">bool</font> delete_block(<font class="keywordtype">bool</font> replace_with_padding);
+01029 <font class="keywordtype">bool</font> insert_block_before(Prototype *block);
+01030 <font class="keywordtype">bool</font> insert_block_after(Prototype *block);
+01031
+01032 <font class="keyword">protected</font>:
+01033 ::FLAC__Metadata_Iterator *iterator_;
+01034 <font class="keyword">virtual</font> <font class="keywordtype">void</font> clear();
+01035 };
+01036
+01037 <font class="comment">/* \} */</font>
+01038
+01039 }
+01040 }
+01041
+01042 <font class="preprocessor">#endif</font>
+</pre></div><hr><address><small>Generated on Fri Feb 4 18:39:10 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/+_2metadata_8h.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/+_2metadata_8h.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/+_2metadata_8h.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -27,7 +27,7 @@
<p>
See the detailed documentation for each interface in the <a class="el" href="group__flacpp__metadata.html">metadata</a> module.
<p>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:12 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC++_2all_8h-source.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC++_2all_8h-source.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC++_2all_8h-source.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,7 +7,7 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>include/FLAC++/all.h</h1><div class="fragment"><pre>00001 <font class="comment">/* libFLAC++ - Free Lossless Audio Codec library</font>
-00002 <font class="comment"> * Copyright (C) 2002,2003,2004 Josh Coalson</font>
+00002 <font class="comment"> * Copyright (C) 2002,2003,2004,2005 Josh Coalson</font>
00003 <font class="comment"> *</font>
00004 <font class="comment"> * Redistribution and use in source and binary forms, with or without</font>
00005 <font class="comment"> * modification, are permitted provided that the following conditions</font>
@@ -47,7 +47,7 @@
00039 <font class="preprocessor">#include "<a class="code" href="+_2metadata_8h.html">metadata.h</a>"</font>
00040
00053 <font class="preprocessor">#endif</font>
-</pre></div><hr><address><small>Generated on Tue Sep 28 21:19:41 2004 for FLAC by
+</pre></div><hr><address><small>Generated on Fri Feb 4 18:39:09 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC++_2decoder_8h-source.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC++_2decoder_8h-source.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC++_2decoder_8h-source.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,7 +7,7 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>include/FLAC++/decoder.h</h1><a href="FLAC++_2decoder_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <font class="comment">/* libFLAC++ - Free Lossless Audio Codec library</font>
-00002 <font class="comment"> * Copyright (C) 2002,2003,2004 Josh Coalson</font>
+00002 <font class="comment"> * Copyright (C) 2002,2003,2004,2005 Josh Coalson</font>
00003 <font class="comment"> *</font>
00004 <font class="comment"> * Redistribution and use in source and binary forms, with or without</font>
00005 <font class="comment"> * modification, are permitted provided that the following conditions</font>
@@ -74,10 +74,10 @@
00106 <font class="keywordtype">bool</font> is_valid() <font class="keyword">const</font>;
00107 <font class="keyword">inline</font> operator bool()<font class="keyword"> const </font>{ <font class="keywordflow">return</font> is_valid(); }
00108
-00109 <font class="keywordtype">bool</font> set_metadata_respond(::<a class="code" href="format_8h.html#a94">FLAC__MetadataType</a> type);
+00109 <font class="keywordtype">bool</font> set_metadata_respond(::<a class="code" href="format_8h.html#a97">FLAC__MetadataType</a> type);
00110 <font class="keywordtype">bool</font> set_metadata_respond_application(<font class="keyword">const</font> FLAC__byte id[4]);
00111 <font class="keywordtype">bool</font> set_metadata_respond_all();
-00112 <font class="keywordtype">bool</font> set_metadata_ignore(::<a class="code" href="format_8h.html#a94">FLAC__MetadataType</a> type);
+00112 <font class="keywordtype">bool</font> set_metadata_ignore(::<a class="code" href="format_8h.html#a97">FLAC__MetadataType</a> type);
00113 <font class="keywordtype">bool</font> set_metadata_ignore_application(<font class="keyword">const</font> FLAC__byte id[4]);
00114 <font class="keywordtype">bool</font> set_metadata_ignore_all();
00115
@@ -105,7 +105,7 @@
00141 <font class="keyword">virtual</font> <font class="keywordtype">void</font> metadata_callback(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *metadata) = 0;
00142 <font class="keyword">virtual</font> <font class="keywordtype">void</font> error_callback(::<a class="code" href="FLAC_2stream__decoder_8h.html#a39">FLAC__StreamDecoderErrorStatus</a> status) = 0;
00143
-00144 <font class="preprocessor">#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))</font>
+00144 <font class="preprocessor">#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)</font>
00145 <font class="preprocessor"></font> <font class="comment">// lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring()</font>
00146 <font class="keyword">friend</font> State;
00147 <font class="preprocessor">#endif</font>
@@ -148,10 +148,10 @@
00197 <font class="keyword">inline</font> operator bool()<font class="keyword"> const </font>{ <font class="keywordflow">return</font> is_valid(); }
00198
00199 <font class="keywordtype">bool</font> set_md5_checking(<font class="keywordtype">bool</font> value);
-00200 <font class="keywordtype">bool</font> set_metadata_respond(::<a class="code" href="format_8h.html#a94">FLAC__MetadataType</a> type);
+00200 <font class="keywordtype">bool</font> set_metadata_respond(::<a class="code" href="format_8h.html#a97">FLAC__MetadataType</a> type);
00201 <font class="keywordtype">bool</font> set_metadata_respond_application(<font class="keyword">const</font> FLAC__byte id[4]);
00202 <font class="keywordtype">bool</font> set_metadata_respond_all();
-00203 <font class="keywordtype">bool</font> set_metadata_ignore(::<a class="code" href="format_8h.html#a94">FLAC__MetadataType</a> type);
+00203 <font class="keywordtype">bool</font> set_metadata_ignore(::<a class="code" href="format_8h.html#a97">FLAC__MetadataType</a> type);
00204 <font class="keywordtype">bool</font> set_metadata_ignore_application(<font class="keyword">const</font> FLAC__byte id[4]);
00205 <font class="keywordtype">bool</font> set_metadata_ignore_all();
00206
@@ -187,7 +187,7 @@
00236 <font class="keyword">virtual</font> <font class="keywordtype">void</font> metadata_callback(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *metadata) = 0;
00237 <font class="keyword">virtual</font> <font class="keywordtype">void</font> error_callback(::<a class="code" href="FLAC_2stream__decoder_8h.html#a39">FLAC__StreamDecoderErrorStatus</a> status) = 0;
00238
-00239 <font class="preprocessor">#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))</font>
+00239 <font class="preprocessor">#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)</font>
00240 <font class="preprocessor"></font> <font class="comment">// lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring()</font>
00241 <font class="keyword">friend</font> State;
00242 <font class="preprocessor">#endif</font>
@@ -235,10 +235,10 @@
00297
00298 <font class="keywordtype">bool</font> set_md5_checking(<font class="keywordtype">bool</font> value);
00299 <font class="keywordtype">bool</font> set_filename(<font class="keyword">const</font> <font class="keywordtype">char</font> *value);
-00300 <font class="keywordtype">bool</font> set_metadata_respond(::<a class="code" href="format_8h.html#a94">FLAC__MetadataType</a> type);
+00300 <font class="keywordtype">bool</font> set_metadata_respond(::<a class="code" href="format_8h.html#a97">FLAC__MetadataType</a> type);
00301 <font class="keywordtype">bool</font> set_metadata_respond_application(<font class="keyword">const</font> FLAC__byte id[4]);
00302 <font class="keywordtype">bool</font> set_metadata_respond_all();
-00303 <font class="keywordtype">bool</font> set_metadata_ignore(::<a class="code" href="format_8h.html#a94">FLAC__MetadataType</a> type);
+00303 <font class="keywordtype">bool</font> set_metadata_ignore(::<a class="code" href="format_8h.html#a97">FLAC__MetadataType</a> type);
00304 <font class="keywordtype">bool</font> set_metadata_ignore_application(<font class="keyword">const</font> FLAC__byte id[4]);
00305 <font class="keywordtype">bool</font> set_metadata_ignore_all();
00306
@@ -267,7 +267,7 @@
00329 <font class="keyword">virtual</font> <font class="keywordtype">void</font> metadata_callback(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *metadata) = 0;
00330 <font class="keyword">virtual</font> <font class="keywordtype">void</font> error_callback(::<a class="code" href="FLAC_2stream__decoder_8h.html#a39">FLAC__StreamDecoderErrorStatus</a> status) = 0;
00331
-00332 <font class="preprocessor">#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))</font>
+00332 <font class="preprocessor">#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)</font>
00333 <font class="preprocessor"></font> <font class="comment">// lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring()</font>
00334 <font class="keyword">friend</font> State;
00335 <font class="preprocessor">#endif</font>
@@ -284,11 +284,11 @@
00346
00347 <font class="comment">/* \} */</font>
00348
-00349 };
-00350 };
+00349 }
+00350 }
00351
00352 <font class="preprocessor">#endif</font>
-</pre></div><hr><address><small>Generated on Tue Sep 28 21:19:40 2004 for FLAC by
+</pre></div><hr><address><small>Generated on Fri Feb 4 18:39:09 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC++_2decoder_8h.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC++_2decoder_8h.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC++_2decoder_8h.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -29,7 +29,7 @@
<p>
See the detailed documentation in the <a class="el" href="group__flacpp__decoder.html">decoder</a> module.
<p>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:11 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC++_2encoder_8h-source.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC++_2encoder_8h-source.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC++_2encoder_8h-source.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,7 +7,7 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>include/FLAC++/encoder.h</h1><a href="FLAC++_2encoder_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <font class="comment">/* libFLAC++ - Free Lossless Audio Codec library</font>
-00002 <font class="comment"> * Copyright (C) 2002,2003,2004 Josh Coalson</font>
+00002 <font class="comment"> * Copyright (C) 2002,2003,2004,2005 Josh Coalson</font>
00003 <font class="comment"> *</font>
00004 <font class="comment"> * Redistribution and use in source and binary forms, with or without</font>
00005 <font class="comment"> * modification, are permitted provided that the following conditions</font>
@@ -127,7 +127,7 @@
00159 virtual ::FLAC__StreamEncoderWriteStatus write_callback(<font class="keyword">const</font> FLAC__byte buffer[], <font class="keywordtype">unsigned</font> bytes, <font class="keywordtype">unsigned</font> samples, <font class="keywordtype">unsigned</font> current_frame) = 0;
00160 <font class="keyword">virtual</font> <font class="keywordtype">void</font> metadata_callback(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *metadata) = 0;
00161
-00162 <font class="preprocessor">#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))</font>
+00162 <font class="preprocessor">#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)</font>
00163 <font class="preprocessor"></font> <font class="comment">// lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring()</font>
00164 <font class="keyword">friend</font> State;
00165 <font class="preprocessor">#endif</font>
@@ -214,7 +214,7 @@
00259 virtual ::FLAC__SeekableStreamEncoderTellStatus tell_callback(FLAC__uint64 *absolute_byte_offset) = 0;
00260 virtual ::FLAC__StreamEncoderWriteStatus write_callback(<font class="keyword">const</font> FLAC__byte buffer[], <font class="keywordtype">unsigned</font> bytes, <font class="keywordtype">unsigned</font> samples, <font class="keywordtype">unsigned</font> current_frame) = 0;
00261
-00262 <font class="preprocessor">#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))</font>
+00262 <font class="preprocessor">#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)</font>
00263 <font class="preprocessor"></font> <font class="comment">// lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring()</font>
00264 <font class="keyword">friend</font> State;
00265 <font class="preprocessor">#endif</font>
@@ -302,7 +302,7 @@
00360 <font class="keyword">protected</font>:
00361 <font class="keyword">virtual</font> <font class="keywordtype">void</font> progress_callback(FLAC__uint64 bytes_written, FLAC__uint64 samples_written, <font class="keywordtype">unsigned</font> frames_written, <font class="keywordtype">unsigned</font> total_frames_estimate);
00362
-00363 <font class="preprocessor">#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))</font>
+00363 <font class="preprocessor">#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)</font>
00364 <font class="preprocessor"></font> <font class="comment">// lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring()</font>
00365 <font class="keyword">friend</font> State;
00366 <font class="preprocessor">#endif</font>
@@ -317,11 +317,11 @@
00375
00376 <font class="comment">/* \} */</font>
00377
-00378 };
-00379 };
+00378 }
+00379 }
00380
00381 <font class="preprocessor">#endif</font>
-</pre></div><hr><address><small>Generated on Tue Sep 28 21:19:41 2004 for FLAC by
+</pre></div><hr><address><small>Generated on Fri Feb 4 18:39:09 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC++_2encoder_8h.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC++_2encoder_8h.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC++_2encoder_8h.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -31,7 +31,7 @@
<p>
See the detailed documentation in the <a class="el" href="group__flacpp__encoder.html">encoder</a> module.
<p>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:11 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC++_2export_8h-source.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC++_2export_8h-source.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC++_2export_8h-source.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,7 +7,7 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>include/FLAC++/export.h</h1><div class="fragment"><pre>00001 <font class="comment">/* libFLAC++ - Free Lossless Audio Codec library</font>
-00002 <font class="comment"> * Copyright (C) 2002,2003,2004 Josh Coalson</font>
+00002 <font class="comment"> * Copyright (C) 2002,2003,2004,2005 Josh Coalson</font>
00003 <font class="comment"> *</font>
00004 <font class="comment"> * Redistribution and use in source and binary forms, with or without</font>
00005 <font class="comment"> * modification, are permitted provided that the following conditions</font>
@@ -53,7 +53,7 @@
00045 <font class="preprocessor">#endif</font>
00046 <font class="preprocessor"></font><font class="preprocessor">#endif</font>
00047 <font class="preprocessor"></font><font class="preprocessor">#endif</font>
-</pre></div><hr><address><small>Generated on Tue Sep 28 21:19:41 2004 for FLAC by
+</pre></div><hr><address><small>Generated on Fri Feb 4 18:39:10 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2all_8h-source.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2all_8h-source.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2all_8h-source.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,7 +7,7 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>include/FLAC/all.h</h1><div class="fragment"><pre>00001 <font class="comment">/* libFLAC - Free Lossless Audio Codec library</font>
-00002 <font class="comment"> * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson</font>
+00002 <font class="comment"> * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson</font>
00003 <font class="comment"> *</font>
00004 <font class="comment"> * Redistribution and use in source and binary forms, with or without</font>
00005 <font class="comment"> * modification, are permitted provided that the following conditions</font>
@@ -55,7 +55,7 @@
00047 <font class="preprocessor">#include "<a class="code" href="OggFLAC_2stream__encoder_8h.html">stream_encoder.h</a>"</font>
00048
00158 <font class="preprocessor">#endif</font>
-</pre></div><hr><address><small>Generated on Tue Sep 28 21:19:41 2004 for FLAC by
+</pre></div><hr><address><small>Generated on Fri Feb 4 18:39:09 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2export_8h-source.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2export_8h-source.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2export_8h-source.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,7 +7,7 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>include/FLAC/export.h</h1><div class="fragment"><pre>00001 <font class="comment">/* libFLAC - Free Lossless Audio Codec library</font>
-00002 <font class="comment"> * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson</font>
+00002 <font class="comment"> * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson</font>
00003 <font class="comment"> *</font>
00004 <font class="comment"> * Redistribution and use in source and binary forms, with or without</font>
00005 <font class="comment"> * modification, are permitted provided that the following conditions</font>
@@ -53,7 +53,7 @@
00045 <font class="preprocessor">#endif</font>
00046 <font class="preprocessor"></font><font class="preprocessor">#endif</font>
00047 <font class="preprocessor"></font><font class="preprocessor">#endif</font>
-</pre></div><hr><address><small>Generated on Tue Sep 28 21:19:41 2004 for FLAC by
+</pre></div><hr><address><small>Generated on Fri Feb 4 18:39:10 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2file__encoder_8h-source.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2file__encoder_8h-source.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2file__encoder_8h-source.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,7 +7,7 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>include/FLAC/file_encoder.h</h1><a href="FLAC_2file__encoder_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <font class="comment">/* libFLAC - Free Lossless Audio Codec library</font>
-00002 <font class="comment"> * Copyright (C) 2002,2003,2004 Josh Coalson</font>
+00002 <font class="comment"> * Copyright (C) 2002,2003,2004,2005 Josh Coalson</font>
00003 <font class="comment"> *</font>
00004 <font class="comment"> * Redistribution and use in source and binary forms, with or without</font>
00005 <font class="comment"> * modification, are permitted provided that the following conditions</font>
@@ -198,7 +198,7 @@
00869 <font class="preprocessor">#endif</font>
00870 <font class="preprocessor"></font>
00871 <font class="preprocessor">#endif</font>
-</pre></div><hr><address><small>Generated on Tue Sep 28 21:19:41 2004 for FLAC by
+</pre></div><hr><address><small>Generated on Fri Feb 4 18:39:10 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2file__encoder_8h.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2file__encoder_8h.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2file__encoder_8h.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -94,7 +94,7 @@
<p>
See the detailed documentation in the <a class="el" href="group__flac__file__encoder.html">file encoder</a> module.
<p>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:11 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2seekable__stream__encoder_8h-source.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2seekable__stream__encoder_8h-source.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2seekable__stream__encoder_8h-source.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,7 +7,7 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>include/FLAC/seekable_stream_encoder.h</h1><a href="FLAC_2seekable__stream__encoder_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <font class="comment">/* libFLAC - Free Lossless Audio Codec library</font>
-00002 <font class="comment"> * Copyright (C) 2002,2003,2004 Josh Coalson</font>
+00002 <font class="comment"> * Copyright (C) 2002,2003,2004,2005 Josh Coalson</font>
00003 <font class="comment"> *</font>
00004 <font class="comment"> * Redistribution and use in source and binary forms, with or without</font>
00005 <font class="comment"> * modification, are permitted provided that the following conditions</font>
@@ -223,7 +223,7 @@
00990 <font class="preprocessor">#endif</font>
00991 <font class="preprocessor"></font>
00992 <font class="preprocessor">#endif</font>
-</pre></div><hr><address><small>Generated on Tue Sep 28 21:19:41 2004 for FLAC by
+</pre></div><hr><address><small>Generated on Fri Feb 4 18:39:11 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2seekable__stream__encoder_8h.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2seekable__stream__encoder_8h.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2seekable__stream__encoder_8h.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -108,7 +108,7 @@
<p>
See the detailed documentation in the <a class="el" href="group__flac__seekable__stream__encoder.html">seekable stream encoder</a> module.
<p>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:12 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2stream__decoder_8h-source.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2stream__decoder_8h-source.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2stream__decoder_8h-source.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,7 +7,7 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>include/FLAC/stream_decoder.h</h1><a href="FLAC_2stream__decoder_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <font class="comment">/* libFLAC - Free Lossless Audio Codec library</font>
-00002 <font class="comment"> * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson</font>
+00002 <font class="comment"> * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson</font>
00003 <font class="comment"> *</font>
00004 <font class="comment"> * Redistribution and use in source and binary forms, with or without</font>
00005 <font class="comment"> * modification, are permitted provided that the following conditions</font>
@@ -144,13 +144,13 @@
00503
00516 FLAC_API FLAC__bool <a class="code" href="FLAC_2stream__decoder_8h.html#a14">FLAC__stream_decoder_set_client_data</a>(<a class="code" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder, <font class="keywordtype">void</font> *value);
00517
-00530 FLAC_API FLAC__bool <a class="code" href="FLAC_2stream__decoder_8h.html#a15">FLAC__stream_decoder_set_metadata_respond</a>(<a class="code" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder, <a class="code" href="format_8h.html#a94">FLAC__MetadataType</a> type);
+00530 FLAC_API FLAC__bool <a class="code" href="FLAC_2stream__decoder_8h.html#a15">FLAC__stream_decoder_set_metadata_respond</a>(<a class="code" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder, <a class="code" href="format_8h.html#a97">FLAC__MetadataType</a> type);
00531
00545 FLAC_API FLAC__bool <a class="code" href="FLAC_2stream__decoder_8h.html#a16">FLAC__stream_decoder_set_metadata_respond_application</a>(<a class="code" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder, <font class="keyword">const</font> FLAC__byte id[4]);
00546
00557 FLAC_API FLAC__bool <a class="code" href="FLAC_2stream__decoder_8h.html#a17">FLAC__stream_decoder_set_metadata_respond_all</a>(<a class="code" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder);
00558
-00571 FLAC_API FLAC__bool <a class="code" href="FLAC_2stream__decoder_8h.html#a18">FLAC__stream_decoder_set_metadata_ignore</a>(<a class="code" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder, <a class="code" href="format_8h.html#a94">FLAC__MetadataType</a> type);
+00571 FLAC_API FLAC__bool <a class="code" href="FLAC_2stream__decoder_8h.html#a18">FLAC__stream_decoder_set_metadata_ignore</a>(<a class="code" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder, <a class="code" href="format_8h.html#a97">FLAC__MetadataType</a> type);
00572
00586 FLAC_API FLAC__bool <a class="code" href="FLAC_2stream__decoder_8h.html#a19">FLAC__stream_decoder_set_metadata_ignore_application</a>(<a class="code" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder, <font class="keyword">const</font> FLAC__byte id[4]);
00587
@@ -162,7 +162,7 @@
00619
00630 FLAC_API <font class="keywordtype">unsigned</font> <a class="code" href="FLAC_2stream__decoder_8h.html#a23">FLAC__stream_decoder_get_channels</a>(<font class="keyword">const</font> <a class="code" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder);
00631
-00642 FLAC_API <a class="code" href="format_8h.html#a92">FLAC__ChannelAssignment</a> <a class="code" href="FLAC_2stream__decoder_8h.html#a24">FLAC__stream_decoder_get_channel_assignment</a>(<font class="keyword">const</font> <a class="code" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder);
+00642 FLAC_API <a class="code" href="format_8h.html#a95">FLAC__ChannelAssignment</a> <a class="code" href="FLAC_2stream__decoder_8h.html#a24">FLAC__stream_decoder_get_channel_assignment</a>(<font class="keyword">const</font> <a class="code" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder);
00643
00654 FLAC_API <font class="keywordtype">unsigned</font> <a class="code" href="FLAC_2stream__decoder_8h.html#a25">FLAC__stream_decoder_get_bits_per_sample</a>(<font class="keyword">const</font> <a class="code" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder);
00655
@@ -193,7 +193,7 @@
00871 <font class="preprocessor">#endif</font>
00872 <font class="preprocessor"></font>
00873 <font class="preprocessor">#endif</font>
-</pre></div><hr><address><small>Generated on Tue Sep 28 21:19:41 2004 for FLAC by
+</pre></div><hr><address><small>Generated on Fri Feb 4 18:39:11 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2stream__decoder_8h.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2stream__decoder_8h.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2stream__decoder_8h.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -57,16 +57,16 @@
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a12">FLAC__stream_decoder_set_metadata_callback</a> (<a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder, <a class="el" href="group__flac__stream__decoder.html#a6">FLAC__StreamDecoderMetadataCallback</a> value)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a13">FLAC__stream_decoder_set_error_callback</a> (<a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder, <a class="el" href="group__flac__stream__decoder.html#a7">FLAC__StreamDecoderErrorCallback</a> value)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a14">FLAC__stream_decoder_set_client_data</a> (<a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder, void *value)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a15">FLAC__stream_decoder_set_metadata_respond</a> (<a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder, <a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> type)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a15">FLAC__stream_decoder_set_metadata_respond</a> (<a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder, <a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> type)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a16">FLAC__stream_decoder_set_metadata_respond_application</a> (<a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder, const FLAC__byte id[4])</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a17">FLAC__stream_decoder_set_metadata_respond_all</a> (<a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a18">FLAC__stream_decoder_set_metadata_ignore</a> (<a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder, <a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> type)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a18">FLAC__stream_decoder_set_metadata_ignore</a> (<a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder, <a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> type)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a19">FLAC__stream_decoder_set_metadata_ignore_application</a> (<a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder, const FLAC__byte id[4])</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a20">FLAC__stream_decoder_set_metadata_ignore_all</a> (<a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top><a class="el" href="group__flac__stream__decoder.html#a36">FLAC__StreamDecoderState</a> </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a21">FLAC__stream_decoder_get_state</a> (const <a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>const char * </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a22">FLAC__stream_decoder_get_resolved_state_string</a> (const <a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>unsigned </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a23">FLAC__stream_decoder_get_channels</a> (const <a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder)</td></tr>
-<tr><td nowrap align=right valign=top><a class="el" href="group__flac__format.html#a92">FLAC__ChannelAssignment</a> </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a24">FLAC__stream_decoder_get_channel_assignment</a> (const <a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder)</td></tr>
+<tr><td nowrap align=right valign=top><a class="el" href="group__flac__format.html#a95">FLAC__ChannelAssignment</a> </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a24">FLAC__stream_decoder_get_channel_assignment</a> (const <a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>unsigned </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a25">FLAC__stream_decoder_get_bits_per_sample</a> (const <a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>unsigned </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a26">FLAC__stream_decoder_get_sample_rate</a> (const <a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>unsigned </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a27">FLAC__stream_decoder_get_blocksize</a> (const <a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder)</td></tr>
@@ -93,7 +93,7 @@
<p>
See the detailed documentation in the <a class="el" href="group__flac__stream__decoder.html">stream decoder</a> module.
<p>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:12 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2stream__encoder_8h-source.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2stream__encoder_8h-source.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2stream__encoder_8h-source.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,7 +7,7 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>include/FLAC/stream_encoder.h</h1><a href="FLAC_2stream__encoder_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <font class="comment">/* libFLAC - Free Lossless Audio Codec library</font>
-00002 <font class="comment"> * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson</font>
+00002 <font class="comment"> * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson</font>
00003 <font class="comment"> *</font>
00004 <font class="comment"> * Redistribution and use in source and binary forms, with or without</font>
00005 <font class="comment"> * modification, are permitted provided that the following conditions</font>
@@ -220,7 +220,7 @@
01062 <font class="preprocessor">#endif</font>
01063 <font class="preprocessor"></font>
01064 <font class="preprocessor">#endif</font>
-</pre></div><hr><address><small>Generated on Tue Sep 28 21:19:41 2004 for FLAC by
+</pre></div><hr><address><small>Generated on Fri Feb 4 18:39:11 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2stream__encoder_8h.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2stream__encoder_8h.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/FLAC_2stream__encoder_8h.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -116,7 +116,7 @@
<p>
See the detailed documentation in the <a class="el" href="group__flac__stream__encoder.html">stream encoder</a> module.
<p>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:12 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC++_2all_8h-source.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC++_2all_8h-source.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC++_2all_8h-source.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,7 +7,7 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>include/OggFLAC++/all.h</h1><div class="fragment"><pre>00001 <font class="comment">/* libOggFLAC++ - Free Lossless Audio Codec + Ogg library</font>
-00002 <font class="comment"> * Copyright (C) 2002,2003,2004 Josh Coalson</font>
+00002 <font class="comment"> * Copyright (C) 2002,2003,2004,2005 Josh Coalson</font>
00003 <font class="comment"> *</font>
00004 <font class="comment"> * Redistribution and use in source and binary forms, with or without</font>
00005 <font class="comment"> * modification, are permitted provided that the following conditions</font>
@@ -46,7 +46,7 @@
00038 <font class="preprocessor">#include "<a class="code" href="OggFLAC++_2decoder_8h.html">decoder.h</a>"</font>
00039
00047 <font class="preprocessor">#endif</font>
-</pre></div><hr><address><small>Generated on Tue Sep 28 21:19:41 2004 for FLAC by
+</pre></div><hr><address><small>Generated on Fri Feb 4 18:39:09 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC++_2decoder_8h-source.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC++_2decoder_8h-source.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC++_2decoder_8h-source.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,7 +7,7 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>include/OggFLAC++/decoder.h</h1><a href="OggFLAC++_2decoder_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <font class="comment">/* libOggFLAC++ - Free Lossless Audio Codec + Ogg library</font>
-00002 <font class="comment"> * Copyright (C) 2002,2003,2004 Josh Coalson</font>
+00002 <font class="comment"> * Copyright (C) 2002,2003,2004,2005 Josh Coalson</font>
00003 <font class="comment"> *</font>
00004 <font class="comment"> * Redistribution and use in source and binary forms, with or without</font>
00005 <font class="comment"> * modification, are permitted provided that the following conditions</font>
@@ -77,10 +77,10 @@
00109 <font class="keyword">inline</font> operator bool()<font class="keyword"> const </font>{ <font class="keywordflow">return</font> is_valid(); }
00110
00111 <font class="keywordtype">bool</font> set_serial_number(<font class="keywordtype">long</font> value);
-00112 <font class="keywordtype">bool</font> set_metadata_respond(::<a class="code" href="format_8h.html#a94">FLAC__MetadataType</a> type);
+00112 <font class="keywordtype">bool</font> set_metadata_respond(::<a class="code" href="format_8h.html#a97">FLAC__MetadataType</a> type);
00113 <font class="keywordtype">bool</font> set_metadata_respond_application(<font class="keyword">const</font> FLAC__byte id[4]);
00114 <font class="keywordtype">bool</font> set_metadata_respond_all();
-00115 <font class="keywordtype">bool</font> set_metadata_ignore(::<a class="code" href="format_8h.html#a94">FLAC__MetadataType</a> type);
+00115 <font class="keywordtype">bool</font> set_metadata_ignore(::<a class="code" href="format_8h.html#a97">FLAC__MetadataType</a> type);
00116 <font class="keywordtype">bool</font> set_metadata_ignore_application(<font class="keyword">const</font> FLAC__byte id[4]);
00117 <font class="keywordtype">bool</font> set_metadata_ignore_all();
00118
@@ -108,7 +108,7 @@
00144 <font class="keyword">virtual</font> <font class="keywordtype">void</font> metadata_callback(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *metadata) = 0;
00145 <font class="keyword">virtual</font> <font class="keywordtype">void</font> error_callback(::<a class="code" href="FLAC_2stream__decoder_8h.html#a39">FLAC__StreamDecoderErrorStatus</a> status) = 0;
00146
-00147 <font class="preprocessor">#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))</font>
+00147 <font class="preprocessor">#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)</font>
00148 <font class="preprocessor"></font> <font class="comment">// lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring()</font>
00149 <font class="keyword">friend</font> State;
00150 <font class="preprocessor">#endif</font>
@@ -152,10 +152,10 @@
00201
00202 <font class="keywordtype">bool</font> set_serial_number(<font class="keywordtype">long</font> value);
00203 <font class="keywordtype">bool</font> set_md5_checking(<font class="keywordtype">bool</font> value);
-00204 <font class="keywordtype">bool</font> set_metadata_respond(::<a class="code" href="format_8h.html#a94">FLAC__MetadataType</a> type);
+00204 <font class="keywordtype">bool</font> set_metadata_respond(::<a class="code" href="format_8h.html#a97">FLAC__MetadataType</a> type);
00205 <font class="keywordtype">bool</font> set_metadata_respond_application(<font class="keyword">const</font> FLAC__byte id[4]);
00206 <font class="keywordtype">bool</font> set_metadata_respond_all();
-00207 <font class="keywordtype">bool</font> set_metadata_ignore(::<a class="code" href="format_8h.html#a94">FLAC__MetadataType</a> type);
+00207 <font class="keywordtype">bool</font> set_metadata_ignore(::<a class="code" href="format_8h.html#a97">FLAC__MetadataType</a> type);
00208 <font class="keywordtype">bool</font> set_metadata_ignore_application(<font class="keyword">const</font> FLAC__byte id[4]);
00209 <font class="keywordtype">bool</font> set_metadata_ignore_all();
00210
@@ -191,7 +191,7 @@
00240 <font class="keyword">virtual</font> <font class="keywordtype">void</font> metadata_callback(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *metadata) = 0;
00241 <font class="keyword">virtual</font> <font class="keywordtype">void</font> error_callback(::<a class="code" href="FLAC_2stream__decoder_8h.html#a39">FLAC__StreamDecoderErrorStatus</a> status) = 0;
00242
-00243 <font class="preprocessor">#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))</font>
+00243 <font class="preprocessor">#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)</font>
00244 <font class="preprocessor"></font> <font class="comment">// lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring()</font>
00245 <font class="keyword">friend</font> State;
00246 <font class="preprocessor">#endif</font>
@@ -240,10 +240,10 @@
00302 <font class="keywordtype">bool</font> set_serial_number(<font class="keywordtype">long</font> value);
00303 <font class="keywordtype">bool</font> set_md5_checking(<font class="keywordtype">bool</font> value);
00304 <font class="keywordtype">bool</font> set_filename(<font class="keyword">const</font> <font class="keywordtype">char</font> *value);
-00305 <font class="keywordtype">bool</font> set_metadata_respond(::<a class="code" href="format_8h.html#a94">FLAC__MetadataType</a> type);
+00305 <font class="keywordtype">bool</font> set_metadata_respond(::<a class="code" href="format_8h.html#a97">FLAC__MetadataType</a> type);
00306 <font class="keywordtype">bool</font> set_metadata_respond_application(<font class="keyword">const</font> FLAC__byte id[4]);
00307 <font class="keywordtype">bool</font> set_metadata_respond_all();
-00308 <font class="keywordtype">bool</font> set_metadata_ignore(::<a class="code" href="format_8h.html#a94">FLAC__MetadataType</a> type);
+00308 <font class="keywordtype">bool</font> set_metadata_ignore(::<a class="code" href="format_8h.html#a97">FLAC__MetadataType</a> type);
00309 <font class="keywordtype">bool</font> set_metadata_ignore_application(<font class="keyword">const</font> FLAC__byte id[4]);
00310 <font class="keywordtype">bool</font> set_metadata_ignore_all();
00311
@@ -272,7 +272,7 @@
00334 <font class="keyword">virtual</font> <font class="keywordtype">void</font> metadata_callback(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *metadata) = 0;
00335 <font class="keyword">virtual</font> <font class="keywordtype">void</font> error_callback(::<a class="code" href="FLAC_2stream__decoder_8h.html#a39">FLAC__StreamDecoderErrorStatus</a> status) = 0;
00336
-00337 <font class="preprocessor">#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))</font>
+00337 <font class="preprocessor">#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)</font>
00338 <font class="preprocessor"></font> <font class="comment">// lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring()</font>
00339 <font class="keyword">friend</font> State;
00340 <font class="preprocessor">#endif</font>
@@ -289,11 +289,11 @@
00351
00352 <font class="comment">/* \} */</font>
00353
-00354 };
-00355 };
+00354 }
+00355 }
00356
00357 <font class="preprocessor">#endif</font>
-</pre></div><hr><address><small>Generated on Tue Sep 28 21:19:41 2004 for FLAC by
+</pre></div><hr><address><small>Generated on Fri Feb 4 18:39:09 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC++_2decoder_8h.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC++_2decoder_8h.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC++_2decoder_8h.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -30,7 +30,7 @@
<p>
See the detailed documentation in the <a class="el" href="group__oggflacpp__decoder.html">decoder</a> module.
<p>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:11 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC++_2encoder_8h-source.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC++_2encoder_8h-source.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC++_2encoder_8h-source.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,7 +7,7 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>include/OggFLAC++/encoder.h</h1><a href="OggFLAC++_2encoder_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <font class="comment">/* libOggFLAC++ - Free Lossless Audio Codec + Ogg library</font>
-00002 <font class="comment"> * Copyright (C) 2002,2003,2004 Josh Coalson</font>
+00002 <font class="comment"> * Copyright (C) 2002,2003,2004,2005 Josh Coalson</font>
00003 <font class="comment"> *</font>
00004 <font class="comment"> * Redistribution and use in source and binary forms, with or without</font>
00005 <font class="comment"> * modification, are permitted provided that the following conditions</font>
@@ -130,7 +130,7 @@
00162 virtual ::FLAC__StreamEncoderWriteStatus write_callback(<font class="keyword">const</font> FLAC__byte buffer[], <font class="keywordtype">unsigned</font> bytes, <font class="keywordtype">unsigned</font> samples, <font class="keywordtype">unsigned</font> current_frame) = 0;
00163 <font class="keyword">virtual</font> <font class="keywordtype">void</font> metadata_callback(<font class="keyword">const</font> ::<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *metadata) = 0;
00164
-00165 <font class="preprocessor">#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))</font>
+00165 <font class="preprocessor">#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)</font>
00166 <font class="preprocessor"></font> <font class="comment">// lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring()</font>
00167 <font class="keyword">friend</font> State;
00168 <font class="preprocessor">#endif</font>
@@ -218,7 +218,7 @@
00263 virtual ::FLAC__SeekableStreamEncoderTellStatus tell_callback(FLAC__uint64 *absolute_byte_offset) = 0;
00264 virtual ::FLAC__StreamEncoderWriteStatus write_callback(<font class="keyword">const</font> FLAC__byte buffer[], <font class="keywordtype">unsigned</font> bytes, <font class="keywordtype">unsigned</font> samples, <font class="keywordtype">unsigned</font> current_frame) = 0;
00265
-00266 <font class="preprocessor">#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))</font>
+00266 <font class="preprocessor">#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)</font>
00267 <font class="preprocessor"></font> <font class="comment">// lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring()</font>
00268 <font class="keyword">friend</font> State;
00269 <font class="preprocessor">#endif</font>
@@ -307,7 +307,7 @@
00365 <font class="keyword">protected</font>:
00366 <font class="keyword">virtual</font> <font class="keywordtype">void</font> progress_callback(FLAC__uint64 bytes_written, FLAC__uint64 samples_written, <font class="keywordtype">unsigned</font> frames_written, <font class="keywordtype">unsigned</font> total_frames_estimate);
00367
-00368 <font class="preprocessor">#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))</font>
+00368 <font class="preprocessor">#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)</font>
00369 <font class="preprocessor"></font> <font class="comment">// lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring()</font>
00370 <font class="keyword">friend</font> State;
00371 <font class="preprocessor">#endif</font>
@@ -322,11 +322,11 @@
00380
00381 <font class="comment">/* \} */</font>
00382
-00383 };
-00384 };
+00383 }
+00384 }
00385
00386 <font class="preprocessor">#endif</font>
-</pre></div><hr><address><small>Generated on Tue Sep 28 21:19:41 2004 for FLAC by
+</pre></div><hr><address><small>Generated on Fri Feb 4 18:39:09 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC++_2encoder_8h.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC++_2encoder_8h.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC++_2encoder_8h.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -31,7 +31,7 @@
<p>
See the detailed documentation in the <a class="el" href="group__oggflacpp__encoder.html">encoder</a> module.
<p>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:11 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC++_2export_8h-source.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC++_2export_8h-source.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC++_2export_8h-source.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,7 +7,7 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>include/OggFLAC++/export.h</h1><div class="fragment"><pre>00001 <font class="comment">/* libOggFLAC++ - Free Lossless Audio Codec + Ogg library</font>
-00002 <font class="comment"> * Copyright (C) 2002,2003,2004 Josh Coalson</font>
+00002 <font class="comment"> * Copyright (C) 2002,2003,2004,2005 Josh Coalson</font>
00003 <font class="comment"> *</font>
00004 <font class="comment"> * Redistribution and use in source and binary forms, with or without</font>
00005 <font class="comment"> * modification, are permitted provided that the following conditions</font>
@@ -53,7 +53,7 @@
00045 <font class="preprocessor">#endif</font>
00046 <font class="preprocessor"></font><font class="preprocessor">#endif</font>
00047 <font class="preprocessor"></font><font class="preprocessor">#endif</font>
-</pre></div><hr><address><small>Generated on Tue Sep 28 21:19:41 2004 for FLAC by
+</pre></div><hr><address><small>Generated on Fri Feb 4 18:39:10 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2all_8h-source.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2all_8h-source.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2all_8h-source.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,7 +7,7 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>include/OggFLAC/all.h</h1><div class="fragment"><pre>00001 <font class="comment">/* libOggFLAC - Free Lossless Audio Codec + Ogg library</font>
-00002 <font class="comment"> * Copyright (C) 2002,2003,2004 Josh Coalson</font>
+00002 <font class="comment"> * Copyright (C) 2002,2003,2004,2005 Josh Coalson</font>
00003 <font class="comment"> *</font>
00004 <font class="comment"> * Redistribution and use in source and binary forms, with or without</font>
00005 <font class="comment"> * modification, are permitted provided that the following conditions</font>
@@ -54,7 +54,7 @@
00046 <font class="preprocessor">#include "<a class="code" href="OggFLAC_2stream__encoder_8h.html">stream_encoder.h</a>"</font>
00047
00055 <font class="preprocessor">#endif</font>
-</pre></div><hr><address><small>Generated on Tue Sep 28 21:19:41 2004 for FLAC by
+</pre></div><hr><address><small>Generated on Fri Feb 4 18:39:09 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2export_8h-source.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2export_8h-source.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2export_8h-source.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,7 +7,7 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>include/OggFLAC/export.h</h1><div class="fragment"><pre>00001 <font class="comment">/* libOggFLAC - Free Lossless Audio Codec + Ogg library</font>
-00002 <font class="comment"> * Copyright (C) 2002,2003,2004 Josh Coalson</font>
+00002 <font class="comment"> * Copyright (C) 2002,2003,2004,2005 Josh Coalson</font>
00003 <font class="comment"> *</font>
00004 <font class="comment"> * Redistribution and use in source and binary forms, with or without</font>
00005 <font class="comment"> * modification, are permitted provided that the following conditions</font>
@@ -53,7 +53,7 @@
00045 <font class="preprocessor">#endif</font>
00046 <font class="preprocessor"></font><font class="preprocessor">#endif</font>
00047 <font class="preprocessor"></font><font class="preprocessor">#endif</font>
-</pre></div><hr><address><small>Generated on Tue Sep 28 21:19:41 2004 for FLAC by
+</pre></div><hr><address><small>Generated on Fri Feb 4 18:39:10 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2file__encoder_8h-source.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2file__encoder_8h-source.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2file__encoder_8h-source.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,7 +7,7 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>include/OggFLAC/file_encoder.h</h1><a href="OggFLAC_2file__encoder_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <font class="comment">/* libOggFLAC - Free Lossless Audio Codec + Ogg library</font>
-00002 <font class="comment"> * Copyright (C) 2002,2003,2004 Josh Coalson</font>
+00002 <font class="comment"> * Copyright (C) 2002,2003,2004,2005 Josh Coalson</font>
00003 <font class="comment"> *</font>
00004 <font class="comment"> * Redistribution and use in source and binary forms, with or without</font>
00005 <font class="comment"> * modification, are permitted provided that the following conditions</font>
@@ -200,7 +200,7 @@
00872 <font class="preprocessor">#endif</font>
00873 <font class="preprocessor"></font>
00874 <font class="preprocessor">#endif</font>
-</pre></div><hr><address><small>Generated on Tue Sep 28 21:19:41 2004 for FLAC by
+</pre></div><hr><address><small>Generated on Fri Feb 4 18:39:10 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2file__encoder_8h.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2file__encoder_8h.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2file__encoder_8h.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -95,7 +95,7 @@
<p>
See the detailed documentation in the <a class="el" href="group__oggflac__file__encoder.html">file encoder</a> module.
<p>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:11 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2seekable__stream__encoder_8h-source.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2seekable__stream__encoder_8h-source.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2seekable__stream__encoder_8h-source.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,7 +7,7 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>include/OggFLAC/seekable_stream_encoder.h</h1><a href="OggFLAC_2seekable__stream__encoder_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <font class="comment">/* libOggFLAC - Free Lossless Audio Codec + Ogg library</font>
-00002 <font class="comment"> * Copyright (C) 2002,2003,2004 Josh Coalson</font>
+00002 <font class="comment"> * Copyright (C) 2002,2003,2004,2005 Josh Coalson</font>
00003 <font class="comment"> *</font>
00004 <font class="comment"> * Redistribution and use in source and binary forms, with or without</font>
00005 <font class="comment"> * modification, are permitted provided that the following conditions</font>
@@ -225,7 +225,7 @@
00934 <font class="preprocessor">#endif</font>
00935 <font class="preprocessor"></font>
00936 <font class="preprocessor">#endif</font>
-</pre></div><hr><address><small>Generated on Tue Sep 28 21:19:41 2004 for FLAC by
+</pre></div><hr><address><small>Generated on Fri Feb 4 18:39:11 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2seekable__stream__encoder_8h.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2seekable__stream__encoder_8h.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2seekable__stream__encoder_8h.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -110,7 +110,7 @@
<p>
See the detailed documentation in the <a class="el" href="group__oggflac__seekable__stream__encoder.html">seekable stream encoder</a> module.
<p>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:12 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2stream__decoder_8h-source.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2stream__decoder_8h-source.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2stream__decoder_8h-source.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,7 +7,7 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>include/OggFLAC/stream_decoder.h</h1><a href="OggFLAC_2stream__decoder_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <font class="comment">/* libOggFLAC - Free Lossless Audio Codec + Ogg library</font>
-00002 <font class="comment"> * Copyright (C) 2002,2003,2004 Josh Coalson</font>
+00002 <font class="comment"> * Copyright (C) 2002,2003,2004,2005 Josh Coalson</font>
00003 <font class="comment"> *</font>
00004 <font class="comment"> * Redistribution and use in source and binary forms, with or without</font>
00005 <font class="comment"> * modification, are permitted provided that the following conditions</font>
@@ -116,13 +116,13 @@
00321
00335 OggFLAC_API FLAC__bool <a class="code" href="OggFLAC_2stream__decoder_8h.html#a12">OggFLAC__stream_decoder_set_serial_number</a>(<a class="code" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder, <font class="keywordtype">long</font> serial_number);
00336
-00350 OggFLAC_API FLAC__bool <a class="code" href="OggFLAC_2stream__decoder_8h.html#a13">OggFLAC__stream_decoder_set_metadata_respond</a>(<a class="code" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder, <a class="code" href="format_8h.html#a94">FLAC__MetadataType</a> type);
+00350 OggFLAC_API FLAC__bool <a class="code" href="OggFLAC_2stream__decoder_8h.html#a13">OggFLAC__stream_decoder_set_metadata_respond</a>(<a class="code" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder, <a class="code" href="format_8h.html#a97">FLAC__MetadataType</a> type);
00351
00366 OggFLAC_API FLAC__bool <a class="code" href="OggFLAC_2stream__decoder_8h.html#a14">OggFLAC__stream_decoder_set_metadata_respond_application</a>(<a class="code" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder, <font class="keyword">const</font> FLAC__byte id[4]);
00367
00379 OggFLAC_API FLAC__bool <a class="code" href="OggFLAC_2stream__decoder_8h.html#a15">OggFLAC__stream_decoder_set_metadata_respond_all</a>(<a class="code" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder);
00380
-00394 OggFLAC_API FLAC__bool <a class="code" href="OggFLAC_2stream__decoder_8h.html#a16">OggFLAC__stream_decoder_set_metadata_ignore</a>(<a class="code" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder, <a class="code" href="format_8h.html#a94">FLAC__MetadataType</a> type);
+00394 OggFLAC_API FLAC__bool <a class="code" href="OggFLAC_2stream__decoder_8h.html#a16">OggFLAC__stream_decoder_set_metadata_ignore</a>(<a class="code" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder, <a class="code" href="format_8h.html#a97">FLAC__MetadataType</a> type);
00395
00410 OggFLAC_API FLAC__bool <a class="code" href="OggFLAC_2stream__decoder_8h.html#a17">OggFLAC__stream_decoder_set_metadata_ignore_application</a>(<a class="code" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder, <font class="keyword">const</font> FLAC__byte id[4]);
00411
@@ -136,7 +136,7 @@
00459
00468 OggFLAC_API <font class="keywordtype">unsigned</font> <a class="code" href="OggFLAC_2stream__decoder_8h.html#a22">OggFLAC__stream_decoder_get_channels</a>(<font class="keyword">const</font> <a class="code" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder);
00469
-00478 OggFLAC_API <a class="code" href="format_8h.html#a92">FLAC__ChannelAssignment</a> <a class="code" href="OggFLAC_2stream__decoder_8h.html#a23">OggFLAC__stream_decoder_get_channel_assignment</a>(<font class="keyword">const</font> <a class="code" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder);
+00478 OggFLAC_API <a class="code" href="format_8h.html#a95">FLAC__ChannelAssignment</a> <a class="code" href="OggFLAC_2stream__decoder_8h.html#a23">OggFLAC__stream_decoder_get_channel_assignment</a>(<font class="keyword">const</font> <a class="code" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder);
00479
00488 OggFLAC_API <font class="keywordtype">unsigned</font> <a class="code" href="OggFLAC_2stream__decoder_8h.html#a24">OggFLAC__stream_decoder_get_bits_per_sample</a>(<font class="keyword">const</font> <a class="code" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder);
00489
@@ -165,7 +165,7 @@
00620 <font class="preprocessor">#endif</font>
00621 <font class="preprocessor"></font>
00622 <font class="preprocessor">#endif</font>
-</pre></div><hr><address><small>Generated on Tue Sep 28 21:19:41 2004 for FLAC by
+</pre></div><hr><address><small>Generated on Fri Feb 4 18:39:11 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2stream__decoder_8h.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2stream__decoder_8h.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2stream__decoder_8h.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -45,17 +45,17 @@
<tr><td nowrap align=right valign=top>OggFLAC_API FLAC__bool </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a10">OggFLAC__stream_decoder_set_error_callback</a> (<a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder, <a class="el" href="group__oggflac__stream__decoder.html#a4">OggFLAC__StreamDecoderErrorCallback</a> value)</td></tr>
<tr><td nowrap align=right valign=top>OggFLAC_API FLAC__bool </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a11">OggFLAC__stream_decoder_set_client_data</a> (<a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder, void *value)</td></tr>
<tr><td nowrap align=right valign=top>OggFLAC_API FLAC__bool </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a12">OggFLAC__stream_decoder_set_serial_number</a> (<a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder, long serial_number)</td></tr>
-<tr><td nowrap align=right valign=top>OggFLAC_API FLAC__bool </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a13">OggFLAC__stream_decoder_set_metadata_respond</a> (<a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder, <a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> type)</td></tr>
+<tr><td nowrap align=right valign=top>OggFLAC_API FLAC__bool </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a13">OggFLAC__stream_decoder_set_metadata_respond</a> (<a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder, <a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> type)</td></tr>
<tr><td nowrap align=right valign=top>OggFLAC_API FLAC__bool </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a14">OggFLAC__stream_decoder_set_metadata_respond_application</a> (<a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder, const FLAC__byte id[4])</td></tr>
<tr><td nowrap align=right valign=top>OggFLAC_API FLAC__bool </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a15">OggFLAC__stream_decoder_set_metadata_respond_all</a> (<a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder)</td></tr>
-<tr><td nowrap align=right valign=top>OggFLAC_API FLAC__bool </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a16">OggFLAC__stream_decoder_set_metadata_ignore</a> (<a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder, <a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> type)</td></tr>
+<tr><td nowrap align=right valign=top>OggFLAC_API FLAC__bool </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a16">OggFLAC__stream_decoder_set_metadata_ignore</a> (<a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder, <a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> type)</td></tr>
<tr><td nowrap align=right valign=top>OggFLAC_API FLAC__bool </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a17">OggFLAC__stream_decoder_set_metadata_ignore_application</a> (<a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder, const FLAC__byte id[4])</td></tr>
<tr><td nowrap align=right valign=top>OggFLAC_API FLAC__bool </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a18">OggFLAC__stream_decoder_set_metadata_ignore_all</a> (<a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>OggFLAC_API <a class="el" href="group__oggflac__stream__decoder.html#a34">OggFLAC__StreamDecoderState</a> </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a19">OggFLAC__stream_decoder_get_state</a> (const <a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>OggFLAC_API <a class="el" href="group__flac__stream__decoder.html#a36">FLAC__StreamDecoderState</a> </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a20">OggFLAC__stream_decoder_get_FLAC_stream_decoder_state</a> (const <a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>OggFLAC_API const char * </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a21">OggFLAC__stream_decoder_get_resolved_state_string</a> (const <a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>OggFLAC_API unsigned </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a22">OggFLAC__stream_decoder_get_channels</a> (const <a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder)</td></tr>
-<tr><td nowrap align=right valign=top>OggFLAC_API <a class="el" href="group__flac__format.html#a92">FLAC__ChannelAssignment</a> </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a23">OggFLAC__stream_decoder_get_channel_assignment</a> (const <a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder)</td></tr>
+<tr><td nowrap align=right valign=top>OggFLAC_API <a class="el" href="group__flac__format.html#a95">FLAC__ChannelAssignment</a> </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a23">OggFLAC__stream_decoder_get_channel_assignment</a> (const <a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>OggFLAC_API unsigned </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a24">OggFLAC__stream_decoder_get_bits_per_sample</a> (const <a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>OggFLAC_API unsigned </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a25">OggFLAC__stream_decoder_get_sample_rate</a> (const <a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>OggFLAC_API unsigned </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a26">OggFLAC__stream_decoder_get_blocksize</a> (const <a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder)</td></tr>
@@ -78,7 +78,7 @@
<p>
See the detailed documentation in the <a class="el" href="group__oggflac__stream__decoder.html">stream decoder</a> module.
<p>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:12 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2stream__encoder_8h-source.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2stream__encoder_8h-source.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2stream__encoder_8h-source.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,7 +7,7 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>include/OggFLAC/stream_encoder.h</h1><a href="OggFLAC_2stream__encoder_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <font class="comment">/* libOggFLAC - Free Lossless Audio Codec + Ogg library</font>
-00002 <font class="comment"> * Copyright (C) 2002,2003,2004 Josh Coalson</font>
+00002 <font class="comment"> * Copyright (C) 2002,2003,2004,2005 Josh Coalson</font>
00003 <font class="comment"> *</font>
00004 <font class="comment"> * Redistribution and use in source and binary forms, with or without</font>
00005 <font class="comment"> * modification, are permitted provided that the following conditions</font>
@@ -201,7 +201,7 @@
00826 <font class="preprocessor">#endif</font>
00827 <font class="preprocessor"></font>
00828 <font class="preprocessor">#endif</font>
-</pre></div><hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+</pre></div><hr><address><small>Generated on Fri Feb 4 18:39:11 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2stream__encoder_8h.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2stream__encoder_8h.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/OggFLAC_2stream__encoder_8h.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -94,7 +94,7 @@
<p>
See the detailed documentation in the <a class="el" href="group__oggflac__stream__encoder.html">stream encoder</a> module.
<p>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:12 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/annotated.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/annotated.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/annotated.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -67,7 +67,7 @@
<tr><td class="indexkey"><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html">FLAC::Metadata::VorbisComment</a></td><td class="indexvalue"></td></tr>
<tr><td class="indexkey"><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a></td><td class="indexvalue"></td></tr>
</table>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:12 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/assert_8h-source.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/assert_8h-source.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/assert_8h-source.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,7 +7,7 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>include/FLAC/assert.h</h1><div class="fragment"><pre>00001 <font class="comment">/* libFLAC - Free Lossless Audio Codec library</font>
-00002 <font class="comment"> * Copyright (C) 2001,2002,2003,2004 Josh Coalson</font>
+00002 <font class="comment"> * Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson</font>
00003 <font class="comment"> *</font>
00004 <font class="comment"> * Redistribution and use in source and binary forms, with or without</font>
00005 <font class="comment"> * modification, are permitted provided that the following conditions</font>
@@ -51,7 +51,7 @@
00043 <font class="preprocessor"></font><font class="preprocessor">#endif</font>
00044 <font class="preprocessor"></font>
00045 <font class="preprocessor">#endif</font>
-</pre></div><hr><address><small>Generated on Tue Sep 28 21:19:41 2004 for FLAC by
+</pre></div><hr><address><small>Generated on Fri Feb 4 18:39:09 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/callback_8h-source.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/callback_8h-source.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/callback_8h-source.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,7 +7,7 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>include/FLAC/callback.h</h1><a href="callback_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <font class="comment">/* libFLAC - Free Lossless Audio Codec library</font>
-00002 <font class="comment"> * Copyright (C) 2004 Josh Coalson</font>
+00002 <font class="comment"> * Copyright (C) 2004,2005 Josh Coalson</font>
00003 <font class="comment"> *</font>
00004 <font class="comment"> * Redistribution and use in source and binary forms, with or without</font>
00005 <font class="comment"> * modification, are permitted provided that the following conditions</font>
@@ -77,7 +77,7 @@
00179 <font class="preprocessor">#endif</font>
00180 <font class="preprocessor"></font>
00181 <font class="preprocessor">#endif</font>
-</pre></div><hr><address><small>Generated on Tue Sep 28 21:19:41 2004 for FLAC by
+</pre></div><hr><address><small>Generated on Fri Feb 4 18:39:10 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/callback_8h.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/callback_8h.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/callback_8h.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -35,7 +35,7 @@
<p>
See the detailed documentation for callbacks in the <a class="el" href="group__flac__callbacks.html">callbacks</a> module.
<p>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:11 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Decoder_1_1File-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Decoder_1_1File-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Decoder_1_1File-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -39,7 +39,7 @@
<tr bgcolor="#f0f0f0"><td><b>skip_single_frame</b>() (defined in <a class="el" href="classFLAC_1_1Decoder_1_1File.html">FLAC::Decoder::File</a>)</td><td><a class="el" href="classFLAC_1_1Decoder_1_1File.html">FLAC::Decoder::File</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>write_callback</b>(const::FLAC__Frame *frame, const FLAC__int32 *const buffer[])=0 (defined in <a class="el" href="classFLAC_1_1Decoder_1_1File.html">FLAC::Decoder::File</a>)</td><td><a class="el" href="classFLAC_1_1Decoder_1_1File.html">FLAC::Decoder::File</a></td><td><code> [protected, pure virtual]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><b>~File</b>() (defined in <a class="el" href="classFLAC_1_1Decoder_1_1File.html">FLAC::Decoder::File</a>)</td><td><a class="el" href="classFLAC_1_1Decoder_1_1File.html">FLAC::Decoder::File</a></td><td><code> [virtual]</code></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:46 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:20 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Decoder_1_1File.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Decoder_1_1File.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Decoder_1_1File.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -27,13 +27,13 @@
bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Decoder_1_1File.html#a5">set_filename</a> (const char *value)</td></tr>
<tr><td> </td><td><font size=-1><em>'value' may not be <code>NULL</code>; use "-" for stdin.</em></font><br><br></td></tr>
<tr><td nowrap align=right valign=top><a name="a6" doxytag="FLAC::Decoder::File::set_metadata_respond"></a>
-bool </td><td valign=bottom><b>set_metadata_respond</b> (::<a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> type)</td></tr>
+bool </td><td valign=bottom><b>set_metadata_respond</b> (::<a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> type)</td></tr>
<tr><td nowrap align=right valign=top><a name="a7" doxytag="FLAC::Decoder::File::set_metadata_respond_application"></a>
bool </td><td valign=bottom><b>set_metadata_respond_application</b> (const FLAC__byte id[4])</td></tr>
<tr><td nowrap align=right valign=top><a name="a8" doxytag="FLAC::Decoder::File::set_metadata_respond_all"></a>
bool </td><td valign=bottom><b>set_metadata_respond_all</b> ()</td></tr>
<tr><td nowrap align=right valign=top><a name="a9" doxytag="FLAC::Decoder::File::set_metadata_ignore"></a>
-bool </td><td valign=bottom><b>set_metadata_ignore</b> (::<a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> type)</td></tr>
+bool </td><td valign=bottom><b>set_metadata_ignore</b> (::<a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> type)</td></tr>
<tr><td nowrap align=right valign=top><a name="a10" doxytag="FLAC::Decoder::File::set_metadata_ignore_application"></a>
bool </td><td valign=bottom><b>set_metadata_ignore_application</b> (const FLAC__byte id[4])</td></tr>
<tr><td nowrap align=right valign=top><a name="a11" doxytag="FLAC::Decoder::File::set_metadata_ignore_all"></a>
@@ -49,7 +49,7 @@
<tr><td nowrap align=right valign=top><a name="a16" doxytag="FLAC::Decoder::File::get_channels"></a>
unsigned </td><td valign=bottom><b>get_channels</b> () const</td></tr>
<tr><td nowrap align=right valign=top><a name="a17" doxytag="FLAC::Decoder::File::get_channel_assignment"></a>
-::<a class="el" href="group__flac__format.html#a92">FLAC__ChannelAssignment</a> </td><td valign=bottom><b>get_channel_assignment</b> () const</td></tr>
+::<a class="el" href="group__flac__format.html#a95">FLAC__ChannelAssignment</a> </td><td valign=bottom><b>get_channel_assignment</b> () const</td></tr>
<tr><td nowrap align=right valign=top><a name="a18" doxytag="FLAC::Decoder::File::get_bits_per_sample"></a>
unsigned </td><td valign=bottom><b>get_bits_per_sample</b> () const</td></tr>
<tr><td nowrap align=right valign=top><a name="a19" doxytag="FLAC::Decoder::File::get_sample_rate"></a>
@@ -86,7 +86,7 @@
<p>
<hr>The documentation for this class was generated from the following file:<ul>
<li>include/FLAC++/<a class="el" href="FLAC++_2decoder_8h-source.html">decoder.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:46 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:20 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Decoder_1_1SeekableStream-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Decoder_1_1SeekableStream-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Decoder_1_1SeekableStream-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -44,7 +44,7 @@
<tr bgcolor="#f0f0f0"><td><b>tell_callback</b>(FLAC__uint64 *absolute_byte_offset)=0 (defined in <a class="el" href="classFLAC_1_1Decoder_1_1SeekableStream.html">FLAC::Decoder::SeekableStream</a>)</td><td><a class="el" href="classFLAC_1_1Decoder_1_1SeekableStream.html">FLAC::Decoder::SeekableStream</a></td><td><code> [protected, pure virtual]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><b>write_callback</b>(const::FLAC__Frame *frame, const FLAC__int32 *const buffer[])=0 (defined in <a class="el" href="classFLAC_1_1Decoder_1_1SeekableStream.html">FLAC::Decoder::SeekableStream</a>)</td><td><a class="el" href="classFLAC_1_1Decoder_1_1SeekableStream.html">FLAC::Decoder::SeekableStream</a></td><td><code> [protected, pure virtual]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><b>~SeekableStream</b>() (defined in <a class="el" href="classFLAC_1_1Decoder_1_1SeekableStream.html">FLAC::Decoder::SeekableStream</a>)</td><td><a class="el" href="classFLAC_1_1Decoder_1_1SeekableStream.html">FLAC::Decoder::SeekableStream</a></td><td><code> [virtual]</code></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:46 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:20 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Decoder_1_1SeekableStream.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Decoder_1_1SeekableStream.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Decoder_1_1SeekableStream.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -24,13 +24,13 @@
<tr><td nowrap align=right valign=top><a name="a4" doxytag="FLAC::Decoder::SeekableStream::set_md5_checking"></a>
bool </td><td valign=bottom><b>set_md5_checking</b> (bool value)</td></tr>
<tr><td nowrap align=right valign=top><a name="a5" doxytag="FLAC::Decoder::SeekableStream::set_metadata_respond"></a>
-bool </td><td valign=bottom><b>set_metadata_respond</b> (::<a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> type)</td></tr>
+bool </td><td valign=bottom><b>set_metadata_respond</b> (::<a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> type)</td></tr>
<tr><td nowrap align=right valign=top><a name="a6" doxytag="FLAC::Decoder::SeekableStream::set_metadata_respond_application"></a>
bool </td><td valign=bottom><b>set_metadata_respond_application</b> (const FLAC__byte id[4])</td></tr>
<tr><td nowrap align=right valign=top><a name="a7" doxytag="FLAC::Decoder::SeekableStream::set_metadata_respond_all"></a>
bool </td><td valign=bottom><b>set_metadata_respond_all</b> ()</td></tr>
<tr><td nowrap align=right valign=top><a name="a8" doxytag="FLAC::Decoder::SeekableStream::set_metadata_ignore"></a>
-bool </td><td valign=bottom><b>set_metadata_ignore</b> (::<a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> type)</td></tr>
+bool </td><td valign=bottom><b>set_metadata_ignore</b> (::<a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> type)</td></tr>
<tr><td nowrap align=right valign=top><a name="a9" doxytag="FLAC::Decoder::SeekableStream::set_metadata_ignore_application"></a>
bool </td><td valign=bottom><b>set_metadata_ignore_application</b> (const FLAC__byte id[4])</td></tr>
<tr><td nowrap align=right valign=top><a name="a10" doxytag="FLAC::Decoder::SeekableStream::set_metadata_ignore_all"></a>
@@ -44,7 +44,7 @@
<tr><td nowrap align=right valign=top><a name="a14" doxytag="FLAC::Decoder::SeekableStream::get_channels"></a>
unsigned </td><td valign=bottom><b>get_channels</b> () const</td></tr>
<tr><td nowrap align=right valign=top><a name="a15" doxytag="FLAC::Decoder::SeekableStream::get_channel_assignment"></a>
-::<a class="el" href="group__flac__format.html#a92">FLAC__ChannelAssignment</a> </td><td valign=bottom><b>get_channel_assignment</b> () const</td></tr>
+::<a class="el" href="group__flac__format.html#a95">FLAC__ChannelAssignment</a> </td><td valign=bottom><b>get_channel_assignment</b> () const</td></tr>
<tr><td nowrap align=right valign=top><a name="a16" doxytag="FLAC::Decoder::SeekableStream::get_bits_per_sample"></a>
unsigned </td><td valign=bottom><b>get_bits_per_sample</b> () const</td></tr>
<tr><td nowrap align=right valign=top><a name="a17" doxytag="FLAC::Decoder::SeekableStream::get_sample_rate"></a>
@@ -95,7 +95,7 @@
<p>
<hr>The documentation for this class was generated from the following file:<ul>
<li>include/FLAC++/<a class="el" href="FLAC++_2decoder_8h-source.html">decoder.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:46 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:20 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Decoder_1_1Stream-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Decoder_1_1Stream-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Decoder_1_1Stream-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -36,7 +36,7 @@
<tr bgcolor="#f0f0f0"><td><b>Stream</b>() (defined in <a class="el" href="classFLAC_1_1Decoder_1_1Stream.html">FLAC::Decoder::Stream</a>)</td><td><a class="el" href="classFLAC_1_1Decoder_1_1Stream.html">FLAC::Decoder::Stream</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>write_callback</b>(const::FLAC__Frame *frame, const FLAC__int32 *const buffer[])=0 (defined in <a class="el" href="classFLAC_1_1Decoder_1_1Stream.html">FLAC::Decoder::Stream</a>)</td><td><a class="el" href="classFLAC_1_1Decoder_1_1Stream.html">FLAC::Decoder::Stream</a></td><td><code> [protected, pure virtual]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><b>~Stream</b>() (defined in <a class="el" href="classFLAC_1_1Decoder_1_1Stream.html">FLAC::Decoder::Stream</a>)</td><td><a class="el" href="classFLAC_1_1Decoder_1_1Stream.html">FLAC::Decoder::Stream</a></td><td><code> [virtual]</code></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:46 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:20 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Decoder_1_1Stream.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Decoder_1_1Stream.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Decoder_1_1Stream.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -22,13 +22,13 @@
<tr><td nowrap align=right valign=top><a name="a3" doxytag="FLAC::Decoder::Stream::operator bool"></a>
</td><td valign=bottom><b>operator bool</b> () const</td></tr>
<tr><td nowrap align=right valign=top><a name="a4" doxytag="FLAC::Decoder::Stream::set_metadata_respond"></a>
-bool </td><td valign=bottom><b>set_metadata_respond</b> (::<a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> type)</td></tr>
+bool </td><td valign=bottom><b>set_metadata_respond</b> (::<a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> type)</td></tr>
<tr><td nowrap align=right valign=top><a name="a5" doxytag="FLAC::Decoder::Stream::set_metadata_respond_application"></a>
bool </td><td valign=bottom><b>set_metadata_respond_application</b> (const FLAC__byte id[4])</td></tr>
<tr><td nowrap align=right valign=top><a name="a6" doxytag="FLAC::Decoder::Stream::set_metadata_respond_all"></a>
bool </td><td valign=bottom><b>set_metadata_respond_all</b> ()</td></tr>
<tr><td nowrap align=right valign=top><a name="a7" doxytag="FLAC::Decoder::Stream::set_metadata_ignore"></a>
-bool </td><td valign=bottom><b>set_metadata_ignore</b> (::<a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> type)</td></tr>
+bool </td><td valign=bottom><b>set_metadata_ignore</b> (::<a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> type)</td></tr>
<tr><td nowrap align=right valign=top><a name="a8" doxytag="FLAC::Decoder::Stream::set_metadata_ignore_application"></a>
bool </td><td valign=bottom><b>set_metadata_ignore_application</b> (const FLAC__byte id[4])</td></tr>
<tr><td nowrap align=right valign=top><a name="a9" doxytag="FLAC::Decoder::Stream::set_metadata_ignore_all"></a>
@@ -38,7 +38,7 @@
<tr><td nowrap align=right valign=top><a name="a11" doxytag="FLAC::Decoder::Stream::get_channels"></a>
unsigned </td><td valign=bottom><b>get_channels</b> () const</td></tr>
<tr><td nowrap align=right valign=top><a name="a12" doxytag="FLAC::Decoder::Stream::get_channel_assignment"></a>
-::<a class="el" href="group__flac__format.html#a92">FLAC__ChannelAssignment</a> </td><td valign=bottom><b>get_channel_assignment</b> () const</td></tr>
+::<a class="el" href="group__flac__format.html#a95">FLAC__ChannelAssignment</a> </td><td valign=bottom><b>get_channel_assignment</b> () const</td></tr>
<tr><td nowrap align=right valign=top><a name="a13" doxytag="FLAC::Decoder::Stream::get_bits_per_sample"></a>
unsigned </td><td valign=bottom><b>get_bits_per_sample</b> () const</td></tr>
<tr><td nowrap align=right valign=top><a name="a14" doxytag="FLAC::Decoder::Stream::get_sample_rate"></a>
@@ -107,7 +107,7 @@
</table>
<hr>The documentation for this class was generated from the following file:<ul>
<li>include/FLAC++/<a class="el" href="FLAC++_2decoder_8h-source.html">decoder.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:46 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:20 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Encoder_1_1File-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Encoder_1_1File-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Encoder_1_1File-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -59,7 +59,7 @@
<tr bgcolor="#f0f0f0"><td><b>set_total_samples_estimate</b>(FLAC__uint64 value) (defined in <a class="el" href="classFLAC_1_1Encoder_1_1File.html">FLAC::Encoder::File</a>)</td><td><a class="el" href="classFLAC_1_1Encoder_1_1File.html">FLAC::Encoder::File</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>set_verify</b>(bool value) (defined in <a class="el" href="classFLAC_1_1Encoder_1_1File.html">FLAC::Encoder::File</a>)</td><td><a class="el" href="classFLAC_1_1Encoder_1_1File.html">FLAC::Encoder::File</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>~File</b>() (defined in <a class="el" href="classFLAC_1_1Encoder_1_1File.html">FLAC::Encoder::File</a>)</td><td><a class="el" href="classFLAC_1_1Encoder_1_1File.html">FLAC::Encoder::File</a></td><td><code> [virtual]</code></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:47 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:20 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Encoder_1_1File.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Encoder_1_1File.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Encoder_1_1File.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -125,7 +125,7 @@
<p>
<hr>The documentation for this class was generated from the following file:<ul>
<li>include/FLAC++/<a class="el" href="FLAC++_2encoder_8h-source.html">encoder.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:47 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:20 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Encoder_1_1SeekableStream-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Encoder_1_1SeekableStream-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Encoder_1_1SeekableStream-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -59,7 +59,7 @@
<tr bgcolor="#f0f0f0"><td><b>tell_callback</b>(FLAC__uint64 *absolute_byte_offset)=0 (defined in <a class="el" href="classFLAC_1_1Encoder_1_1SeekableStream.html">FLAC::Encoder::SeekableStream</a>)</td><td><a class="el" href="classFLAC_1_1Encoder_1_1SeekableStream.html">FLAC::Encoder::SeekableStream</a></td><td><code> [protected, pure virtual]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><b>write_callback</b>(const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame)=0 (defined in <a class="el" href="classFLAC_1_1Encoder_1_1SeekableStream.html">FLAC::Encoder::SeekableStream</a>)</td><td><a class="el" href="classFLAC_1_1Encoder_1_1SeekableStream.html">FLAC::Encoder::SeekableStream</a></td><td><code> [protected, pure virtual]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><b>~SeekableStream</b>() (defined in <a class="el" href="classFLAC_1_1Encoder_1_1SeekableStream.html">FLAC::Encoder::SeekableStream</a>)</td><td><a class="el" href="classFLAC_1_1Encoder_1_1SeekableStream.html">FLAC::Encoder::SeekableStream</a></td><td><code> [virtual]</code></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:46 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:20 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Encoder_1_1SeekableStream.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Encoder_1_1SeekableStream.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Encoder_1_1SeekableStream.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -125,7 +125,7 @@
<p>
<hr>The documentation for this class was generated from the following file:<ul>
<li>include/FLAC++/<a class="el" href="FLAC++_2encoder_8h-source.html">encoder.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:46 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:20 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Encoder_1_1Stream-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Encoder_1_1Stream-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Encoder_1_1Stream-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -57,7 +57,7 @@
<tr bgcolor="#f0f0f0"><td><b>Stream</b>() (defined in <a class="el" href="classFLAC_1_1Encoder_1_1Stream.html">FLAC::Encoder::Stream</a>)</td><td><a class="el" href="classFLAC_1_1Encoder_1_1Stream.html">FLAC::Encoder::Stream</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>write_callback</b>(const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame)=0 (defined in <a class="el" href="classFLAC_1_1Encoder_1_1Stream.html">FLAC::Encoder::Stream</a>)</td><td><a class="el" href="classFLAC_1_1Encoder_1_1Stream.html">FLAC::Encoder::Stream</a></td><td><code> [protected, pure virtual]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><b>~Stream</b>() (defined in <a class="el" href="classFLAC_1_1Encoder_1_1Stream.html">FLAC::Encoder::Stream</a>)</td><td><a class="el" href="classFLAC_1_1Encoder_1_1Stream.html">FLAC::Encoder::Stream</a></td><td><code> [virtual]</code></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:46 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:20 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Encoder_1_1Stream.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Encoder_1_1Stream.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Encoder_1_1Stream.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -121,7 +121,7 @@
<p>
<hr>The documentation for this class was generated from the following file:<ul>
<li>include/FLAC++/<a class="el" href="FLAC++_2encoder_8h-source.html">encoder.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:46 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:20 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Application-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Application-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Application-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -12,7 +12,9 @@
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Application.html#z13_1">Application</a>(const::FLAC__StreamMetadata &object)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Application.html">FLAC::Metadata::Application</a></td><td><code> [inline]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Application.html#z13_2">Application</a>(const::FLAC__StreamMetadata *object)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Application.html">FLAC::Metadata::Application</a></td><td><code> [inline]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Application.html#a1">Application</a>(::FLAC__StreamMetadata *object, bool copy)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Application.html">FLAC::Metadata::Application</a></td><td><code> [inline]</code></td></tr>
- <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b1">clear</a>()</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected, virtual]</code></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Application.html#a3">assign</a>(::FLAC__StreamMetadata *object, bool copy)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Application.html">FLAC::Metadata::Application</a></td><td><code> [inline]</code></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b1">assign_object</a>(::FLAC__StreamMetadata *object, bool copy)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected]</code></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b2">clear</a>()</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected, virtual]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><b>get_data</b>() const (defined in <a class="el" href="classFLAC_1_1Metadata_1_1Application.html">FLAC::Metadata::Application</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Application.html">FLAC::Metadata::Application</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>get_id</b>() const (defined in <a class="el" href="classFLAC_1_1Metadata_1_1Application.html">FLAC::Metadata::Application</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Application.html">FLAC::Metadata::Application</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a2">get_is_last</a>() const</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td></td></tr>
@@ -38,14 +40,14 @@
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#z0_1">Prototype</a>(const::FLAC__StreamMetadata &)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#z0_2">Prototype</a>(const::FLAC__StreamMetadata *)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b0">Prototype</a>(::FLAC__StreamMetadata *object, bool copy)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected]</code></td></tr>
- <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Application.html#a6">set_data</a>(const FLAC__byte *data, unsigned length)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Application.html">FLAC::Metadata::Application</a></td><td></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Application.html#a7">set_data</a>(const FLAC__byte *data, unsigned length)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Application.html">FLAC::Metadata::Application</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>set_data</b>(FLAC__byte *data, unsigned length, bool copy) (defined in <a class="el" href="classFLAC_1_1Metadata_1_1Application.html">FLAC::Metadata::Application</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Application.html">FLAC::Metadata::Application</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>set_id</b>(const FLAC__byte value[4]) (defined in <a class="el" href="classFLAC_1_1Metadata_1_1Application.html">FLAC::Metadata::Application</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Application.html">FLAC::Metadata::Application</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a5">set_is_last</a>(bool)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>SimpleIterator</b> (defined in <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [friend]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><b>~Application</b>() (defined in <a class="el" href="classFLAC_1_1Metadata_1_1Application.html">FLAC::Metadata::Application</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Application.html">FLAC::Metadata::Application</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a0">~Prototype</a>()</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [virtual]</code></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:47 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:21 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Application.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Application.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Application.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -23,25 +23,26 @@
<tr><td nowrap align=right valign=top> </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Application.html#a1">Application</a> (::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, bool copy)</td></tr>
<tr><td nowrap align=right valign=top><a name="a2" doxytag="FLAC::Metadata::Application::~Application"></a>
</td><td valign=bottom><b>~Application</b> ()</td></tr>
-<tr><td nowrap align=right valign=top><a name="a3" doxytag="FLAC::Metadata::Application::get_id"></a>
+<tr><td nowrap align=right valign=top>Application & </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Application.html#a3">assign</a> (::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, bool copy)</td></tr>
+<tr><td nowrap align=right valign=top><a name="a4" doxytag="FLAC::Metadata::Application::get_id"></a>
const FLAC__byte * </td><td valign=bottom><b>get_id</b> () const</td></tr>
-<tr><td nowrap align=right valign=top><a name="a4" doxytag="FLAC::Metadata::Application::get_data"></a>
+<tr><td nowrap align=right valign=top><a name="a5" doxytag="FLAC::Metadata::Application::get_data"></a>
const FLAC__byte * </td><td valign=bottom><b>get_data</b> () const</td></tr>
-<tr><td nowrap align=right valign=top><a name="a5" doxytag="FLAC::Metadata::Application::set_id"></a>
+<tr><td nowrap align=right valign=top><a name="a6" doxytag="FLAC::Metadata::Application::set_id"></a>
void </td><td valign=bottom><b>set_id</b> (const FLAC__byte value[4])</td></tr>
-<tr><td nowrap align=right valign=top><a name="a6" doxytag="FLAC::Metadata::Application::set_data"></a>
-bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Application.html#a6">set_data</a> (const FLAC__byte *data, unsigned length)</td></tr>
+<tr><td nowrap align=right valign=top><a name="a7" doxytag="FLAC::Metadata::Application::set_data"></a>
+bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Application.html#a7">set_data</a> (const FLAC__byte *data, unsigned length)</td></tr>
<tr><td> </td><td><font size=-1><em>This form always copies <em>data</em>.</em></font><br><br></td></tr>
-<tr><td nowrap align=right valign=top><a name="a7" doxytag="FLAC::Metadata::Application::set_data"></a>
+<tr><td nowrap align=right valign=top><a name="a8" doxytag="FLAC::Metadata::Application::set_data"></a>
bool </td><td valign=bottom><b>set_data</b> (FLAC__byte *data, unsigned length, bool copy)</td></tr>
<tr><td colspan="2"><div class="groupHeader"></div></td></tr>
<tr><td nowrap align=right valign=top> </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Application.html#z13_0">Application</a> (const Application &object)</td></tr>
<tr><td nowrap align=right valign=top> </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Application.html#z13_1">Application</a> (const::FLAC__StreamMetadata &object)</td></tr>
<tr><td nowrap align=right valign=top> </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Application.html#z13_2">Application</a> (const::FLAC__StreamMetadata *object)</td></tr>
<tr><td colspan="2"><div class="groupHeader"></div></td></tr>
-<tr><td nowrap align=right valign=top>void </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Application.html#z14_0">operator=</a> (const Application &object)</td></tr>
-<tr><td nowrap align=right valign=top>void </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Application.html#z14_1">operator=</a> (const::FLAC__StreamMetadata &object)</td></tr>
-<tr><td nowrap align=right valign=top>void </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Application.html#z14_2">operator=</a> (const::FLAC__StreamMetadata *object)</td></tr>
+<tr><td nowrap align=right valign=top>Application & </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Application.html#z14_0">operator=</a> (const Application &object)</td></tr>
+<tr><td nowrap align=right valign=top>Application & </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Application.html#z14_1">operator=</a> (const::FLAC__StreamMetadata &object)</td></tr>
+<tr><td nowrap align=right valign=top>Application & </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Application.html#z14_2">operator=</a> (const::FLAC__StreamMetadata *object)</td></tr>
<tr><td colspan="2"><div class="groupHeader"></div></td></tr>
<tr><td nowrap align=right valign=top>bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Application.html#z15_0">operator==</a> (const Application &object) const</td></tr>
<tr><td nowrap align=right valign=top>bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Application.html#z15_1">operator==</a> (const::FLAC__StreamMetadata &object) const</td></tr>
@@ -187,7 +188,7 @@
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> void FLAC::Metadata::Application::operator= </td>
+ <td class="md" nowrap valign="top"> Application& FLAC::Metadata::Application::operator= </td>
<td class="md" valign="top">( </td>
<td class="md" nowrap valign="top">const Application & </td>
<td class="mdname1" valign="top" nowrap> <em>object</em> </td>
@@ -216,7 +217,7 @@
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> void FLAC::Metadata::Application::operator= </td>
+ <td class="md" nowrap valign="top"> Application& FLAC::Metadata::Application::operator= </td>
<td class="md" valign="top">( </td>
<td class="md" nowrap valign="top">const ::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> & </td>
<td class="mdname1" valign="top" nowrap> <em>object</em> </td>
@@ -247,7 +248,7 @@
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> void FLAC::Metadata::Application::operator= </td>
+ <td class="md" nowrap valign="top"> Application& FLAC::Metadata::Application::operator= </td>
<td class="md" valign="top">( </td>
<td class="md" nowrap valign="top">const ::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> * </td>
<td class="mdname1" valign="top" nowrap> <em>object</em> </td>
@@ -272,6 +273,44 @@
Reimplemented from <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#z1_2">FLAC::Metadata::Prototype</a>. </td>
</tr>
</table>
+<a name="a3" doxytag="FLAC::Metadata::Application::assign"></a><p>
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
+ <tr>
+ <td class="md">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <td class="md" nowrap valign="top"> Application& FLAC::Metadata::Application::assign </td>
+ <td class="md" valign="top">( </td>
+ <td class="md" nowrap valign="top">::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> * </td>
+ <td class="mdname" nowrap> <em>object</em>, </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td class="md" nowrap>bool </td>
+ <td class="mdname" nowrap> <em>copy</em></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td class="md">) </td>
+ <td class="md" colspan="2"><code> [inline]</code></td>
+ </tr>
+
+ </table>
+ </td>
+ </tr>
+</table>
+<table cellspacing=5 cellpadding=0 border=0>
+ <tr>
+ <td>
+
+ </td>
+ <td>
+
+<p>
+Assigns an object with copy control. See <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b1">Prototype::assign_object</a>(::FLAC__StreamMetadata *object, bool copy). </td>
+ </tr>
+</table>
<a name="z15_0" doxytag="FLAC::Metadata::Application::operator=="></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
@@ -456,7 +495,7 @@
</table>
<hr>The documentation for this class was generated from the following file:<ul>
<li>include/FLAC++/<a class="el" href="+_2metadata_8h-source.html">metadata.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:47 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:21 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Chain-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Chain-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Chain-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -22,7 +22,7 @@
<tr bgcolor="#f0f0f0"><td><b>write</b>(bool use_padding,::FLAC__IOHandle handle,::FLAC__IOCallbacks callbacks) (defined in <a class="el" href="classFLAC_1_1Metadata_1_1Chain.html">FLAC::Metadata::Chain</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Chain.html">FLAC::Metadata::Chain</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>write</b>(bool use_padding,::FLAC__IOHandle handle,::FLAC__IOCallbacks callbacks,::FLAC__IOHandle temp_handle,::FLAC__IOCallbacks temp_callbacks) (defined in <a class="el" href="classFLAC_1_1Metadata_1_1Chain.html">FLAC::Metadata::Chain</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Chain.html">FLAC::Metadata::Chain</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>~Chain</b>() (defined in <a class="el" href="classFLAC_1_1Metadata_1_1Chain.html">FLAC::Metadata::Chain</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Chain.html">FLAC::Metadata::Chain</a></td><td><code> [virtual]</code></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:47 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:22 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Chain.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Chain.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Chain.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -52,7 +52,7 @@
<p>
<hr>The documentation for this class was generated from the following file:<ul>
<li>include/FLAC++/<a class="el" href="+_2metadata_8h-source.html">metadata.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:47 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:22 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1CueSheet-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1CueSheet-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1CueSheet-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,14 +7,16 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>FLAC::Metadata::CueSheet Member List</h1>This is the complete list of members for <a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html">FLAC::Metadata::CueSheet</a>, including all inherited members.<table>
- <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b1">clear</a>()</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected, virtual]</code></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a3">assign</a>(::FLAC__StreamMetadata *object, bool copy)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html">FLAC::Metadata::CueSheet</a></td><td><code> [inline]</code></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b1">assign_object</a>(::FLAC__StreamMetadata *object, bool copy)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected]</code></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b2">clear</a>()</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected, virtual]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><b>CueSheet</b>() (defined in <a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html">FLAC::Metadata::CueSheet</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html">FLAC::Metadata::CueSheet</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#z25_0">CueSheet</a>(const CueSheet &object)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html">FLAC::Metadata::CueSheet</a></td><td><code> [inline]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#z25_1">CueSheet</a>(const::FLAC__StreamMetadata &object)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html">FLAC::Metadata::CueSheet</a></td><td><code> [inline]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#z25_2">CueSheet</a>(const::FLAC__StreamMetadata *object)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html">FLAC::Metadata::CueSheet</a></td><td><code> [inline]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a1">CueSheet</a>(::FLAC__StreamMetadata *object, bool copy)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html">FLAC::Metadata::CueSheet</a></td><td><code> [inline]</code></td></tr>
- <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a13">delete_index</a>(unsigned track_num, unsigned index_num)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html">FLAC::Metadata::CueSheet</a></td><td></td></tr>
- <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a16">delete_track</a>(unsigned i)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html">FLAC::Metadata::CueSheet</a></td><td></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a14">delete_index</a>(unsigned track_num, unsigned index_num)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html">FLAC::Metadata::CueSheet</a></td><td></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a17">delete_track</a>(unsigned i)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html">FLAC::Metadata::CueSheet</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>get_is_cd</b>() const (defined in <a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html">FLAC::Metadata::CueSheet</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html">FLAC::Metadata::CueSheet</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a2">get_is_last</a>() const</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>get_lead_in</b>() const (defined in <a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html">FLAC::Metadata::CueSheet</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html">FLAC::Metadata::CueSheet</a></td><td></td></tr>
@@ -23,9 +25,9 @@
<tr bgcolor="#f0f0f0"><td><b>get_num_tracks</b>() const (defined in <a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html">FLAC::Metadata::CueSheet</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html">FLAC::Metadata::CueSheet</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>get_track</b>(unsigned i) const (defined in <a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html">FLAC::Metadata::CueSheet</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html">FLAC::Metadata::CueSheet</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a3">get_type</a>() const</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td></td></tr>
- <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a12">insert_index</a>(unsigned track_num, unsigned index_num, const::FLAC__StreamMetadata_CueSheet_Index &index)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html">FLAC::Metadata::CueSheet</a></td><td></td></tr>
- <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a15">insert_track</a>(unsigned i, const Track &track)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html">FLAC::Metadata::CueSheet</a></td><td></td></tr>
- <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a17">is_legal</a>(bool check_cd_da_subset=false, const char **violation=0) const</td><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html">FLAC::Metadata::CueSheet</a></td><td></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a13">insert_index</a>(unsigned track_num, unsigned index_num, const::FLAC__StreamMetadata_CueSheet_Index &index)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html">FLAC::Metadata::CueSheet</a></td><td></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a16">insert_track</a>(unsigned i, const Track &track)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html">FLAC::Metadata::CueSheet</a></td><td></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a18">is_legal</a>(bool check_cd_da_subset=false, const char **violation=0) const</td><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html">FLAC::Metadata::CueSheet</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="group__flacpp__metadata__object.html#a7">is_valid</a>() const</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [inline]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><b>Iterator</b> (defined in <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [friend]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><b>object_</b> (defined in <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected]</code></td></tr>
@@ -51,11 +53,11 @@
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a5">set_is_last</a>(bool)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>set_lead_in</b>(FLAC__uint64 value) (defined in <a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html">FLAC::Metadata::CueSheet</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html">FLAC::Metadata::CueSheet</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>set_media_catalog_number</b>(const char value[128]) (defined in <a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html">FLAC::Metadata::CueSheet</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html">FLAC::Metadata::CueSheet</a></td><td></td></tr>
- <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a14">set_track</a>(unsigned i, const Track &track)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html">FLAC::Metadata::CueSheet</a></td><td></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a15">set_track</a>(unsigned i, const Track &track)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html">FLAC::Metadata::CueSheet</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>SimpleIterator</b> (defined in <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [friend]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><b>~CueSheet</b>() (defined in <a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html">FLAC::Metadata::CueSheet</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html">FLAC::Metadata::CueSheet</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a0">~Prototype</a>()</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [virtual]</code></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:47 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:22 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1CueSheet.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1CueSheet.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1CueSheet.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -23,50 +23,51 @@
<tr><td nowrap align=right valign=top> </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a1">CueSheet</a> (::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, bool copy)</td></tr>
<tr><td nowrap align=right valign=top><a name="a2" doxytag="FLAC::Metadata::CueSheet::~CueSheet"></a>
</td><td valign=bottom><b>~CueSheet</b> ()</td></tr>
-<tr><td nowrap align=right valign=top><a name="a3" doxytag="FLAC::Metadata::CueSheet::get_media_catalog_number"></a>
+<tr><td nowrap align=right valign=top>CueSheet & </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a3">assign</a> (::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, bool copy)</td></tr>
+<tr><td nowrap align=right valign=top><a name="a4" doxytag="FLAC::Metadata::CueSheet::get_media_catalog_number"></a>
const char * </td><td valign=bottom><b>get_media_catalog_number</b> () const</td></tr>
-<tr><td nowrap align=right valign=top><a name="a4" doxytag="FLAC::Metadata::CueSheet::get_lead_in"></a>
+<tr><td nowrap align=right valign=top><a name="a5" doxytag="FLAC::Metadata::CueSheet::get_lead_in"></a>
FLAC__uint64 </td><td valign=bottom><b>get_lead_in</b> () const</td></tr>
-<tr><td nowrap align=right valign=top><a name="a5" doxytag="FLAC::Metadata::CueSheet::get_is_cd"></a>
+<tr><td nowrap align=right valign=top><a name="a6" doxytag="FLAC::Metadata::CueSheet::get_is_cd"></a>
bool </td><td valign=bottom><b>get_is_cd</b> () const</td></tr>
-<tr><td nowrap align=right valign=top><a name="a6" doxytag="FLAC::Metadata::CueSheet::get_num_tracks"></a>
+<tr><td nowrap align=right valign=top><a name="a7" doxytag="FLAC::Metadata::CueSheet::get_num_tracks"></a>
unsigned </td><td valign=bottom><b>get_num_tracks</b> () const</td></tr>
-<tr><td nowrap align=right valign=top><a name="a7" doxytag="FLAC::Metadata::CueSheet::get_track"></a>
+<tr><td nowrap align=right valign=top><a name="a8" doxytag="FLAC::Metadata::CueSheet::get_track"></a>
<a class="el" href="classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html">Track</a> </td><td valign=bottom><b>get_track</b> (unsigned i) const</td></tr>
-<tr><td nowrap align=right valign=top><a name="a8" doxytag="FLAC::Metadata::CueSheet::set_media_catalog_number"></a>
+<tr><td nowrap align=right valign=top><a name="a9" doxytag="FLAC::Metadata::CueSheet::set_media_catalog_number"></a>
void </td><td valign=bottom><b>set_media_catalog_number</b> (const char value[128])</td></tr>
-<tr><td nowrap align=right valign=top><a name="a9" doxytag="FLAC::Metadata::CueSheet::set_lead_in"></a>
+<tr><td nowrap align=right valign=top><a name="a10" doxytag="FLAC::Metadata::CueSheet::set_lead_in"></a>
void </td><td valign=bottom><b>set_lead_in</b> (FLAC__uint64 value)</td></tr>
-<tr><td nowrap align=right valign=top><a name="a10" doxytag="FLAC::Metadata::CueSheet::set_is_cd"></a>
+<tr><td nowrap align=right valign=top><a name="a11" doxytag="FLAC::Metadata::CueSheet::set_is_cd"></a>
void </td><td valign=bottom><b>set_is_cd</b> (bool value)</td></tr>
-<tr><td nowrap align=right valign=top><a name="a11" doxytag="FLAC::Metadata::CueSheet::set_index"></a>
+<tr><td nowrap align=right valign=top><a name="a12" doxytag="FLAC::Metadata::CueSheet::set_index"></a>
void </td><td valign=bottom><b>set_index</b> (unsigned track_num, unsigned index_num, const::FLAC__StreamMetadata_CueSheet_Index &index)</td></tr>
-<tr><td nowrap align=right valign=top><a name="a12" doxytag="FLAC::Metadata::CueSheet::insert_index"></a>
-bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a12">insert_index</a> (unsigned track_num, unsigned index_num, const::FLAC__StreamMetadata_CueSheet_Index &index)</td></tr>
-<tr><td> </td><td><font size=-1><em>See <a class="el" href="group__flac__metadata__object.html#a28">FLAC__metadata_object_cuesheet_track_insert_index</a>().</em></font><br><br></td></tr>
-<tr><td nowrap align=right valign=top><a name="a13" doxytag="FLAC::Metadata::CueSheet::delete_index"></a>
-bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a13">delete_index</a> (unsigned track_num, unsigned index_num)</td></tr>
-<tr><td> </td><td><font size=-1><em>See <a class="el" href="group__flac__metadata__object.html#a30">FLAC__metadata_object_cuesheet_track_delete_index</a>().</em></font><br><br></td></tr>
-<tr><td nowrap align=right valign=top><a name="a14" doxytag="FLAC::Metadata::CueSheet::set_track"></a>
-bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a14">set_track</a> (unsigned i, const <a class="el" href="classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html">Track</a> &track)</td></tr>
+<tr><td nowrap align=right valign=top><a name="a13" doxytag="FLAC::Metadata::CueSheet::insert_index"></a>
+bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a13">insert_index</a> (unsigned track_num, unsigned index_num, const::FLAC__StreamMetadata_CueSheet_Index &index)</td></tr>
+<tr><td> </td><td><font size=-1><em>See <a class="el" href="group__flac__metadata__object.html#a32">FLAC__metadata_object_cuesheet_track_insert_index</a>().</em></font><br><br></td></tr>
+<tr><td nowrap align=right valign=top><a name="a14" doxytag="FLAC::Metadata::CueSheet::delete_index"></a>
+bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a14">delete_index</a> (unsigned track_num, unsigned index_num)</td></tr>
+<tr><td> </td><td><font size=-1><em>See <a class="el" href="group__flac__metadata__object.html#a34">FLAC__metadata_object_cuesheet_track_delete_index</a>().</em></font><br><br></td></tr>
+<tr><td nowrap align=right valign=top><a name="a15" doxytag="FLAC::Metadata::CueSheet::set_track"></a>
+bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a15">set_track</a> (unsigned i, const <a class="el" href="classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html">Track</a> &track)</td></tr>
<tr><td> </td><td><font size=-1><em>See FLAC__metadata_object_cuesheet_set_track().</em></font><br><br></td></tr>
-<tr><td nowrap align=right valign=top><a name="a15" doxytag="FLAC::Metadata::CueSheet::insert_track"></a>
-bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a15">insert_track</a> (unsigned i, const <a class="el" href="classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html">Track</a> &track)</td></tr>
-<tr><td> </td><td><font size=-1><em>See <a class="el" href="group__flac__metadata__object.html#a32">FLAC__metadata_object_cuesheet_insert_track</a>().</em></font><br><br></td></tr>
-<tr><td nowrap align=right valign=top><a name="a16" doxytag="FLAC::Metadata::CueSheet::delete_track"></a>
-bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a16">delete_track</a> (unsigned i)</td></tr>
-<tr><td> </td><td><font size=-1><em>See <a class="el" href="group__flac__metadata__object.html#a34">FLAC__metadata_object_cuesheet_delete_track</a>().</em></font><br><br></td></tr>
-<tr><td nowrap align=right valign=top><a name="a17" doxytag="FLAC::Metadata::CueSheet::is_legal"></a>
-bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a17">is_legal</a> (bool check_cd_da_subset=false, const char **violation=0) const</td></tr>
-<tr><td> </td><td><font size=-1><em>See <a class="el" href="group__flac__metadata__object.html#a35">FLAC__metadata_object_cuesheet_is_legal</a>().</em></font><br><br></td></tr>
+<tr><td nowrap align=right valign=top><a name="a16" doxytag="FLAC::Metadata::CueSheet::insert_track"></a>
+bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a16">insert_track</a> (unsigned i, const <a class="el" href="classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html">Track</a> &track)</td></tr>
+<tr><td> </td><td><font size=-1><em>See <a class="el" href="group__flac__metadata__object.html#a36">FLAC__metadata_object_cuesheet_insert_track</a>().</em></font><br><br></td></tr>
+<tr><td nowrap align=right valign=top><a name="a17" doxytag="FLAC::Metadata::CueSheet::delete_track"></a>
+bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a17">delete_track</a> (unsigned i)</td></tr>
+<tr><td> </td><td><font size=-1><em>See <a class="el" href="group__flac__metadata__object.html#a38">FLAC__metadata_object_cuesheet_delete_track</a>().</em></font><br><br></td></tr>
+<tr><td nowrap align=right valign=top><a name="a18" doxytag="FLAC::Metadata::CueSheet::is_legal"></a>
+bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a18">is_legal</a> (bool check_cd_da_subset=false, const char **violation=0) const</td></tr>
+<tr><td> </td><td><font size=-1><em>See <a class="el" href="group__flac__metadata__object.html#a39">FLAC__metadata_object_cuesheet_is_legal</a>().</em></font><br><br></td></tr>
<tr><td colspan="2"><div class="groupHeader"></div></td></tr>
<tr><td nowrap align=right valign=top> </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#z25_0">CueSheet</a> (const CueSheet &object)</td></tr>
<tr><td nowrap align=right valign=top> </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#z25_1">CueSheet</a> (const::FLAC__StreamMetadata &object)</td></tr>
<tr><td nowrap align=right valign=top> </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#z25_2">CueSheet</a> (const::FLAC__StreamMetadata *object)</td></tr>
<tr><td colspan="2"><div class="groupHeader"></div></td></tr>
-<tr><td nowrap align=right valign=top>void </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#z26_0">operator=</a> (const CueSheet &object)</td></tr>
-<tr><td nowrap align=right valign=top>void </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#z26_1">operator=</a> (const::FLAC__StreamMetadata &object)</td></tr>
-<tr><td nowrap align=right valign=top>void </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#z26_2">operator=</a> (const::FLAC__StreamMetadata *object)</td></tr>
+<tr><td nowrap align=right valign=top>CueSheet & </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#z26_0">operator=</a> (const CueSheet &object)</td></tr>
+<tr><td nowrap align=right valign=top>CueSheet & </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#z26_1">operator=</a> (const::FLAC__StreamMetadata &object)</td></tr>
+<tr><td nowrap align=right valign=top>CueSheet & </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#z26_2">operator=</a> (const::FLAC__StreamMetadata *object)</td></tr>
<tr><td colspan="2"><div class="groupHeader"></div></td></tr>
<tr><td nowrap align=right valign=top>bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#z27_0">operator==</a> (const CueSheet &object) const</td></tr>
<tr><td nowrap align=right valign=top>bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#z27_1">operator==</a> (const::FLAC__StreamMetadata &object) const</td></tr>
@@ -212,7 +213,7 @@
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> void FLAC::Metadata::CueSheet::operator= </td>
+ <td class="md" nowrap valign="top"> CueSheet& FLAC::Metadata::CueSheet::operator= </td>
<td class="md" valign="top">( </td>
<td class="md" nowrap valign="top">const CueSheet & </td>
<td class="mdname1" valign="top" nowrap> <em>object</em> </td>
@@ -241,7 +242,7 @@
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> void FLAC::Metadata::CueSheet::operator= </td>
+ <td class="md" nowrap valign="top"> CueSheet& FLAC::Metadata::CueSheet::operator= </td>
<td class="md" valign="top">( </td>
<td class="md" nowrap valign="top">const ::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> & </td>
<td class="mdname1" valign="top" nowrap> <em>object</em> </td>
@@ -272,7 +273,7 @@
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> void FLAC::Metadata::CueSheet::operator= </td>
+ <td class="md" nowrap valign="top"> CueSheet& FLAC::Metadata::CueSheet::operator= </td>
<td class="md" valign="top">( </td>
<td class="md" nowrap valign="top">const ::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> * </td>
<td class="mdname1" valign="top" nowrap> <em>object</em> </td>
@@ -297,6 +298,44 @@
Reimplemented from <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#z1_2">FLAC::Metadata::Prototype</a>. </td>
</tr>
</table>
+<a name="a3" doxytag="FLAC::Metadata::CueSheet::assign"></a><p>
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
+ <tr>
+ <td class="md">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <td class="md" nowrap valign="top"> CueSheet& FLAC::Metadata::CueSheet::assign </td>
+ <td class="md" valign="top">( </td>
+ <td class="md" nowrap valign="top">::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> * </td>
+ <td class="mdname" nowrap> <em>object</em>, </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td class="md" nowrap>bool </td>
+ <td class="mdname" nowrap> <em>copy</em></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td class="md">) </td>
+ <td class="md" colspan="2"><code> [inline]</code></td>
+ </tr>
+
+ </table>
+ </td>
+ </tr>
+</table>
+<table cellspacing=5 cellpadding=0 border=0>
+ <tr>
+ <td>
+
+ </td>
+ <td>
+
+<p>
+Assigns an object with copy control. See <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b1">Prototype::assign_object</a>(::FLAC__StreamMetadata *object, bool copy). </td>
+ </tr>
+</table>
<a name="z27_0" doxytag="FLAC::Metadata::CueSheet::operator=="></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
@@ -481,7 +520,7 @@
</table>
<hr>The documentation for this class was generated from the following file:<ul>
<li>include/FLAC++/<a class="el" href="+_2metadata_8h-source.html">metadata.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:47 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:22 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -28,7 +28,7 @@
<tr bgcolor="#f0f0f0"><td><b>Track</b>(const::FLAC__StreamMetadata_CueSheet_Track *track) (defined in <a class="el" href="classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html">FLAC::Metadata::CueSheet::Track</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html">FLAC::Metadata::CueSheet::Track</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>Track</b>(const Track &track) (defined in <a class="el" href="classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html">FLAC::Metadata::CueSheet::Track</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html">FLAC::Metadata::CueSheet::Track</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>~Track</b>() (defined in <a class="el" href="classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html">FLAC::Metadata::CueSheet::Track</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html">FLAC::Metadata::CueSheet::Track</a></td><td><code> [virtual]</code></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:47 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:22 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -17,7 +17,7 @@
<tr><td nowrap align=right valign=top><a name="a2" doxytag="FLAC::Metadata::CueSheet::Track::Track"></a>
</td><td valign=bottom><b>Track</b> (const Track &track)</td></tr>
<tr><td nowrap align=right valign=top><a name="a3" doxytag="FLAC::Metadata::CueSheet::Track::operator="></a>
-void </td><td valign=bottom><b>operator=</b> (const Track &track)</td></tr>
+Track & </td><td valign=bottom><b>operator=</b> (const Track &track)</td></tr>
<tr><td nowrap align=right valign=top><a name="a4" doxytag="FLAC::Metadata::CueSheet::Track::~Track"></a>
virtual </td><td valign=bottom><b>~Track</b> ()</td></tr>
<tr><td nowrap align=right valign=top><a name="a5" doxytag="FLAC::Metadata::CueSheet::Track::is_valid"></a>
@@ -61,7 +61,7 @@
<p>
<hr>The documentation for this class was generated from the following file:<ul>
<li>include/FLAC++/<a class="el" href="+_2metadata_8h-source.html">metadata.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:47 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:22 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Iterator-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Iterator-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Iterator-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -21,7 +21,7 @@
<tr bgcolor="#f0f0f0"><td><b>prev</b>() (defined in <a class="el" href="classFLAC_1_1Metadata_1_1Iterator.html">FLAC::Metadata::Iterator</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Iterator.html">FLAC::Metadata::Iterator</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>set_block</b>(Prototype *block) (defined in <a class="el" href="classFLAC_1_1Metadata_1_1Iterator.html">FLAC::Metadata::Iterator</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Iterator.html">FLAC::Metadata::Iterator</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>~Iterator</b>() (defined in <a class="el" href="classFLAC_1_1Metadata_1_1Iterator.html">FLAC::Metadata::Iterator</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Iterator.html">FLAC::Metadata::Iterator</a></td><td><code> [virtual]</code></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:47 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:22 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Iterator.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Iterator.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Iterator.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -26,7 +26,7 @@
<tr><td nowrap align=right valign=top><a name="a5" doxytag="FLAC::Metadata::Iterator::prev"></a>
bool </td><td valign=bottom><b>prev</b> ()</td></tr>
<tr><td nowrap align=right valign=top><a name="a6" doxytag="FLAC::Metadata::Iterator::get_block_type"></a>
-::<a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> </td><td valign=bottom><b>get_block_type</b> () const</td></tr>
+::<a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> </td><td valign=bottom><b>get_block_type</b> () const</td></tr>
<tr><td nowrap align=right valign=top><a name="a7" doxytag="FLAC::Metadata::Iterator::get_block"></a>
<a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">Prototype</a> * </td><td valign=bottom><b>get_block</b> ()</td></tr>
<tr><td nowrap align=right valign=top><a name="a8" doxytag="FLAC::Metadata::Iterator::set_block"></a>
@@ -49,7 +49,7 @@
<p>
<hr>The documentation for this class was generated from the following file:<ul>
<li>include/FLAC++/<a class="el" href="+_2metadata_8h-source.html">metadata.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:47 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:22 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Padding-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Padding-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Padding-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,7 +7,9 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>FLAC::Metadata::Padding Member List</h1>This is the complete list of members for <a class="el" href="classFLAC_1_1Metadata_1_1Padding.html">FLAC::Metadata::Padding</a>, including all inherited members.<table>
- <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b1">clear</a>()</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected, virtual]</code></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Padding.html#a3">assign</a>(::FLAC__StreamMetadata *object, bool copy)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Padding.html">FLAC::Metadata::Padding</a></td><td><code> [inline]</code></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b1">assign_object</a>(::FLAC__StreamMetadata *object, bool copy)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected]</code></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b2">clear</a>()</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected, virtual]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a2">get_is_last</a>() const</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a4">get_length</a>() const</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a3">get_type</a>() const</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td></td></tr>
@@ -41,7 +43,7 @@
<tr bgcolor="#f0f0f0"><td><b>SimpleIterator</b> (defined in <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [friend]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><b>~Padding</b>() (defined in <a class="el" href="classFLAC_1_1Metadata_1_1Padding.html">FLAC::Metadata::Padding</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Padding.html">FLAC::Metadata::Padding</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a0">~Prototype</a>()</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [virtual]</code></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:47 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:21 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Padding.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Padding.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Padding.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -23,16 +23,17 @@
<tr><td nowrap align=right valign=top> </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Padding.html#a1">Padding</a> (::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, bool copy)</td></tr>
<tr><td nowrap align=right valign=top><a name="a2" doxytag="FLAC::Metadata::Padding::~Padding"></a>
</td><td valign=bottom><b>~Padding</b> ()</td></tr>
-<tr><td nowrap align=right valign=top><a name="a3" doxytag="FLAC::Metadata::Padding::set_length"></a>
+<tr><td nowrap align=right valign=top>Padding & </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Padding.html#a3">assign</a> (::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, bool copy)</td></tr>
+<tr><td nowrap align=right valign=top><a name="a4" doxytag="FLAC::Metadata::Padding::set_length"></a>
void </td><td valign=bottom><b>set_length</b> (unsigned length)</td></tr>
<tr><td colspan="2"><div class="groupHeader"></div></td></tr>
<tr><td nowrap align=right valign=top> </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Padding.html#z9_0">Padding</a> (const Padding &object)</td></tr>
<tr><td nowrap align=right valign=top> </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Padding.html#z9_1">Padding</a> (const::FLAC__StreamMetadata &object)</td></tr>
<tr><td nowrap align=right valign=top> </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Padding.html#z9_2">Padding</a> (const::FLAC__StreamMetadata *object)</td></tr>
<tr><td colspan="2"><div class="groupHeader"></div></td></tr>
-<tr><td nowrap align=right valign=top>void </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Padding.html#z10_0">operator=</a> (const Padding &object)</td></tr>
-<tr><td nowrap align=right valign=top>void </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Padding.html#z10_1">operator=</a> (const::FLAC__StreamMetadata &object)</td></tr>
-<tr><td nowrap align=right valign=top>void </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Padding.html#z10_2">operator=</a> (const::FLAC__StreamMetadata *object)</td></tr>
+<tr><td nowrap align=right valign=top>Padding & </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Padding.html#z10_0">operator=</a> (const Padding &object)</td></tr>
+<tr><td nowrap align=right valign=top>Padding & </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Padding.html#z10_1">operator=</a> (const::FLAC__StreamMetadata &object)</td></tr>
+<tr><td nowrap align=right valign=top>Padding & </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Padding.html#z10_2">operator=</a> (const::FLAC__StreamMetadata *object)</td></tr>
<tr><td colspan="2"><div class="groupHeader"></div></td></tr>
<tr><td nowrap align=right valign=top>bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Padding.html#z11_0">operator==</a> (const Padding &object) const</td></tr>
<tr><td nowrap align=right valign=top>bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Padding.html#z11_1">operator==</a> (const::FLAC__StreamMetadata &object) const</td></tr>
@@ -178,7 +179,7 @@
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> void FLAC::Metadata::Padding::operator= </td>
+ <td class="md" nowrap valign="top"> Padding& FLAC::Metadata::Padding::operator= </td>
<td class="md" valign="top">( </td>
<td class="md" nowrap valign="top">const Padding & </td>
<td class="mdname1" valign="top" nowrap> <em>object</em> </td>
@@ -207,7 +208,7 @@
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> void FLAC::Metadata::Padding::operator= </td>
+ <td class="md" nowrap valign="top"> Padding& FLAC::Metadata::Padding::operator= </td>
<td class="md" valign="top">( </td>
<td class="md" nowrap valign="top">const ::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> & </td>
<td class="mdname1" valign="top" nowrap> <em>object</em> </td>
@@ -238,7 +239,7 @@
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> void FLAC::Metadata::Padding::operator= </td>
+ <td class="md" nowrap valign="top"> Padding& FLAC::Metadata::Padding::operator= </td>
<td class="md" valign="top">( </td>
<td class="md" nowrap valign="top">const ::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> * </td>
<td class="mdname1" valign="top" nowrap> <em>object</em> </td>
@@ -263,6 +264,44 @@
Reimplemented from <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#z1_2">FLAC::Metadata::Prototype</a>. </td>
</tr>
</table>
+<a name="a3" doxytag="FLAC::Metadata::Padding::assign"></a><p>
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
+ <tr>
+ <td class="md">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <td class="md" nowrap valign="top"> Padding& FLAC::Metadata::Padding::assign </td>
+ <td class="md" valign="top">( </td>
+ <td class="md" nowrap valign="top">::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> * </td>
+ <td class="mdname" nowrap> <em>object</em>, </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td class="md" nowrap>bool </td>
+ <td class="mdname" nowrap> <em>copy</em></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td class="md">) </td>
+ <td class="md" colspan="2"><code> [inline]</code></td>
+ </tr>
+
+ </table>
+ </td>
+ </tr>
+</table>
+<table cellspacing=5 cellpadding=0 border=0>
+ <tr>
+ <td>
+
+ </td>
+ <td>
+
+<p>
+Assigns an object with copy control. See <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b1">Prototype::assign_object</a>(::FLAC__StreamMetadata *object, bool copy). </td>
+ </tr>
+</table>
<a name="z11_0" doxytag="FLAC::Metadata::Padding::operator=="></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
@@ -447,7 +486,7 @@
</table>
<hr>The documentation for this class was generated from the following file:<ul>
<li>include/FLAC++/<a class="el" href="+_2metadata_8h-source.html">metadata.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:47 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:21 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Prototype-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Prototype-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Prototype-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,7 +7,8 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>FLAC::Metadata::Prototype Member List</h1>This is the complete list of members for <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a>, including all inherited members.<table>
- <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b1">clear</a>()</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected, virtual]</code></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b1">assign_object</a>(::FLAC__StreamMetadata *object, bool copy)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected]</code></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b2">clear</a>()</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected, virtual]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a2">get_is_last</a>() const</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a4">get_length</a>() const</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a3">get_type</a>() const</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td></td></tr>
@@ -31,7 +32,7 @@
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a5">set_is_last</a>(bool)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>SimpleIterator</b> (defined in <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [friend]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a0">~Prototype</a>()</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [virtual]</code></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:47 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:21 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Prototype.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Prototype.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Prototype.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -27,7 +27,7 @@
<tr><td nowrap align=right valign=top>virtual </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a0">~Prototype</a> ()</td></tr>
<tr><td nowrap align=right valign=top>bool </td><td valign=bottom><a class="el" href="group__flacpp__metadata__object.html#a7">is_valid</a> () const</td></tr>
<tr><td nowrap align=right valign=top>bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a2">get_is_last</a> () const</td></tr>
-<tr><td nowrap align=right valign=top>::<a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a3">get_type</a> () const</td></tr>
+<tr><td nowrap align=right valign=top>::<a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a3">get_type</a> () const</td></tr>
<tr><td nowrap align=right valign=top>unsigned </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a4">get_length</a> () const</td></tr>
<tr><td nowrap align=right valign=top>void </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a5">set_is_last</a> (bool)</td></tr>
<tr><td nowrap align=right valign=top> </td><td valign=bottom><a class="el" href="group__flacpp__metadata__object.html#a8">operator const ::FLAC__StreamMetadata *</a> () const</td></tr>
@@ -41,15 +41,16 @@
<tr><td nowrap align=right valign=top>bool </td><td valign=bottom><a class="el" href="group__flacpp__metadata__object.html#a6">operator!=</a> (const::FLAC__StreamMetadata *) const</td></tr>
<tr><td colspan=2><br><h2>Protected Methods</h2></td></tr>
<tr><td nowrap align=right valign=top> </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b0">Prototype</a> (::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, bool copy)</td></tr>
-<tr><td nowrap align=right valign=top>virtual void </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b1">clear</a> ()</td></tr>
+<tr><td nowrap align=right valign=top>Prototype & </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b1">assign_object</a> (::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, bool copy)</td></tr>
+<tr><td nowrap align=right valign=top>virtual void </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b2">clear</a> ()</td></tr>
<tr><td colspan="2"><div class="groupHeader"></div></td></tr>
<tr><td nowrap align=right valign=top> </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#z0_0">Prototype</a> (const Prototype &)</td></tr>
<tr><td nowrap align=right valign=top> </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#z0_1">Prototype</a> (const::FLAC__StreamMetadata &)</td></tr>
<tr><td nowrap align=right valign=top> </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#z0_2">Prototype</a> (const::FLAC__StreamMetadata *)</td></tr>
<tr><td colspan="2"><div class="groupHeader"></div></td></tr>
-<tr><td nowrap align=right valign=top>void </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#z1_0">operator=</a> (const Prototype &)</td></tr>
-<tr><td nowrap align=right valign=top>void </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#z1_1">operator=</a> (const::FLAC__StreamMetadata &)</td></tr>
-<tr><td nowrap align=right valign=top>void </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#z1_2">operator=</a> (const::FLAC__StreamMetadata *)</td></tr>
+<tr><td nowrap align=right valign=top>Prototype & </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#z1_0">operator=</a> (const Prototype &)</td></tr>
+<tr><td nowrap align=right valign=top>Prototype & </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#z1_1">operator=</a> (const::FLAC__StreamMetadata &)</td></tr>
+<tr><td nowrap align=right valign=top>Prototype & </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#z1_2">operator=</a> (const::FLAC__StreamMetadata *)</td></tr>
<tr><td colspan=2><br><h2>Protected Attributes</h2></td></tr>
<tr><td nowrap align=right valign=top><a name="n0" doxytag="FLAC::Metadata::Prototype::object_"></a>
::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> * </td><td valign=bottom><b>object_</b></td></tr>
@@ -226,7 +227,7 @@
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> void FLAC::Metadata::Prototype::operator= </td>
+ <td class="md" nowrap valign="top"> Prototype& FLAC::Metadata::Prototype::operator= </td>
<td class="md" valign="top">( </td>
<td class="md" nowrap valign="top">const Prototype & </td>
<td class="mdname1" valign="top" nowrap> </td>
@@ -255,7 +256,7 @@
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> void FLAC::Metadata::Prototype::operator= </td>
+ <td class="md" nowrap valign="top"> Prototype& FLAC::Metadata::Prototype::operator= </td>
<td class="md" valign="top">( </td>
<td class="md" nowrap valign="top">const::FLAC__StreamMetadata & </td>
<td class="mdname1" valign="top" nowrap> </td>
@@ -286,7 +287,7 @@
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> void FLAC::Metadata::Prototype::operator= </td>
+ <td class="md" nowrap valign="top"> Prototype& FLAC::Metadata::Prototype::operator= </td>
<td class="md" valign="top">( </td>
<td class="md" nowrap valign="top">const::FLAC__StreamMetadata * </td>
<td class="mdname1" valign="top" nowrap> </td>
@@ -311,12 +312,50 @@
Reimplemented in <a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z5_2">FLAC::Metadata::StreamInfo</a>. </td>
</tr>
</table>
-<a name="b1" doxytag="FLAC::Metadata::Prototype::clear"></a><p>
+<a name="b1" doxytag="FLAC::Metadata::Prototype::assign_object"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
+ <td class="md" nowrap valign="top"> Prototype& FLAC::Metadata::Prototype::assign_object </td>
+ <td class="md" valign="top">( </td>
+ <td class="md" nowrap valign="top">::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> * </td>
+ <td class="mdname" nowrap> <em>object</em>, </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td class="md" nowrap>bool </td>
+ <td class="mdname" nowrap> <em>copy</em></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td class="md">) </td>
+ <td class="md" colspan="2"><code> [protected]</code></td>
+ </tr>
+
+ </table>
+ </td>
+ </tr>
+</table>
+<table cellspacing=5 cellpadding=0 border=0>
+ <tr>
+ <td>
+
+ </td>
+ <td>
+
+<p>
+Assigns an object with copy control. See <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b0">Prototype</a>(::FLAC__StreamMetadata *object, bool copy). </td>
+ </tr>
+</table>
+<a name="b2" doxytag="FLAC::Metadata::Prototype::clear"></a><p>
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
+ <tr>
+ <td class="md">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
<td class="md" nowrap valign="top"> virtual void FLAC::Metadata::Prototype::clear </td>
<td class="md" valign="top">( </td>
<td class="mdname1" valign="top" nowrap> </td>
@@ -376,7 +415,7 @@
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> ::<a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> FLAC::Metadata::Prototype::get_type </td>
+ <td class="md" nowrap valign="top"> ::<a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> FLAC::Metadata::Prototype::get_type </td>
<td class="md" valign="top">( </td>
<td class="mdname1" valign="top" nowrap> </td>
<td class="md" valign="top">) </td>
@@ -470,7 +509,7 @@
</table>
<hr>The documentation for this class was generated from the following file:<ul>
<li>include/FLAC++/<a class="el" href="+_2metadata_8h-source.html">metadata.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:47 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:20 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SeekTable-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SeekTable-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SeekTable-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,15 +7,17 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>FLAC::Metadata::SeekTable Member List</h1>This is the complete list of members for <a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html">FLAC::Metadata::SeekTable</a>, including all inherited members.<table>
- <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b1">clear</a>()</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected, virtual]</code></td></tr>
- <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#a7">delete_point</a>(unsigned index)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html">FLAC::Metadata::SeekTable</a></td><td></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#a3">assign</a>(::FLAC__StreamMetadata *object, bool copy)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html">FLAC::Metadata::SeekTable</a></td><td><code> [inline]</code></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b1">assign_object</a>(::FLAC__StreamMetadata *object, bool copy)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected]</code></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b2">clear</a>()</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected, virtual]</code></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#a8">delete_point</a>(unsigned index)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html">FLAC::Metadata::SeekTable</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a2">get_is_last</a>() const</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a4">get_length</a>() const</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>get_num_points</b>() const (defined in <a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html">FLAC::Metadata::SeekTable</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html">FLAC::Metadata::SeekTable</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>get_point</b>(unsigned index) const (defined in <a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html">FLAC::Metadata::SeekTable</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html">FLAC::Metadata::SeekTable</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a3">get_type</a>() const</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td></td></tr>
- <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#a6">insert_point</a>(unsigned index, const::FLAC__StreamMetadata_SeekPoint &point)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html">FLAC::Metadata::SeekTable</a></td><td></td></tr>
- <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#a8">is_legal</a>() const</td><td><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html">FLAC::Metadata::SeekTable</a></td><td></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#a7">insert_point</a>(unsigned index, const::FLAC__StreamMetadata_SeekPoint &point)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html">FLAC::Metadata::SeekTable</a></td><td></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#a9">is_legal</a>() const</td><td><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html">FLAC::Metadata::SeekTable</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="group__flacpp__metadata__object.html#a7">is_valid</a>() const</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [inline]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><b>Iterator</b> (defined in <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [friend]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><b>object_</b> (defined in <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected]</code></td></tr>
@@ -42,11 +44,11 @@
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#z17_2">SeekTable</a>(const::FLAC__StreamMetadata *object)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html">FLAC::Metadata::SeekTable</a></td><td><code> [inline]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#a1">SeekTable</a>(::FLAC__StreamMetadata *object, bool copy)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html">FLAC::Metadata::SeekTable</a></td><td><code> [inline]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a5">set_is_last</a>(bool)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td></td></tr>
- <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#a5">set_point</a>(unsigned index, const::FLAC__StreamMetadata_SeekPoint &point)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html">FLAC::Metadata::SeekTable</a></td><td></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#a6">set_point</a>(unsigned index, const::FLAC__StreamMetadata_SeekPoint &point)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html">FLAC::Metadata::SeekTable</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>SimpleIterator</b> (defined in <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [friend]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a0">~Prototype</a>()</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [virtual]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><b>~SeekTable</b>() (defined in <a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html">FLAC::Metadata::SeekTable</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html">FLAC::Metadata::SeekTable</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:47 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:21 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SeekTable.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SeekTable.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SeekTable.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -23,30 +23,31 @@
<tr><td nowrap align=right valign=top> </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#a1">SeekTable</a> (::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, bool copy)</td></tr>
<tr><td nowrap align=right valign=top><a name="a2" doxytag="FLAC::Metadata::SeekTable::~SeekTable"></a>
</td><td valign=bottom><b>~SeekTable</b> ()</td></tr>
-<tr><td nowrap align=right valign=top><a name="a3" doxytag="FLAC::Metadata::SeekTable::get_num_points"></a>
+<tr><td nowrap align=right valign=top>SeekTable & </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#a3">assign</a> (::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, bool copy)</td></tr>
+<tr><td nowrap align=right valign=top><a name="a4" doxytag="FLAC::Metadata::SeekTable::get_num_points"></a>
unsigned </td><td valign=bottom><b>get_num_points</b> () const</td></tr>
-<tr><td nowrap align=right valign=top><a name="a4" doxytag="FLAC::Metadata::SeekTable::get_point"></a>
+<tr><td nowrap align=right valign=top><a name="a5" doxytag="FLAC::Metadata::SeekTable::get_point"></a>
::<a class="el" href="structFLAC____StreamMetadata__SeekPoint.html">FLAC__StreamMetadata_SeekPoint</a> </td><td valign=bottom><b>get_point</b> (unsigned index) const</td></tr>
-<tr><td nowrap align=right valign=top><a name="a5" doxytag="FLAC::Metadata::SeekTable::set_point"></a>
-void </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#a5">set_point</a> (unsigned index, const::FLAC__StreamMetadata_SeekPoint &point)</td></tr>
+<tr><td nowrap align=right valign=top><a name="a6" doxytag="FLAC::Metadata::SeekTable::set_point"></a>
+void </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#a6">set_point</a> (unsigned index, const::FLAC__StreamMetadata_SeekPoint &point)</td></tr>
<tr><td> </td><td><font size=-1><em>See <a class="el" href="group__flac__metadata__object.html#a6">FLAC__metadata_object_seektable_set_point</a>().</em></font><br><br></td></tr>
-<tr><td nowrap align=right valign=top><a name="a6" doxytag="FLAC::Metadata::SeekTable::insert_point"></a>
-bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#a6">insert_point</a> (unsigned index, const::FLAC__StreamMetadata_SeekPoint &point)</td></tr>
+<tr><td nowrap align=right valign=top><a name="a7" doxytag="FLAC::Metadata::SeekTable::insert_point"></a>
+bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#a7">insert_point</a> (unsigned index, const::FLAC__StreamMetadata_SeekPoint &point)</td></tr>
<tr><td> </td><td><font size=-1><em>See <a class="el" href="group__flac__metadata__object.html#a7">FLAC__metadata_object_seektable_insert_point</a>().</em></font><br><br></td></tr>
-<tr><td nowrap align=right valign=top><a name="a7" doxytag="FLAC::Metadata::SeekTable::delete_point"></a>
-bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#a7">delete_point</a> (unsigned index)</td></tr>
+<tr><td nowrap align=right valign=top><a name="a8" doxytag="FLAC::Metadata::SeekTable::delete_point"></a>
+bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#a8">delete_point</a> (unsigned index)</td></tr>
<tr><td> </td><td><font size=-1><em>See <a class="el" href="group__flac__metadata__object.html#a8">FLAC__metadata_object_seektable_delete_point</a>().</em></font><br><br></td></tr>
-<tr><td nowrap align=right valign=top><a name="a8" doxytag="FLAC::Metadata::SeekTable::is_legal"></a>
-bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#a8">is_legal</a> () const</td></tr>
+<tr><td nowrap align=right valign=top><a name="a9" doxytag="FLAC::Metadata::SeekTable::is_legal"></a>
+bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#a9">is_legal</a> () const</td></tr>
<tr><td> </td><td><font size=-1><em>See <a class="el" href="group__flac__metadata__object.html#a9">FLAC__metadata_object_seektable_is_legal</a>().</em></font><br><br></td></tr>
<tr><td colspan="2"><div class="groupHeader"></div></td></tr>
<tr><td nowrap align=right valign=top> </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#z17_0">SeekTable</a> (const SeekTable &object)</td></tr>
<tr><td nowrap align=right valign=top> </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#z17_1">SeekTable</a> (const::FLAC__StreamMetadata &object)</td></tr>
<tr><td nowrap align=right valign=top> </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#z17_2">SeekTable</a> (const::FLAC__StreamMetadata *object)</td></tr>
<tr><td colspan="2"><div class="groupHeader"></div></td></tr>
-<tr><td nowrap align=right valign=top>void </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#z18_0">operator=</a> (const SeekTable &object)</td></tr>
-<tr><td nowrap align=right valign=top>void </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#z18_1">operator=</a> (const::FLAC__StreamMetadata &object)</td></tr>
-<tr><td nowrap align=right valign=top>void </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#z18_2">operator=</a> (const::FLAC__StreamMetadata *object)</td></tr>
+<tr><td nowrap align=right valign=top>SeekTable & </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#z18_0">operator=</a> (const SeekTable &object)</td></tr>
+<tr><td nowrap align=right valign=top>SeekTable & </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#z18_1">operator=</a> (const::FLAC__StreamMetadata &object)</td></tr>
+<tr><td nowrap align=right valign=top>SeekTable & </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#z18_2">operator=</a> (const::FLAC__StreamMetadata *object)</td></tr>
<tr><td colspan="2"><div class="groupHeader"></div></td></tr>
<tr><td nowrap align=right valign=top>bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#z19_0">operator==</a> (const SeekTable &object) const</td></tr>
<tr><td nowrap align=right valign=top>bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#z19_1">operator==</a> (const::FLAC__StreamMetadata &object) const</td></tr>
@@ -192,7 +193,7 @@
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> void FLAC::Metadata::SeekTable::operator= </td>
+ <td class="md" nowrap valign="top"> SeekTable& FLAC::Metadata::SeekTable::operator= </td>
<td class="md" valign="top">( </td>
<td class="md" nowrap valign="top">const SeekTable & </td>
<td class="mdname1" valign="top" nowrap> <em>object</em> </td>
@@ -221,7 +222,7 @@
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> void FLAC::Metadata::SeekTable::operator= </td>
+ <td class="md" nowrap valign="top"> SeekTable& FLAC::Metadata::SeekTable::operator= </td>
<td class="md" valign="top">( </td>
<td class="md" nowrap valign="top">const ::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> & </td>
<td class="mdname1" valign="top" nowrap> <em>object</em> </td>
@@ -252,7 +253,7 @@
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> void FLAC::Metadata::SeekTable::operator= </td>
+ <td class="md" nowrap valign="top"> SeekTable& FLAC::Metadata::SeekTable::operator= </td>
<td class="md" valign="top">( </td>
<td class="md" nowrap valign="top">const ::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> * </td>
<td class="mdname1" valign="top" nowrap> <em>object</em> </td>
@@ -277,6 +278,44 @@
Reimplemented from <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#z1_2">FLAC::Metadata::Prototype</a>. </td>
</tr>
</table>
+<a name="a3" doxytag="FLAC::Metadata::SeekTable::assign"></a><p>
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
+ <tr>
+ <td class="md">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <td class="md" nowrap valign="top"> SeekTable& FLAC::Metadata::SeekTable::assign </td>
+ <td class="md" valign="top">( </td>
+ <td class="md" nowrap valign="top">::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> * </td>
+ <td class="mdname" nowrap> <em>object</em>, </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td class="md" nowrap>bool </td>
+ <td class="mdname" nowrap> <em>copy</em></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td class="md">) </td>
+ <td class="md" colspan="2"><code> [inline]</code></td>
+ </tr>
+
+ </table>
+ </td>
+ </tr>
+</table>
+<table cellspacing=5 cellpadding=0 border=0>
+ <tr>
+ <td>
+
+ </td>
+ <td>
+
+<p>
+Assigns an object with copy control. See <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b1">Prototype::assign_object</a>(::FLAC__StreamMetadata *object, bool copy). </td>
+ </tr>
+</table>
<a name="z19_0" doxytag="FLAC::Metadata::SeekTable::operator=="></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
@@ -461,7 +500,7 @@
</table>
<hr>The documentation for this class was generated from the following file:<ul>
<li>include/FLAC++/<a class="el" href="+_2metadata_8h-source.html">metadata.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:47 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:21 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SimpleIterator-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SimpleIterator-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SimpleIterator-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -22,7 +22,7 @@
<tr bgcolor="#f0f0f0"><td><b>SimpleIterator</b>() (defined in <a class="el" href="classFLAC_1_1Metadata_1_1SimpleIterator.html">FLAC::Metadata::SimpleIterator</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1SimpleIterator.html">FLAC::Metadata::SimpleIterator</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>status</b>() (defined in <a class="el" href="classFLAC_1_1Metadata_1_1SimpleIterator.html">FLAC::Metadata::SimpleIterator</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1SimpleIterator.html">FLAC::Metadata::SimpleIterator</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>~SimpleIterator</b>() (defined in <a class="el" href="classFLAC_1_1Metadata_1_1SimpleIterator.html">FLAC::Metadata::SimpleIterator</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1SimpleIterator.html">FLAC::Metadata::SimpleIterator</a></td><td><code> [virtual]</code></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:47 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:22 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SimpleIterator.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SimpleIterator.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SimpleIterator.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -30,7 +30,7 @@
<tr><td nowrap align=right valign=top><a name="a7" doxytag="FLAC::Metadata::SimpleIterator::prev"></a>
bool </td><td valign=bottom><b>prev</b> ()</td></tr>
<tr><td nowrap align=right valign=top><a name="a8" doxytag="FLAC::Metadata::SimpleIterator::get_block_type"></a>
-::<a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> </td><td valign=bottom><b>get_block_type</b> () const</td></tr>
+::<a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> </td><td valign=bottom><b>get_block_type</b> () const</td></tr>
<tr><td nowrap align=right valign=top><a name="a9" doxytag="FLAC::Metadata::SimpleIterator::get_block"></a>
<a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">Prototype</a> * </td><td valign=bottom><b>get_block</b> ()</td></tr>
<tr><td nowrap align=right valign=top><a name="a10" doxytag="FLAC::Metadata::SimpleIterator::set_block"></a>
@@ -51,7 +51,7 @@
<p>
<hr>The documentation for this class was generated from the following file:<ul>
<li>include/FLAC++/<a class="el" href="+_2metadata_8h-source.html">metadata.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:47 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:22 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1StreamInfo-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1StreamInfo-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1StreamInfo-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,7 +7,9 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>FLAC::Metadata::StreamInfo Member List</h1>This is the complete list of members for <a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html">FLAC::Metadata::StreamInfo</a>, including all inherited members.<table>
- <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b1">clear</a>()</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected, virtual]</code></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html#a3">assign</a>(::FLAC__StreamMetadata *object, bool copy)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html">FLAC::Metadata::StreamInfo</a></td><td><code> [inline]</code></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b1">assign_object</a>(::FLAC__StreamMetadata *object, bool copy)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected]</code></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b2">clear</a>()</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected, virtual]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z8_6">get_bits_per_sample</a>() const</td><td><a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html">FLAC::Metadata::StreamInfo</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z8_5">get_channels</a>() const</td><td><a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html">FLAC::Metadata::StreamInfo</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a2">get_is_last</a>() const</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td></td></tr>
@@ -58,7 +60,7 @@
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html#a1">StreamInfo</a>(::FLAC__StreamMetadata *object, bool copy)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html">FLAC::Metadata::StreamInfo</a></td><td><code> [inline]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a0">~Prototype</a>()</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [virtual]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><b>~StreamInfo</b>() (defined in <a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html">FLAC::Metadata::StreamInfo</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html">FLAC::Metadata::StreamInfo</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:47 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:21 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1StreamInfo.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1StreamInfo.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1StreamInfo.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -23,14 +23,15 @@
<tr><td nowrap align=right valign=top> </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html#a1">StreamInfo</a> (::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, bool copy)</td></tr>
<tr><td nowrap align=right valign=top><a name="a2" doxytag="FLAC::Metadata::StreamInfo::~StreamInfo"></a>
</td><td valign=bottom><b>~StreamInfo</b> ()</td></tr>
+<tr><td nowrap align=right valign=top>StreamInfo & </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html#a3">assign</a> (::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, bool copy)</td></tr>
<tr><td colspan="2"><div class="groupHeader"></div></td></tr>
<tr><td nowrap align=right valign=top> </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z4_0">StreamInfo</a> (const StreamInfo &object)</td></tr>
<tr><td nowrap align=right valign=top> </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z4_1">StreamInfo</a> (const::FLAC__StreamMetadata &object)</td></tr>
<tr><td nowrap align=right valign=top> </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z4_2">StreamInfo</a> (const::FLAC__StreamMetadata *object)</td></tr>
<tr><td colspan="2"><div class="groupHeader"></div></td></tr>
-<tr><td nowrap align=right valign=top>void </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z5_0">operator=</a> (const StreamInfo &object)</td></tr>
-<tr><td nowrap align=right valign=top>void </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z5_1">operator=</a> (const::FLAC__StreamMetadata &object)</td></tr>
-<tr><td nowrap align=right valign=top>void </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z5_2">operator=</a> (const::FLAC__StreamMetadata *object)</td></tr>
+<tr><td nowrap align=right valign=top>StreamInfo & </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z5_0">operator=</a> (const StreamInfo &object)</td></tr>
+<tr><td nowrap align=right valign=top>StreamInfo & </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z5_1">operator=</a> (const::FLAC__StreamMetadata &object)</td></tr>
+<tr><td nowrap align=right valign=top>StreamInfo & </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z5_2">operator=</a> (const::FLAC__StreamMetadata *object)</td></tr>
<tr><td colspan="2"><div class="groupHeader"></div></td></tr>
<tr><td nowrap align=right valign=top>bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z6_0">operator==</a> (const StreamInfo &object) const</td></tr>
<tr><td nowrap align=right valign=top>bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z6_1">operator==</a> (const::FLAC__StreamMetadata &object) const</td></tr>
@@ -195,7 +196,7 @@
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> void FLAC::Metadata::StreamInfo::operator= </td>
+ <td class="md" nowrap valign="top"> StreamInfo& FLAC::Metadata::StreamInfo::operator= </td>
<td class="md" valign="top">( </td>
<td class="md" nowrap valign="top">const StreamInfo & </td>
<td class="mdname1" valign="top" nowrap> <em>object</em> </td>
@@ -224,7 +225,7 @@
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> void FLAC::Metadata::StreamInfo::operator= </td>
+ <td class="md" nowrap valign="top"> StreamInfo& FLAC::Metadata::StreamInfo::operator= </td>
<td class="md" valign="top">( </td>
<td class="md" nowrap valign="top">const ::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> & </td>
<td class="mdname1" valign="top" nowrap> <em>object</em> </td>
@@ -255,7 +256,7 @@
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> void FLAC::Metadata::StreamInfo::operator= </td>
+ <td class="md" nowrap valign="top"> StreamInfo& FLAC::Metadata::StreamInfo::operator= </td>
<td class="md" valign="top">( </td>
<td class="md" nowrap valign="top">const ::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> * </td>
<td class="mdname1" valign="top" nowrap> <em>object</em> </td>
@@ -280,6 +281,44 @@
Reimplemented from <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#z1_2">FLAC::Metadata::Prototype</a>. </td>
</tr>
</table>
+<a name="a3" doxytag="FLAC::Metadata::StreamInfo::assign"></a><p>
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
+ <tr>
+ <td class="md">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <td class="md" nowrap valign="top"> StreamInfo& FLAC::Metadata::StreamInfo::assign </td>
+ <td class="md" valign="top">( </td>
+ <td class="md" nowrap valign="top">::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> * </td>
+ <td class="mdname" nowrap> <em>object</em>, </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td class="md" nowrap>bool </td>
+ <td class="mdname" nowrap> <em>copy</em></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td class="md">) </td>
+ <td class="md" colspan="2"><code> [inline]</code></td>
+ </tr>
+
+ </table>
+ </td>
+ </tr>
+</table>
+<table cellspacing=5 cellpadding=0 border=0>
+ <tr>
+ <td>
+
+ </td>
+ <td>
+
+<p>
+Assigns an object with copy control. See <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b1">Prototype::assign_object</a>(::FLAC__StreamMetadata *object, bool copy). </td>
+ </tr>
+</table>
<a name="z6_0" doxytag="FLAC::Metadata::StreamInfo::operator=="></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
@@ -977,7 +1016,7 @@
</table>
<hr>The documentation for this class was generated from the following file:<ul>
<li>include/FLAC++/<a class="el" href="+_2metadata_8h-source.html">metadata.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:47 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:21 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Unknown-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Unknown-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Unknown-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,7 +7,9 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>FLAC::Metadata::Unknown Member List</h1>This is the complete list of members for <a class="el" href="classFLAC_1_1Metadata_1_1Unknown.html">FLAC::Metadata::Unknown</a>, including all inherited members.<table>
- <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b1">clear</a>()</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected, virtual]</code></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Unknown.html#a3">assign</a>(::FLAC__StreamMetadata *object, bool copy)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Unknown.html">FLAC::Metadata::Unknown</a></td><td><code> [inline]</code></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b1">assign_object</a>(::FLAC__StreamMetadata *object, bool copy)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected]</code></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b2">clear</a>()</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected, virtual]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><b>get_data</b>() const (defined in <a class="el" href="classFLAC_1_1Metadata_1_1Unknown.html">FLAC::Metadata::Unknown</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Unknown.html">FLAC::Metadata::Unknown</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a2">get_is_last</a>() const</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a4">get_length</a>() const</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td></td></tr>
@@ -32,7 +34,7 @@
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#z0_1">Prototype</a>(const::FLAC__StreamMetadata &)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#z0_2">Prototype</a>(const::FLAC__StreamMetadata *)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b0">Prototype</a>(::FLAC__StreamMetadata *object, bool copy)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected]</code></td></tr>
- <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Unknown.html#a4">set_data</a>(const FLAC__byte *data, unsigned length)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Unknown.html">FLAC::Metadata::Unknown</a></td><td></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Unknown.html#a5">set_data</a>(const FLAC__byte *data, unsigned length)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Unknown.html">FLAC::Metadata::Unknown</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>set_data</b>(FLAC__byte *data, unsigned length, bool copy) (defined in <a class="el" href="classFLAC_1_1Metadata_1_1Unknown.html">FLAC::Metadata::Unknown</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Unknown.html">FLAC::Metadata::Unknown</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a5">set_is_last</a>(bool)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>SimpleIterator</b> (defined in <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [friend]</code></td></tr>
@@ -43,7 +45,7 @@
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Unknown.html#a1">Unknown</a>(::FLAC__StreamMetadata *object, bool copy)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Unknown.html">FLAC::Metadata::Unknown</a></td><td><code> [inline]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a0">~Prototype</a>()</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [virtual]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><b>~Unknown</b>() (defined in <a class="el" href="classFLAC_1_1Metadata_1_1Unknown.html">FLAC::Metadata::Unknown</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Unknown.html">FLAC::Metadata::Unknown</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:47 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:22 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Unknown.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Unknown.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Unknown.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -23,21 +23,22 @@
<tr><td nowrap align=right valign=top> </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Unknown.html#a1">Unknown</a> (::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, bool copy)</td></tr>
<tr><td nowrap align=right valign=top><a name="a2" doxytag="FLAC::Metadata::Unknown::~Unknown"></a>
</td><td valign=bottom><b>~Unknown</b> ()</td></tr>
-<tr><td nowrap align=right valign=top><a name="a3" doxytag="FLAC::Metadata::Unknown::get_data"></a>
+<tr><td nowrap align=right valign=top>Unknown & </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Unknown.html#a3">assign</a> (::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, bool copy)</td></tr>
+<tr><td nowrap align=right valign=top><a name="a4" doxytag="FLAC::Metadata::Unknown::get_data"></a>
const FLAC__byte * </td><td valign=bottom><b>get_data</b> () const</td></tr>
-<tr><td nowrap align=right valign=top><a name="a4" doxytag="FLAC::Metadata::Unknown::set_data"></a>
-bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Unknown.html#a4">set_data</a> (const FLAC__byte *data, unsigned length)</td></tr>
+<tr><td nowrap align=right valign=top><a name="a5" doxytag="FLAC::Metadata::Unknown::set_data"></a>
+bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Unknown.html#a5">set_data</a> (const FLAC__byte *data, unsigned length)</td></tr>
<tr><td> </td><td><font size=-1><em>This form always copies <em>data</em>.</em></font><br><br></td></tr>
-<tr><td nowrap align=right valign=top><a name="a5" doxytag="FLAC::Metadata::Unknown::set_data"></a>
+<tr><td nowrap align=right valign=top><a name="a6" doxytag="FLAC::Metadata::Unknown::set_data"></a>
bool </td><td valign=bottom><b>set_data</b> (FLAC__byte *data, unsigned length, bool copy)</td></tr>
<tr><td colspan="2"><div class="groupHeader"></div></td></tr>
<tr><td nowrap align=right valign=top> </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Unknown.html#z29_0">Unknown</a> (const Unknown &object)</td></tr>
<tr><td nowrap align=right valign=top> </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Unknown.html#z29_1">Unknown</a> (const::FLAC__StreamMetadata &object)</td></tr>
<tr><td nowrap align=right valign=top> </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Unknown.html#z29_2">Unknown</a> (const::FLAC__StreamMetadata *object)</td></tr>
<tr><td colspan="2"><div class="groupHeader"></div></td></tr>
-<tr><td nowrap align=right valign=top>void </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Unknown.html#z30_0">operator=</a> (const Unknown &object)</td></tr>
-<tr><td nowrap align=right valign=top>void </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Unknown.html#z30_1">operator=</a> (const::FLAC__StreamMetadata &object)</td></tr>
-<tr><td nowrap align=right valign=top>void </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Unknown.html#z30_2">operator=</a> (const::FLAC__StreamMetadata *object)</td></tr>
+<tr><td nowrap align=right valign=top>Unknown & </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Unknown.html#z30_0">operator=</a> (const Unknown &object)</td></tr>
+<tr><td nowrap align=right valign=top>Unknown & </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Unknown.html#z30_1">operator=</a> (const::FLAC__StreamMetadata &object)</td></tr>
+<tr><td nowrap align=right valign=top>Unknown & </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Unknown.html#z30_2">operator=</a> (const::FLAC__StreamMetadata *object)</td></tr>
<tr><td colspan="2"><div class="groupHeader"></div></td></tr>
<tr><td nowrap align=right valign=top>bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Unknown.html#z31_0">operator==</a> (const Unknown &object) const</td></tr>
<tr><td nowrap align=right valign=top>bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1Unknown.html#z31_1">operator==</a> (const::FLAC__StreamMetadata &object) const</td></tr>
@@ -183,7 +184,7 @@
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> void FLAC::Metadata::Unknown::operator= </td>
+ <td class="md" nowrap valign="top"> Unknown& FLAC::Metadata::Unknown::operator= </td>
<td class="md" valign="top">( </td>
<td class="md" nowrap valign="top">const Unknown & </td>
<td class="mdname1" valign="top" nowrap> <em>object</em> </td>
@@ -212,7 +213,7 @@
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> void FLAC::Metadata::Unknown::operator= </td>
+ <td class="md" nowrap valign="top"> Unknown& FLAC::Metadata::Unknown::operator= </td>
<td class="md" valign="top">( </td>
<td class="md" nowrap valign="top">const ::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> & </td>
<td class="mdname1" valign="top" nowrap> <em>object</em> </td>
@@ -243,7 +244,7 @@
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> void FLAC::Metadata::Unknown::operator= </td>
+ <td class="md" nowrap valign="top"> Unknown& FLAC::Metadata::Unknown::operator= </td>
<td class="md" valign="top">( </td>
<td class="md" nowrap valign="top">const ::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> * </td>
<td class="mdname1" valign="top" nowrap> <em>object</em> </td>
@@ -268,6 +269,44 @@
Reimplemented from <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#z1_2">FLAC::Metadata::Prototype</a>. </td>
</tr>
</table>
+<a name="a3" doxytag="FLAC::Metadata::Unknown::assign"></a><p>
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
+ <tr>
+ <td class="md">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <td class="md" nowrap valign="top"> Unknown& FLAC::Metadata::Unknown::assign </td>
+ <td class="md" valign="top">( </td>
+ <td class="md" nowrap valign="top">::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> * </td>
+ <td class="mdname" nowrap> <em>object</em>, </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td class="md" nowrap>bool </td>
+ <td class="mdname" nowrap> <em>copy</em></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td class="md">) </td>
+ <td class="md" colspan="2"><code> [inline]</code></td>
+ </tr>
+
+ </table>
+ </td>
+ </tr>
+</table>
+<table cellspacing=5 cellpadding=0 border=0>
+ <tr>
+ <td>
+
+ </td>
+ <td>
+
+<p>
+Assigns an object with copy control. See <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b1">Prototype::assign_object</a>(::FLAC__StreamMetadata *object, bool copy). </td>
+ </tr>
+</table>
<a name="z31_0" doxytag="FLAC::Metadata::Unknown::operator=="></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
@@ -452,7 +491,7 @@
</table>
<hr>The documentation for this class was generated from the following file:<ul>
<li>include/FLAC++/<a class="el" href="+_2metadata_8h-source.html">metadata.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:47 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:22 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1VorbisComment-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1VorbisComment-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1VorbisComment-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,15 +7,18 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>FLAC::Metadata::VorbisComment Member List</h1>This is the complete list of members for <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html">FLAC::Metadata::VorbisComment</a>, including all inherited members.<table>
- <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b1">clear</a>()</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected, virtual]</code></td></tr>
- <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a9">delete_comment</a>(unsigned index)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html">FLAC::Metadata::VorbisComment</a></td><td></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a10">append_comment</a>(const Entry &entry)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html">FLAC::Metadata::VorbisComment</a></td><td></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a3">assign</a>(::FLAC__StreamMetadata *object, bool copy)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html">FLAC::Metadata::VorbisComment</a></td><td><code> [inline]</code></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b1">assign_object</a>(::FLAC__StreamMetadata *object, bool copy)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected]</code></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b2">clear</a>()</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected, virtual]</code></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a11">delete_comment</a>(unsigned index)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html">FLAC::Metadata::VorbisComment</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>get_comment</b>(unsigned index) const (defined in <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html">FLAC::Metadata::VorbisComment</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html">FLAC::Metadata::VorbisComment</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a2">get_is_last</a>() const</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a4">get_length</a>() const</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>get_num_comments</b>() const (defined in <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html">FLAC::Metadata::VorbisComment</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html">FLAC::Metadata::VorbisComment</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a3">get_type</a>() const</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>get_vendor_string</b>() const (defined in <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html">FLAC::Metadata::VorbisComment</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html">FLAC::Metadata::VorbisComment</a></td><td></td></tr>
- <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a8">insert_comment</a>(unsigned index, const Entry &entry)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html">FLAC::Metadata::VorbisComment</a></td><td></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a9">insert_comment</a>(unsigned index, const Entry &entry)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html">FLAC::Metadata::VorbisComment</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="group__flacpp__metadata__object.html#a7">is_valid</a>() const</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [inline]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><b>Iterator</b> (defined in <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [friend]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><b>object_</b> (defined in <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected]</code></td></tr>
@@ -36,9 +39,9 @@
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#z0_1">Prototype</a>(const::FLAC__StreamMetadata &)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#z0_2">Prototype</a>(const::FLAC__StreamMetadata *)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b0">Prototype</a>(::FLAC__StreamMetadata *object, bool copy)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [protected]</code></td></tr>
- <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a7">set_comment</a>(unsigned index, const Entry &entry)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html">FLAC::Metadata::VorbisComment</a></td><td></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a8">set_comment</a>(unsigned index, const Entry &entry)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html">FLAC::Metadata::VorbisComment</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a5">set_is_last</a>(bool)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td></td></tr>
- <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a6">set_vendor_string</a>(const Entry &entry)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html">FLAC::Metadata::VorbisComment</a></td><td></td></tr>
+ <tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a7">set_vendor_string</a>(const FLAC__byte *string)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html">FLAC::Metadata::VorbisComment</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>SimpleIterator</b> (defined in <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [friend]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><b>VorbisComment</b>() (defined in <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html">FLAC::Metadata::VorbisComment</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html">FLAC::Metadata::VorbisComment</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z21_0">VorbisComment</a>(const VorbisComment &object)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html">FLAC::Metadata::VorbisComment</a></td><td><code> [inline]</code></td></tr>
@@ -47,7 +50,7 @@
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a1">VorbisComment</a>(::FLAC__StreamMetadata *object, bool copy)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html">FLAC::Metadata::VorbisComment</a></td><td><code> [inline]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a0">~Prototype</a>()</td><td><a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html">FLAC::Metadata::Prototype</a></td><td><code> [virtual]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><b>~VorbisComment</b>() (defined in <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html">FLAC::Metadata::VorbisComment</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html">FLAC::Metadata::VorbisComment</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:47 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:21 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1VorbisComment.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1VorbisComment.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1VorbisComment.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -23,34 +23,36 @@
<tr><td nowrap align=right valign=top> </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a1">VorbisComment</a> (::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, bool copy)</td></tr>
<tr><td nowrap align=right valign=top><a name="a2" doxytag="FLAC::Metadata::VorbisComment::~VorbisComment"></a>
</td><td valign=bottom><b>~VorbisComment</b> ()</td></tr>
-<tr><td nowrap align=right valign=top><a name="a3" doxytag="FLAC::Metadata::VorbisComment::get_num_comments"></a>
+<tr><td nowrap align=right valign=top>VorbisComment & </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a3">assign</a> (::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, bool copy)</td></tr>
+<tr><td nowrap align=right valign=top><a name="a4" doxytag="FLAC::Metadata::VorbisComment::get_num_comments"></a>
unsigned </td><td valign=bottom><b>get_num_comments</b> () const</td></tr>
-<tr><td nowrap align=right valign=top><a name="a4" doxytag="FLAC::Metadata::VorbisComment::get_vendor_string"></a>
-<a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">Entry</a> </td><td valign=bottom><b>get_vendor_string</b> () const</td></tr>
-<tr><td nowrap align=right valign=top><a name="a5" doxytag="FLAC::Metadata::VorbisComment::get_comment"></a>
+<tr><td nowrap align=right valign=top><a name="a5" doxytag="FLAC::Metadata::VorbisComment::get_vendor_string"></a>
+const FLAC__byte * </td><td valign=bottom><b>get_vendor_string</b> () const</td></tr>
+<tr><td nowrap align=right valign=top><a name="a6" doxytag="FLAC::Metadata::VorbisComment::get_comment"></a>
<a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">Entry</a> </td><td valign=bottom><b>get_comment</b> (unsigned index) const</td></tr>
-<tr><td nowrap align=right valign=top><a name="a6" doxytag="FLAC::Metadata::VorbisComment::set_vendor_string"></a>
-bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a6">set_vendor_string</a> (const <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">Entry</a> &entry)</td></tr>
-<tr><td> </td><td><font size=-1><em>See <a class="el" href="group__flac__metadata__object.html#a15">FLAC__metadata_object_vorbiscomment_set_vendor_string</a>() <dl compact><dt><b>
-Note: </b><dd>
-Only the <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">Entry</a>'s field name will be used.</dl></em></font><br><br></td></tr>
-<tr><td nowrap align=right valign=top><a name="a7" doxytag="FLAC::Metadata::VorbisComment::set_comment"></a>
-bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a7">set_comment</a> (unsigned index, const <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">Entry</a> &entry)</td></tr>
+<tr><td nowrap align=right valign=top><a name="a7" doxytag="FLAC::Metadata::VorbisComment::set_vendor_string"></a>
+bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a7">set_vendor_string</a> (const FLAC__byte *string)</td></tr>
+<tr><td> </td><td><font size=-1><em>See <a class="el" href="group__flac__metadata__object.html#a15">FLAC__metadata_object_vorbiscomment_set_vendor_string</a>().</em></font><br><br></td></tr>
+<tr><td nowrap align=right valign=top><a name="a8" doxytag="FLAC::Metadata::VorbisComment::set_comment"></a>
+bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a8">set_comment</a> (unsigned index, const <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">Entry</a> &entry)</td></tr>
<tr><td> </td><td><font size=-1><em>See <a class="el" href="group__flac__metadata__object.html#a17">FLAC__metadata_object_vorbiscomment_set_comment</a>().</em></font><br><br></td></tr>
-<tr><td nowrap align=right valign=top><a name="a8" doxytag="FLAC::Metadata::VorbisComment::insert_comment"></a>
-bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a8">insert_comment</a> (unsigned index, const <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">Entry</a> &entry)</td></tr>
+<tr><td nowrap align=right valign=top><a name="a9" doxytag="FLAC::Metadata::VorbisComment::insert_comment"></a>
+bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a9">insert_comment</a> (unsigned index, const <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">Entry</a> &entry)</td></tr>
<tr><td> </td><td><font size=-1><em>See <a class="el" href="group__flac__metadata__object.html#a18">FLAC__metadata_object_vorbiscomment_insert_comment</a>().</em></font><br><br></td></tr>
-<tr><td nowrap align=right valign=top><a name="a9" doxytag="FLAC::Metadata::VorbisComment::delete_comment"></a>
-bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a9">delete_comment</a> (unsigned index)</td></tr>
-<tr><td> </td><td><font size=-1><em>See <a class="el" href="group__flac__metadata__object.html#a19">FLAC__metadata_object_vorbiscomment_delete_comment</a>().</em></font><br><br></td></tr>
+<tr><td nowrap align=right valign=top><a name="a10" doxytag="FLAC::Metadata::VorbisComment::append_comment"></a>
+bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a10">append_comment</a> (const <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">Entry</a> &entry)</td></tr>
+<tr><td> </td><td><font size=-1><em>See <a class="el" href="group__flac__metadata__object.html#a19">FLAC__metadata_object_vorbiscomment_append_comment</a>().</em></font><br><br></td></tr>
+<tr><td nowrap align=right valign=top><a name="a11" doxytag="FLAC::Metadata::VorbisComment::delete_comment"></a>
+bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a11">delete_comment</a> (unsigned index)</td></tr>
+<tr><td> </td><td><font size=-1><em>See <a class="el" href="group__flac__metadata__object.html#a21">FLAC__metadata_object_vorbiscomment_delete_comment</a>().</em></font><br><br></td></tr>
<tr><td colspan="2"><div class="groupHeader"></div></td></tr>
<tr><td nowrap align=right valign=top> </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z21_0">VorbisComment</a> (const VorbisComment &object)</td></tr>
<tr><td nowrap align=right valign=top> </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z21_1">VorbisComment</a> (const::FLAC__StreamMetadata &object)</td></tr>
<tr><td nowrap align=right valign=top> </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z21_2">VorbisComment</a> (const::FLAC__StreamMetadata *object)</td></tr>
<tr><td colspan="2"><div class="groupHeader"></div></td></tr>
-<tr><td nowrap align=right valign=top>void </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z22_0">operator=</a> (const VorbisComment &object)</td></tr>
-<tr><td nowrap align=right valign=top>void </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z22_1">operator=</a> (const::FLAC__StreamMetadata &object)</td></tr>
-<tr><td nowrap align=right valign=top>void </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z22_2">operator=</a> (const::FLAC__StreamMetadata *object)</td></tr>
+<tr><td nowrap align=right valign=top>VorbisComment & </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z22_0">operator=</a> (const VorbisComment &object)</td></tr>
+<tr><td nowrap align=right valign=top>VorbisComment & </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z22_1">operator=</a> (const::FLAC__StreamMetadata &object)</td></tr>
+<tr><td nowrap align=right valign=top>VorbisComment & </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z22_2">operator=</a> (const::FLAC__StreamMetadata *object)</td></tr>
<tr><td colspan="2"><div class="groupHeader"></div></td></tr>
<tr><td nowrap align=right valign=top>bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z23_0">operator==</a> (const VorbisComment &object) const</td></tr>
<tr><td nowrap align=right valign=top>bool </td><td valign=bottom><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#z23_1">operator==</a> (const::FLAC__StreamMetadata &object) const</td></tr>
@@ -196,7 +198,7 @@
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> void FLAC::Metadata::VorbisComment::operator= </td>
+ <td class="md" nowrap valign="top"> VorbisComment& FLAC::Metadata::VorbisComment::operator= </td>
<td class="md" valign="top">( </td>
<td class="md" nowrap valign="top">const VorbisComment & </td>
<td class="mdname1" valign="top" nowrap> <em>object</em> </td>
@@ -225,7 +227,7 @@
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> void FLAC::Metadata::VorbisComment::operator= </td>
+ <td class="md" nowrap valign="top"> VorbisComment& FLAC::Metadata::VorbisComment::operator= </td>
<td class="md" valign="top">( </td>
<td class="md" nowrap valign="top">const ::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> & </td>
<td class="mdname1" valign="top" nowrap> <em>object</em> </td>
@@ -256,7 +258,7 @@
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> void FLAC::Metadata::VorbisComment::operator= </td>
+ <td class="md" nowrap valign="top"> VorbisComment& FLAC::Metadata::VorbisComment::operator= </td>
<td class="md" valign="top">( </td>
<td class="md" nowrap valign="top">const ::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> * </td>
<td class="mdname1" valign="top" nowrap> <em>object</em> </td>
@@ -281,6 +283,44 @@
Reimplemented from <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#z1_2">FLAC::Metadata::Prototype</a>. </td>
</tr>
</table>
+<a name="a3" doxytag="FLAC::Metadata::VorbisComment::assign"></a><p>
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
+ <tr>
+ <td class="md">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <td class="md" nowrap valign="top"> VorbisComment& FLAC::Metadata::VorbisComment::assign </td>
+ <td class="md" valign="top">( </td>
+ <td class="md" nowrap valign="top">::<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> * </td>
+ <td class="mdname" nowrap> <em>object</em>, </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td class="md" nowrap>bool </td>
+ <td class="mdname" nowrap> <em>copy</em></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td class="md">) </td>
+ <td class="md" colspan="2"><code> [inline]</code></td>
+ </tr>
+
+ </table>
+ </td>
+ </tr>
+</table>
+<table cellspacing=5 cellpadding=0 border=0>
+ <tr>
+ <td>
+
+ </td>
+ <td>
+
+<p>
+Assigns an object with copy control. See <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b1">Prototype::assign_object</a>(::FLAC__StreamMetadata *object, bool copy). </td>
+ </tr>
+</table>
<a name="z23_0" doxytag="FLAC::Metadata::VorbisComment::operator=="></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
@@ -465,7 +505,7 @@
</table>
<hr>The documentation for this class was generated from the following file:<ul>
<li>include/FLAC++/<a class="el" href="+_2metadata_8h-source.html">metadata.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:47 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:21 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -9,7 +9,9 @@
<hr><h1>FLAC::Metadata::VorbisComment::Entry Member List</h1>This is the complete list of members for <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a>, including all inherited members.<table>
<tr bgcolor="#f0f0f0"><td><b>Entry</b>() (defined in <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>Entry</b>(const char *field, unsigned field_length) (defined in <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a></td><td></td></tr>
+ <tr bgcolor="#f0f0f0"><td><b>Entry</b>(const char *field) (defined in <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>Entry</b>(const char *field_name, const char *field_value, unsigned field_value_length) (defined in <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a></td><td></td></tr>
+ <tr bgcolor="#f0f0f0"><td><b>Entry</b>(const char *field_name, const char *field_value) (defined in <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>Entry</b>(const Entry &entry) (defined in <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>entry_</b> (defined in <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a></td><td><code> [protected]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><b>field_name_</b> (defined in <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a></td><td><code> [protected]</code></td></tr>
@@ -27,10 +29,12 @@
<tr bgcolor="#f0f0f0"><td><b>is_valid_</b> (defined in <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a></td><td><code> [protected]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><b>operator=</b>(const Entry &entry) (defined in <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>set_field</b>(const char *field, unsigned field_length) (defined in <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a></td><td></td></tr>
+ <tr bgcolor="#f0f0f0"><td><b>set_field</b>(const char *field) (defined in <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>set_field_name</b>(const char *field_name) (defined in <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>set_field_value</b>(const char *field_value, unsigned field_value_length) (defined in <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a></td><td></td></tr>
+ <tr bgcolor="#f0f0f0"><td><b>set_field_value</b>(const char *field_value) (defined in <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>~Entry</b>() (defined in <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a>)</td><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a></td><td><code> [virtual]</code></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:47 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:22 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,35 +15,43 @@
<tr><td nowrap align=right valign=top><a name="a1" doxytag="FLAC::Metadata::VorbisComment::Entry::Entry"></a>
</td><td valign=bottom><b>Entry</b> (const char *field, unsigned field_length)</td></tr>
<tr><td nowrap align=right valign=top><a name="a2" doxytag="FLAC::Metadata::VorbisComment::Entry::Entry"></a>
+ </td><td valign=bottom><b>Entry</b> (const char *field)</td></tr>
+<tr><td nowrap align=right valign=top><a name="a3" doxytag="FLAC::Metadata::VorbisComment::Entry::Entry"></a>
</td><td valign=bottom><b>Entry</b> (const char *field_name, const char *field_value, unsigned field_value_length)</td></tr>
-<tr><td nowrap align=right valign=top><a name="a3" doxytag="FLAC::Metadata::VorbisComment::Entry::Entry"></a>
+<tr><td nowrap align=right valign=top><a name="a4" doxytag="FLAC::Metadata::VorbisComment::Entry::Entry"></a>
+ </td><td valign=bottom><b>Entry</b> (const char *field_name, const char *field_value)</td></tr>
+<tr><td nowrap align=right valign=top><a name="a5" doxytag="FLAC::Metadata::VorbisComment::Entry::Entry"></a>
</td><td valign=bottom><b>Entry</b> (const Entry &entry)</td></tr>
-<tr><td nowrap align=right valign=top><a name="a4" doxytag="FLAC::Metadata::VorbisComment::Entry::operator="></a>
-void </td><td valign=bottom><b>operator=</b> (const Entry &entry)</td></tr>
-<tr><td nowrap align=right valign=top><a name="a5" doxytag="FLAC::Metadata::VorbisComment::Entry::~Entry"></a>
+<tr><td nowrap align=right valign=top><a name="a6" doxytag="FLAC::Metadata::VorbisComment::Entry::operator="></a>
+Entry & </td><td valign=bottom><b>operator=</b> (const Entry &entry)</td></tr>
+<tr><td nowrap align=right valign=top><a name="a7" doxytag="FLAC::Metadata::VorbisComment::Entry::~Entry"></a>
virtual </td><td valign=bottom><b>~Entry</b> ()</td></tr>
-<tr><td nowrap align=right valign=top><a name="a6" doxytag="FLAC::Metadata::VorbisComment::Entry::is_valid"></a>
+<tr><td nowrap align=right valign=top><a name="a8" doxytag="FLAC::Metadata::VorbisComment::Entry::is_valid"></a>
virtual bool </td><td valign=bottom><b>is_valid</b> () const</td></tr>
-<tr><td nowrap align=right valign=top><a name="a7" doxytag="FLAC::Metadata::VorbisComment::Entry::get_field_length"></a>
+<tr><td nowrap align=right valign=top><a name="a9" doxytag="FLAC::Metadata::VorbisComment::Entry::get_field_length"></a>
unsigned </td><td valign=bottom><b>get_field_length</b> () const</td></tr>
-<tr><td nowrap align=right valign=top><a name="a8" doxytag="FLAC::Metadata::VorbisComment::Entry::get_field_name_length"></a>
+<tr><td nowrap align=right valign=top><a name="a10" doxytag="FLAC::Metadata::VorbisComment::Entry::get_field_name_length"></a>
unsigned </td><td valign=bottom><b>get_field_name_length</b> () const</td></tr>
-<tr><td nowrap align=right valign=top><a name="a9" doxytag="FLAC::Metadata::VorbisComment::Entry::get_field_value_length"></a>
+<tr><td nowrap align=right valign=top><a name="a11" doxytag="FLAC::Metadata::VorbisComment::Entry::get_field_value_length"></a>
unsigned </td><td valign=bottom><b>get_field_value_length</b> () const</td></tr>
-<tr><td nowrap align=right valign=top><a name="a10" doxytag="FLAC::Metadata::VorbisComment::Entry::get_entry"></a>
+<tr><td nowrap align=right valign=top><a name="a12" doxytag="FLAC::Metadata::VorbisComment::Entry::get_entry"></a>
::<a class="el" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> </td><td valign=bottom><b>get_entry</b> () const</td></tr>
-<tr><td nowrap align=right valign=top><a name="a11" doxytag="FLAC::Metadata::VorbisComment::Entry::get_field"></a>
+<tr><td nowrap align=right valign=top><a name="a13" doxytag="FLAC::Metadata::VorbisComment::Entry::get_field"></a>
const char * </td><td valign=bottom><b>get_field</b> () const</td></tr>
-<tr><td nowrap align=right valign=top><a name="a12" doxytag="FLAC::Metadata::VorbisComment::Entry::get_field_name"></a>
+<tr><td nowrap align=right valign=top><a name="a14" doxytag="FLAC::Metadata::VorbisComment::Entry::get_field_name"></a>
const char * </td><td valign=bottom><b>get_field_name</b> () const</td></tr>
-<tr><td nowrap align=right valign=top><a name="a13" doxytag="FLAC::Metadata::VorbisComment::Entry::get_field_value"></a>
+<tr><td nowrap align=right valign=top><a name="a15" doxytag="FLAC::Metadata::VorbisComment::Entry::get_field_value"></a>
const char * </td><td valign=bottom><b>get_field_value</b> () const</td></tr>
-<tr><td nowrap align=right valign=top><a name="a14" doxytag="FLAC::Metadata::VorbisComment::Entry::set_field"></a>
+<tr><td nowrap align=right valign=top><a name="a16" doxytag="FLAC::Metadata::VorbisComment::Entry::set_field"></a>
bool </td><td valign=bottom><b>set_field</b> (const char *field, unsigned field_length)</td></tr>
-<tr><td nowrap align=right valign=top><a name="a15" doxytag="FLAC::Metadata::VorbisComment::Entry::set_field_name"></a>
+<tr><td nowrap align=right valign=top><a name="a17" doxytag="FLAC::Metadata::VorbisComment::Entry::set_field"></a>
+bool </td><td valign=bottom><b>set_field</b> (const char *field)</td></tr>
+<tr><td nowrap align=right valign=top><a name="a18" doxytag="FLAC::Metadata::VorbisComment::Entry::set_field_name"></a>
bool </td><td valign=bottom><b>set_field_name</b> (const char *field_name)</td></tr>
-<tr><td nowrap align=right valign=top><a name="a16" doxytag="FLAC::Metadata::VorbisComment::Entry::set_field_value"></a>
+<tr><td nowrap align=right valign=top><a name="a19" doxytag="FLAC::Metadata::VorbisComment::Entry::set_field_value"></a>
bool </td><td valign=bottom><b>set_field_value</b> (const char *field_value, unsigned field_value_length)</td></tr>
+<tr><td nowrap align=right valign=top><a name="a20" doxytag="FLAC::Metadata::VorbisComment::Entry::set_field_value"></a>
+bool </td><td valign=bottom><b>set_field_value</b> (const char *field_value)</td></tr>
<tr><td colspan=2><br><h2>Protected Attributes</h2></td></tr>
<tr><td nowrap align=right valign=top><a name="n0" doxytag="FLAC::Metadata::VorbisComment::Entry::is_valid_"></a>
bool </td><td valign=bottom><b>is_valid_</b></td></tr>
@@ -61,17 +69,17 @@
<hr><a name="_details"></a><h2>Detailed Description</h2>
Convenience class for encapsulating Vorbis comment entries. An entry is a vendor string or a comment field. In the case of a vendor string, the field name is undefined; only the field value is relevant.
<p>
-A <em>field</em> as used in the methods refers to an entire 'NAME=VALUE' string; the string is not null- terminated and a length field is required since the string may contain embedded nulls.
+A <em>field</em> as used in the methods refers to an entire 'NAME=VALUE' string; for convenience the string is NUL-terminated. A length field is required in the unlikely event that the value contains contain embedded NULs.
<p>
-A <em>field_name</em> is what is on the left side of the first '=' in the <em>field</em>. By definition it is ASCII and so is null-terminated and does not require a length to describe it. <em>field_name</em> is undefined for a vendor string entry.
+A <em>field_name</em> is what is on the left side of the first '=' in the <em>field</em>. By definition it is ASCII and so is NUL-terminated and does not require a length to describe it. <em>field_name</em> is undefined for a vendor string entry.
<p>
-A <em>field_value</em> is what is on the right side of the first '=' in the <em>field</em>. By definition, this may contain embedded nulls and so a <em>field_value_length</em> is requires to describe it.
+A <em>field_value</em> is what is on the right side of the first '=' in the <em>field</em>. By definition, this may contain embedded NULs and so a <em>field_value_length</em> is required to describe it. However in practice, embedded NULs are not known to be used, so it is generally safe to treat field values as NUL- terminated UTF-8 strings.
<p>
-Always check <a class="el" href="group__flacpp__metadata__object.html#a7">is_valid</a>() after the constructor or operator= to make sure memory was properly allocated.
+Always check <a class="el" href="group__flacpp__metadata__object.html#a7">is_valid</a>() after the constructor or operator= to make sure memory was properly allocated and that the <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">Entry</a> conforms to the Vorbis comment specification.
<p>
<hr>The documentation for this class was generated from the following file:<ul>
<li>include/FLAC++/<a class="el" href="+_2metadata_8h-source.html">metadata.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:47 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:22 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Decoder_1_1File-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Decoder_1_1File-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Decoder_1_1File-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -40,7 +40,7 @@
<tr bgcolor="#f0f0f0"><td><b>set_serial_number</b>(long value) (defined in <a class="el" href="classOggFLAC_1_1Decoder_1_1File.html">OggFLAC::Decoder::File</a>)</td><td><a class="el" href="classOggFLAC_1_1Decoder_1_1File.html">OggFLAC::Decoder::File</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>write_callback</b>(const::FLAC__Frame *frame, const FLAC__int32 *const buffer[])=0 (defined in <a class="el" href="classOggFLAC_1_1Decoder_1_1File.html">OggFLAC::Decoder::File</a>)</td><td><a class="el" href="classOggFLAC_1_1Decoder_1_1File.html">OggFLAC::Decoder::File</a></td><td><code> [protected, pure virtual]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><b>~File</b>() (defined in <a class="el" href="classOggFLAC_1_1Decoder_1_1File.html">OggFLAC::Decoder::File</a>)</td><td><a class="el" href="classOggFLAC_1_1Decoder_1_1File.html">OggFLAC::Decoder::File</a></td><td><code> [virtual]</code></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:48 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:22 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Decoder_1_1File.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Decoder_1_1File.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Decoder_1_1File.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -29,13 +29,13 @@
bool </td><td valign=bottom><a class="el" href="classOggFLAC_1_1Decoder_1_1File.html#a6">set_filename</a> (const char *value)</td></tr>
<tr><td> </td><td><font size=-1><em>'value' may not be <code>NULL</code>; use "-" for stdin.</em></font><br><br></td></tr>
<tr><td nowrap align=right valign=top><a name="a7" doxytag="OggFLAC::Decoder::File::set_metadata_respond"></a>
-bool </td><td valign=bottom><b>set_metadata_respond</b> (::<a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> type)</td></tr>
+bool </td><td valign=bottom><b>set_metadata_respond</b> (::<a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> type)</td></tr>
<tr><td nowrap align=right valign=top><a name="a8" doxytag="OggFLAC::Decoder::File::set_metadata_respond_application"></a>
bool </td><td valign=bottom><b>set_metadata_respond_application</b> (const FLAC__byte id[4])</td></tr>
<tr><td nowrap align=right valign=top><a name="a9" doxytag="OggFLAC::Decoder::File::set_metadata_respond_all"></a>
bool </td><td valign=bottom><b>set_metadata_respond_all</b> ()</td></tr>
<tr><td nowrap align=right valign=top><a name="a10" doxytag="OggFLAC::Decoder::File::set_metadata_ignore"></a>
-bool </td><td valign=bottom><b>set_metadata_ignore</b> (::<a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> type)</td></tr>
+bool </td><td valign=bottom><b>set_metadata_ignore</b> (::<a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> type)</td></tr>
<tr><td nowrap align=right valign=top><a name="a11" doxytag="OggFLAC::Decoder::File::set_metadata_ignore_application"></a>
bool </td><td valign=bottom><b>set_metadata_ignore_application</b> (const FLAC__byte id[4])</td></tr>
<tr><td nowrap align=right valign=top><a name="a12" doxytag="OggFLAC::Decoder::File::set_metadata_ignore_all"></a>
@@ -53,7 +53,7 @@
<tr><td nowrap align=right valign=top><a name="a18" doxytag="OggFLAC::Decoder::File::get_channels"></a>
unsigned </td><td valign=bottom><b>get_channels</b> () const</td></tr>
<tr><td nowrap align=right valign=top><a name="a19" doxytag="OggFLAC::Decoder::File::get_channel_assignment"></a>
-::<a class="el" href="group__flac__format.html#a92">FLAC__ChannelAssignment</a> </td><td valign=bottom><b>get_channel_assignment</b> () const</td></tr>
+::<a class="el" href="group__flac__format.html#a95">FLAC__ChannelAssignment</a> </td><td valign=bottom><b>get_channel_assignment</b> () const</td></tr>
<tr><td nowrap align=right valign=top><a name="a20" doxytag="OggFLAC::Decoder::File::get_bits_per_sample"></a>
unsigned </td><td valign=bottom><b>get_bits_per_sample</b> () const</td></tr>
<tr><td nowrap align=right valign=top><a name="a21" doxytag="OggFLAC::Decoder::File::get_sample_rate"></a>
@@ -88,7 +88,7 @@
<p>
<hr>The documentation for this class was generated from the following file:<ul>
<li>include/OggFLAC++/<a class="el" href="OggFLAC++_2decoder_8h-source.html">decoder.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:48 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:22 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Decoder_1_1SeekableStream-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Decoder_1_1SeekableStream-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Decoder_1_1SeekableStream-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -45,7 +45,7 @@
<tr bgcolor="#f0f0f0"><td><b>tell_callback</b>(FLAC__uint64 *absolute_byte_offset)=0 (defined in <a class="el" href="classOggFLAC_1_1Decoder_1_1SeekableStream.html">OggFLAC::Decoder::SeekableStream</a>)</td><td><a class="el" href="classOggFLAC_1_1Decoder_1_1SeekableStream.html">OggFLAC::Decoder::SeekableStream</a></td><td><code> [protected, pure virtual]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><b>write_callback</b>(const::FLAC__Frame *frame, const FLAC__int32 *const buffer[])=0 (defined in <a class="el" href="classOggFLAC_1_1Decoder_1_1SeekableStream.html">OggFLAC::Decoder::SeekableStream</a>)</td><td><a class="el" href="classOggFLAC_1_1Decoder_1_1SeekableStream.html">OggFLAC::Decoder::SeekableStream</a></td><td><code> [protected, pure virtual]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><b>~SeekableStream</b>() (defined in <a class="el" href="classOggFLAC_1_1Decoder_1_1SeekableStream.html">OggFLAC::Decoder::SeekableStream</a>)</td><td><a class="el" href="classOggFLAC_1_1Decoder_1_1SeekableStream.html">OggFLAC::Decoder::SeekableStream</a></td><td><code> [virtual]</code></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:48 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:22 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Decoder_1_1SeekableStream.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Decoder_1_1SeekableStream.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Decoder_1_1SeekableStream.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -26,13 +26,13 @@
<tr><td nowrap align=right valign=top><a name="a5" doxytag="OggFLAC::Decoder::SeekableStream::set_md5_checking"></a>
bool </td><td valign=bottom><b>set_md5_checking</b> (bool value)</td></tr>
<tr><td nowrap align=right valign=top><a name="a6" doxytag="OggFLAC::Decoder::SeekableStream::set_metadata_respond"></a>
-bool </td><td valign=bottom><b>set_metadata_respond</b> (::<a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> type)</td></tr>
+bool </td><td valign=bottom><b>set_metadata_respond</b> (::<a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> type)</td></tr>
<tr><td nowrap align=right valign=top><a name="a7" doxytag="OggFLAC::Decoder::SeekableStream::set_metadata_respond_application"></a>
bool </td><td valign=bottom><b>set_metadata_respond_application</b> (const FLAC__byte id[4])</td></tr>
<tr><td nowrap align=right valign=top><a name="a8" doxytag="OggFLAC::Decoder::SeekableStream::set_metadata_respond_all"></a>
bool </td><td valign=bottom><b>set_metadata_respond_all</b> ()</td></tr>
<tr><td nowrap align=right valign=top><a name="a9" doxytag="OggFLAC::Decoder::SeekableStream::set_metadata_ignore"></a>
-bool </td><td valign=bottom><b>set_metadata_ignore</b> (::<a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> type)</td></tr>
+bool </td><td valign=bottom><b>set_metadata_ignore</b> (::<a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> type)</td></tr>
<tr><td nowrap align=right valign=top><a name="a10" doxytag="OggFLAC::Decoder::SeekableStream::set_metadata_ignore_application"></a>
bool </td><td valign=bottom><b>set_metadata_ignore_application</b> (const FLAC__byte id[4])</td></tr>
<tr><td nowrap align=right valign=top><a name="a11" doxytag="OggFLAC::Decoder::SeekableStream::set_metadata_ignore_all"></a>
@@ -48,7 +48,7 @@
<tr><td nowrap align=right valign=top><a name="a16" doxytag="OggFLAC::Decoder::SeekableStream::get_channels"></a>
unsigned </td><td valign=bottom><b>get_channels</b> () const</td></tr>
<tr><td nowrap align=right valign=top><a name="a17" doxytag="OggFLAC::Decoder::SeekableStream::get_channel_assignment"></a>
-::<a class="el" href="group__flac__format.html#a92">FLAC__ChannelAssignment</a> </td><td valign=bottom><b>get_channel_assignment</b> () const</td></tr>
+::<a class="el" href="group__flac__format.html#a95">FLAC__ChannelAssignment</a> </td><td valign=bottom><b>get_channel_assignment</b> () const</td></tr>
<tr><td nowrap align=right valign=top><a name="a18" doxytag="OggFLAC::Decoder::SeekableStream::get_bits_per_sample"></a>
unsigned </td><td valign=bottom><b>get_bits_per_sample</b> () const</td></tr>
<tr><td nowrap align=right valign=top><a name="a19" doxytag="OggFLAC::Decoder::SeekableStream::get_sample_rate"></a>
@@ -97,7 +97,7 @@
<p>
<hr>The documentation for this class was generated from the following file:<ul>
<li>include/OggFLAC++/<a class="el" href="OggFLAC++_2decoder_8h-source.html">decoder.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:48 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:22 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Decoder_1_1Stream-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Decoder_1_1Stream-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Decoder_1_1Stream-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -37,7 +37,7 @@
<tr bgcolor="#f0f0f0"><td><b>Stream</b>() (defined in <a class="el" href="classOggFLAC_1_1Decoder_1_1Stream.html">OggFLAC::Decoder::Stream</a>)</td><td><a class="el" href="classOggFLAC_1_1Decoder_1_1Stream.html">OggFLAC::Decoder::Stream</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>write_callback</b>(const::FLAC__Frame *frame, const FLAC__int32 *const buffer[])=0 (defined in <a class="el" href="classOggFLAC_1_1Decoder_1_1Stream.html">OggFLAC::Decoder::Stream</a>)</td><td><a class="el" href="classOggFLAC_1_1Decoder_1_1Stream.html">OggFLAC::Decoder::Stream</a></td><td><code> [protected, pure virtual]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><b>~Stream</b>() (defined in <a class="el" href="classOggFLAC_1_1Decoder_1_1Stream.html">OggFLAC::Decoder::Stream</a>)</td><td><a class="el" href="classOggFLAC_1_1Decoder_1_1Stream.html">OggFLAC::Decoder::Stream</a></td><td><code> [virtual]</code></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:47 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:22 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Decoder_1_1Stream.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Decoder_1_1Stream.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Decoder_1_1Stream.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -24,13 +24,13 @@
<tr><td nowrap align=right valign=top><a name="a4" doxytag="OggFLAC::Decoder::Stream::set_serial_number"></a>
bool </td><td valign=bottom><b>set_serial_number</b> (long value)</td></tr>
<tr><td nowrap align=right valign=top><a name="a5" doxytag="OggFLAC::Decoder::Stream::set_metadata_respond"></a>
-bool </td><td valign=bottom><b>set_metadata_respond</b> (::<a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> type)</td></tr>
+bool </td><td valign=bottom><b>set_metadata_respond</b> (::<a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> type)</td></tr>
<tr><td nowrap align=right valign=top><a name="a6" doxytag="OggFLAC::Decoder::Stream::set_metadata_respond_application"></a>
bool </td><td valign=bottom><b>set_metadata_respond_application</b> (const FLAC__byte id[4])</td></tr>
<tr><td nowrap align=right valign=top><a name="a7" doxytag="OggFLAC::Decoder::Stream::set_metadata_respond_all"></a>
bool </td><td valign=bottom><b>set_metadata_respond_all</b> ()</td></tr>
<tr><td nowrap align=right valign=top><a name="a8" doxytag="OggFLAC::Decoder::Stream::set_metadata_ignore"></a>
-bool </td><td valign=bottom><b>set_metadata_ignore</b> (::<a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> type)</td></tr>
+bool </td><td valign=bottom><b>set_metadata_ignore</b> (::<a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> type)</td></tr>
<tr><td nowrap align=right valign=top><a name="a9" doxytag="OggFLAC::Decoder::Stream::set_metadata_ignore_application"></a>
bool </td><td valign=bottom><b>set_metadata_ignore_application</b> (const FLAC__byte id[4])</td></tr>
<tr><td nowrap align=right valign=top><a name="a10" doxytag="OggFLAC::Decoder::Stream::set_metadata_ignore_all"></a>
@@ -42,7 +42,7 @@
<tr><td nowrap align=right valign=top><a name="a13" doxytag="OggFLAC::Decoder::Stream::get_channels"></a>
unsigned </td><td valign=bottom><b>get_channels</b> () const</td></tr>
<tr><td nowrap align=right valign=top><a name="a14" doxytag="OggFLAC::Decoder::Stream::get_channel_assignment"></a>
-::<a class="el" href="group__flac__format.html#a92">FLAC__ChannelAssignment</a> </td><td valign=bottom><b>get_channel_assignment</b> () const</td></tr>
+::<a class="el" href="group__flac__format.html#a95">FLAC__ChannelAssignment</a> </td><td valign=bottom><b>get_channel_assignment</b> () const</td></tr>
<tr><td nowrap align=right valign=top><a name="a15" doxytag="OggFLAC::Decoder::Stream::get_bits_per_sample"></a>
unsigned </td><td valign=bottom><b>get_bits_per_sample</b> () const</td></tr>
<tr><td nowrap align=right valign=top><a name="a16" doxytag="OggFLAC::Decoder::Stream::get_sample_rate"></a>
@@ -109,7 +109,7 @@
</table>
<hr>The documentation for this class was generated from the following file:<ul>
<li>include/OggFLAC++/<a class="el" href="OggFLAC++_2decoder_8h-source.html">decoder.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:47 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:22 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Encoder_1_1File-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Encoder_1_1File-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Encoder_1_1File-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -59,7 +59,7 @@
<tr bgcolor="#f0f0f0"><td><b>set_total_samples_estimate</b>(FLAC__uint64 value) (defined in <a class="el" href="classOggFLAC_1_1Encoder_1_1File.html">OggFLAC::Encoder::File</a>)</td><td><a class="el" href="classOggFLAC_1_1Encoder_1_1File.html">OggFLAC::Encoder::File</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>set_verify</b>(bool value) (defined in <a class="el" href="classOggFLAC_1_1Encoder_1_1File.html">OggFLAC::Encoder::File</a>)</td><td><a class="el" href="classOggFLAC_1_1Encoder_1_1File.html">OggFLAC::Encoder::File</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>~File</b>() (defined in <a class="el" href="classOggFLAC_1_1Encoder_1_1File.html">OggFLAC::Encoder::File</a>)</td><td><a class="el" href="classOggFLAC_1_1Encoder_1_1File.html">OggFLAC::Encoder::File</a></td><td><code> [virtual]</code></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:48 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:23 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Encoder_1_1File.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Encoder_1_1File.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Encoder_1_1File.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -125,7 +125,7 @@
<p>
<hr>The documentation for this class was generated from the following file:<ul>
<li>include/OggFLAC++/<a class="el" href="OggFLAC++_2encoder_8h-source.html">encoder.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:48 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:23 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Encoder_1_1SeekableStream-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Encoder_1_1SeekableStream-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Encoder_1_1SeekableStream-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -60,7 +60,7 @@
<tr bgcolor="#f0f0f0"><td><b>tell_callback</b>(FLAC__uint64 *absolute_byte_offset)=0 (defined in <a class="el" href="classOggFLAC_1_1Encoder_1_1SeekableStream.html">OggFLAC::Encoder::SeekableStream</a>)</td><td><a class="el" href="classOggFLAC_1_1Encoder_1_1SeekableStream.html">OggFLAC::Encoder::SeekableStream</a></td><td><code> [protected, pure virtual]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><b>write_callback</b>(const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame)=0 (defined in <a class="el" href="classOggFLAC_1_1Encoder_1_1SeekableStream.html">OggFLAC::Encoder::SeekableStream</a>)</td><td><a class="el" href="classOggFLAC_1_1Encoder_1_1SeekableStream.html">OggFLAC::Encoder::SeekableStream</a></td><td><code> [protected, pure virtual]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><b>~SeekableStream</b>() (defined in <a class="el" href="classOggFLAC_1_1Encoder_1_1SeekableStream.html">OggFLAC::Encoder::SeekableStream</a>)</td><td><a class="el" href="classOggFLAC_1_1Encoder_1_1SeekableStream.html">OggFLAC::Encoder::SeekableStream</a></td><td><code> [virtual]</code></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:48 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:23 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Encoder_1_1SeekableStream.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Encoder_1_1SeekableStream.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Encoder_1_1SeekableStream.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -127,7 +127,7 @@
<p>
<hr>The documentation for this class was generated from the following file:<ul>
<li>include/OggFLAC++/<a class="el" href="OggFLAC++_2encoder_8h-source.html">encoder.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:48 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:23 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Encoder_1_1Stream-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Encoder_1_1Stream-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Encoder_1_1Stream-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -58,7 +58,7 @@
<tr bgcolor="#f0f0f0"><td><b>Stream</b>() (defined in <a class="el" href="classOggFLAC_1_1Encoder_1_1Stream.html">OggFLAC::Encoder::Stream</a>)</td><td><a class="el" href="classOggFLAC_1_1Encoder_1_1Stream.html">OggFLAC::Encoder::Stream</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>write_callback</b>(const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame)=0 (defined in <a class="el" href="classOggFLAC_1_1Encoder_1_1Stream.html">OggFLAC::Encoder::Stream</a>)</td><td><a class="el" href="classOggFLAC_1_1Encoder_1_1Stream.html">OggFLAC::Encoder::Stream</a></td><td><code> [protected, pure virtual]</code></td></tr>
<tr bgcolor="#f0f0f0"><td><b>~Stream</b>() (defined in <a class="el" href="classOggFLAC_1_1Encoder_1_1Stream.html">OggFLAC::Encoder::Stream</a>)</td><td><a class="el" href="classOggFLAC_1_1Encoder_1_1Stream.html">OggFLAC::Encoder::Stream</a></td><td><code> [virtual]</code></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:48 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:22 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Encoder_1_1Stream.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Encoder_1_1Stream.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classOggFLAC_1_1Encoder_1_1Stream.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -123,7 +123,7 @@
<p>
<hr>The documentation for this class was generated from the following file:<ul>
<li>include/OggFLAC++/<a class="el" href="OggFLAC++_2encoder_8h-source.html">encoder.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:48 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:22 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classes.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classes.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/classes.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -22,7 +22,7 @@
<tr><td><a class="el" href="structFLAC____EntropyCodingMethod__PartitionedRice.html">FLAC__EntropyCodingMethod_PartitionedRice</a> </td><td><a class="el" href="structFLAC____StreamMetadata__CueSheet.html">FLAC__StreamMetadata_CueSheet</a> </td><td><a class="el" href="structFLAC____Subframe__Verbatim.html">FLAC__Subframe_Verbatim</a> </td><td><a class="el" href="classOggFLAC_1_1Decoder_1_1SeekableStream.html">SeekableStream</a> (OggFLAC::Decoder) </td><td><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">VorbisComment::Entry</a> (FLAC::Metadata) </td></tr>
<tr><td><a class="el" href="structFLAC____EntropyCodingMethod__PartitionedRiceContents.html">FLAC__EntropyCodingMethod_PartitionedRiceContents</a> </td><td><a class="el" href="structFLAC____StreamMetadata__CueSheet__Index.html">FLAC__StreamMetadata_CueSheet_Index</a> </td><td><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah"> I </td></tr></table></td></tr>
</table>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:12 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/file__decoder_8h-source.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/file__decoder_8h-source.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/file__decoder_8h-source.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,7 +7,7 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>include/FLAC/file_decoder.h</h1><a href="file__decoder_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <font class="comment">/* libFLAC - Free Lossless Audio Codec library</font>
-00002 <font class="comment"> * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson</font>
+00002 <font class="comment"> * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson</font>
00003 <font class="comment"> *</font>
00004 <font class="comment"> * Redistribution and use in source and binary forms, with or without</font>
00005 <font class="comment"> * modification, are permitted provided that the following conditions</font>
@@ -113,13 +113,13 @@
00330
00343 FLAC_API FLAC__bool <a class="code" href="file__decoder_8h.html#a11">FLAC__file_decoder_set_client_data</a>(<a class="code" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder, <font class="keywordtype">void</font> *value);
00344
-00358 FLAC_API FLAC__bool <a class="code" href="file__decoder_8h.html#a12">FLAC__file_decoder_set_metadata_respond</a>(<a class="code" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder, <a class="code" href="format_8h.html#a94">FLAC__MetadataType</a> type);
+00358 FLAC_API FLAC__bool <a class="code" href="file__decoder_8h.html#a12">FLAC__file_decoder_set_metadata_respond</a>(<a class="code" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder, <a class="code" href="format_8h.html#a97">FLAC__MetadataType</a> type);
00359
00373 FLAC_API FLAC__bool <a class="code" href="file__decoder_8h.html#a13">FLAC__file_decoder_set_metadata_respond_application</a>(<a class="code" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder, <font class="keyword">const</font> FLAC__byte id[4]);
00374
00386 FLAC_API FLAC__bool <a class="code" href="file__decoder_8h.html#a14">FLAC__file_decoder_set_metadata_respond_all</a>(<a class="code" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder);
00387
-00401 FLAC_API FLAC__bool <a class="code" href="file__decoder_8h.html#a15">FLAC__file_decoder_set_metadata_ignore</a>(<a class="code" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder, <a class="code" href="format_8h.html#a94">FLAC__MetadataType</a> type);
+00401 FLAC_API FLAC__bool <a class="code" href="file__decoder_8h.html#a15">FLAC__file_decoder_set_metadata_ignore</a>(<a class="code" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder, <a class="code" href="format_8h.html#a97">FLAC__MetadataType</a> type);
00402
00416 FLAC_API FLAC__bool <a class="code" href="file__decoder_8h.html#a16">FLAC__file_decoder_set_metadata_ignore_application</a>(<a class="code" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder, <font class="keyword">const</font> FLAC__byte id[4]);
00417
@@ -137,7 +137,7 @@
00490
00500 FLAC_API <font class="keywordtype">unsigned</font> <a class="code" href="file__decoder_8h.html#a23">FLAC__file_decoder_get_channels</a>(<font class="keyword">const</font> <a class="code" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder);
00501
-00511 FLAC_API <a class="code" href="format_8h.html#a92">FLAC__ChannelAssignment</a> <a class="code" href="file__decoder_8h.html#a24">FLAC__file_decoder_get_channel_assignment</a>(<font class="keyword">const</font> <a class="code" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder);
+00511 FLAC_API <a class="code" href="format_8h.html#a95">FLAC__ChannelAssignment</a> <a class="code" href="file__decoder_8h.html#a24">FLAC__file_decoder_get_channel_assignment</a>(<font class="keyword">const</font> <a class="code" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder);
00512
00522 FLAC_API <font class="keywordtype">unsigned</font> <a class="code" href="file__decoder_8h.html#a25">FLAC__file_decoder_get_bits_per_sample</a>(<font class="keyword">const</font> <a class="code" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder);
00523
@@ -168,7 +168,7 @@
00658 <font class="preprocessor">#endif</font>
00659 <font class="preprocessor"></font>
00660 <font class="preprocessor">#endif</font>
-</pre></div><hr><address><small>Generated on Tue Sep 28 21:19:41 2004 for FLAC by
+</pre></div><hr><address><small>Generated on Fri Feb 4 18:39:10 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/file__decoder_8h.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/file__decoder_8h.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/file__decoder_8h.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -44,10 +44,10 @@
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a9">FLAC__file_decoder_set_metadata_callback</a> (<a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder, <a class="el" href="group__flac__file__decoder.html#a2">FLAC__FileDecoderMetadataCallback</a> value)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a10">FLAC__file_decoder_set_error_callback</a> (<a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder, <a class="el" href="group__flac__file__decoder.html#a3">FLAC__FileDecoderErrorCallback</a> value)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a11">FLAC__file_decoder_set_client_data</a> (<a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder, void *value)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a12">FLAC__file_decoder_set_metadata_respond</a> (<a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder, <a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> type)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a12">FLAC__file_decoder_set_metadata_respond</a> (<a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder, <a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> type)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a13">FLAC__file_decoder_set_metadata_respond_application</a> (<a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder, const FLAC__byte id[4])</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a14">FLAC__file_decoder_set_metadata_respond_all</a> (<a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a15">FLAC__file_decoder_set_metadata_ignore</a> (<a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder, <a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> type)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a15">FLAC__file_decoder_set_metadata_ignore</a> (<a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder, <a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> type)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a16">FLAC__file_decoder_set_metadata_ignore_application</a> (<a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder, const FLAC__byte id[4])</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a17">FLAC__file_decoder_set_metadata_ignore_all</a> (<a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top><a class="el" href="group__flac__file__decoder.html#a36">FLAC__FileDecoderState</a> </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a18">FLAC__file_decoder_get_state</a> (const <a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder)</td></tr>
@@ -56,7 +56,7 @@
<tr><td nowrap align=right valign=top>const char * </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a21">FLAC__file_decoder_get_resolved_state_string</a> (const <a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a22">FLAC__file_decoder_get_md5_checking</a> (const <a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>unsigned </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a23">FLAC__file_decoder_get_channels</a> (const <a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder)</td></tr>
-<tr><td nowrap align=right valign=top><a class="el" href="group__flac__format.html#a92">FLAC__ChannelAssignment</a> </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a24">FLAC__file_decoder_get_channel_assignment</a> (const <a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder)</td></tr>
+<tr><td nowrap align=right valign=top><a class="el" href="group__flac__format.html#a95">FLAC__ChannelAssignment</a> </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a24">FLAC__file_decoder_get_channel_assignment</a> (const <a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>unsigned </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a25">FLAC__file_decoder_get_bits_per_sample</a> (const <a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>unsigned </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a26">FLAC__file_decoder_get_sample_rate</a> (const <a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>unsigned </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a27">FLAC__file_decoder_get_blocksize</a> (const <a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder)</td></tr>
@@ -80,7 +80,7 @@
<p>
See the detailed documentation in the <a class="el" href="group__flac__file__decoder.html">file decoder</a> module.
<p>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:11 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/files.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/files.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/files.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -36,7 +36,7 @@
<tr><td class="indexkey">include/OggFLAC/<a class="el" href="OggFLAC_2stream__decoder_8h.html">stream_decoder.h</a> <a href="OggFLAC_2stream__decoder_8h-source.html">[code]</a></td><td class="indexvalue">This module contains the functions which implement the stream decoder</td></tr>
<tr><td class="indexkey">include/OggFLAC/<a class="el" href="OggFLAC_2stream__encoder_8h.html">stream_encoder.h</a> <a href="OggFLAC_2stream__encoder_8h-source.html">[code]</a></td><td class="indexvalue">This module contains the functions which implement the stream encoder</td></tr>
</table>
-<hr><address><small>Generated on Tue Sep 28 21:19:40 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:09 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/format_8h-source.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/format_8h-source.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/format_8h-source.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,7 +7,7 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>include/FLAC/format.h</h1><a href="format_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <font class="comment">/* libFLAC - Free Lossless Audio Codec library</font>
-00002 <font class="comment"> * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson</font>
+00002 <font class="comment"> * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson</font>
00003 <font class="comment"> *</font>
00004 <font class="comment"> * Redistribution and use in source and binary forms, with or without</font>
00005 <font class="comment"> * modification, are permitted provided that the following conditions</font>
@@ -52,33 +52,33 @@
00088 <font class="comment"> format specification. There is nothing to tune here.</font>
00089 <font class="comment">*/</font>
00090
-<a name="l00092"></a><a class="code" href="group__flac__format.html#a72">00092</a> <font class="preprocessor">#define FLAC__MAX_METADATA_TYPE_CODE (126u)</font>
+<a name="l00092"></a><a class="code" href="group__flac__format.html#a75">00092</a> <font class="preprocessor">#define FLAC__MAX_METADATA_TYPE_CODE (126u)</font>
00093 <font class="preprocessor"></font>
-<a name="l00095"></a><a class="code" href="group__flac__format.html#a73">00095</a> <font class="preprocessor">#define FLAC__MIN_BLOCK_SIZE (16u)</font>
+<a name="l00095"></a><a class="code" href="group__flac__format.html#a76">00095</a> <font class="preprocessor">#define FLAC__MIN_BLOCK_SIZE (16u)</font>
00096 <font class="preprocessor"></font>
-<a name="l00098"></a><a class="code" href="group__flac__format.html#a74">00098</a> <font class="preprocessor">#define FLAC__MAX_BLOCK_SIZE (65535u)</font>
+<a name="l00098"></a><a class="code" href="group__flac__format.html#a77">00098</a> <font class="preprocessor">#define FLAC__MAX_BLOCK_SIZE (65535u)</font>
00099 <font class="preprocessor"></font>
-<a name="l00101"></a><a class="code" href="group__flac__format.html#a75">00101</a> <font class="preprocessor">#define FLAC__MAX_CHANNELS (8u)</font>
+<a name="l00101"></a><a class="code" href="group__flac__format.html#a78">00101</a> <font class="preprocessor">#define FLAC__MAX_CHANNELS (8u)</font>
00102 <font class="preprocessor"></font>
-<a name="l00104"></a><a class="code" href="group__flac__format.html#a76">00104</a> <font class="preprocessor">#define FLAC__MIN_BITS_PER_SAMPLE (4u)</font>
+<a name="l00104"></a><a class="code" href="group__flac__format.html#a79">00104</a> <font class="preprocessor">#define FLAC__MIN_BITS_PER_SAMPLE (4u)</font>
00105 <font class="preprocessor"></font>
-<a name="l00107"></a><a class="code" href="group__flac__format.html#a77">00107</a> <font class="preprocessor">#define FLAC__MAX_BITS_PER_SAMPLE (32u)</font>
+<a name="l00107"></a><a class="code" href="group__flac__format.html#a80">00107</a> <font class="preprocessor">#define FLAC__MAX_BITS_PER_SAMPLE (32u)</font>
00108 <font class="preprocessor"></font>
-<a name="l00117"></a><a class="code" href="group__flac__format.html#a78">00117</a> <font class="preprocessor">#define FLAC__REFERENCE_CODEC_MAX_BITS_PER_SAMPLE (24u)</font>
+<a name="l00117"></a><a class="code" href="group__flac__format.html#a81">00117</a> <font class="preprocessor">#define FLAC__REFERENCE_CODEC_MAX_BITS_PER_SAMPLE (24u)</font>
00118 <font class="preprocessor"></font>
-<a name="l00123"></a><a class="code" href="group__flac__format.html#a79">00123</a> <font class="preprocessor">#define FLAC__MAX_SAMPLE_RATE (655350u)</font>
+<a name="l00123"></a><a class="code" href="group__flac__format.html#a82">00123</a> <font class="preprocessor">#define FLAC__MAX_SAMPLE_RATE (655350u)</font>
00124 <font class="preprocessor"></font>
-<a name="l00126"></a><a class="code" href="group__flac__format.html#a80">00126</a> <font class="preprocessor">#define FLAC__MAX_LPC_ORDER (32u)</font>
+<a name="l00126"></a><a class="code" href="group__flac__format.html#a83">00126</a> <font class="preprocessor">#define FLAC__MAX_LPC_ORDER (32u)</font>
00127 <font class="preprocessor"></font>
-<a name="l00131"></a><a class="code" href="group__flac__format.html#a81">00131</a> <font class="preprocessor">#define FLAC__MIN_QLP_COEFF_PRECISION (5u)</font>
+<a name="l00131"></a><a class="code" href="group__flac__format.html#a84">00131</a> <font class="preprocessor">#define FLAC__MIN_QLP_COEFF_PRECISION (5u)</font>
00132 <font class="preprocessor"></font>
-<a name="l00136"></a><a class="code" href="group__flac__format.html#a82">00136</a> <font class="preprocessor">#define FLAC__MAX_QLP_COEFF_PRECISION (15u)</font>
+<a name="l00136"></a><a class="code" href="group__flac__format.html#a85">00136</a> <font class="preprocessor">#define FLAC__MAX_QLP_COEFF_PRECISION (15u)</font>
00137 <font class="preprocessor"></font>
-<a name="l00139"></a><a class="code" href="group__flac__format.html#a83">00139</a> <font class="preprocessor">#define FLAC__MAX_FIXED_ORDER (4u)</font>
+<a name="l00139"></a><a class="code" href="group__flac__format.html#a86">00139</a> <font class="preprocessor">#define FLAC__MAX_FIXED_ORDER (4u)</font>
00140 <font class="preprocessor"></font>
-<a name="l00142"></a><a class="code" href="group__flac__format.html#a84">00142</a> <font class="preprocessor">#define FLAC__MAX_RICE_PARTITION_ORDER (15u)</font>
+<a name="l00142"></a><a class="code" href="group__flac__format.html#a87">00142</a> <font class="preprocessor">#define FLAC__MAX_RICE_PARTITION_ORDER (15u)</font>
00143 <font class="preprocessor"></font>
-<a name="l00145"></a><a class="code" href="group__flac__format.html#a85">00145</a> <font class="preprocessor">#define FLAC__SUBSET_MAX_RICE_PARTITION_ORDER (8u)</font>
+<a name="l00145"></a><a class="code" href="group__flac__format.html#a88">00145</a> <font class="preprocessor">#define FLAC__SUBSET_MAX_RICE_PARTITION_ORDER (8u)</font>
00146 <font class="preprocessor"></font>
<a name="l00153"></a><a class="code" href="group__flac__format.html#a0">00153</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">char</font> *<a class="code" href="format_8h.html#a0">FLAC__VERSION_STRING</a>;
00154
@@ -90,7 +90,7 @@
00168
<a name="l00170"></a><a class="code" href="group__flac__format.html#a4">00170</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a4">FLAC__STREAM_SYNC_LEN</a>; <font class="comment">/* = 32 bits */</font>
00171
-<a name="l00173"></a><a class="code" href="group__flac__format.html#a86">00173</a> <font class="preprocessor">#define FLAC__STREAM_SYNC_LENGTH (4u)</font>
+<a name="l00173"></a><a class="code" href="group__flac__format.html#a89">00173</a> <font class="preprocessor">#define FLAC__STREAM_SYNC_LENGTH (4u)</font>
00174 <font class="preprocessor"></font>
00175
00176 <font class="comment">/*****************************************************************************</font>
@@ -101,9 +101,9 @@
00181
00182 <font class="comment">/*****************************************************************************/</font>
00183
-<a name="l00185"></a><a class="code" href="group__flac__format.html#a90">00185</a> <font class="keyword">typedef</font> <font class="keyword">enum</font> {
-00186 <a class="code" href="format_8h.html#a90a86">FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE</a> = 0
-00189 } <a class="code" href="format_8h.html#a90">FLAC__EntropyCodingMethodType</a>;
+<a name="l00185"></a><a class="code" href="group__flac__format.html#a93">00185</a> <font class="keyword">typedef</font> <font class="keyword">enum</font> {
+00186 <a class="code" href="format_8h.html#a93a86">FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE</a> = 0
+00189 } <a class="code" href="format_8h.html#a93">FLAC__EntropyCodingMethodType</a>;
00190
<a name="l00196"></a><a class="code" href="group__flac__format.html#a5">00196</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">char</font> * <font class="keyword">const</font> <a class="code" href="format_8h.html#a5">FLAC__EntropyCodingMethodTypeString</a>[];
00197
@@ -126,7 +126,7 @@
<a name="l00230"></a><a class="code" href="group__flac__format.html#a8">00230</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a8">FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_RAW_LEN</a>;
00232 <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a9">FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ESCAPE_PARAMETER</a>;
<a name="l00237"></a><a class="code" href="structFLAC____EntropyCodingMethod.html">00237</a> <font class="keyword">typedef</font> <font class="keyword">struct </font>{
-00238 <a class="code" href="format_8h.html#a90">FLAC__EntropyCodingMethodType</a> type;
+00238 <a class="code" href="format_8h.html#a93">FLAC__EntropyCodingMethodType</a> type;
00239 <font class="keyword">union </font>{
00240 <a class="code" href="structFLAC____EntropyCodingMethod__PartitionedRice.html">FLAC__EntropyCodingMethod_PartitionedRice</a> partitioned_rice;
00241 } data;
@@ -135,12 +135,12 @@
<a name="l00244"></a><a class="code" href="group__flac__format.html#a10">00244</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a10">FLAC__ENTROPY_CODING_METHOD_TYPE_LEN</a>;
00246 <font class="comment">/*****************************************************************************/</font>
00247
-<a name="l00249"></a><a class="code" href="group__flac__format.html#a91">00249</a> <font class="keyword">typedef</font> <font class="keyword">enum</font> {
-00250 <a class="code" href="format_8h.html#a91a87">FLAC__SUBFRAME_TYPE_CONSTANT</a> = 0,
-00251 <a class="code" href="format_8h.html#a91a88">FLAC__SUBFRAME_TYPE_VERBATIM</a> = 1,
-00252 <a class="code" href="format_8h.html#a91a89">FLAC__SUBFRAME_TYPE_FIXED</a> = 2,
-00253 <a class="code" href="format_8h.html#a91a90">FLAC__SUBFRAME_TYPE_LPC</a> = 3
-00254 } <a class="code" href="format_8h.html#a91">FLAC__SubframeType</a>;
+<a name="l00249"></a><a class="code" href="group__flac__format.html#a94">00249</a> <font class="keyword">typedef</font> <font class="keyword">enum</font> {
+00250 <a class="code" href="format_8h.html#a94a87">FLAC__SUBFRAME_TYPE_CONSTANT</a> = 0,
+00251 <a class="code" href="format_8h.html#a94a88">FLAC__SUBFRAME_TYPE_VERBATIM</a> = 1,
+00252 <a class="code" href="format_8h.html#a94a89">FLAC__SUBFRAME_TYPE_FIXED</a> = 2,
+00253 <a class="code" href="format_8h.html#a94a90">FLAC__SUBFRAME_TYPE_LPC</a> = 3
+00254 } <a class="code" href="format_8h.html#a94">FLAC__SubframeType</a>;
00255
<a name="l00261"></a><a class="code" href="group__flac__format.html#a11">00261</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">char</font> * <font class="keyword">const</font> <a class="code" href="format_8h.html#a11">FLAC__SubframeTypeString</a>[];
00262
@@ -158,7 +158,7 @@
<a name="l00280"></a><a class="code" href="structFLAC____Subframe__Fixed.html">00280</a> <font class="keyword">typedef</font> <font class="keyword">struct </font>{
00281 <a class="code" href="structFLAC____EntropyCodingMethod.html">FLAC__EntropyCodingMethod</a> entropy_coding_method;
00284 <font class="keywordtype">unsigned</font> order;
-00287 FLAC__int32 warmup[<a class="code" href="format_8h.html#a83">FLAC__MAX_FIXED_ORDER</a>];
+00287 FLAC__int32 warmup[<a class="code" href="format_8h.html#a86">FLAC__MAX_FIXED_ORDER</a>];
00290 <font class="keyword">const</font> FLAC__int32 *residual;
00292 } <a class="code" href="structFLAC____Subframe__Fixed.html">FLAC__Subframe_Fixed</a>;
00293
@@ -168,15 +168,15 @@
00301 <font class="keywordtype">unsigned</font> order;
00304 <font class="keywordtype">unsigned</font> qlp_coeff_precision;
00307 <font class="keywordtype">int</font> quantization_level;
-00310 FLAC__int32 qlp_coeff[<a class="code" href="format_8h.html#a80">FLAC__MAX_LPC_ORDER</a>];
-00313 FLAC__int32 warmup[<a class="code" href="format_8h.html#a80">FLAC__MAX_LPC_ORDER</a>];
+00310 FLAC__int32 qlp_coeff[<a class="code" href="format_8h.html#a83">FLAC__MAX_LPC_ORDER</a>];
+00313 FLAC__int32 warmup[<a class="code" href="format_8h.html#a83">FLAC__MAX_LPC_ORDER</a>];
00316 <font class="keyword">const</font> FLAC__int32 *residual;
00318 } <a class="code" href="structFLAC____Subframe__LPC.html">FLAC__Subframe_LPC</a>;
00319
<a name="l00320"></a><a class="code" href="group__flac__format.html#a12">00320</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a12">FLAC__SUBFRAME_LPC_QLP_COEFF_PRECISION_LEN</a>;
<a name="l00321"></a><a class="code" href="group__flac__format.html#a13">00321</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a13">FLAC__SUBFRAME_LPC_QLP_SHIFT_LEN</a>;
<a name="l00326"></a><a class="code" href="structFLAC____Subframe.html">00326</a> <font class="keyword">typedef</font> <font class="keyword">struct </font>{
-00327 <a class="code" href="format_8h.html#a91">FLAC__SubframeType</a> type;
+00327 <a class="code" href="format_8h.html#a94">FLAC__SubframeType</a> type;
00328 <font class="keyword">union </font>{
00329 <a class="code" href="structFLAC____Subframe__Constant.html">FLAC__Subframe_Constant</a> constant;
00330 <a class="code" href="structFLAC____Subframe__Fixed.html">FLAC__Subframe_Fixed</a> fixed;
@@ -203,19 +203,19 @@
00352 <font class="comment"> *</font>
00353 <font class="comment"> *****************************************************************************/</font>
00354
-<a name="l00356"></a><a class="code" href="group__flac__format.html#a92">00356</a> <font class="keyword">typedef</font> <font class="keyword">enum</font> {
-00357 <a class="code" href="format_8h.html#a92a91">FLAC__CHANNEL_ASSIGNMENT_INDEPENDENT</a> = 0,
-00358 <a class="code" href="format_8h.html#a92a92">FLAC__CHANNEL_ASSIGNMENT_LEFT_SIDE</a> = 1,
-00359 <a class="code" href="format_8h.html#a92a93">FLAC__CHANNEL_ASSIGNMENT_RIGHT_SIDE</a> = 2,
-00360 <a class="code" href="format_8h.html#a92a94">FLAC__CHANNEL_ASSIGNMENT_MID_SIDE</a> = 3
-00361 } <a class="code" href="format_8h.html#a92">FLAC__ChannelAssignment</a>;
+<a name="l00356"></a><a class="code" href="group__flac__format.html#a95">00356</a> <font class="keyword">typedef</font> <font class="keyword">enum</font> {
+00357 <a class="code" href="format_8h.html#a95a91">FLAC__CHANNEL_ASSIGNMENT_INDEPENDENT</a> = 0,
+00358 <a class="code" href="format_8h.html#a95a92">FLAC__CHANNEL_ASSIGNMENT_LEFT_SIDE</a> = 1,
+00359 <a class="code" href="format_8h.html#a95a93">FLAC__CHANNEL_ASSIGNMENT_RIGHT_SIDE</a> = 2,
+00360 <a class="code" href="format_8h.html#a95a94">FLAC__CHANNEL_ASSIGNMENT_MID_SIDE</a> = 3
+00361 } <a class="code" href="format_8h.html#a95">FLAC__ChannelAssignment</a>;
00362
<a name="l00368"></a><a class="code" href="group__flac__format.html#a21">00368</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">char</font> * <font class="keyword">const</font> <a class="code" href="format_8h.html#a21">FLAC__ChannelAssignmentString</a>[];
00369
-<a name="l00371"></a><a class="code" href="group__flac__format.html#a93">00371</a> <font class="keyword">typedef</font> <font class="keyword">enum</font> {
-00372 <a class="code" href="format_8h.html#a93a95">FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER</a>,
-00373 <a class="code" href="format_8h.html#a93a96">FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER</a>
-00374 } <a class="code" href="format_8h.html#a93">FLAC__FrameNumberType</a>;
+<a name="l00371"></a><a class="code" href="group__flac__format.html#a96">00371</a> <font class="keyword">typedef</font> <font class="keyword">enum</font> {
+00372 <a class="code" href="format_8h.html#a96a95">FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER</a>,
+00373 <a class="code" href="format_8h.html#a96a96">FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER</a>
+00374 } <a class="code" href="format_8h.html#a96">FLAC__FrameNumberType</a>;
00375
<a name="l00381"></a><a class="code" href="group__flac__format.html#a22">00381</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">char</font> * <font class="keyword">const</font> <a class="code" href="format_8h.html#a22">FLAC__FrameNumberTypeString</a>[];
00382
@@ -224,9 +224,9 @@
00387 <font class="keywordtype">unsigned</font> blocksize;
00390 <font class="keywordtype">unsigned</font> sample_rate;
00393 <font class="keywordtype">unsigned</font> channels;
-00396 <a class="code" href="format_8h.html#a92">FLAC__ChannelAssignment</a> channel_assignment;
+00396 <a class="code" href="format_8h.html#a95">FLAC__ChannelAssignment</a> channel_assignment;
00399 <font class="keywordtype">unsigned</font> bits_per_sample;
-00402 <a class="code" href="format_8h.html#a93">FLAC__FrameNumberType</a> number_type;
+00402 <a class="code" href="format_8h.html#a96">FLAC__FrameNumberType</a> number_type;
00405 <font class="keyword">union </font>{
00406 FLAC__uint32 frame_number;
00407 FLAC__uint64 sample_number;
@@ -250,7 +250,7 @@
<a name="l00440"></a><a class="code" href="group__flac__format.html#a32">00440</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a32">FLAC__FRAME_FOOTER_CRC_LEN</a>;
<a name="l00445"></a><a class="code" href="structFLAC____Frame.html">00445</a> <font class="keyword">typedef</font> <font class="keyword">struct </font>{
00446 <a class="code" href="structFLAC____FrameHeader.html">FLAC__FrameHeader</a> header;
-00447 <a class="code" href="structFLAC____Subframe.html">FLAC__Subframe</a> subframes[<a class="code" href="format_8h.html#a75">FLAC__MAX_CHANNELS</a>];
+00447 <a class="code" href="structFLAC____Subframe.html">FLAC__Subframe</a> subframes[<a class="code" href="format_8h.html#a78">FLAC__MAX_CHANNELS</a>];
00448 <a class="code" href="structFLAC____FrameFooter.html">FLAC__FrameFooter</a> footer;
00449 } <a class="code" href="structFLAC____Frame.html">FLAC__Frame</a>;
00450
@@ -263,16 +263,16 @@
00457 <font class="comment"> *</font>
00458 <font class="comment"> *****************************************************************************/</font>
00459
-<a name="l00461"></a><a class="code" href="group__flac__format.html#a94">00461</a> <font class="keyword">typedef</font> <font class="keyword">enum</font> {
+<a name="l00461"></a><a class="code" href="group__flac__format.html#a97">00461</a> <font class="keyword">typedef</font> <font class="keyword">enum</font> {
00462
-00463 <a class="code" href="format_8h.html#a94a97">FLAC__METADATA_TYPE_STREAMINFO</a> = 0,
-00466 <a class="code" href="format_8h.html#a94a98">FLAC__METADATA_TYPE_PADDING</a> = 1,
-00469 <a class="code" href="format_8h.html#a94a99">FLAC__METADATA_TYPE_APPLICATION</a> = 2,
-00472 <a class="code" href="format_8h.html#a94a100">FLAC__METADATA_TYPE_SEEKTABLE</a> = 3,
-00475 <a class="code" href="format_8h.html#a94a101">FLAC__METADATA_TYPE_VORBIS_COMMENT</a> = 4,
-00478 <a class="code" href="format_8h.html#a94a102">FLAC__METADATA_TYPE_CUESHEET</a> = 5,
-00481 <a class="code" href="format_8h.html#a94a103">FLAC__METADATA_TYPE_UNDEFINED</a> = 6
-00484 } <a class="code" href="format_8h.html#a94">FLAC__MetadataType</a>;
+00463 <a class="code" href="format_8h.html#a97a97">FLAC__METADATA_TYPE_STREAMINFO</a> = 0,
+00466 <a class="code" href="format_8h.html#a97a98">FLAC__METADATA_TYPE_PADDING</a> = 1,
+00469 <a class="code" href="format_8h.html#a97a99">FLAC__METADATA_TYPE_APPLICATION</a> = 2,
+00472 <a class="code" href="format_8h.html#a97a100">FLAC__METADATA_TYPE_SEEKTABLE</a> = 3,
+00475 <a class="code" href="format_8h.html#a97a101">FLAC__METADATA_TYPE_VORBIS_COMMENT</a> = 4,
+00478 <a class="code" href="format_8h.html#a97a102">FLAC__METADATA_TYPE_CUESHEET</a> = 5,
+00481 <a class="code" href="format_8h.html#a97a103">FLAC__METADATA_TYPE_UNDEFINED</a> = 6
+00484 } <a class="code" href="format_8h.html#a97">FLAC__MetadataType</a>;
00485
<a name="l00491"></a><a class="code" href="group__flac__format.html#a33">00491</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">char</font> * <font class="keyword">const</font> <a class="code" href="format_8h.html#a33">FLAC__MetadataTypeString</a>[];
00492
@@ -296,7 +296,7 @@
<a name="l00512"></a><a class="code" href="group__flac__format.html#a40">00512</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a40">FLAC__STREAM_METADATA_STREAMINFO_BITS_PER_SAMPLE_LEN</a>;
<a name="l00513"></a><a class="code" href="group__flac__format.html#a41">00513</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a41">FLAC__STREAM_METADATA_STREAMINFO_TOTAL_SAMPLES_LEN</a>;
<a name="l00514"></a><a class="code" href="group__flac__format.html#a42">00514</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a42">FLAC__STREAM_METADATA_STREAMINFO_MD5SUM_LEN</a>;
-<a name="l00517"></a><a class="code" href="group__flac__format.html#a87">00517</a> <font class="preprocessor">#define FLAC__STREAM_METADATA_STREAMINFO_LENGTH (34u)</font>
+<a name="l00517"></a><a class="code" href="group__flac__format.html#a90">00517</a> <font class="preprocessor">#define FLAC__STREAM_METADATA_STREAMINFO_LENGTH (34u)</font>
00518 <font class="preprocessor"></font>
<a name="l00521"></a><a class="code" href="structFLAC____StreamMetadata__Padding.html">00521</a> <font class="keyword">typedef</font> <font class="keyword">struct </font>{
00522 <font class="keywordtype">int</font> dummy;
@@ -318,7 +318,7 @@
<a name="l00553"></a><a class="code" href="group__flac__format.html#a44">00553</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a44">FLAC__STREAM_METADATA_SEEKPOINT_SAMPLE_NUMBER_LEN</a>;
<a name="l00554"></a><a class="code" href="group__flac__format.html#a45">00554</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a45">FLAC__STREAM_METADATA_SEEKPOINT_STREAM_OFFSET_LEN</a>;
<a name="l00555"></a><a class="code" href="group__flac__format.html#a46">00555</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a46">FLAC__STREAM_METADATA_SEEKPOINT_FRAME_SAMPLES_LEN</a>;
-<a name="l00558"></a><a class="code" href="group__flac__format.html#a88">00558</a> <font class="preprocessor">#define FLAC__STREAM_METADATA_SEEKPOINT_LENGTH (18u)</font>
+<a name="l00558"></a><a class="code" href="group__flac__format.html#a91">00558</a> <font class="preprocessor">#define FLAC__STREAM_METADATA_SEEKPOINT_LENGTH (18u)</font>
00559 <font class="preprocessor"></font>
<a name="l00564"></a><a class="code" href="group__flac__format.html#a47">00564</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> FLAC__uint64 <a class="code" href="format_8h.html#a47">FLAC__STREAM_METADATA_SEEKPOINT_PLACEHOLDER</a>;
00565
@@ -329,111 +329,116 @@
00582 } <a class="code" href="structFLAC____StreamMetadata__SeekTable.html">FLAC__StreamMetadata_SeekTable</a>;
00583
00584
-<a name="l00587"></a><a class="code" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">00587</a> <font class="keyword">typedef</font> <font class="keyword">struct </font>{
-00588 FLAC__uint32 length;
-00589 FLAC__byte *entry;
-00590 } <a class="code" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a>;
-00591
-<a name="l00592"></a><a class="code" href="group__flac__format.html#a48">00592</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a48">FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN</a>;
-<a name="l00597"></a><a class="code" href="structFLAC____StreamMetadata__VorbisComment.html">00597</a> <font class="keyword">typedef</font> <font class="keyword">struct </font>{
-00598 <a class="code" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> vendor_string;
-00599 FLAC__uint32 num_comments;
-00600 <a class="code" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> *comments;
-00601 } <a class="code" href="structFLAC____StreamMetadata__VorbisComment.html">FLAC__StreamMetadata_VorbisComment</a>;
-00602
-<a name="l00603"></a><a class="code" href="group__flac__format.html#a49">00603</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a49">FLAC__STREAM_METADATA_VORBIS_COMMENT_NUM_COMMENTS_LEN</a>;
-<a name="l00610"></a><a class="code" href="structFLAC____StreamMetadata__CueSheet__Index.html">00610</a> <font class="keyword">typedef</font> <font class="keyword">struct </font>{
-00611 FLAC__uint64 offset;
-00616 FLAC__byte number;
-00618 } <a class="code" href="structFLAC____StreamMetadata__CueSheet__Index.html">FLAC__StreamMetadata_CueSheet_Index</a>;
-00619
-<a name="l00620"></a><a class="code" href="group__flac__format.html#a50">00620</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a50">FLAC__STREAM_METADATA_CUESHEET_INDEX_OFFSET_LEN</a>;
-<a name="l00621"></a><a class="code" href="group__flac__format.html#a51">00621</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a51">FLAC__STREAM_METADATA_CUESHEET_INDEX_NUMBER_LEN</a>;
-<a name="l00622"></a><a class="code" href="group__flac__format.html#a52">00622</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a52">FLAC__STREAM_METADATA_CUESHEET_INDEX_RESERVED_LEN</a>;
-<a name="l00629"></a><a class="code" href="structFLAC____StreamMetadata__CueSheet__Track.html">00629</a> <font class="keyword">typedef</font> <font class="keyword">struct </font>{
-00630 FLAC__uint64 offset;
-00633 FLAC__byte number;
-00636 <font class="keywordtype">char</font> isrc[13];
-00639 <font class="keywordtype">unsigned</font> type:1;
-00642 <font class="keywordtype">unsigned</font> pre_emphasis:1;
-00645 FLAC__byte num_indices;
-00648 <a class="code" href="structFLAC____StreamMetadata__CueSheet__Index.html">FLAC__StreamMetadata_CueSheet_Index</a> *indices;
-00651 } <a class="code" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a>;
-00652
-<a name="l00653"></a><a class="code" href="group__flac__format.html#a53">00653</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a53">FLAC__STREAM_METADATA_CUESHEET_TRACK_OFFSET_LEN</a>;
-<a name="l00654"></a><a class="code" href="group__flac__format.html#a54">00654</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a54">FLAC__STREAM_METADATA_CUESHEET_TRACK_NUMBER_LEN</a>;
-<a name="l00655"></a><a class="code" href="group__flac__format.html#a55">00655</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a55">FLAC__STREAM_METADATA_CUESHEET_TRACK_ISRC_LEN</a>;
-<a name="l00656"></a><a class="code" href="group__flac__format.html#a56">00656</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a56">FLAC__STREAM_METADATA_CUESHEET_TRACK_TYPE_LEN</a>;
-<a name="l00657"></a><a class="code" href="group__flac__format.html#a57">00657</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a57">FLAC__STREAM_METADATA_CUESHEET_TRACK_PRE_EMPHASIS_LEN</a>;
-<a name="l00658"></a><a class="code" href="group__flac__format.html#a58">00658</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a58">FLAC__STREAM_METADATA_CUESHEET_TRACK_RESERVED_LEN</a>;
-<a name="l00659"></a><a class="code" href="group__flac__format.html#a59">00659</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a59">FLAC__STREAM_METADATA_CUESHEET_TRACK_NUM_INDICES_LEN</a>;
-<a name="l00666"></a><a class="code" href="structFLAC____StreamMetadata__CueSheet.html">00666</a> <font class="keyword">typedef</font> <font class="keyword">struct </font>{
-00667 <font class="keywordtype">char</font> media_catalog_number[129];
-00673 FLAC__uint64 lead_in;
-00676 FLAC__bool is_cd;
-00679 <font class="keywordtype">unsigned</font> num_tracks;
-00682 <a class="code" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> *tracks;
-00685 } <a class="code" href="structFLAC____StreamMetadata__CueSheet.html">FLAC__StreamMetadata_CueSheet</a>;
-00686
-<a name="l00687"></a><a class="code" href="group__flac__format.html#a60">00687</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a60">FLAC__STREAM_METADATA_CUESHEET_MEDIA_CATALOG_NUMBER_LEN</a>;
-<a name="l00688"></a><a class="code" href="group__flac__format.html#a61">00688</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a61">FLAC__STREAM_METADATA_CUESHEET_LEAD_IN_LEN</a>;
-<a name="l00689"></a><a class="code" href="group__flac__format.html#a62">00689</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a62">FLAC__STREAM_METADATA_CUESHEET_IS_CD_LEN</a>;
-<a name="l00690"></a><a class="code" href="group__flac__format.html#a63">00690</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a63">FLAC__STREAM_METADATA_CUESHEET_RESERVED_LEN</a>;
-<a name="l00691"></a><a class="code" href="group__flac__format.html#a64">00691</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a64">FLAC__STREAM_METADATA_CUESHEET_NUM_TRACKS_LEN</a>;
-<a name="l00698"></a><a class="code" href="structFLAC____StreamMetadata__Unknown.html">00698</a> <font class="keyword">typedef</font> <font class="keyword">struct </font>{
-00699 FLAC__byte *data;
-00700 } <a class="code" href="structFLAC____StreamMetadata__Unknown.html">FLAC__StreamMetadata_Unknown</a>;
-00701
-00702
-<a name="l00705"></a><a class="code" href="structFLAC____StreamMetadata.html">00705</a> <font class="keyword">typedef</font> <font class="keyword">struct </font>{
-00706 <a class="code" href="format_8h.html#a94">FLAC__MetadataType</a> type;
-00711 FLAC__bool is_last;
-00714 <font class="keywordtype">unsigned</font> length;
-00717 <font class="keyword">union </font>{
-00718 <a class="code" href="structFLAC____StreamMetadata__StreamInfo.html">FLAC__StreamMetadata_StreamInfo</a> stream_info;
-00719 <a class="code" href="structFLAC____StreamMetadata__Padding.html">FLAC__StreamMetadata_Padding</a> padding;
-00720 <a class="code" href="structFLAC____StreamMetadata__Application.html">FLAC__StreamMetadata_Application</a> application;
-00721 <a class="code" href="structFLAC____StreamMetadata__SeekTable.html">FLAC__StreamMetadata_SeekTable</a> seek_table;
-00722 <a class="code" href="structFLAC____StreamMetadata__VorbisComment.html">FLAC__StreamMetadata_VorbisComment</a> vorbis_comment;
-00723 <a class="code" href="structFLAC____StreamMetadata__CueSheet.html">FLAC__StreamMetadata_CueSheet</a> cue_sheet;
-00724 <a class="code" href="structFLAC____StreamMetadata__Unknown.html">FLAC__StreamMetadata_Unknown</a> unknown;
-00725 } data;
-00728 } <a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a>;
-00729
-<a name="l00730"></a><a class="code" href="group__flac__format.html#a65">00730</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a65">FLAC__STREAM_METADATA_IS_LAST_LEN</a>;
-<a name="l00731"></a><a class="code" href="group__flac__format.html#a66">00731</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a66">FLAC__STREAM_METADATA_TYPE_LEN</a>;
-<a name="l00732"></a><a class="code" href="group__flac__format.html#a67">00732</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a67">FLAC__STREAM_METADATA_LENGTH_LEN</a>;
-<a name="l00735"></a><a class="code" href="group__flac__format.html#a89">00735</a> <font class="preprocessor">#define FLAC__STREAM_METADATA_HEADER_LENGTH (4u)</font>
-00736 <font class="preprocessor"></font>
-00737 <font class="comment">/*****************************************************************************/</font>
-00738
-00739
-00740 <font class="comment">/*****************************************************************************</font>
-00741 <font class="comment"> *</font>
-00742 <font class="comment"> * Utility functions</font>
-00743 <font class="comment"> *</font>
-00744 <font class="comment"> *****************************************************************************/</font>
-00745
-00746 <font class="comment">/* @@@@ add to unit tests; it is already indirectly tested by the metadata_object tests */</font>
-00755 FLAC_API FLAC__bool <a class="code" href="format_8h.html#a68">FLAC__format_sample_rate_is_valid</a>(<font class="keywordtype">unsigned</font> sample_rate);
-00756
-00757 <font class="comment">/* @@@@ add to unit tests; it is already indirectly tested by the metadata_object tests */</font>
-00768 FLAC_API FLAC__bool <a class="code" href="format_8h.html#a69">FLAC__format_seektable_is_legal</a>(<font class="keyword">const</font> <a class="code" href="structFLAC____StreamMetadata__SeekTable.html">FLAC__StreamMetadata_SeekTable</a> *seek_table);
-00769
-00770 <font class="comment">/* @@@@ add to unit tests; it is already indirectly tested by the metadata_object tests */</font>
-00783 FLAC_API <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a70">FLAC__format_seektable_sort</a>(<a class="code" href="structFLAC____StreamMetadata__SeekTable.html">FLAC__StreamMetadata_SeekTable</a> *seek_table);
-00784
-00785 <font class="comment">/* @@@@ add to unit tests; it is already indirectly tested by the metadata_object tests */</font>
-00804 FLAC_API FLAC__bool <a class="code" href="format_8h.html#a71">FLAC__format_cuesheet_is_legal</a>(<font class="keyword">const</font> <a class="code" href="structFLAC____StreamMetadata__CueSheet.html">FLAC__StreamMetadata_CueSheet</a> *cue_sheet, FLAC__bool check_cd_da_subset, <font class="keyword">const</font> <font class="keywordtype">char</font> **violation);
+<a name="l00591"></a><a class="code" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">00591</a> <font class="keyword">typedef</font> <font class="keyword">struct </font>{
+00592 FLAC__uint32 length;
+00593 FLAC__byte *entry;
+00594 } <a class="code" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a>;
+00595
+<a name="l00596"></a><a class="code" href="group__flac__format.html#a48">00596</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a48">FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN</a>;
+<a name="l00601"></a><a class="code" href="structFLAC____StreamMetadata__VorbisComment.html">00601</a> <font class="keyword">typedef</font> <font class="keyword">struct </font>{
+00602 <a class="code" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> vendor_string;
+00603 FLAC__uint32 num_comments;
+00604 <a class="code" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> *comments;
+00605 } <a class="code" href="structFLAC____StreamMetadata__VorbisComment.html">FLAC__StreamMetadata_VorbisComment</a>;
+00606
+<a name="l00607"></a><a class="code" href="group__flac__format.html#a49">00607</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a49">FLAC__STREAM_METADATA_VORBIS_COMMENT_NUM_COMMENTS_LEN</a>;
+<a name="l00614"></a><a class="code" href="structFLAC____StreamMetadata__CueSheet__Index.html">00614</a> <font class="keyword">typedef</font> <font class="keyword">struct </font>{
+00615 FLAC__uint64 offset;
+00620 FLAC__byte number;
+00622 } <a class="code" href="structFLAC____StreamMetadata__CueSheet__Index.html">FLAC__StreamMetadata_CueSheet_Index</a>;
+00623
+<a name="l00624"></a><a class="code" href="group__flac__format.html#a50">00624</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a50">FLAC__STREAM_METADATA_CUESHEET_INDEX_OFFSET_LEN</a>;
+<a name="l00625"></a><a class="code" href="group__flac__format.html#a51">00625</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a51">FLAC__STREAM_METADATA_CUESHEET_INDEX_NUMBER_LEN</a>;
+<a name="l00626"></a><a class="code" href="group__flac__format.html#a52">00626</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a52">FLAC__STREAM_METADATA_CUESHEET_INDEX_RESERVED_LEN</a>;
+<a name="l00633"></a><a class="code" href="structFLAC____StreamMetadata__CueSheet__Track.html">00633</a> <font class="keyword">typedef</font> <font class="keyword">struct </font>{
+00634 FLAC__uint64 offset;
+00637 FLAC__byte number;
+00640 <font class="keywordtype">char</font> isrc[13];
+00643 <font class="keywordtype">unsigned</font> type:1;
+00646 <font class="keywordtype">unsigned</font> pre_emphasis:1;
+00649 FLAC__byte num_indices;
+00652 <a class="code" href="structFLAC____StreamMetadata__CueSheet__Index.html">FLAC__StreamMetadata_CueSheet_Index</a> *indices;
+00655 } <a class="code" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a>;
+00656
+<a name="l00657"></a><a class="code" href="group__flac__format.html#a53">00657</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a53">FLAC__STREAM_METADATA_CUESHEET_TRACK_OFFSET_LEN</a>;
+<a name="l00658"></a><a class="code" href="group__flac__format.html#a54">00658</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a54">FLAC__STREAM_METADATA_CUESHEET_TRACK_NUMBER_LEN</a>;
+<a name="l00659"></a><a class="code" href="group__flac__format.html#a55">00659</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a55">FLAC__STREAM_METADATA_CUESHEET_TRACK_ISRC_LEN</a>;
+<a name="l00660"></a><a class="code" href="group__flac__format.html#a56">00660</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a56">FLAC__STREAM_METADATA_CUESHEET_TRACK_TYPE_LEN</a>;
+<a name="l00661"></a><a class="code" href="group__flac__format.html#a57">00661</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a57">FLAC__STREAM_METADATA_CUESHEET_TRACK_PRE_EMPHASIS_LEN</a>;
+<a name="l00662"></a><a class="code" href="group__flac__format.html#a58">00662</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a58">FLAC__STREAM_METADATA_CUESHEET_TRACK_RESERVED_LEN</a>;
+<a name="l00663"></a><a class="code" href="group__flac__format.html#a59">00663</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a59">FLAC__STREAM_METADATA_CUESHEET_TRACK_NUM_INDICES_LEN</a>;
+<a name="l00670"></a><a class="code" href="structFLAC____StreamMetadata__CueSheet.html">00670</a> <font class="keyword">typedef</font> <font class="keyword">struct </font>{
+00671 <font class="keywordtype">char</font> media_catalog_number[129];
+00677 FLAC__uint64 lead_in;
+00680 FLAC__bool is_cd;
+00683 <font class="keywordtype">unsigned</font> num_tracks;
+00686 <a class="code" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> *tracks;
+00689 } <a class="code" href="structFLAC____StreamMetadata__CueSheet.html">FLAC__StreamMetadata_CueSheet</a>;
+00690
+<a name="l00691"></a><a class="code" href="group__flac__format.html#a60">00691</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a60">FLAC__STREAM_METADATA_CUESHEET_MEDIA_CATALOG_NUMBER_LEN</a>;
+<a name="l00692"></a><a class="code" href="group__flac__format.html#a61">00692</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a61">FLAC__STREAM_METADATA_CUESHEET_LEAD_IN_LEN</a>;
+<a name="l00693"></a><a class="code" href="group__flac__format.html#a62">00693</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a62">FLAC__STREAM_METADATA_CUESHEET_IS_CD_LEN</a>;
+<a name="l00694"></a><a class="code" href="group__flac__format.html#a63">00694</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a63">FLAC__STREAM_METADATA_CUESHEET_RESERVED_LEN</a>;
+<a name="l00695"></a><a class="code" href="group__flac__format.html#a64">00695</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a64">FLAC__STREAM_METADATA_CUESHEET_NUM_TRACKS_LEN</a>;
+<a name="l00702"></a><a class="code" href="structFLAC____StreamMetadata__Unknown.html">00702</a> <font class="keyword">typedef</font> <font class="keyword">struct </font>{
+00703 FLAC__byte *data;
+00704 } <a class="code" href="structFLAC____StreamMetadata__Unknown.html">FLAC__StreamMetadata_Unknown</a>;
+00705
+00706
+<a name="l00709"></a><a class="code" href="structFLAC____StreamMetadata.html">00709</a> <font class="keyword">typedef</font> <font class="keyword">struct </font>{
+00710 <a class="code" href="format_8h.html#a97">FLAC__MetadataType</a> type;
+00715 FLAC__bool is_last;
+00718 <font class="keywordtype">unsigned</font> length;
+00721 <font class="keyword">union </font>{
+00722 <a class="code" href="structFLAC____StreamMetadata__StreamInfo.html">FLAC__StreamMetadata_StreamInfo</a> stream_info;
+00723 <a class="code" href="structFLAC____StreamMetadata__Padding.html">FLAC__StreamMetadata_Padding</a> padding;
+00724 <a class="code" href="structFLAC____StreamMetadata__Application.html">FLAC__StreamMetadata_Application</a> application;
+00725 <a class="code" href="structFLAC____StreamMetadata__SeekTable.html">FLAC__StreamMetadata_SeekTable</a> seek_table;
+00726 <a class="code" href="structFLAC____StreamMetadata__VorbisComment.html">FLAC__StreamMetadata_VorbisComment</a> vorbis_comment;
+00727 <a class="code" href="structFLAC____StreamMetadata__CueSheet.html">FLAC__StreamMetadata_CueSheet</a> cue_sheet;
+00728 <a class="code" href="structFLAC____StreamMetadata__Unknown.html">FLAC__StreamMetadata_Unknown</a> unknown;
+00729 } data;
+00732 } <a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a>;
+00733
+<a name="l00734"></a><a class="code" href="group__flac__format.html#a65">00734</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a65">FLAC__STREAM_METADATA_IS_LAST_LEN</a>;
+<a name="l00735"></a><a class="code" href="group__flac__format.html#a66">00735</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a66">FLAC__STREAM_METADATA_TYPE_LEN</a>;
+<a name="l00736"></a><a class="code" href="group__flac__format.html#a67">00736</a> <font class="keyword">extern</font> FLAC_API <font class="keyword">const</font> <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a67">FLAC__STREAM_METADATA_LENGTH_LEN</a>;
+<a name="l00739"></a><a class="code" href="group__flac__format.html#a92">00739</a> <font class="preprocessor">#define FLAC__STREAM_METADATA_HEADER_LENGTH (4u)</font>
+00740 <font class="preprocessor"></font>
+00741 <font class="comment">/*****************************************************************************/</font>
+00742
+00743
+00744 <font class="comment">/*****************************************************************************</font>
+00745 <font class="comment"> *</font>
+00746 <font class="comment"> * Utility functions</font>
+00747 <font class="comment"> *</font>
+00748 <font class="comment"> *****************************************************************************/</font>
+00749
+00758 FLAC_API FLAC__bool <a class="code" href="format_8h.html#a68">FLAC__format_sample_rate_is_valid</a>(<font class="keywordtype">unsigned</font> sample_rate);
+00759
+00772 FLAC_API FLAC__bool <a class="code" href="format_8h.html#a69">FLAC__format_vorbiscomment_entry_name_is_legal</a>(<font class="keyword">const</font> <font class="keywordtype">char</font> *name);
+00773
+00788 FLAC_API FLAC__bool <a class="code" href="format_8h.html#a70">FLAC__format_vorbiscomment_entry_value_is_legal</a>(<font class="keyword">const</font> FLAC__byte *value, <font class="keywordtype">unsigned</font> length);
+00789
+00804 FLAC_API FLAC__bool <a class="code" href="format_8h.html#a71">FLAC__format_vorbiscomment_entry_is_legal</a>(<font class="keyword">const</font> FLAC__byte *entry, <font class="keywordtype">unsigned</font> length);
00805
-00806 <font class="comment">/* \} */</font>
-00807
-00808 <font class="preprocessor">#ifdef __cplusplus</font>
-00809 <font class="preprocessor"></font>}
-00810 <font class="preprocessor">#endif</font>
-00811 <font class="preprocessor"></font>
-00812 <font class="preprocessor">#endif</font>
-</pre></div><hr><address><small>Generated on Tue Sep 28 21:19:41 2004 for FLAC by
+00806 <font class="comment">/* @@@@ add to unit tests; it is already indirectly tested by the metadata_object tests */</font>
+00817 FLAC_API FLAC__bool <a class="code" href="format_8h.html#a72">FLAC__format_seektable_is_legal</a>(<font class="keyword">const</font> <a class="code" href="structFLAC____StreamMetadata__SeekTable.html">FLAC__StreamMetadata_SeekTable</a> *seek_table);
+00818
+00819 <font class="comment">/* @@@@ add to unit tests; it is already indirectly tested by the metadata_object tests */</font>
+00832 FLAC_API <font class="keywordtype">unsigned</font> <a class="code" href="format_8h.html#a73">FLAC__format_seektable_sort</a>(<a class="code" href="structFLAC____StreamMetadata__SeekTable.html">FLAC__StreamMetadata_SeekTable</a> *seek_table);
+00833
+00834 <font class="comment">/* @@@@ add to unit tests; it is already indirectly tested by the metadata_object tests */</font>
+00853 FLAC_API FLAC__bool <a class="code" href="format_8h.html#a74">FLAC__format_cuesheet_is_legal</a>(<font class="keyword">const</font> <a class="code" href="structFLAC____StreamMetadata__CueSheet.html">FLAC__StreamMetadata_CueSheet</a> *cue_sheet, FLAC__bool check_cd_da_subset, <font class="keyword">const</font> <font class="keywordtype">char</font> **violation);
+00854
+00855 <font class="comment">/* \} */</font>
+00856
+00857 <font class="preprocessor">#ifdef __cplusplus</font>
+00858 <font class="preprocessor"></font>}
+00859 <font class="preprocessor">#endif</font>
+00860 <font class="preprocessor"></font>
+00861 <font class="preprocessor">#endif</font>
+</pre></div><hr><address><small>Generated on Fri Feb 4 18:39:10 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/format_8h.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/format_8h.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/format_8h.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -39,56 +39,59 @@
<tr><td nowrap align=right valign=top>struct </td><td valign=bottom><a class="el" href="structFLAC____StreamMetadata__Unknown.html">FLAC__StreamMetadata_Unknown</a></td></tr>
<tr><td nowrap align=right valign=top>struct </td><td valign=bottom><a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a></td></tr>
<tr><td colspan=2><br><h2>Defines</h2></td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a72">FLAC__MAX_METADATA_TYPE_CODE</a> (126u)</td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a73">FLAC__MIN_BLOCK_SIZE</a> (16u)</td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a74">FLAC__MAX_BLOCK_SIZE</a> (65535u)</td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a75">FLAC__MAX_CHANNELS</a> (8u)</td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a76">FLAC__MIN_BITS_PER_SAMPLE</a> (4u)</td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a77">FLAC__MAX_BITS_PER_SAMPLE</a> (32u)</td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a78">FLAC__REFERENCE_CODEC_MAX_BITS_PER_SAMPLE</a> (24u)</td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a79">FLAC__MAX_SAMPLE_RATE</a> (655350u)</td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a80">FLAC__MAX_LPC_ORDER</a> (32u)</td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a81">FLAC__MIN_QLP_COEFF_PRECISION</a> (5u)</td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a82">FLAC__MAX_QLP_COEFF_PRECISION</a> (15u)</td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a83">FLAC__MAX_FIXED_ORDER</a> (4u)</td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a84">FLAC__MAX_RICE_PARTITION_ORDER</a> (15u)</td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a85">FLAC__SUBSET_MAX_RICE_PARTITION_ORDER</a> (8u)</td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a86">FLAC__STREAM_SYNC_LENGTH</a> (4u)</td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a87">FLAC__STREAM_METADATA_STREAMINFO_LENGTH</a> (34u)</td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a88">FLAC__STREAM_METADATA_SEEKPOINT_LENGTH</a> (18u)</td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a89">FLAC__STREAM_METADATA_HEADER_LENGTH</a> (4u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a75">FLAC__MAX_METADATA_TYPE_CODE</a> (126u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a76">FLAC__MIN_BLOCK_SIZE</a> (16u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a77">FLAC__MAX_BLOCK_SIZE</a> (65535u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a78">FLAC__MAX_CHANNELS</a> (8u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a79">FLAC__MIN_BITS_PER_SAMPLE</a> (4u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a80">FLAC__MAX_BITS_PER_SAMPLE</a> (32u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a81">FLAC__REFERENCE_CODEC_MAX_BITS_PER_SAMPLE</a> (24u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a82">FLAC__MAX_SAMPLE_RATE</a> (655350u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a83">FLAC__MAX_LPC_ORDER</a> (32u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a84">FLAC__MIN_QLP_COEFF_PRECISION</a> (5u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a85">FLAC__MAX_QLP_COEFF_PRECISION</a> (15u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a86">FLAC__MAX_FIXED_ORDER</a> (4u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a87">FLAC__MAX_RICE_PARTITION_ORDER</a> (15u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a88">FLAC__SUBSET_MAX_RICE_PARTITION_ORDER</a> (8u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a89">FLAC__STREAM_SYNC_LENGTH</a> (4u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a90">FLAC__STREAM_METADATA_STREAMINFO_LENGTH</a> (34u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a91">FLAC__STREAM_METADATA_SEEKPOINT_LENGTH</a> (18u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a92">FLAC__STREAM_METADATA_HEADER_LENGTH</a> (4u)</td></tr>
<tr><td colspan=2><br><h2>Enumerations</h2></td></tr>
-<tr><td nowrap align=right valign=top>enum </td><td valign=bottom><a class="el" href="group__flac__format.html#a90">FLAC__EntropyCodingMethodType</a> { <a class="el" href="group__flac__format.html#a90a86">FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE</a> = 0
+<tr><td nowrap align=right valign=top>enum </td><td valign=bottom><a class="el" href="group__flac__format.html#a93">FLAC__EntropyCodingMethodType</a> { <a class="el" href="group__flac__format.html#a93a86">FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE</a> = 0
}</td></tr>
-<tr><td nowrap align=right valign=top>enum </td><td valign=bottom><a class="el" href="group__flac__format.html#a91">FLAC__SubframeType</a> { <a class="el" href="group__flac__format.html#a91a87">FLAC__SUBFRAME_TYPE_CONSTANT</a> = 0,
-<a class="el" href="group__flac__format.html#a91a88">FLAC__SUBFRAME_TYPE_VERBATIM</a> = 1,
-<a class="el" href="group__flac__format.html#a91a89">FLAC__SUBFRAME_TYPE_FIXED</a> = 2,
-<a class="el" href="group__flac__format.html#a91a90">FLAC__SUBFRAME_TYPE_LPC</a> = 3
+<tr><td nowrap align=right valign=top>enum </td><td valign=bottom><a class="el" href="group__flac__format.html#a94">FLAC__SubframeType</a> { <a class="el" href="group__flac__format.html#a94a87">FLAC__SUBFRAME_TYPE_CONSTANT</a> = 0,
+<a class="el" href="group__flac__format.html#a94a88">FLAC__SUBFRAME_TYPE_VERBATIM</a> = 1,
+<a class="el" href="group__flac__format.html#a94a89">FLAC__SUBFRAME_TYPE_FIXED</a> = 2,
+<a class="el" href="group__flac__format.html#a94a90">FLAC__SUBFRAME_TYPE_LPC</a> = 3
}</td></tr>
-<tr><td nowrap align=right valign=top>enum </td><td valign=bottom><a class="el" href="group__flac__format.html#a92">FLAC__ChannelAssignment</a> { <a class="el" href="group__flac__format.html#a92a91">FLAC__CHANNEL_ASSIGNMENT_INDEPENDENT</a> = 0,
-<a class="el" href="group__flac__format.html#a92a92">FLAC__CHANNEL_ASSIGNMENT_LEFT_SIDE</a> = 1,
-<a class="el" href="group__flac__format.html#a92a93">FLAC__CHANNEL_ASSIGNMENT_RIGHT_SIDE</a> = 2,
-<a class="el" href="group__flac__format.html#a92a94">FLAC__CHANNEL_ASSIGNMENT_MID_SIDE</a> = 3
+<tr><td nowrap align=right valign=top>enum </td><td valign=bottom><a class="el" href="group__flac__format.html#a95">FLAC__ChannelAssignment</a> { <a class="el" href="group__flac__format.html#a95a91">FLAC__CHANNEL_ASSIGNMENT_INDEPENDENT</a> = 0,
+<a class="el" href="group__flac__format.html#a95a92">FLAC__CHANNEL_ASSIGNMENT_LEFT_SIDE</a> = 1,
+<a class="el" href="group__flac__format.html#a95a93">FLAC__CHANNEL_ASSIGNMENT_RIGHT_SIDE</a> = 2,
+<a class="el" href="group__flac__format.html#a95a94">FLAC__CHANNEL_ASSIGNMENT_MID_SIDE</a> = 3
}</td></tr>
-<tr><td nowrap align=right valign=top>enum </td><td valign=bottom><a class="el" href="group__flac__format.html#a93">FLAC__FrameNumberType</a> { <a class="el" href="group__flac__format.html#a93a95">FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER</a>,
-<a class="el" href="group__flac__format.html#a93a96">FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER</a>
+<tr><td nowrap align=right valign=top>enum </td><td valign=bottom><a class="el" href="group__flac__format.html#a96">FLAC__FrameNumberType</a> { <a class="el" href="group__flac__format.html#a96a95">FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER</a>,
+<a class="el" href="group__flac__format.html#a96a96">FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER</a>
}</td></tr>
-<tr><td nowrap align=right valign=top>enum </td><td valign=bottom><a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> { <br>
- <a class="el" href="group__flac__format.html#a94a97">FLAC__METADATA_TYPE_STREAMINFO</a> = 0,
-<a class="el" href="group__flac__format.html#a94a98">FLAC__METADATA_TYPE_PADDING</a> = 1,
-<a class="el" href="group__flac__format.html#a94a99">FLAC__METADATA_TYPE_APPLICATION</a> = 2,
-<a class="el" href="group__flac__format.html#a94a100">FLAC__METADATA_TYPE_SEEKTABLE</a> = 3,
+<tr><td nowrap align=right valign=top>enum </td><td valign=bottom><a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> { <br>
+ <a class="el" href="group__flac__format.html#a97a97">FLAC__METADATA_TYPE_STREAMINFO</a> = 0,
+<a class="el" href="group__flac__format.html#a97a98">FLAC__METADATA_TYPE_PADDING</a> = 1,
+<a class="el" href="group__flac__format.html#a97a99">FLAC__METADATA_TYPE_APPLICATION</a> = 2,
+<a class="el" href="group__flac__format.html#a97a100">FLAC__METADATA_TYPE_SEEKTABLE</a> = 3,
<br>
- <a class="el" href="group__flac__format.html#a94a101">FLAC__METADATA_TYPE_VORBIS_COMMENT</a> = 4,
-<a class="el" href="group__flac__format.html#a94a102">FLAC__METADATA_TYPE_CUESHEET</a> = 5,
-<a class="el" href="group__flac__format.html#a94a103">FLAC__METADATA_TYPE_UNDEFINED</a> = 6
+ <a class="el" href="group__flac__format.html#a97a101">FLAC__METADATA_TYPE_VORBIS_COMMENT</a> = 4,
+<a class="el" href="group__flac__format.html#a97a102">FLAC__METADATA_TYPE_CUESHEET</a> = 5,
+<a class="el" href="group__flac__format.html#a97a103">FLAC__METADATA_TYPE_UNDEFINED</a> = 6
<br>
}</td></tr>
<tr><td colspan=2><br><h2>Functions</h2></td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__format.html#a68">FLAC__format_sample_rate_is_valid</a> (unsigned sample_rate)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__format.html#a69">FLAC__format_seektable_is_legal</a> (const <a class="el" href="structFLAC____StreamMetadata__SeekTable.html">FLAC__StreamMetadata_SeekTable</a> *seek_table)</td></tr>
-<tr><td nowrap align=right valign=top>unsigned </td><td valign=bottom><a class="el" href="group__flac__format.html#a70">FLAC__format_seektable_sort</a> (<a class="el" href="structFLAC____StreamMetadata__SeekTable.html">FLAC__StreamMetadata_SeekTable</a> *seek_table)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__format.html#a71">FLAC__format_cuesheet_is_legal</a> (const <a class="el" href="structFLAC____StreamMetadata__CueSheet.html">FLAC__StreamMetadata_CueSheet</a> *cue_sheet, FLAC__bool check_cd_da_subset, const char **violation)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__format.html#a69">FLAC__format_vorbiscomment_entry_name_is_legal</a> (const char *name)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__format.html#a70">FLAC__format_vorbiscomment_entry_value_is_legal</a> (const FLAC__byte *value, unsigned length)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__format.html#a71">FLAC__format_vorbiscomment_entry_is_legal</a> (const FLAC__byte *entry, unsigned length)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__format.html#a72">FLAC__format_seektable_is_legal</a> (const <a class="el" href="structFLAC____StreamMetadata__SeekTable.html">FLAC__StreamMetadata_SeekTable</a> *seek_table)</td></tr>
+<tr><td nowrap align=right valign=top>unsigned </td><td valign=bottom><a class="el" href="group__flac__format.html#a73">FLAC__format_seektable_sort</a> (<a class="el" href="structFLAC____StreamMetadata__SeekTable.html">FLAC__StreamMetadata_SeekTable</a> *seek_table)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__format.html#a74">FLAC__format_cuesheet_is_legal</a> (const <a class="el" href="structFLAC____StreamMetadata__CueSheet.html">FLAC__StreamMetadata_CueSheet</a> *cue_sheet, FLAC__bool check_cd_da_subset, const char **violation)</td></tr>
<tr><td colspan=2><br><h2>Variables</h2></td></tr>
<tr><td nowrap align=right valign=top>const char * </td><td valign=bottom><a class="el" href="group__flac__format.html#a0">FLAC__VERSION_STRING</a></td></tr>
<tr><td nowrap align=right valign=top>const char * </td><td valign=bottom><a class="el" href="group__flac__format.html#a1">FLAC__VENDOR_STRING</a></td></tr>
@@ -172,7 +175,7 @@
<p>
See the detailed documentation in the <a class="el" href="group__flac__format.html">format</a> module.
<p>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:12 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/functions.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/functions.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/functions.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -12,8 +12,11 @@
<p>
Here is a list of all documented class members with links to the classes they belong to:<a name="index_a"><h3>- a -</h3></a>
<ul>
-<li>Application()
-: <a class="el" href="classFLAC_1_1Metadata_1_1Application.html#a1">FLAC::Metadata::Application</a></ul>
+<li>append_comment()
+: <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a10">FLAC::Metadata::VorbisComment</a><li>Application()
+: <a class="el" href="classFLAC_1_1Metadata_1_1Application.html#a1">FLAC::Metadata::Application</a><li>assign()
+: <a class="el" href="classFLAC_1_1Metadata_1_1Unknown.html#a3">FLAC::Metadata::Unknown</a>, <a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a3">FLAC::Metadata::CueSheet</a>, <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a3">FLAC::Metadata::VorbisComment</a>, <a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#a3">FLAC::Metadata::SeekTable</a>, <a class="el" href="classFLAC_1_1Metadata_1_1Application.html#a3">FLAC::Metadata::Application</a>, <a class="el" href="classFLAC_1_1Metadata_1_1Padding.html#a3">FLAC::Metadata::Padding</a>, <a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html#a3">FLAC::Metadata::StreamInfo</a><li>assign_object()
+: <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b1">FLAC::Metadata::Prototype</a></ul>
<a name="index_b"><h3>- b -</h3></a>
<ul>
<li>bits_per_sample
@@ -25,7 +28,7 @@
: <a class="el" href="structFLAC____EntropyCodingMethod__PartitionedRiceContents.html#m2">FLAC__EntropyCodingMethod_PartitionedRiceContents</a><li>channel_assignment
: <a class="el" href="structFLAC____FrameHeader.html#m3">FLAC__FrameHeader</a><li>channels
: <a class="el" href="structFLAC____FrameHeader.html#m2">FLAC__FrameHeader</a><li>clear()
-: <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b1">FLAC::Metadata::Prototype</a><li>contents
+: <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#b2">FLAC::Metadata::Prototype</a><li>contents
: <a class="el" href="structFLAC____EntropyCodingMethod__PartitionedRice.html#m1">FLAC__EntropyCodingMethod_PartitionedRice</a><li>crc
: <a class="el" href="structFLAC____FrameFooter.html#m0">FLAC__FrameFooter</a>, <a class="el" href="structFLAC____FrameHeader.html#m9">FLAC__FrameHeader</a><li>CueSheet()
: <a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a1">FLAC::Metadata::CueSheet</a></ul>
@@ -33,10 +36,10 @@
<ul>
<li>data
: <a class="el" href="structFLAC____StreamMetadata.html#m10">FLAC__StreamMetadata</a>, <a class="el" href="structFLAC____Subframe__Verbatim.html#m0">FLAC__Subframe_Verbatim</a><li>delete_comment()
-: <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a9">FLAC::Metadata::VorbisComment</a><li>delete_index()
-: <a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a13">FLAC::Metadata::CueSheet</a><li>delete_point()
-: <a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#a7">FLAC::Metadata::SeekTable</a><li>delete_track()
-: <a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a16">FLAC::Metadata::CueSheet</a><li>dummy
+: <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a11">FLAC::Metadata::VorbisComment</a><li>delete_index()
+: <a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a14">FLAC::Metadata::CueSheet</a><li>delete_point()
+: <a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#a8">FLAC::Metadata::SeekTable</a><li>delete_track()
+: <a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a17">FLAC::Metadata::CueSheet</a><li>dummy
: <a class="el" href="structFLAC____StreamMetadata__Padding.html#m0">FLAC__StreamMetadata_Padding</a></ul>
<a name="index_e"><h3>- e -</h3></a>
<ul>
@@ -66,13 +69,13 @@
<li>indices
: <a class="el" href="structFLAC____StreamMetadata__CueSheet__Track.html#m6">FLAC__StreamMetadata_CueSheet_Track</a><li>init()
: <a class="el" href="classOggFLAC_1_1Decoder_1_1Stream.html#a18">OggFLAC::Decoder::Stream</a>, <a class="el" href="classFLAC_1_1Decoder_1_1Stream.html#a16">FLAC::Decoder::Stream</a><li>insert_comment()
-: <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a8">FLAC::Metadata::VorbisComment</a><li>insert_index()
-: <a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a12">FLAC::Metadata::CueSheet</a><li>insert_point()
-: <a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#a6">FLAC::Metadata::SeekTable</a><li>insert_track()
-: <a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a15">FLAC::Metadata::CueSheet</a><li>is_cd
+: <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a9">FLAC::Metadata::VorbisComment</a><li>insert_index()
+: <a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a13">FLAC::Metadata::CueSheet</a><li>insert_point()
+: <a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#a7">FLAC::Metadata::SeekTable</a><li>insert_track()
+: <a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a16">FLAC::Metadata::CueSheet</a><li>is_cd
: <a class="el" href="structFLAC____StreamMetadata__CueSheet.html#m2">FLAC__StreamMetadata_CueSheet</a><li>is_last
: <a class="el" href="structFLAC____StreamMetadata.html#m1">FLAC__StreamMetadata</a><li>is_legal()
-: <a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a17">FLAC::Metadata::CueSheet</a>, <a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#a8">FLAC::Metadata::SeekTable</a><li>is_valid()
+: <a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a18">FLAC::Metadata::CueSheet</a>, <a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#a9">FLAC::Metadata::SeekTable</a><li>is_valid()
: <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a7">FLAC::Metadata::Prototype</a><li>isrc
: <a class="el" href="structFLAC____StreamMetadata__CueSheet__Track.html#m2">FLAC__StreamMetadata_CueSheet_Track</a></ul>
<a name="index_l"><h3>- l -</h3></a>
@@ -126,8 +129,8 @@
: <a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#a1">FLAC::Metadata::SeekTable</a><li>set_bits_per_sample()
: <a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z8_15">FLAC::Metadata::StreamInfo</a><li>set_channels()
: <a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z8_14">FLAC::Metadata::StreamInfo</a><li>set_comment()
-: <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a7">FLAC::Metadata::VorbisComment</a><li>set_data()
-: <a class="el" href="classFLAC_1_1Metadata_1_1Unknown.html#a4">FLAC::Metadata::Unknown</a>, <a class="el" href="classFLAC_1_1Metadata_1_1Application.html#a6">FLAC::Metadata::Application</a><li>set_filename()
+: <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a8">FLAC::Metadata::VorbisComment</a><li>set_data()
+: <a class="el" href="classFLAC_1_1Metadata_1_1Unknown.html#a5">FLAC::Metadata::Unknown</a>, <a class="el" href="classFLAC_1_1Metadata_1_1Application.html#a7">FLAC::Metadata::Application</a><li>set_filename()
: <a class="el" href="classOggFLAC_1_1Decoder_1_1File.html#a6">OggFLAC::Decoder::File</a>, <a class="el" href="classFLAC_1_1Decoder_1_1File.html#a5">FLAC::Decoder::File</a><li>set_is_last()
: <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a5">FLAC::Metadata::Prototype</a><li>set_max_blocksize()
: <a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z8_10">FLAC::Metadata::StreamInfo</a><li>set_max_framesize()
@@ -135,11 +138,11 @@
: <a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z8_17">FLAC::Metadata::StreamInfo</a><li>set_min_blocksize()
: <a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z8_9">FLAC::Metadata::StreamInfo</a><li>set_min_framesize()
: <a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z8_11">FLAC::Metadata::StreamInfo</a><li>set_point()
-: <a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#a5">FLAC::Metadata::SeekTable</a><li>set_sample_rate()
+: <a class="el" href="classFLAC_1_1Metadata_1_1SeekTable.html#a6">FLAC::Metadata::SeekTable</a><li>set_sample_rate()
: <a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z8_13">FLAC::Metadata::StreamInfo</a><li>set_total_samples()
: <a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html#z8_16">FLAC::Metadata::StreamInfo</a><li>set_track()
-: <a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a14">FLAC::Metadata::CueSheet</a><li>set_vendor_string()
-: <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a6">FLAC::Metadata::VorbisComment</a><li>stream_offset
+: <a class="el" href="classFLAC_1_1Metadata_1_1CueSheet.html#a15">FLAC::Metadata::CueSheet</a><li>set_vendor_string()
+: <a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment.html#a7">FLAC::Metadata::VorbisComment</a><li>stream_offset
: <a class="el" href="structFLAC____StreamMetadata__SeekPoint.html#m1">FLAC__StreamMetadata_SeekPoint</a><li>StreamInfo()
: <a class="el" href="classFLAC_1_1Metadata_1_1StreamInfo.html#a1">FLAC::Metadata::StreamInfo</a></ul>
<a name="index_t"><h3>- t -</h3></a>
@@ -164,7 +167,7 @@
<ul>
<li>~Prototype()
: <a class="el" href="classFLAC_1_1Metadata_1_1Prototype.html#a0">FLAC::Metadata::Prototype</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/globals.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/globals.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/globals.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -13,19 +13,19 @@
Here is a list of all documented file members with links to the documentation:<a name="index_f"><h3>- f -</h3></a>
<ul>
<li>FLAC__CHANNEL_ASSIGNMENT_INDEPENDENT
-: <a class="el" href="format_8h.html#a92a91">format.h</a><li>FLAC__CHANNEL_ASSIGNMENT_LEFT_SIDE
-: <a class="el" href="format_8h.html#a92a92">format.h</a><li>FLAC__CHANNEL_ASSIGNMENT_MID_SIDE
-: <a class="el" href="format_8h.html#a92a94">format.h</a><li>FLAC__CHANNEL_ASSIGNMENT_RIGHT_SIDE
-: <a class="el" href="format_8h.html#a92a93">format.h</a><li>FLAC__ChannelAssignment
-: <a class="el" href="format_8h.html#a92">format.h</a><li>FLAC__ChannelAssignmentString
+: <a class="el" href="format_8h.html#a95a91">format.h</a><li>FLAC__CHANNEL_ASSIGNMENT_LEFT_SIDE
+: <a class="el" href="format_8h.html#a95a92">format.h</a><li>FLAC__CHANNEL_ASSIGNMENT_MID_SIDE
+: <a class="el" href="format_8h.html#a95a94">format.h</a><li>FLAC__CHANNEL_ASSIGNMENT_RIGHT_SIDE
+: <a class="el" href="format_8h.html#a95a93">format.h</a><li>FLAC__ChannelAssignment
+: <a class="el" href="format_8h.html#a95">format.h</a><li>FLAC__ChannelAssignmentString
: <a class="el" href="format_8h.html#a21">format.h</a><li>FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE
-: <a class="el" href="format_8h.html#a90a86">format.h</a><li>FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ESCAPE_PARAMETER
+: <a class="el" href="format_8h.html#a93a86">format.h</a><li>FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ESCAPE_PARAMETER
: <a class="el" href="format_8h.html#a9">format.h</a><li>FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ORDER_LEN
: <a class="el" href="format_8h.html#a6">format.h</a><li>FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_PARAMETER_LEN
: <a class="el" href="format_8h.html#a7">format.h</a><li>FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_RAW_LEN
: <a class="el" href="format_8h.html#a8">format.h</a><li>FLAC__ENTROPY_CODING_METHOD_TYPE_LEN
: <a class="el" href="format_8h.html#a10">format.h</a><li>FLAC__EntropyCodingMethodType
-: <a class="el" href="format_8h.html#a90">format.h</a><li>FLAC__EntropyCodingMethodTypeString
+: <a class="el" href="format_8h.html#a93">format.h</a><li>FLAC__EntropyCodingMethodTypeString
: <a class="el" href="format_8h.html#a5">format.h</a><li>FLAC__FILE_DECODER_ALREADY_INITIALIZED
: <a class="el" href="file__decoder_8h.html#a36a10">file_decoder.h</a><li>FLAC__file_decoder_delete()
: <a class="el" href="file__decoder_8h.html#a5">file_decoder.h</a><li>FLAC__FILE_DECODER_END_OF_FILE
@@ -134,9 +134,12 @@
: <a class="el" href="FLAC_2file__encoder_8h.html#a1">file_encoder.h</a><li>FLAC__FileEncoderState
: <a class="el" href="FLAC_2file__encoder_8h.html#a52">file_encoder.h</a><li>FLAC__FileEncoderStateString
: <a class="el" href="FLAC_2file__encoder_8h.html#a0">file_encoder.h</a><li>FLAC__format_cuesheet_is_legal()
-: <a class="el" href="format_8h.html#a71">format.h</a><li>FLAC__format_sample_rate_is_valid()
+: <a class="el" href="format_8h.html#a74">format.h</a><li>FLAC__format_sample_rate_is_valid()
: <a class="el" href="format_8h.html#a68">format.h</a><li>FLAC__format_seektable_is_legal()
-: <a class="el" href="format_8h.html#a69">format.h</a><li>FLAC__format_seektable_sort()
+: <a class="el" href="format_8h.html#a72">format.h</a><li>FLAC__format_seektable_sort()
+: <a class="el" href="format_8h.html#a73">format.h</a><li>FLAC__format_vorbiscomment_entry_is_legal()
+: <a class="el" href="format_8h.html#a71">format.h</a><li>FLAC__format_vorbiscomment_entry_name_is_legal()
+: <a class="el" href="format_8h.html#a69">format.h</a><li>FLAC__format_vorbiscomment_entry_value_is_legal()
: <a class="el" href="format_8h.html#a70">format.h</a><li>FLAC__FRAME_FOOTER_CRC_LEN
: <a class="el" href="format_8h.html#a32">format.h</a><li>FLAC__FRAME_HEADER_BITS_PER_SAMPLE_LEN
: <a class="el" href="format_8h.html#a29">format.h</a><li>FLAC__FRAME_HEADER_BLOCK_SIZE_LEN
@@ -148,9 +151,9 @@
: <a class="el" href="format_8h.html#a23">format.h</a><li>FLAC__FRAME_HEADER_SYNC_LEN
: <a class="el" href="format_8h.html#a24">format.h</a><li>FLAC__FRAME_HEADER_ZERO_PAD_LEN
: <a class="el" href="format_8h.html#a30">format.h</a><li>FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER
-: <a class="el" href="format_8h.html#a93a95">format.h</a><li>FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER
-: <a class="el" href="format_8h.html#a93a96">format.h</a><li>FLAC__FrameNumberType
-: <a class="el" href="format_8h.html#a93">format.h</a><li>FLAC__FrameNumberTypeString
+: <a class="el" href="format_8h.html#a96a95">format.h</a><li>FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER
+: <a class="el" href="format_8h.html#a96a96">format.h</a><li>FLAC__FrameNumberType
+: <a class="el" href="format_8h.html#a96">format.h</a><li>FLAC__FrameNumberTypeString
: <a class="el" href="format_8h.html#a22">format.h</a><li>FLAC__IOCallback_Close
: <a class="el" href="callback_8h.html#a6">callback.h</a><li>FLAC__IOCallback_Eof
: <a class="el" href="callback_8h.html#a5">callback.h</a><li>FLAC__IOCallback_Read
@@ -158,15 +161,15 @@
: <a class="el" href="callback_8h.html#a3">callback.h</a><li>FLAC__IOCallback_Tell
: <a class="el" href="callback_8h.html#a4">callback.h</a><li>FLAC__IOCallback_Write
: <a class="el" href="callback_8h.html#a2">callback.h</a><li>FLAC__MAX_BITS_PER_SAMPLE
-: <a class="el" href="format_8h.html#a77">format.h</a><li>FLAC__MAX_BLOCK_SIZE
-: <a class="el" href="format_8h.html#a74">format.h</a><li>FLAC__MAX_CHANNELS
-: <a class="el" href="format_8h.html#a75">format.h</a><li>FLAC__MAX_FIXED_ORDER
-: <a class="el" href="format_8h.html#a83">format.h</a><li>FLAC__MAX_LPC_ORDER
-: <a class="el" href="format_8h.html#a80">format.h</a><li>FLAC__MAX_METADATA_TYPE_CODE
-: <a class="el" href="format_8h.html#a72">format.h</a><li>FLAC__MAX_QLP_COEFF_PRECISION
-: <a class="el" href="format_8h.html#a82">format.h</a><li>FLAC__MAX_RICE_PARTITION_ORDER
-: <a class="el" href="format_8h.html#a84">format.h</a><li>FLAC__MAX_SAMPLE_RATE
-: <a class="el" href="format_8h.html#a79">format.h</a><li>FLAC__Metadata_Chain
+: <a class="el" href="format_8h.html#a80">format.h</a><li>FLAC__MAX_BLOCK_SIZE
+: <a class="el" href="format_8h.html#a77">format.h</a><li>FLAC__MAX_CHANNELS
+: <a class="el" href="format_8h.html#a78">format.h</a><li>FLAC__MAX_FIXED_ORDER
+: <a class="el" href="format_8h.html#a86">format.h</a><li>FLAC__MAX_LPC_ORDER
+: <a class="el" href="format_8h.html#a83">format.h</a><li>FLAC__MAX_METADATA_TYPE_CODE
+: <a class="el" href="format_8h.html#a75">format.h</a><li>FLAC__MAX_QLP_COEFF_PRECISION
+: <a class="el" href="format_8h.html#a85">format.h</a><li>FLAC__MAX_RICE_PARTITION_ORDER
+: <a class="el" href="format_8h.html#a87">format.h</a><li>FLAC__MAX_SAMPLE_RATE
+: <a class="el" href="format_8h.html#a82">format.h</a><li>FLAC__Metadata_Chain
: <a class="el" href="metadata_8h.html#a0">metadata.h</a><li>FLAC__metadata_chain_check_if_tempfile_needed()
: <a class="el" href="metadata_8h.html#a8">metadata.h</a><li>FLAC__metadata_chain_delete()
: <a class="el" href="metadata_8h.html#a4">metadata.h</a><li>FLAC__metadata_chain_merge_padding()
@@ -213,18 +216,18 @@
: <a class="el" href="metadata_8h.html#a21">metadata.h</a><li>FLAC__metadata_object_application_set_data()
: <a class="el" href="metadata_8h.html#a4">metadata.h</a><li>FLAC__metadata_object_clone()
: <a class="el" href="metadata_8h.html#a1">metadata.h</a><li>FLAC__metadata_object_cuesheet_delete_track()
-: <a class="el" href="metadata_8h.html#a34">metadata.h</a><li>FLAC__metadata_object_cuesheet_insert_blank_track()
-: <a class="el" href="metadata_8h.html#a33">metadata.h</a><li>FLAC__metadata_object_cuesheet_insert_track()
-: <a class="el" href="metadata_8h.html#a32">metadata.h</a><li>FLAC__metadata_object_cuesheet_is_legal()
-: <a class="el" href="metadata_8h.html#a35">metadata.h</a><li>FLAC__metadata_object_cuesheet_resize_tracks()
-: <a class="el" href="metadata_8h.html#a31">metadata.h</a><li>FLAC__metadata_object_cuesheet_track_clone()
-: <a class="el" href="metadata_8h.html#a25">metadata.h</a><li>FLAC__metadata_object_cuesheet_track_delete()
-: <a class="el" href="metadata_8h.html#a26">metadata.h</a><li>FLAC__metadata_object_cuesheet_track_delete_index()
-: <a class="el" href="metadata_8h.html#a30">metadata.h</a><li>FLAC__metadata_object_cuesheet_track_insert_blank_index()
-: <a class="el" href="metadata_8h.html#a29">metadata.h</a><li>FLAC__metadata_object_cuesheet_track_insert_index()
-: <a class="el" href="metadata_8h.html#a28">metadata.h</a><li>FLAC__metadata_object_cuesheet_track_new()
-: <a class="el" href="metadata_8h.html#a24">metadata.h</a><li>FLAC__metadata_object_cuesheet_track_resize_indices()
-: <a class="el" href="metadata_8h.html#a27">metadata.h</a><li>FLAC__metadata_object_delete()
+: <a class="el" href="metadata_8h.html#a38">metadata.h</a><li>FLAC__metadata_object_cuesheet_insert_blank_track()
+: <a class="el" href="metadata_8h.html#a37">metadata.h</a><li>FLAC__metadata_object_cuesheet_insert_track()
+: <a class="el" href="metadata_8h.html#a36">metadata.h</a><li>FLAC__metadata_object_cuesheet_is_legal()
+: <a class="el" href="metadata_8h.html#a39">metadata.h</a><li>FLAC__metadata_object_cuesheet_resize_tracks()
+: <a class="el" href="metadata_8h.html#a35">metadata.h</a><li>FLAC__metadata_object_cuesheet_track_clone()
+: <a class="el" href="metadata_8h.html#a29">metadata.h</a><li>FLAC__metadata_object_cuesheet_track_delete()
+: <a class="el" href="metadata_8h.html#a30">metadata.h</a><li>FLAC__metadata_object_cuesheet_track_delete_index()
+: <a class="el" href="metadata_8h.html#a34">metadata.h</a><li>FLAC__metadata_object_cuesheet_track_insert_blank_index()
+: <a class="el" href="metadata_8h.html#a33">metadata.h</a><li>FLAC__metadata_object_cuesheet_track_insert_index()
+: <a class="el" href="metadata_8h.html#a32">metadata.h</a><li>FLAC__metadata_object_cuesheet_track_new()
+: <a class="el" href="metadata_8h.html#a28">metadata.h</a><li>FLAC__metadata_object_cuesheet_track_resize_indices()
+: <a class="el" href="metadata_8h.html#a31">metadata.h</a><li>FLAC__metadata_object_delete()
: <a class="el" href="metadata_8h.html#a2">metadata.h</a><li>FLAC__metadata_object_is_equal()
: <a class="el" href="metadata_8h.html#a3">metadata.h</a><li>FLAC__metadata_object_new()
: <a class="el" href="metadata_8h.html#a0">metadata.h</a><li>FLAC__metadata_object_seektable_delete_point()
@@ -237,13 +240,17 @@
: <a class="el" href="metadata_8h.html#a11">metadata.h</a><li>FLAC__metadata_object_seektable_template_append_points()
: <a class="el" href="metadata_8h.html#a12">metadata.h</a><li>FLAC__metadata_object_seektable_template_append_spaced_points()
: <a class="el" href="metadata_8h.html#a13">metadata.h</a><li>FLAC__metadata_object_seektable_template_sort()
-: <a class="el" href="metadata_8h.html#a14">metadata.h</a><li>FLAC__metadata_object_vorbiscomment_delete_comment()
-: <a class="el" href="metadata_8h.html#a19">metadata.h</a><li>FLAC__metadata_object_vorbiscomment_entry_matches()
-: <a class="el" href="metadata_8h.html#a20">metadata.h</a><li>FLAC__metadata_object_vorbiscomment_find_entry_from()
-: <a class="el" href="metadata_8h.html#a21">metadata.h</a><li>FLAC__metadata_object_vorbiscomment_insert_comment()
+: <a class="el" href="metadata_8h.html#a14">metadata.h</a><li>FLAC__metadata_object_vorbiscomment_append_comment()
+: <a class="el" href="metadata_8h.html#a19">metadata.h</a><li>FLAC__metadata_object_vorbiscomment_delete_comment()
+: <a class="el" href="metadata_8h.html#a21">metadata.h</a><li>FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair()
+: <a class="el" href="metadata_8h.html#a22">metadata.h</a><li>FLAC__metadata_object_vorbiscomment_entry_matches()
+: <a class="el" href="metadata_8h.html#a24">metadata.h</a><li>FLAC__metadata_object_vorbiscomment_entry_to_name_value_pair()
+: <a class="el" href="metadata_8h.html#a23">metadata.h</a><li>FLAC__metadata_object_vorbiscomment_find_entry_from()
+: <a class="el" href="metadata_8h.html#a25">metadata.h</a><li>FLAC__metadata_object_vorbiscomment_insert_comment()
: <a class="el" href="metadata_8h.html#a18">metadata.h</a><li>FLAC__metadata_object_vorbiscomment_remove_entries_matching()
-: <a class="el" href="metadata_8h.html#a23">metadata.h</a><li>FLAC__metadata_object_vorbiscomment_remove_entry_matching()
-: <a class="el" href="metadata_8h.html#a22">metadata.h</a><li>FLAC__metadata_object_vorbiscomment_resize_comments()
+: <a class="el" href="metadata_8h.html#a27">metadata.h</a><li>FLAC__metadata_object_vorbiscomment_remove_entry_matching()
+: <a class="el" href="metadata_8h.html#a26">metadata.h</a><li>FLAC__metadata_object_vorbiscomment_replace_comment()
+: <a class="el" href="metadata_8h.html#a20">metadata.h</a><li>FLAC__metadata_object_vorbiscomment_resize_comments()
: <a class="el" href="metadata_8h.html#a16">metadata.h</a><li>FLAC__metadata_object_vorbiscomment_set_comment()
: <a class="el" href="metadata_8h.html#a17">metadata.h</a><li>FLAC__metadata_object_vorbiscomment_set_vendor_string()
: <a class="el" href="metadata_8h.html#a15">metadata.h</a><li>FLAC__metadata_simple_iterator_delete()
@@ -275,19 +282,19 @@
: <a class="el" href="metadata_8h.html#a0">metadata.h</a><li>FLAC__Metadata_SimpleIteratorStatus
: <a class="el" href="metadata_8h.html#a14">metadata.h</a><li>FLAC__Metadata_SimpleIteratorStatusString
: <a class="el" href="metadata_8h.html#a1">metadata.h</a><li>FLAC__METADATA_TYPE_APPLICATION
-: <a class="el" href="format_8h.html#a94a99">format.h</a><li>FLAC__METADATA_TYPE_CUESHEET
-: <a class="el" href="format_8h.html#a94a102">format.h</a><li>FLAC__METADATA_TYPE_PADDING
-: <a class="el" href="format_8h.html#a94a98">format.h</a><li>FLAC__METADATA_TYPE_SEEKTABLE
-: <a class="el" href="format_8h.html#a94a100">format.h</a><li>FLAC__METADATA_TYPE_STREAMINFO
-: <a class="el" href="format_8h.html#a94a97">format.h</a><li>FLAC__METADATA_TYPE_UNDEFINED
-: <a class="el" href="format_8h.html#a94a103">format.h</a><li>FLAC__METADATA_TYPE_VORBIS_COMMENT
-: <a class="el" href="format_8h.html#a94a101">format.h</a><li>FLAC__MetadataType
-: <a class="el" href="format_8h.html#a94">format.h</a><li>FLAC__MetadataTypeString
+: <a class="el" href="format_8h.html#a97a99">format.h</a><li>FLAC__METADATA_TYPE_CUESHEET
+: <a class="el" href="format_8h.html#a97a102">format.h</a><li>FLAC__METADATA_TYPE_PADDING
+: <a class="el" href="format_8h.html#a97a98">format.h</a><li>FLAC__METADATA_TYPE_SEEKTABLE
+: <a class="el" href="format_8h.html#a97a100">format.h</a><li>FLAC__METADATA_TYPE_STREAMINFO
+: <a class="el" href="format_8h.html#a97a97">format.h</a><li>FLAC__METADATA_TYPE_UNDEFINED
+: <a class="el" href="format_8h.html#a97a103">format.h</a><li>FLAC__METADATA_TYPE_VORBIS_COMMENT
+: <a class="el" href="format_8h.html#a97a101">format.h</a><li>FLAC__MetadataType
+: <a class="el" href="format_8h.html#a97">format.h</a><li>FLAC__MetadataTypeString
: <a class="el" href="format_8h.html#a33">format.h</a><li>FLAC__MIN_BITS_PER_SAMPLE
-: <a class="el" href="format_8h.html#a76">format.h</a><li>FLAC__MIN_BLOCK_SIZE
-: <a class="el" href="format_8h.html#a73">format.h</a><li>FLAC__MIN_QLP_COEFF_PRECISION
-: <a class="el" href="format_8h.html#a81">format.h</a><li>FLAC__REFERENCE_CODEC_MAX_BITS_PER_SAMPLE
-: <a class="el" href="format_8h.html#a78">format.h</a><li>FLAC__SEEKABLE_STREAM_DECODER_ALREADY_INITIALIZED
+: <a class="el" href="format_8h.html#a79">format.h</a><li>FLAC__MIN_BLOCK_SIZE
+: <a class="el" href="format_8h.html#a76">format.h</a><li>FLAC__MIN_QLP_COEFF_PRECISION
+: <a class="el" href="format_8h.html#a84">format.h</a><li>FLAC__REFERENCE_CODEC_MAX_BITS_PER_SAMPLE
+: <a class="el" href="format_8h.html#a81">format.h</a><li>FLAC__SEEKABLE_STREAM_DECODER_ALREADY_INITIALIZED
: <a class="el" href="seekable__stream__decoder_8h.html#a50a20">seekable_stream_decoder.h</a><li>FLAC__seekable_stream_decoder_delete()
: <a class="el" href="seekable__stream__decoder_8h.html#a14">seekable_stream_decoder.h</a><li>FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM
: <a class="el" href="seekable__stream__decoder_8h.html#a50a15">seekable_stream_decoder.h</a><li>FLAC__seekable_stream_decoder_finish()
@@ -570,17 +577,17 @@
: <a class="el" href="format_8h.html#a57">format.h</a><li>FLAC__STREAM_METADATA_CUESHEET_TRACK_RESERVED_LEN
: <a class="el" href="format_8h.html#a58">format.h</a><li>FLAC__STREAM_METADATA_CUESHEET_TRACK_TYPE_LEN
: <a class="el" href="format_8h.html#a56">format.h</a><li>FLAC__STREAM_METADATA_HEADER_LENGTH
-: <a class="el" href="format_8h.html#a89">format.h</a><li>FLAC__STREAM_METADATA_IS_LAST_LEN
+: <a class="el" href="format_8h.html#a92">format.h</a><li>FLAC__STREAM_METADATA_IS_LAST_LEN
: <a class="el" href="format_8h.html#a65">format.h</a><li>FLAC__STREAM_METADATA_LENGTH_LEN
: <a class="el" href="format_8h.html#a67">format.h</a><li>FLAC__STREAM_METADATA_SEEKPOINT_FRAME_SAMPLES_LEN
: <a class="el" href="format_8h.html#a46">format.h</a><li>FLAC__STREAM_METADATA_SEEKPOINT_LENGTH
-: <a class="el" href="format_8h.html#a88">format.h</a><li>FLAC__STREAM_METADATA_SEEKPOINT_PLACEHOLDER
+: <a class="el" href="format_8h.html#a91">format.h</a><li>FLAC__STREAM_METADATA_SEEKPOINT_PLACEHOLDER
: <a class="el" href="format_8h.html#a47">format.h</a><li>FLAC__STREAM_METADATA_SEEKPOINT_SAMPLE_NUMBER_LEN
: <a class="el" href="format_8h.html#a44">format.h</a><li>FLAC__STREAM_METADATA_SEEKPOINT_STREAM_OFFSET_LEN
: <a class="el" href="format_8h.html#a45">format.h</a><li>FLAC__STREAM_METADATA_STREAMINFO_BITS_PER_SAMPLE_LEN
: <a class="el" href="format_8h.html#a40">format.h</a><li>FLAC__STREAM_METADATA_STREAMINFO_CHANNELS_LEN
: <a class="el" href="format_8h.html#a39">format.h</a><li>FLAC__STREAM_METADATA_STREAMINFO_LENGTH
-: <a class="el" href="format_8h.html#a87">format.h</a><li>FLAC__STREAM_METADATA_STREAMINFO_MAX_BLOCK_SIZE_LEN
+: <a class="el" href="format_8h.html#a90">format.h</a><li>FLAC__STREAM_METADATA_STREAMINFO_MAX_BLOCK_SIZE_LEN
: <a class="el" href="format_8h.html#a35">format.h</a><li>FLAC__STREAM_METADATA_STREAMINFO_MAX_FRAME_SIZE_LEN
: <a class="el" href="format_8h.html#a37">format.h</a><li>FLAC__STREAM_METADATA_STREAMINFO_MD5SUM_LEN
: <a class="el" href="format_8h.html#a42">format.h</a><li>FLAC__STREAM_METADATA_STREAMINFO_MIN_BLOCK_SIZE_LEN
@@ -593,7 +600,7 @@
: <a class="el" href="format_8h.html#a49">format.h</a><li>FLAC__STREAM_SYNC
: <a class="el" href="format_8h.html#a3">format.h</a><li>FLAC__STREAM_SYNC_LEN
: <a class="el" href="format_8h.html#a4">format.h</a><li>FLAC__STREAM_SYNC_LENGTH
-: <a class="el" href="format_8h.html#a86">format.h</a><li>FLAC__STREAM_SYNC_STRING
+: <a class="el" href="format_8h.html#a89">format.h</a><li>FLAC__STREAM_SYNC_STRING
: <a class="el" href="format_8h.html#a2">format.h</a><li>FLAC__StreamDecoderErrorCallback
: <a class="el" href="FLAC_2stream__decoder_8h.html#a7">stream_decoder.h</a><li>FLAC__StreamDecoderErrorStatus
: <a class="el" href="FLAC_2stream__decoder_8h.html#a39">stream_decoder.h</a><li>FLAC__StreamDecoderErrorStatusString
@@ -615,16 +622,16 @@
: <a class="el" href="FLAC_2stream__encoder_8h.html#a1">stream_encoder.h</a><li>FLAC__SUBFRAME_LPC_QLP_COEFF_PRECISION_LEN
: <a class="el" href="format_8h.html#a12">format.h</a><li>FLAC__SUBFRAME_LPC_QLP_SHIFT_LEN
: <a class="el" href="format_8h.html#a13">format.h</a><li>FLAC__SUBFRAME_TYPE_CONSTANT
-: <a class="el" href="format_8h.html#a91a87">format.h</a><li>FLAC__SUBFRAME_TYPE_FIXED
-: <a class="el" href="format_8h.html#a91a89">format.h</a><li>FLAC__SUBFRAME_TYPE_LEN
+: <a class="el" href="format_8h.html#a94a87">format.h</a><li>FLAC__SUBFRAME_TYPE_FIXED
+: <a class="el" href="format_8h.html#a94a89">format.h</a><li>FLAC__SUBFRAME_TYPE_LEN
: <a class="el" href="format_8h.html#a15">format.h</a><li>FLAC__SUBFRAME_TYPE_LPC
-: <a class="el" href="format_8h.html#a91a90">format.h</a><li>FLAC__SUBFRAME_TYPE_VERBATIM
-: <a class="el" href="format_8h.html#a91a88">format.h</a><li>FLAC__SUBFRAME_WASTED_BITS_FLAG_LEN
+: <a class="el" href="format_8h.html#a94a90">format.h</a><li>FLAC__SUBFRAME_TYPE_VERBATIM
+: <a class="el" href="format_8h.html#a94a88">format.h</a><li>FLAC__SUBFRAME_WASTED_BITS_FLAG_LEN
: <a class="el" href="format_8h.html#a16">format.h</a><li>FLAC__SUBFRAME_ZERO_PAD_LEN
: <a class="el" href="format_8h.html#a14">format.h</a><li>FLAC__SubframeType
-: <a class="el" href="format_8h.html#a91">format.h</a><li>FLAC__SubframeTypeString
+: <a class="el" href="format_8h.html#a94">format.h</a><li>FLAC__SubframeTypeString
: <a class="el" href="format_8h.html#a11">format.h</a><li>FLAC__SUBSET_MAX_RICE_PARTITION_ORDER
-: <a class="el" href="format_8h.html#a85">format.h</a><li>FLAC__VENDOR_STRING
+: <a class="el" href="format_8h.html#a88">format.h</a><li>FLAC__VENDOR_STRING
: <a class="el" href="format_8h.html#a1">format.h</a><li>FLAC__VERSION_STRING
: <a class="el" href="format_8h.html#a0">format.h</a></ul>
<a name="index_o"><h3>- o -</h3></a>
@@ -872,7 +879,7 @@
: <a class="el" href="OggFLAC_2stream__encoder_8h.html#a53">stream_encoder.h</a><li>OggFLAC__StreamEncoderStateString
: <a class="el" href="OggFLAC_2stream__encoder_8h.html#a0">stream_encoder.h</a><li>OggFLAC__StreamEncoderWriteCallback
: <a class="el" href="OggFLAC_2stream__encoder_8h.html#a1">stream_encoder.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:48 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:23 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -32,7 +32,7 @@
<hr><a name="_details"></a><h2>Detailed Description</h2>
The FLAC C API is the interface to libFLAC, a set of structures describing the components of FLAC streams, and functions for encoding and decoding streams, as well as manipulating FLAC metadata in files.
<p>
-You should start with the format components as all other modules are dependent on it. <hr><address><small>Generated on Tue Sep 28 21:19:43 2004 for FLAC by
+You should start with the format components as all other modules are dependent on it. <hr><address><small>Generated on Fri Feb 4 18:39:14 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__callbacks.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__callbacks.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__callbacks.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -257,7 +257,7 @@
</dl> </td>
</tr>
</table>
-<hr><address><small>Generated on Tue Sep 28 21:19:43 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:14 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__decoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__decoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__decoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -32,7 +32,7 @@
<p>
For decoding FLAC streams, libFLAC provides three layers of access. The lowest layer is non-seekable stream-level decoding, the next is seekable stream-level decoding, and the highest layer is file-level decoding. The interfaces are described in the <a class="el" href="group__flac__stream__decoder.html">stream decoder</a>, <a class="el" href="group__flac__seekable__stream__decoder.html">seekable stream decoder</a>, and <a class="el" href="group__flac__file__decoder.html">file decoder</a> modules respectively. Typically you will choose the highest layer that your input source will support.
<p>
-The stream decoder relies on callbacks for all input and output and has no provisions for seeking. The seekable stream decoder wraps the stream decoder and exposes functions for seeking. However, you must provide extra callbacks for seek-related operations on your stream, like seek and tell. The file decoder wraps the seekable stream decoder and supplies most of the callbacks internally, simplifying the processing of standard files. <hr><address><small>Generated on Tue Sep 28 21:19:44 2004 for FLAC by
+The stream decoder relies on callbacks for all input and output and has no provisions for seeking. The seekable stream decoder wraps the stream decoder and exposes functions for seeking. However, you must provide extra callbacks for seek-related operations on your stream, like seek and tell. The file decoder wraps the seekable stream decoder and supplies most of the callbacks internally, simplifying the processing of standard files. <hr><address><small>Generated on Fri Feb 4 18:39:17 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__encoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__encoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__encoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -32,7 +32,7 @@
<p>
For encoding FLAC streams, libFLAC provides three layers of access. The lowest layer is non-seekable stream-level encoding, the next is seekable stream-level encoding, and the highest layer is file-level encoding. The interfaces are described in the <a class="el" href="group__flac__stream__encoder.html">stream encoder</a>, <a class="el" href="group__flac__seekable__stream__encoder.html">seekable stream encoder</a>, and <a class="el" href="group__flac__file__encoder.html">file encoder</a> modules respectively. Typically you will choose the highest layer that your input source will support. The stream encoder relies on callbacks for writing the data and metadata. The file encoder provides these callbacks internally and you need only supply the filename.
<p>
-The stream encoder relies on callbacks for writing the data and has no provisions for seeking the output. The seekable stream encoder wraps the stream encoder and also automaticallay handles the writing back of metadata discovered while encoding. However, you must provide extra callbacks for seek-related operations on your output, like seek and tell. The file encoder wraps the seekable stream encoder and supplies all of the callbacks internally, simplifying the processing of standard files. The only callback exposed is for progress reporting, and that is optional. <hr><address><small>Generated on Tue Sep 28 21:19:45 2004 for FLAC by
+The stream encoder relies on callbacks for writing the data and has no provisions for seeking the output. The seekable stream encoder wraps the stream encoder and also automaticallay handles the writing back of metadata discovered while encoding. However, you must provide extra callbacks for seek-related operations on your output, like seek and tell. The file encoder wraps the seekable stream encoder and supplies all of the callbacks internally, simplifying the processing of standard files. The only callback exposed is for progress reporting, and that is optional. <hr><address><small>Generated on Fri Feb 4 18:39:18 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__file__decoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__file__decoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__file__decoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -41,10 +41,10 @@
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a9">FLAC__file_decoder_set_metadata_callback</a> (<a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder, <a class="el" href="group__flac__file__decoder.html#a2">FLAC__FileDecoderMetadataCallback</a> value)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a10">FLAC__file_decoder_set_error_callback</a> (<a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder, <a class="el" href="group__flac__file__decoder.html#a3">FLAC__FileDecoderErrorCallback</a> value)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a11">FLAC__file_decoder_set_client_data</a> (<a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder, void *value)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a12">FLAC__file_decoder_set_metadata_respond</a> (<a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder, <a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> type)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a12">FLAC__file_decoder_set_metadata_respond</a> (<a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder, <a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> type)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a13">FLAC__file_decoder_set_metadata_respond_application</a> (<a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder, const FLAC__byte id[4])</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a14">FLAC__file_decoder_set_metadata_respond_all</a> (<a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a15">FLAC__file_decoder_set_metadata_ignore</a> (<a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder, <a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> type)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a15">FLAC__file_decoder_set_metadata_ignore</a> (<a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder, <a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> type)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a16">FLAC__file_decoder_set_metadata_ignore_application</a> (<a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder, const FLAC__byte id[4])</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a17">FLAC__file_decoder_set_metadata_ignore_all</a> (<a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top><a class="el" href="group__flac__file__decoder.html#a36">FLAC__FileDecoderState</a> </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a18">FLAC__file_decoder_get_state</a> (const <a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder)</td></tr>
@@ -53,7 +53,7 @@
<tr><td nowrap align=right valign=top>const char * </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a21">FLAC__file_decoder_get_resolved_state_string</a> (const <a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a22">FLAC__file_decoder_get_md5_checking</a> (const <a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>unsigned </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a23">FLAC__file_decoder_get_channels</a> (const <a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder)</td></tr>
-<tr><td nowrap align=right valign=top><a class="el" href="group__flac__format.html#a92">FLAC__ChannelAssignment</a> </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a24">FLAC__file_decoder_get_channel_assignment</a> (const <a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder)</td></tr>
+<tr><td nowrap align=right valign=top><a class="el" href="group__flac__format.html#a95">FLAC__ChannelAssignment</a> </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a24">FLAC__file_decoder_get_channel_assignment</a> (const <a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>unsigned </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a25">FLAC__file_decoder_get_bits_per_sample</a> (const <a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>unsigned </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a26">FLAC__file_decoder_get_sample_rate</a> (const <a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>unsigned </td><td valign=bottom><a class="el" href="group__flac__file__decoder.html#a27">FLAC__file_decoder_get_blocksize</a> (const <a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> *decoder)</td></tr>
@@ -685,7 +685,7 @@
<tr>
<td></td>
<td></td>
- <td class="md" nowrap><a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> </td>
+ <td class="md" nowrap><a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> </td>
<td class="mdname" nowrap> <em>type</em></td>
</tr>
<tr>
@@ -846,7 +846,7 @@
<tr>
<td></td>
<td></td>
- <td class="md" nowrap><a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> </td>
+ <td class="md" nowrap><a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> </td>
<td class="mdname" nowrap> <em>type</em></td>
</tr>
<tr>
@@ -1263,7 +1263,7 @@
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> <a class="el" href="group__flac__format.html#a92">FLAC__ChannelAssignment</a> FLAC__file_decoder_get_channel_assignment </td>
+ <td class="md" nowrap valign="top"> <a class="el" href="group__flac__format.html#a95">FLAC__ChannelAssignment</a> FLAC__file_decoder_get_channel_assignment </td>
<td class="md" valign="top">( </td>
<td class="md" nowrap valign="top">const <a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a> * </td>
<td class="mdname1" valign="top" nowrap> <em>decoder</em> </td>
@@ -1835,7 +1835,7 @@
Using a FLAC__FileDecoderState as the index to this array will give the string equivalent. The contents should not be modified. </td>
</tr>
</table>
-<hr><address><small>Generated on Tue Sep 28 21:19:43 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:14 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__file__encoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__file__encoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__file__encoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -2774,7 +2774,7 @@
Using a FLAC__FileEncoderState as the index to this array will give the string equivalent. The contents should not be modified. </td>
</tr>
</table>
-<hr><address><small>Generated on Tue Sep 28 21:19:43 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:15 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__format.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__format.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__format.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -36,56 +36,59 @@
<tr><td nowrap align=right valign=top>struct </td><td valign=bottom><a class="el" href="structFLAC____StreamMetadata__Unknown.html">FLAC__StreamMetadata_Unknown</a></td></tr>
<tr><td nowrap align=right valign=top>struct </td><td valign=bottom><a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a></td></tr>
<tr><td colspan=2><br><h2>Defines</h2></td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a72">FLAC__MAX_METADATA_TYPE_CODE</a> (126u)</td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a73">FLAC__MIN_BLOCK_SIZE</a> (16u)</td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a74">FLAC__MAX_BLOCK_SIZE</a> (65535u)</td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a75">FLAC__MAX_CHANNELS</a> (8u)</td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a76">FLAC__MIN_BITS_PER_SAMPLE</a> (4u)</td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a77">FLAC__MAX_BITS_PER_SAMPLE</a> (32u)</td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a78">FLAC__REFERENCE_CODEC_MAX_BITS_PER_SAMPLE</a> (24u)</td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a79">FLAC__MAX_SAMPLE_RATE</a> (655350u)</td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a80">FLAC__MAX_LPC_ORDER</a> (32u)</td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a81">FLAC__MIN_QLP_COEFF_PRECISION</a> (5u)</td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a82">FLAC__MAX_QLP_COEFF_PRECISION</a> (15u)</td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a83">FLAC__MAX_FIXED_ORDER</a> (4u)</td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a84">FLAC__MAX_RICE_PARTITION_ORDER</a> (15u)</td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a85">FLAC__SUBSET_MAX_RICE_PARTITION_ORDER</a> (8u)</td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a86">FLAC__STREAM_SYNC_LENGTH</a> (4u)</td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a87">FLAC__STREAM_METADATA_STREAMINFO_LENGTH</a> (34u)</td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a88">FLAC__STREAM_METADATA_SEEKPOINT_LENGTH</a> (18u)</td></tr>
-<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a89">FLAC__STREAM_METADATA_HEADER_LENGTH</a> (4u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a75">FLAC__MAX_METADATA_TYPE_CODE</a> (126u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a76">FLAC__MIN_BLOCK_SIZE</a> (16u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a77">FLAC__MAX_BLOCK_SIZE</a> (65535u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a78">FLAC__MAX_CHANNELS</a> (8u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a79">FLAC__MIN_BITS_PER_SAMPLE</a> (4u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a80">FLAC__MAX_BITS_PER_SAMPLE</a> (32u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a81">FLAC__REFERENCE_CODEC_MAX_BITS_PER_SAMPLE</a> (24u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a82">FLAC__MAX_SAMPLE_RATE</a> (655350u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a83">FLAC__MAX_LPC_ORDER</a> (32u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a84">FLAC__MIN_QLP_COEFF_PRECISION</a> (5u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a85">FLAC__MAX_QLP_COEFF_PRECISION</a> (15u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a86">FLAC__MAX_FIXED_ORDER</a> (4u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a87">FLAC__MAX_RICE_PARTITION_ORDER</a> (15u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a88">FLAC__SUBSET_MAX_RICE_PARTITION_ORDER</a> (8u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a89">FLAC__STREAM_SYNC_LENGTH</a> (4u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a90">FLAC__STREAM_METADATA_STREAMINFO_LENGTH</a> (34u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a91">FLAC__STREAM_METADATA_SEEKPOINT_LENGTH</a> (18u)</td></tr>
+<tr><td nowrap align=right valign=top>#define </td><td valign=bottom><a class="el" href="group__flac__format.html#a92">FLAC__STREAM_METADATA_HEADER_LENGTH</a> (4u)</td></tr>
<tr><td colspan=2><br><h2>Enumerations</h2></td></tr>
-<tr><td nowrap align=right valign=top>enum </td><td valign=bottom><a class="el" href="group__flac__format.html#a90">FLAC__EntropyCodingMethodType</a> { <a class="el" href="group__flac__format.html#a90a86">FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE</a> = 0
+<tr><td nowrap align=right valign=top>enum </td><td valign=bottom><a class="el" href="group__flac__format.html#a93">FLAC__EntropyCodingMethodType</a> { <a class="el" href="group__flac__format.html#a93a86">FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE</a> = 0
}</td></tr>
-<tr><td nowrap align=right valign=top>enum </td><td valign=bottom><a class="el" href="group__flac__format.html#a91">FLAC__SubframeType</a> { <a class="el" href="group__flac__format.html#a91a87">FLAC__SUBFRAME_TYPE_CONSTANT</a> = 0,
-<a class="el" href="group__flac__format.html#a91a88">FLAC__SUBFRAME_TYPE_VERBATIM</a> = 1,
-<a class="el" href="group__flac__format.html#a91a89">FLAC__SUBFRAME_TYPE_FIXED</a> = 2,
-<a class="el" href="group__flac__format.html#a91a90">FLAC__SUBFRAME_TYPE_LPC</a> = 3
+<tr><td nowrap align=right valign=top>enum </td><td valign=bottom><a class="el" href="group__flac__format.html#a94">FLAC__SubframeType</a> { <a class="el" href="group__flac__format.html#a94a87">FLAC__SUBFRAME_TYPE_CONSTANT</a> = 0,
+<a class="el" href="group__flac__format.html#a94a88">FLAC__SUBFRAME_TYPE_VERBATIM</a> = 1,
+<a class="el" href="group__flac__format.html#a94a89">FLAC__SUBFRAME_TYPE_FIXED</a> = 2,
+<a class="el" href="group__flac__format.html#a94a90">FLAC__SUBFRAME_TYPE_LPC</a> = 3
}</td></tr>
-<tr><td nowrap align=right valign=top>enum </td><td valign=bottom><a class="el" href="group__flac__format.html#a92">FLAC__ChannelAssignment</a> { <a class="el" href="group__flac__format.html#a92a91">FLAC__CHANNEL_ASSIGNMENT_INDEPENDENT</a> = 0,
-<a class="el" href="group__flac__format.html#a92a92">FLAC__CHANNEL_ASSIGNMENT_LEFT_SIDE</a> = 1,
-<a class="el" href="group__flac__format.html#a92a93">FLAC__CHANNEL_ASSIGNMENT_RIGHT_SIDE</a> = 2,
-<a class="el" href="group__flac__format.html#a92a94">FLAC__CHANNEL_ASSIGNMENT_MID_SIDE</a> = 3
+<tr><td nowrap align=right valign=top>enum </td><td valign=bottom><a class="el" href="group__flac__format.html#a95">FLAC__ChannelAssignment</a> { <a class="el" href="group__flac__format.html#a95a91">FLAC__CHANNEL_ASSIGNMENT_INDEPENDENT</a> = 0,
+<a class="el" href="group__flac__format.html#a95a92">FLAC__CHANNEL_ASSIGNMENT_LEFT_SIDE</a> = 1,
+<a class="el" href="group__flac__format.html#a95a93">FLAC__CHANNEL_ASSIGNMENT_RIGHT_SIDE</a> = 2,
+<a class="el" href="group__flac__format.html#a95a94">FLAC__CHANNEL_ASSIGNMENT_MID_SIDE</a> = 3
}</td></tr>
-<tr><td nowrap align=right valign=top>enum </td><td valign=bottom><a class="el" href="group__flac__format.html#a93">FLAC__FrameNumberType</a> { <a class="el" href="group__flac__format.html#a93a95">FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER</a>,
-<a class="el" href="group__flac__format.html#a93a96">FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER</a>
+<tr><td nowrap align=right valign=top>enum </td><td valign=bottom><a class="el" href="group__flac__format.html#a96">FLAC__FrameNumberType</a> { <a class="el" href="group__flac__format.html#a96a95">FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER</a>,
+<a class="el" href="group__flac__format.html#a96a96">FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER</a>
}</td></tr>
-<tr><td nowrap align=right valign=top>enum </td><td valign=bottom><a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> { <br>
- <a class="el" href="group__flac__format.html#a94a97">FLAC__METADATA_TYPE_STREAMINFO</a> = 0,
-<a class="el" href="group__flac__format.html#a94a98">FLAC__METADATA_TYPE_PADDING</a> = 1,
-<a class="el" href="group__flac__format.html#a94a99">FLAC__METADATA_TYPE_APPLICATION</a> = 2,
-<a class="el" href="group__flac__format.html#a94a100">FLAC__METADATA_TYPE_SEEKTABLE</a> = 3,
+<tr><td nowrap align=right valign=top>enum </td><td valign=bottom><a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> { <br>
+ <a class="el" href="group__flac__format.html#a97a97">FLAC__METADATA_TYPE_STREAMINFO</a> = 0,
+<a class="el" href="group__flac__format.html#a97a98">FLAC__METADATA_TYPE_PADDING</a> = 1,
+<a class="el" href="group__flac__format.html#a97a99">FLAC__METADATA_TYPE_APPLICATION</a> = 2,
+<a class="el" href="group__flac__format.html#a97a100">FLAC__METADATA_TYPE_SEEKTABLE</a> = 3,
<br>
- <a class="el" href="group__flac__format.html#a94a101">FLAC__METADATA_TYPE_VORBIS_COMMENT</a> = 4,
-<a class="el" href="group__flac__format.html#a94a102">FLAC__METADATA_TYPE_CUESHEET</a> = 5,
-<a class="el" href="group__flac__format.html#a94a103">FLAC__METADATA_TYPE_UNDEFINED</a> = 6
+ <a class="el" href="group__flac__format.html#a97a101">FLAC__METADATA_TYPE_VORBIS_COMMENT</a> = 4,
+<a class="el" href="group__flac__format.html#a97a102">FLAC__METADATA_TYPE_CUESHEET</a> = 5,
+<a class="el" href="group__flac__format.html#a97a103">FLAC__METADATA_TYPE_UNDEFINED</a> = 6
<br>
}</td></tr>
<tr><td colspan=2><br><h2>Functions</h2></td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__format.html#a68">FLAC__format_sample_rate_is_valid</a> (unsigned sample_rate)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__format.html#a69">FLAC__format_seektable_is_legal</a> (const <a class="el" href="structFLAC____StreamMetadata__SeekTable.html">FLAC__StreamMetadata_SeekTable</a> *seek_table)</td></tr>
-<tr><td nowrap align=right valign=top>unsigned </td><td valign=bottom><a class="el" href="group__flac__format.html#a70">FLAC__format_seektable_sort</a> (<a class="el" href="structFLAC____StreamMetadata__SeekTable.html">FLAC__StreamMetadata_SeekTable</a> *seek_table)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__format.html#a71">FLAC__format_cuesheet_is_legal</a> (const <a class="el" href="structFLAC____StreamMetadata__CueSheet.html">FLAC__StreamMetadata_CueSheet</a> *cue_sheet, FLAC__bool check_cd_da_subset, const char **violation)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__format.html#a69">FLAC__format_vorbiscomment_entry_name_is_legal</a> (const char *name)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__format.html#a70">FLAC__format_vorbiscomment_entry_value_is_legal</a> (const FLAC__byte *value, unsigned length)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__format.html#a71">FLAC__format_vorbiscomment_entry_is_legal</a> (const FLAC__byte *entry, unsigned length)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__format.html#a72">FLAC__format_seektable_is_legal</a> (const <a class="el" href="structFLAC____StreamMetadata__SeekTable.html">FLAC__StreamMetadata_SeekTable</a> *seek_table)</td></tr>
+<tr><td nowrap align=right valign=top>unsigned </td><td valign=bottom><a class="el" href="group__flac__format.html#a73">FLAC__format_seektable_sort</a> (<a class="el" href="structFLAC____StreamMetadata__SeekTable.html">FLAC__StreamMetadata_SeekTable</a> *seek_table)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__format.html#a74">FLAC__format_cuesheet_is_legal</a> (const <a class="el" href="structFLAC____StreamMetadata__CueSheet.html">FLAC__StreamMetadata_CueSheet</a> *cue_sheet, FLAC__bool check_cd_da_subset, const char **violation)</td></tr>
<tr><td colspan=2><br><h2>Variables</h2></td></tr>
<tr><td nowrap align=right valign=top>const char * </td><td valign=bottom><a class="el" href="group__flac__format.html#a0">FLAC__VERSION_STRING</a></td></tr>
<tr><td nowrap align=right valign=top>const char * </td><td valign=bottom><a class="el" href="group__flac__format.html#a1">FLAC__VENDOR_STRING</a></td></tr>
@@ -172,7 +175,7 @@
<dl compact><dt><b>
Note: </b><dd>
It's not the best convention, but symbols ending in _LEN are in bits and _LENGTH are in bytes. _LENGTH symbols are #defines instead of global variables because they are usually used when declaring byte arrays and some compilers require compile-time knowledge of array sizes when declared on the stack. </dl><hr><h2>Define Documentation</h2>
-<a name="a72" doxytag="format.h::FLAC__MAX_METADATA_TYPE_CODE"></a><p>
+<a name="a75" doxytag="format.h::FLAC__MAX_METADATA_TYPE_CODE"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -194,7 +197,7 @@
The largest legal metadata type code. </td>
</tr>
</table>
-<a name="a73" doxytag="format.h::FLAC__MIN_BLOCK_SIZE"></a><p>
+<a name="a76" doxytag="format.h::FLAC__MIN_BLOCK_SIZE"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -216,7 +219,7 @@
The minimum block size, in samples, permitted by the format. </td>
</tr>
</table>
-<a name="a74" doxytag="format.h::FLAC__MAX_BLOCK_SIZE"></a><p>
+<a name="a77" doxytag="format.h::FLAC__MAX_BLOCK_SIZE"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -238,7 +241,7 @@
The maximum block size, in samples, permitted by the format. </td>
</tr>
</table>
-<a name="a75" doxytag="format.h::FLAC__MAX_CHANNELS"></a><p>
+<a name="a78" doxytag="format.h::FLAC__MAX_CHANNELS"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -260,7 +263,7 @@
The maximum number of channels permitted by the format. </td>
</tr>
</table>
-<a name="a76" doxytag="format.h::FLAC__MIN_BITS_PER_SAMPLE"></a><p>
+<a name="a79" doxytag="format.h::FLAC__MIN_BITS_PER_SAMPLE"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -282,7 +285,7 @@
The minimum sample resolution permitted by the format. </td>
</tr>
</table>
-<a name="a77" doxytag="format.h::FLAC__MAX_BITS_PER_SAMPLE"></a><p>
+<a name="a80" doxytag="format.h::FLAC__MAX_BITS_PER_SAMPLE"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -304,7 +307,7 @@
The maximum sample resolution permitted by the format. </td>
</tr>
</table>
-<a name="a78" doxytag="format.h::FLAC__REFERENCE_CODEC_MAX_BITS_PER_SAMPLE"></a><p>
+<a name="a81" doxytag="format.h::FLAC__REFERENCE_CODEC_MAX_BITS_PER_SAMPLE"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -330,7 +333,7 @@
FLAC__MAX_BITS_PER_SAMPLE is the limit of the FLAC format. However, the reference encoder/decoder is currently limited to 24 bits because of prevalent 32-bit math, so make sure and use this value when appropriate. </dl> </td>
</tr>
</table>
-<a name="a79" doxytag="format.h::FLAC__MAX_SAMPLE_RATE"></a><p>
+<a name="a82" doxytag="format.h::FLAC__MAX_SAMPLE_RATE"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -352,7 +355,7 @@
The maximum sample rate permitted by the format. The value is ((2 ^ 16) - 1) * 10; see <a href="../format.html">FLAC format</a> as to why. </td>
</tr>
</table>
-<a name="a80" doxytag="format.h::FLAC__MAX_LPC_ORDER"></a><p>
+<a name="a83" doxytag="format.h::FLAC__MAX_LPC_ORDER"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -374,7 +377,7 @@
The maximum LPC order permitted by the format. </td>
</tr>
</table>
-<a name="a81" doxytag="format.h::FLAC__MIN_QLP_COEFF_PRECISION"></a><p>
+<a name="a84" doxytag="format.h::FLAC__MIN_QLP_COEFF_PRECISION"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -396,7 +399,7 @@
The minimum quantized linear predictor coefficient precision permitted by the format. </td>
</tr>
</table>
-<a name="a82" doxytag="format.h::FLAC__MAX_QLP_COEFF_PRECISION"></a><p>
+<a name="a85" doxytag="format.h::FLAC__MAX_QLP_COEFF_PRECISION"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -418,7 +421,7 @@
The maximum quantized linear predictor coefficient precision permitted by the format. </td>
</tr>
</table>
-<a name="a83" doxytag="format.h::FLAC__MAX_FIXED_ORDER"></a><p>
+<a name="a86" doxytag="format.h::FLAC__MAX_FIXED_ORDER"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -440,7 +443,7 @@
The maximum order of the fixed predictors permitted by the format. </td>
</tr>
</table>
-<a name="a84" doxytag="format.h::FLAC__MAX_RICE_PARTITION_ORDER"></a><p>
+<a name="a87" doxytag="format.h::FLAC__MAX_RICE_PARTITION_ORDER"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -462,7 +465,7 @@
The maximum Rice partition order permitted by the format. </td>
</tr>
</table>
-<a name="a85" doxytag="format.h::FLAC__SUBSET_MAX_RICE_PARTITION_ORDER"></a><p>
+<a name="a88" doxytag="format.h::FLAC__SUBSET_MAX_RICE_PARTITION_ORDER"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -484,7 +487,7 @@
The maximum Rice partition order permitted by the FLAC Subset. </td>
</tr>
</table>
-<a name="a86" doxytag="format.h::FLAC__STREAM_SYNC_LENGTH"></a><p>
+<a name="a89" doxytag="format.h::FLAC__STREAM_SYNC_LENGTH"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -506,7 +509,7 @@
The length of the FLAC signature in bytes. </td>
</tr>
</table>
-<a name="a87" doxytag="format.h::FLAC__STREAM_METADATA_STREAMINFO_LENGTH"></a><p>
+<a name="a90" doxytag="format.h::FLAC__STREAM_METADATA_STREAMINFO_LENGTH"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -528,7 +531,7 @@
The total stream length of the STREAMINFO block in bytes. </td>
</tr>
</table>
-<a name="a88" doxytag="format.h::FLAC__STREAM_METADATA_SEEKPOINT_LENGTH"></a><p>
+<a name="a91" doxytag="format.h::FLAC__STREAM_METADATA_SEEKPOINT_LENGTH"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -550,7 +553,7 @@
The total stream length of a seek point in bytes. </td>
</tr>
</table>
-<a name="a89" doxytag="format.h::FLAC__STREAM_METADATA_HEADER_LENGTH"></a><p>
+<a name="a92" doxytag="format.h::FLAC__STREAM_METADATA_HEADER_LENGTH"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -573,7 +576,7 @@
</tr>
</table>
<hr><h2>Enumeration Type Documentation</h2>
-<a name="a90" doxytag="format.h::FLAC__EntropyCodingMethodType"></a><p>
+<a name="a93" doxytag="format.h::FLAC__EntropyCodingMethodType"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -595,14 +598,14 @@
An enumeration of the available entropy coding methods. <dl compact><dt><b>
Enumeration values:</b><dd>
<table border=0 cellspacing=2 cellpadding=0>
-<tr><td valign=top><em><a name="a90a86" doxytag="FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE"></a><em>FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE</em></em> </td><td>
+<tr><td valign=top><em><a name="a93a86" doxytag="FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE"></a><em>FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE</em></em> </td><td>
Residual is coded by partitioning into contexts, each with it's own Rice parameter. </td></tr>
</table>
</dl>
</td>
</tr>
</table>
-<a name="a91" doxytag="format.h::FLAC__SubframeType"></a><p>
+<a name="a94" doxytag="format.h::FLAC__SubframeType"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -624,20 +627,20 @@
An enumeration of the available subframe types. <dl compact><dt><b>
Enumeration values:</b><dd>
<table border=0 cellspacing=2 cellpadding=0>
-<tr><td valign=top><em><a name="a91a87" doxytag="FLAC__SUBFRAME_TYPE_CONSTANT"></a><em>FLAC__SUBFRAME_TYPE_CONSTANT</em></em> </td><td>
+<tr><td valign=top><em><a name="a94a87" doxytag="FLAC__SUBFRAME_TYPE_CONSTANT"></a><em>FLAC__SUBFRAME_TYPE_CONSTANT</em></em> </td><td>
constant signal </td></tr>
-<tr><td valign=top><em><a name="a91a88" doxytag="FLAC__SUBFRAME_TYPE_VERBATIM"></a><em>FLAC__SUBFRAME_TYPE_VERBATIM</em></em> </td><td>
+<tr><td valign=top><em><a name="a94a88" doxytag="FLAC__SUBFRAME_TYPE_VERBATIM"></a><em>FLAC__SUBFRAME_TYPE_VERBATIM</em></em> </td><td>
uncompressed signal </td></tr>
-<tr><td valign=top><em><a name="a91a89" doxytag="FLAC__SUBFRAME_TYPE_FIXED"></a><em>FLAC__SUBFRAME_TYPE_FIXED</em></em> </td><td>
+<tr><td valign=top><em><a name="a94a89" doxytag="FLAC__SUBFRAME_TYPE_FIXED"></a><em>FLAC__SUBFRAME_TYPE_FIXED</em></em> </td><td>
fixed polynomial prediction </td></tr>
-<tr><td valign=top><em><a name="a91a90" doxytag="FLAC__SUBFRAME_TYPE_LPC"></a><em>FLAC__SUBFRAME_TYPE_LPC</em></em> </td><td>
+<tr><td valign=top><em><a name="a94a90" doxytag="FLAC__SUBFRAME_TYPE_LPC"></a><em>FLAC__SUBFRAME_TYPE_LPC</em></em> </td><td>
linear prediction </td></tr>
</table>
</dl>
</td>
</tr>
</table>
-<a name="a92" doxytag="format.h::FLAC__ChannelAssignment"></a><p>
+<a name="a95" doxytag="format.h::FLAC__ChannelAssignment"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -659,20 +662,20 @@
An enumeration of the available channel assignments. <dl compact><dt><b>
Enumeration values:</b><dd>
<table border=0 cellspacing=2 cellpadding=0>
-<tr><td valign=top><em><a name="a92a91" doxytag="FLAC__CHANNEL_ASSIGNMENT_INDEPENDENT"></a><em>FLAC__CHANNEL_ASSIGNMENT_INDEPENDENT</em></em> </td><td>
+<tr><td valign=top><em><a name="a95a91" doxytag="FLAC__CHANNEL_ASSIGNMENT_INDEPENDENT"></a><em>FLAC__CHANNEL_ASSIGNMENT_INDEPENDENT</em></em> </td><td>
independent channels </td></tr>
-<tr><td valign=top><em><a name="a92a92" doxytag="FLAC__CHANNEL_ASSIGNMENT_LEFT_SIDE"></a><em>FLAC__CHANNEL_ASSIGNMENT_LEFT_SIDE</em></em> </td><td>
+<tr><td valign=top><em><a name="a95a92" doxytag="FLAC__CHANNEL_ASSIGNMENT_LEFT_SIDE"></a><em>FLAC__CHANNEL_ASSIGNMENT_LEFT_SIDE</em></em> </td><td>
left+side stereo </td></tr>
-<tr><td valign=top><em><a name="a92a93" doxytag="FLAC__CHANNEL_ASSIGNMENT_RIGHT_SIDE"></a><em>FLAC__CHANNEL_ASSIGNMENT_RIGHT_SIDE</em></em> </td><td>
+<tr><td valign=top><em><a name="a95a93" doxytag="FLAC__CHANNEL_ASSIGNMENT_RIGHT_SIDE"></a><em>FLAC__CHANNEL_ASSIGNMENT_RIGHT_SIDE</em></em> </td><td>
right+side stereo </td></tr>
-<tr><td valign=top><em><a name="a92a94" doxytag="FLAC__CHANNEL_ASSIGNMENT_MID_SIDE"></a><em>FLAC__CHANNEL_ASSIGNMENT_MID_SIDE</em></em> </td><td>
+<tr><td valign=top><em><a name="a95a94" doxytag="FLAC__CHANNEL_ASSIGNMENT_MID_SIDE"></a><em>FLAC__CHANNEL_ASSIGNMENT_MID_SIDE</em></em> </td><td>
mid+side stereo </td></tr>
</table>
</dl>
</td>
</tr>
</table>
-<a name="a93" doxytag="format.h::FLAC__FrameNumberType"></a><p>
+<a name="a96" doxytag="format.h::FLAC__FrameNumberType"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -694,16 +697,16 @@
An enumeration of the possible frame numbering methods. <dl compact><dt><b>
Enumeration values:</b><dd>
<table border=0 cellspacing=2 cellpadding=0>
-<tr><td valign=top><em><a name="a93a95" doxytag="FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER"></a><em>FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER</em></em> </td><td>
+<tr><td valign=top><em><a name="a96a95" doxytag="FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER"></a><em>FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER</em></em> </td><td>
number contains the frame number </td></tr>
-<tr><td valign=top><em><a name="a93a96" doxytag="FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER"></a><em>FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER</em></em> </td><td>
+<tr><td valign=top><em><a name="a96a96" doxytag="FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER"></a><em>FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER</em></em> </td><td>
number contains the sample number of first sample in frame </td></tr>
</table>
</dl>
</td>
</tr>
</table>
-<a name="a94" doxytag="format.h::FLAC__MetadataType"></a><p>
+<a name="a97" doxytag="format.h::FLAC__MetadataType"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -725,19 +728,19 @@
An enumeration of the available metadata block types. <dl compact><dt><b>
Enumeration values:</b><dd>
<table border=0 cellspacing=2 cellpadding=0>
-<tr><td valign=top><em><a name="a94a97" doxytag="FLAC__METADATA_TYPE_STREAMINFO"></a><em>FLAC__METADATA_TYPE_STREAMINFO</em></em> </td><td>
+<tr><td valign=top><em><a name="a97a97" doxytag="FLAC__METADATA_TYPE_STREAMINFO"></a><em>FLAC__METADATA_TYPE_STREAMINFO</em></em> </td><td>
<a href="../format.html#metadata_block_streaminfo">STREAMINFO</a> block </td></tr>
-<tr><td valign=top><em><a name="a94a98" doxytag="FLAC__METADATA_TYPE_PADDING"></a><em>FLAC__METADATA_TYPE_PADDING</em></em> </td><td>
+<tr><td valign=top><em><a name="a97a98" doxytag="FLAC__METADATA_TYPE_PADDING"></a><em>FLAC__METADATA_TYPE_PADDING</em></em> </td><td>
<a href="../format.html#metadata_block_padding">PADDING</a> block </td></tr>
-<tr><td valign=top><em><a name="a94a99" doxytag="FLAC__METADATA_TYPE_APPLICATION"></a><em>FLAC__METADATA_TYPE_APPLICATION</em></em> </td><td>
+<tr><td valign=top><em><a name="a97a99" doxytag="FLAC__METADATA_TYPE_APPLICATION"></a><em>FLAC__METADATA_TYPE_APPLICATION</em></em> </td><td>
<a href="../format.html#metadata_block_application">APPLICATION</a> block </td></tr>
-<tr><td valign=top><em><a name="a94a100" doxytag="FLAC__METADATA_TYPE_SEEKTABLE"></a><em>FLAC__METADATA_TYPE_SEEKTABLE</em></em> </td><td>
+<tr><td valign=top><em><a name="a97a100" doxytag="FLAC__METADATA_TYPE_SEEKTABLE"></a><em>FLAC__METADATA_TYPE_SEEKTABLE</em></em> </td><td>
<a href="../format.html#metadata_block_seektable">SEEKTABLE</a> block </td></tr>
-<tr><td valign=top><em><a name="a94a101" doxytag="FLAC__METADATA_TYPE_VORBIS_COMMENT"></a><em>FLAC__METADATA_TYPE_VORBIS_COMMENT</em></em> </td><td>
+<tr><td valign=top><em><a name="a97a101" doxytag="FLAC__METADATA_TYPE_VORBIS_COMMENT"></a><em>FLAC__METADATA_TYPE_VORBIS_COMMENT</em></em> </td><td>
<a href="../format.html#metadata_block_vorbis_comment">VORBISCOMMENT</a> block </td></tr>
-<tr><td valign=top><em><a name="a94a102" doxytag="FLAC__METADATA_TYPE_CUESHEET"></a><em>FLAC__METADATA_TYPE_CUESHEET</em></em> </td><td>
+<tr><td valign=top><em><a name="a97a102" doxytag="FLAC__METADATA_TYPE_CUESHEET"></a><em>FLAC__METADATA_TYPE_CUESHEET</em></em> </td><td>
<a href="../format.html#metadata_block_cuesheet">CUESHEET</a> block </td></tr>
-<tr><td valign=top><em><a name="a94a103" doxytag="FLAC__METADATA_TYPE_UNDEFINED"></a><em>FLAC__METADATA_TYPE_UNDEFINED</em></em> </td><td>
+<tr><td valign=top><em><a name="a97a103" doxytag="FLAC__METADATA_TYPE_UNDEFINED"></a><em>FLAC__METADATA_TYPE_UNDEFINED</em></em> </td><td>
marker to denote beginning of undefined type range; this number will increase as new metadata types are added </td></tr>
</table>
</dl>
@@ -786,12 +789,170 @@
</dl> </td>
</tr>
</table>
-<a name="a69" doxytag="format.h::FLAC__format_seektable_is_legal"></a><p>
+<a name="a69" doxytag="format.h::FLAC__format_vorbiscomment_entry_name_is_legal"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
+ <td class="md" nowrap valign="top"> FLAC__bool FLAC__format_vorbiscomment_entry_name_is_legal </td>
+ <td class="md" valign="top">( </td>
+ <td class="md" nowrap valign="top">const char * </td>
+ <td class="mdname1" valign="top" nowrap> <em>name</em> </td>
+ <td class="md" valign="top">) </td>
+ <td class="md" nowrap></td>
+ </tr>
+
+ </table>
+ </td>
+ </tr>
+</table>
+<table cellspacing=5 cellpadding=0 border=0>
+ <tr>
+ <td>
+
+ </td>
+ <td>
+
+<p>
+Check a Vorbis comment entry name to see if it conforms to the Vorbis comment specification.
+<p>
+Vorbis comment names must be composed only of characters from [0x20-0x3C,0x3E-0x7D].<dl compact><dt><b>
+Parameters: </b><dd>
+<table border=0 cellspacing=2 cellpadding=0>
+<tr><td valign=top><em>name</em> </td><td>
+A NUL-terminated string to be checked. </td></tr>
+</table>
+</dl><dl compact><dt><b>
+Assertions:</b><dd>
+ <div class="fragment"><pre>name != NULL
+</pre></div> </dl><dl compact><dt><b>
+Return values: </b><dd>
+<table border=0 cellspacing=2 cellpadding=0>
+<tr><td valign=top><em>FLAC__bool</em> </td><td>
+<code>false</code> if entry name is illegal, else <code>true</code>. </td></tr>
+</table>
+</dl> </td>
+ </tr>
+</table>
+<a name="a70" doxytag="format.h::FLAC__format_vorbiscomment_entry_value_is_legal"></a><p>
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
+ <tr>
+ <td class="md">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <td class="md" nowrap valign="top"> FLAC__bool FLAC__format_vorbiscomment_entry_value_is_legal </td>
+ <td class="md" valign="top">( </td>
+ <td class="md" nowrap valign="top">const FLAC__byte * </td>
+ <td class="mdname" nowrap> <em>value</em>, </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td class="md" nowrap>unsigned </td>
+ <td class="mdname" nowrap> <em>length</em></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td class="md">) </td>
+ <td class="md" colspan="2"></td>
+ </tr>
+
+ </table>
+ </td>
+ </tr>
+</table>
+<table cellspacing=5 cellpadding=0 border=0>
+ <tr>
+ <td>
+
+ </td>
+ <td>
+
+<p>
+Check a Vorbis comment entry value to see if it conforms to the Vorbis comment specification.
+<p>
+Vorbis comment values must be valid UTF-8 sequences.<dl compact><dt><b>
+Parameters: </b><dd>
+<table border=0 cellspacing=2 cellpadding=0>
+<tr><td valign=top><em>value</em> </td><td>
+A string to be checked. </td></tr>
+<tr><td valign=top><em>length</em> </td><td>
+A the length of <em>value</em> in bytes. May be <code>(unsigned)(-1)</code> to indicate that <em>value</em> is a plain UTF-8 NUL-terminated string. </td></tr>
+</table>
+</dl><dl compact><dt><b>
+Assertions:</b><dd>
+ <div class="fragment"><pre>value != NULL
+</pre></div> </dl><dl compact><dt><b>
+Return values: </b><dd>
+<table border=0 cellspacing=2 cellpadding=0>
+<tr><td valign=top><em>FLAC__bool</em> </td><td>
+<code>false</code> if entry name is illegal, else <code>true</code>. </td></tr>
+</table>
+</dl> </td>
+ </tr>
+</table>
+<a name="a71" doxytag="format.h::FLAC__format_vorbiscomment_entry_is_legal"></a><p>
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
+ <tr>
+ <td class="md">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <td class="md" nowrap valign="top"> FLAC__bool FLAC__format_vorbiscomment_entry_is_legal </td>
+ <td class="md" valign="top">( </td>
+ <td class="md" nowrap valign="top">const FLAC__byte * </td>
+ <td class="mdname" nowrap> <em>entry</em>, </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td class="md" nowrap>unsigned </td>
+ <td class="mdname" nowrap> <em>length</em></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td class="md">) </td>
+ <td class="md" colspan="2"></td>
+ </tr>
+
+ </table>
+ </td>
+ </tr>
+</table>
+<table cellspacing=5 cellpadding=0 border=0>
+ <tr>
+ <td>
+
+ </td>
+ <td>
+
+<p>
+Check a Vorbis comment entry to see if it conforms to the Vorbis comment specification.
+<p>
+Vorbis comment entries must be of the form 'name=value', and 'name' and 'value' must be legal according to <a class="el" href="group__flac__format.html#a69">FLAC__format_vorbiscomment_entry_name_is_legal</a>() and <a class="el" href="group__flac__format.html#a70">FLAC__format_vorbiscomment_entry_value_is_legal</a>() respectively.<dl compact><dt><b>
+Parameters: </b><dd>
+<table border=0 cellspacing=2 cellpadding=0>
+<tr><td valign=top><em>value</em> </td><td>
+A string to be checked. </td></tr>
+</table>
+</dl><dl compact><dt><b>
+Assertions:</b><dd>
+ <div class="fragment"><pre>value != NULL
+</pre></div> </dl><dl compact><dt><b>
+Return values: </b><dd>
+<table border=0 cellspacing=2 cellpadding=0>
+<tr><td valign=top><em>FLAC__bool</em> </td><td>
+<code>false</code> if entry name is illegal, else <code>true</code>. </td></tr>
+</table>
+</dl> </td>
+ </tr>
+</table>
+<a name="a72" doxytag="format.h::FLAC__format_seektable_is_legal"></a><p>
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
+ <tr>
+ <td class="md">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
<td class="md" nowrap valign="top"> FLAC__bool FLAC__format_seektable_is_legal </td>
<td class="md" valign="top">( </td>
<td class="md" nowrap valign="top">const <a class="el" href="structFLAC____StreamMetadata__SeekTable.html">FLAC__StreamMetadata_SeekTable</a> * </td>
@@ -830,7 +991,7 @@
</dl> </td>
</tr>
</table>
-<a name="a70" doxytag="format.h::FLAC__format_seektable_sort"></a><p>
+<a name="a73" doxytag="format.h::FLAC__format_seektable_sort"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -874,7 +1035,7 @@
</dl> </td>
</tr>
</table>
-<a name="a71" doxytag="format.h::FLAC__format_cuesheet_is_legal"></a><p>
+<a name="a74" doxytag="format.h::FLAC__format_cuesheet_is_legal"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -2360,7 +2521,7 @@
== 24 (bits) </td>
</tr>
</table>
-<hr><address><small>Generated on Tue Sep 28 21:19:43 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:15 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__metadata.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__metadata.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__metadata.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -54,7 +54,7 @@
<p>
Unless you will be using the level 1 or 2 interfaces to modify existing metadata however, you will not probably not need these.
<p>
-From a dependency standpoint, none of the encoders or decoders require the metadata module. This is so that embedded users can strip out the metadata module from libFLAC to reduce the size and complexity. <hr><address><small>Generated on Tue Sep 28 21:19:43 2004 for FLAC by
+From a dependency standpoint, none of the encoders or decoders require the metadata module. This is so that embedded users can strip out the metadata module from libFLAC to reduce the size and complexity. <hr><address><small>Generated on Fri Feb 4 18:39:15 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__metadata__level0.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__metadata__level0.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__metadata__level0.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -133,7 +133,7 @@
</dl> </td>
</tr>
</table>
-<hr><address><small>Generated on Tue Sep 28 21:19:43 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:15 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__metadata__level1.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__metadata__level1.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__metadata__level1.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -41,7 +41,7 @@
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__level1.html#a6">FLAC__metadata_simple_iterator_is_writable</a> (const <a class="el" href="group__flac__metadata__level1.html#a0">FLAC__Metadata_SimpleIterator</a> *iterator)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__level1.html#a7">FLAC__metadata_simple_iterator_next</a> (<a class="el" href="group__flac__metadata__level1.html#a0">FLAC__Metadata_SimpleIterator</a> *iterator)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__level1.html#a8">FLAC__metadata_simple_iterator_prev</a> (<a class="el" href="group__flac__metadata__level1.html#a0">FLAC__Metadata_SimpleIterator</a> *iterator)</td></tr>
-<tr><td nowrap align=right valign=top><a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> </td><td valign=bottom><a class="el" href="group__flac__metadata__level1.html#a9">FLAC__metadata_simple_iterator_get_block_type</a> (const <a class="el" href="group__flac__metadata__level1.html#a0">FLAC__Metadata_SimpleIterator</a> *iterator)</td></tr>
+<tr><td nowrap align=right valign=top><a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> </td><td valign=bottom><a class="el" href="group__flac__metadata__level1.html#a9">FLAC__metadata_simple_iterator_get_block_type</a> (const <a class="el" href="group__flac__metadata__level1.html#a0">FLAC__Metadata_SimpleIterator</a> *iterator)</td></tr>
<tr><td nowrap align=right valign=top><a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> * </td><td valign=bottom><a class="el" href="group__flac__metadata__level1.html#a10">FLAC__metadata_simple_iterator_get_block</a> (<a class="el" href="group__flac__metadata__level1.html#a0">FLAC__Metadata_SimpleIterator</a> *iterator)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__level1.html#a11">FLAC__metadata_simple_iterator_set_block</a> (<a class="el" href="group__flac__metadata__level1.html#a0">FLAC__Metadata_SimpleIterator</a> *iterator, <a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *block, FLAC__bool use_padding)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__level1.html#a12">FLAC__metadata_simple_iterator_insert_block_after</a> (<a class="el" href="group__flac__metadata__level1.html#a0">FLAC__Metadata_SimpleIterator</a> *iterator, <a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *block, FLAC__bool use_padding)</td></tr>
@@ -470,7 +470,7 @@
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> <a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> FLAC__metadata_simple_iterator_get_block_type </td>
+ <td class="md" nowrap valign="top"> <a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> FLAC__metadata_simple_iterator_get_block_type </td>
<td class="md" valign="top">( </td>
<td class="md" nowrap valign="top">const <a class="el" href="group__flac__metadata__level1.html#a0">FLAC__Metadata_SimpleIterator</a> * </td>
<td class="mdname1" valign="top" nowrap> <em>iterator</em> </td>
@@ -782,7 +782,7 @@
Using a FLAC__Metadata_SimpleIteratorStatus as the index to this array will give the string equivalent. The contents should not be modified. </td>
</tr>
</table>
-<hr><address><small>Generated on Tue Sep 28 21:19:43 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:15 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__metadata__level2.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__metadata__level2.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__metadata__level2.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -54,7 +54,7 @@
<tr><td nowrap align=right valign=top>void </td><td valign=bottom><a class="el" href="group__flac__metadata__level2.html#a16">FLAC__metadata_iterator_init</a> (<a class="el" href="group__flac__metadata__level2.html#a1">FLAC__Metadata_Iterator</a> *iterator, <a class="el" href="group__flac__metadata__level2.html#a0">FLAC__Metadata_Chain</a> *chain)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__level2.html#a17">FLAC__metadata_iterator_next</a> (<a class="el" href="group__flac__metadata__level2.html#a1">FLAC__Metadata_Iterator</a> *iterator)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__level2.html#a18">FLAC__metadata_iterator_prev</a> (<a class="el" href="group__flac__metadata__level2.html#a1">FLAC__Metadata_Iterator</a> *iterator)</td></tr>
-<tr><td nowrap align=right valign=top><a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> </td><td valign=bottom><a class="el" href="group__flac__metadata__level2.html#a19">FLAC__metadata_iterator_get_block_type</a> (const <a class="el" href="group__flac__metadata__level2.html#a1">FLAC__Metadata_Iterator</a> *iterator)</td></tr>
+<tr><td nowrap align=right valign=top><a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> </td><td valign=bottom><a class="el" href="group__flac__metadata__level2.html#a19">FLAC__metadata_iterator_get_block_type</a> (const <a class="el" href="group__flac__metadata__level2.html#a1">FLAC__Metadata_Iterator</a> *iterator)</td></tr>
<tr><td nowrap align=right valign=top><a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> * </td><td valign=bottom><a class="el" href="group__flac__metadata__level2.html#a20">FLAC__metadata_iterator_get_block</a> (<a class="el" href="group__flac__metadata__level2.html#a1">FLAC__Metadata_Iterator</a> *iterator)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__level2.html#a21">FLAC__metadata_iterator_set_block</a> (<a class="el" href="group__flac__metadata__level2.html#a1">FLAC__Metadata_Iterator</a> *iterator, <a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *block)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__level2.html#a22">FLAC__metadata_iterator_delete_block</a> (<a class="el" href="group__flac__metadata__level2.html#a1">FLAC__Metadata_Iterator</a> *iterator, FLAC__bool replace_with_padding)</td></tr>
@@ -1029,7 +1029,7 @@
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> <a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> FLAC__metadata_iterator_get_block_type </td>
+ <td class="md" nowrap valign="top"> <a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> FLAC__metadata_iterator_get_block_type </td>
<td class="md" valign="top">( </td>
<td class="md" nowrap valign="top">const <a class="el" href="group__flac__metadata__level2.html#a1">FLAC__Metadata_Iterator</a> * </td>
<td class="mdname1" valign="top" nowrap> <em>iterator</em> </td>
@@ -1361,7 +1361,7 @@
Using a FLAC__Metadata_ChainStatus as the index to this array will give the string equivalent. The contents should not be modified. </td>
</tr>
</table>
-<hr><address><small>Generated on Tue Sep 28 21:19:43 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:15 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__metadata__object.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__metadata__object.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__metadata__object.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -12,7 +12,7 @@
</h1>This module contains methods for manipulating FLAC metadata objects.
<a href="#_details">More...</a><table border=0 cellpadding=0 cellspacing=0>
<tr><td colspan=2><br><h2>Functions</h2></td></tr>
-<tr><td nowrap align=right valign=top><a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> * </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a0">FLAC__metadata_object_new</a> (<a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> type)</td></tr>
+<tr><td nowrap align=right valign=top><a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> * </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a0">FLAC__metadata_object_new</a> (<a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> type)</td></tr>
<tr><td nowrap align=right valign=top><a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> * </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a1">FLAC__metadata_object_clone</a> (const <a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)</td></tr>
<tr><td nowrap align=right valign=top>void </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a2">FLAC__metadata_object_delete</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a3">FLAC__metadata_object_is_equal</a> (const <a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *block1, const <a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *block2)</td></tr>
@@ -31,23 +31,27 @@
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a16">FLAC__metadata_object_vorbiscomment_resize_comments</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned new_num_comments)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a17">FLAC__metadata_object_vorbiscomment_set_comment</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned comment_num, <a class="el" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> entry, FLAC__bool copy)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a18">FLAC__metadata_object_vorbiscomment_insert_comment</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned comment_num, <a class="el" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> entry, FLAC__bool copy)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a19">FLAC__metadata_object_vorbiscomment_delete_comment</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned comment_num)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a20">FLAC__metadata_object_vorbiscomment_entry_matches</a> (const <a class="el" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> *entry, const char *field_name, unsigned field_name_length)</td></tr>
-<tr><td nowrap align=right valign=top>int </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a21">FLAC__metadata_object_vorbiscomment_find_entry_from</a> (const <a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned offset, const char *field_name)</td></tr>
-<tr><td nowrap align=right valign=top>int </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a22">FLAC__metadata_object_vorbiscomment_remove_entry_matching</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, const char *field_name)</td></tr>
-<tr><td nowrap align=right valign=top>int </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a23">FLAC__metadata_object_vorbiscomment_remove_entries_matching</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, const char *field_name)</td></tr>
-<tr><td nowrap align=right valign=top><a class="el" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> * </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a24">FLAC__metadata_object_cuesheet_track_new</a> ()</td></tr>
-<tr><td nowrap align=right valign=top><a class="el" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> * </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a25">FLAC__metadata_object_cuesheet_track_clone</a> (const <a class="el" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> *object)</td></tr>
-<tr><td nowrap align=right valign=top>void </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a26">FLAC__metadata_object_cuesheet_track_delete</a> (<a class="el" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> *object)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a27">FLAC__metadata_object_cuesheet_track_resize_indices</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned track_num, unsigned new_num_indices)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a28">FLAC__metadata_object_cuesheet_track_insert_index</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned track_num, unsigned index_num, <a class="el" href="structFLAC____StreamMetadata__CueSheet__Index.html">FLAC__StreamMetadata_CueSheet_Index</a> index)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a29">FLAC__metadata_object_cuesheet_track_insert_blank_index</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned track_num, unsigned index_num)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a30">FLAC__metadata_object_cuesheet_track_delete_index</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned track_num, unsigned index_num)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a31">FLAC__metadata_object_cuesheet_resize_tracks</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned new_num_tracks)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a32">FLAC__metadata_object_cuesheet_insert_track</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned track_num, <a class="el" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> *track, FLAC__bool copy)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a33">FLAC__metadata_object_cuesheet_insert_blank_track</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned track_num)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a34">FLAC__metadata_object_cuesheet_delete_track</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned track_num)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a35">FLAC__metadata_object_cuesheet_is_legal</a> (const <a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, FLAC__bool check_cd_da_subset, const char **violation)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a19">FLAC__metadata_object_vorbiscomment_append_comment</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <a class="el" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> entry, FLAC__bool copy)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a20">FLAC__metadata_object_vorbiscomment_replace_comment</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <a class="el" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> entry, FLAC__bool all, FLAC__bool copy)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a21">FLAC__metadata_object_vorbiscomment_delete_comment</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned comment_num)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a22">FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair</a> (<a class="el" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> *entry, const char *field_name, const char *field_value)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a23">FLAC__metadata_object_vorbiscomment_entry_to_name_value_pair</a> (const <a class="el" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> entry, char **field_name, char **field_value)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a24">FLAC__metadata_object_vorbiscomment_entry_matches</a> (const <a class="el" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> entry, const char *field_name, unsigned field_name_length)</td></tr>
+<tr><td nowrap align=right valign=top>int </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a25">FLAC__metadata_object_vorbiscomment_find_entry_from</a> (const <a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned offset, const char *field_name)</td></tr>
+<tr><td nowrap align=right valign=top>int </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a26">FLAC__metadata_object_vorbiscomment_remove_entry_matching</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, const char *field_name)</td></tr>
+<tr><td nowrap align=right valign=top>int </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a27">FLAC__metadata_object_vorbiscomment_remove_entries_matching</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, const char *field_name)</td></tr>
+<tr><td nowrap align=right valign=top><a class="el" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> * </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a28">FLAC__metadata_object_cuesheet_track_new</a> ()</td></tr>
+<tr><td nowrap align=right valign=top><a class="el" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> * </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a29">FLAC__metadata_object_cuesheet_track_clone</a> (const <a class="el" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> *object)</td></tr>
+<tr><td nowrap align=right valign=top>void </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a30">FLAC__metadata_object_cuesheet_track_delete</a> (<a class="el" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> *object)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a31">FLAC__metadata_object_cuesheet_track_resize_indices</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned track_num, unsigned new_num_indices)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a32">FLAC__metadata_object_cuesheet_track_insert_index</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned track_num, unsigned index_num, <a class="el" href="structFLAC____StreamMetadata__CueSheet__Index.html">FLAC__StreamMetadata_CueSheet_Index</a> index)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a33">FLAC__metadata_object_cuesheet_track_insert_blank_index</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned track_num, unsigned index_num)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a34">FLAC__metadata_object_cuesheet_track_delete_index</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned track_num, unsigned index_num)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a35">FLAC__metadata_object_cuesheet_resize_tracks</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned new_num_tracks)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a36">FLAC__metadata_object_cuesheet_insert_track</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned track_num, <a class="el" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> *track, FLAC__bool copy)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a37">FLAC__metadata_object_cuesheet_insert_blank_track</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned track_num)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a38">FLAC__metadata_object_cuesheet_delete_track</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned track_num)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a39">FLAC__metadata_object_cuesheet_is_legal</a> (const <a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, FLAC__bool check_cd_da_subset, const char **violation)</td></tr>
</table>
<hr><a name="_details"></a><h2>Detailed Description</h2>
This module contains methods for manipulating FLAC metadata objects.
@@ -62,6 +66,10 @@
<p>
We don't have the convenience of C++ here, so note that the library relies on you to keep the types straight. In other words, if you pass, for example, a <a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a>* that represents a STREAMINFO block to <a class="el" href="group__flac__metadata__object.html#a4">FLAC__metadata_object_application_set_data</a>(), you will get an assertion failure.
<p>
+For convenience the FLAC__metadata_object_vorbiscomment_*() functions maintain a trailing NUL on each Vorbis comment entry. This is not counted toward the length or stored in the stream, but it can make working with plain comments (those that don't contain embedded-NULs in the value) easier. Entries passed into these functions have trailing NULs added if missing, and returned entries are guaranteed to have a trailing NUL.
+<p>
+The FLAC__metadata_object_vorbiscomment_*() functions that take a Vorbis comment entry/name/value will first validate that it complies with the Vorbis comment specification and return false if it does not.
+<p>
There is no need to recalculate the length field on metadata blocks you have modified. They will be calculated automatically before they are written back to a file. <hr><h2>Function Documentation</h2>
<a name="a0" doxytag="metadata.h::FLAC__metadata_object_new"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
@@ -71,7 +79,7 @@
<tr>
<td class="md" nowrap valign="top"> <a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a>* FLAC__metadata_object_new </td>
<td class="md" valign="top">( </td>
- <td class="md" nowrap valign="top"><a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> </td>
+ <td class="md" nowrap valign="top"><a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> </td>
<td class="mdname1" valign="top" nowrap> <em>type</em> </td>
<td class="md" valign="top">) </td>
<td class="md" nowrap></td>
@@ -301,7 +309,7 @@
<p>
Sets the application data of an APPLICATION block.
<p>
-If <em>copy</em> is <code>true</code>, a copy of the data is stored; otherwise, the object takes ownership of the pointer. Returns <code>false</code> if <em>copy</em> == <code>true</code> and malloc fails.<dl compact><dt><b>
+If <em>copy</em> is <code>true</code>, a copy of the data is stored; otherwise, the object takes ownership of the pointer.<dl compact><dt><b>
Parameters: </b><dd>
<table border=0 cellspacing=2 cellpadding=0>
<tr><td valign=top><em>object</em> </td><td>
@@ -316,14 +324,14 @@
</dl><dl compact><dt><b>
Assertions:</b><dd>
<div class="fragment"><pre>object != NULL
-</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a94a99">FLAC__METADATA_TYPE_APPLICATION</a>
+</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a97a99">FLAC__METADATA_TYPE_APPLICATION</a>
</pre></div> <div class="fragment"><pre>(data != NULL && length > 0) ||
(data == NULL && length == 0 && copy == <font class="keyword">false</font>)
</pre></div> </dl><dl compact><dt><b>
Return values: </b><dd>
<table border=0 cellspacing=2 cellpadding=0>
<tr><td valign=top><em>FLAC__bool</em> </td><td>
-<code>false</code> if <em>copy</em> is <code>true</code> and malloc fails, else <code>true</code>. </td></tr>
+<code>false</code> if <em>copy</em> is <code>true</code> and malloc() fails, else <code>true</code>. </td></tr>
</table>
</dl> </td>
</tr>
@@ -376,7 +384,7 @@
</dl><dl compact><dt><b>
Assertions:</b><dd>
<div class="fragment"><pre>object != NULL
-</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a94a100">FLAC__METADATA_TYPE_SEEKTABLE</a>
+</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a97a100">FLAC__METADATA_TYPE_SEEKTABLE</a>
</pre></div> <div class="fragment"><pre>(object->data.seek_table.points == NULL && object->data.seek_table.num_points == 0) ||
(object->data.seek_table.points != NULL && object->data.seek_table.num_points > 0)
</pre></div> </dl><dl compact><dt><b>
@@ -442,7 +450,7 @@
</dl><dl compact><dt><b>
Assertions:</b><dd>
<div class="fragment"><pre>object != NULL
-</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a94a100">FLAC__METADATA_TYPE_SEEKTABLE</a>
+</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a97a100">FLAC__METADATA_TYPE_SEEKTABLE</a>
</pre></div> <div class="fragment"><pre>object->data.seek_table.num_points > point_num
</pre></div> </dl> </td>
</tr>
@@ -501,7 +509,7 @@
</dl><dl compact><dt><b>
Assertions:</b><dd>
<div class="fragment"><pre>object != NULL
-</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a94a100">FLAC__METADATA_TYPE_SEEKTABLE</a>
+</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a97a100">FLAC__METADATA_TYPE_SEEKTABLE</a>
</pre></div> <div class="fragment"><pre>object->data.seek_table.num_points >= point_num
</pre></div> </dl><dl compact><dt><b>
Return values: </b><dd>
@@ -558,7 +566,7 @@
</dl><dl compact><dt><b>
Assertions:</b><dd>
<div class="fragment"><pre>object != NULL
-</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a94a100">FLAC__METADATA_TYPE_SEEKTABLE</a>
+</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a97a100">FLAC__METADATA_TYPE_SEEKTABLE</a>
</pre></div> <div class="fragment"><pre>object->data.seek_table.num_points > point_num
</pre></div> </dl><dl compact><dt><b>
Return values: </b><dd>
@@ -604,7 +612,7 @@
</dl><dl compact><dt><b>
Assertions:</b><dd>
<div class="fragment"><pre>object != NULL
-</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a94a100">FLAC__METADATA_TYPE_SEEKTABLE</a>
+</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a97a100">FLAC__METADATA_TYPE_SEEKTABLE</a>
</pre></div> </dl><dl compact><dt><b>
Return values: </b><dd>
<table border=0 cellspacing=2 cellpadding=0>
@@ -664,7 +672,7 @@
</dl><dl compact><dt><b>
Assertions:</b><dd>
<div class="fragment"><pre>object != NULL
-</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a94a100">FLAC__METADATA_TYPE_SEEKTABLE</a>
+</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a97a100">FLAC__METADATA_TYPE_SEEKTABLE</a>
</pre></div> </dl><dl compact><dt><b>
Return values: </b><dd>
<table border=0 cellspacing=2 cellpadding=0>
@@ -724,7 +732,7 @@
</dl><dl compact><dt><b>
Assertions:</b><dd>
<div class="fragment"><pre>object != NULL
-</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a94a100">FLAC__METADATA_TYPE_SEEKTABLE</a>
+</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a97a100">FLAC__METADATA_TYPE_SEEKTABLE</a>
</pre></div> </dl><dl compact><dt><b>
Return values: </b><dd>
<table border=0 cellspacing=2 cellpadding=0>
@@ -792,7 +800,7 @@
</dl><dl compact><dt><b>
Assertions:</b><dd>
<div class="fragment"><pre>object != NULL
-</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a94a100">FLAC__METADATA_TYPE_SEEKTABLE</a>
+</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a97a100">FLAC__METADATA_TYPE_SEEKTABLE</a>
</pre></div> </dl><dl compact><dt><b>
Return values: </b><dd>
<table border=0 cellspacing=2 cellpadding=0>
@@ -860,7 +868,7 @@
</dl><dl compact><dt><b>
Assertions:</b><dd>
<div class="fragment"><pre>object != NULL
-</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a94a100">FLAC__METADATA_TYPE_SEEKTABLE</a>
+</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a97a100">FLAC__METADATA_TYPE_SEEKTABLE</a>
</pre></div> </dl><dl compact><dt><b>
Return values: </b><dd>
<table border=0 cellspacing=2 cellpadding=0>
@@ -911,17 +919,17 @@
<tr><td valign=top><em>object</em> </td><td>
A pointer to a seek table to be sorted. </td></tr>
<tr><td valign=top><em>compact</em> </td><td>
-If <code>false</code>, behaves like <a class="el" href="group__flac__format.html#a70">FLAC__format_seektable_sort</a>(). If <code>true</code>, duplicates are deleted and the seek table is shrunk appropriately; the number of placeholder points present in the seek table will be the same after the call as before. </td></tr>
+If <code>false</code>, behaves like <a class="el" href="group__flac__format.html#a73">FLAC__format_seektable_sort</a>(). If <code>true</code>, duplicates are deleted and the seek table is shrunk appropriately; the number of placeholder points present in the seek table will be the same after the call as before. </td></tr>
</table>
</dl><dl compact><dt><b>
Assertions:</b><dd>
<div class="fragment"><pre>object != NULL
-</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a94a100">FLAC__METADATA_TYPE_SEEKTABLE</a>
+</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a97a100">FLAC__METADATA_TYPE_SEEKTABLE</a>
</pre></div> </dl><dl compact><dt><b>
Return values: </b><dd>
<table border=0 cellspacing=2 cellpadding=0>
<tr><td valign=top><em>FLAC__bool</em> </td><td>
-<code>false</code> if realloc fails, else <code>true</code>. </td></tr>
+<code>false</code> if realloc() fails, else <code>true</code>. </td></tr>
</table>
</dl> </td>
</tr>
@@ -969,7 +977,13 @@
<p>
Sets the vendor string in a VORBIS_COMMENT block.
<p>
-If <em>copy</em> is <code>true</code>, a copy of the entry is stored; otherwise, the object takes ownership of the <code>entry->entry</code> pointer. Returns <code>false</code> if <em>copy</em> == <code>true</code> and malloc fails.<dl compact><dt><b>
+For convenience, a trailing NUL is added to the entry if it doesn't have one already.
+<p>
+If <em>copy</em> is <code>true</code>, a copy of the entry is stored; otherwise, the object takes ownership of the <code>entry.entry</code> pointer.
+<p>
+<dl compact><dt><b>
+Note: </b><dd>
+If this function returns <code>false</code>, the caller still owns the pointer.</dl><dl compact><dt><b>
Parameters: </b><dd>
<table border=0 cellspacing=2 cellpadding=0>
<tr><td valign=top><em>object</em> </td><td>
@@ -982,14 +996,14 @@
</dl><dl compact><dt><b>
Assertions:</b><dd>
<div class="fragment"><pre>object != NULL
-</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a94a101">FLAC__METADATA_TYPE_VORBIS_COMMENT</a>
-</pre></div> <div class="fragment"><pre>(entry->entry != NULL && entry->length > 0) ||
- (entry->entry == NULL && entry->length == 0)
+</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a97a101">FLAC__METADATA_TYPE_VORBIS_COMMENT</a>
+</pre></div> <div class="fragment"><pre>(entry.entry != NULL && entry.length > 0) ||
+ (entry.entry == NULL && entry.length == 0)
</pre></div> </dl><dl compact><dt><b>
Return values: </b><dd>
<table border=0 cellspacing=2 cellpadding=0>
<tr><td valign=top><em>FLAC__bool</em> </td><td>
-<code>false</code> if <em>copy</em> is <code>true</code> and malloc fails, else <code>true</code>. </td></tr>
+<code>false</code> if memory allocation fails or <em>entry</em> does not comply with the Vorbis comment specification, else <code>true</code>. </td></tr>
</table>
</dl> </td>
</tr>
@@ -1042,14 +1056,14 @@
</dl><dl compact><dt><b>
Assertions:</b><dd>
<div class="fragment"><pre>object != NULL
-</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a94a101">FLAC__METADATA_TYPE_VORBIS_COMMENT</a>
+</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a97a101">FLAC__METADATA_TYPE_VORBIS_COMMENT</a>
</pre></div> <div class="fragment"><pre>(object->data.vorbis_comment.comments == NULL && object->data.vorbis_comment.num_comments == 0) ||
(object->data.vorbis_comment.comments != NULL && object->data.vorbis_comment.num_comments > 0)
</pre></div> </dl><dl compact><dt><b>
Return values: </b><dd>
<table border=0 cellspacing=2 cellpadding=0>
<tr><td valign=top><em>FLAC__bool</em> </td><td>
-<code>false</code> if memory allocation error, else <code>true</code>. </td></tr>
+<code>false</code> if memory allocation fails, else <code>true</code>. </td></tr>
</table>
</dl> </td>
</tr>
@@ -1103,7 +1117,13 @@
<p>
Sets a comment in a VORBIS_COMMENT block.
<p>
-If <em>copy</em> is <code>true</code>, a copy of the entry is stored; otherwise, the object takes ownership of the <code>entry->entry</code> pointer. Returns <code>false</code> if <em>copy</em> == <code>true</code> and malloc fails.<dl compact><dt><b>
+For convenience, a trailing NUL is added to the entry if it doesn't have one already.
+<p>
+If <em>copy</em> is <code>true</code>, a copy of the entry is stored; otherwise, the object takes ownership of the <code>entry.entry</code> pointer.
+<p>
+<dl compact><dt><b>
+Note: </b><dd>
+If this function returns <code>false</code>, the caller still owns the pointer.</dl><dl compact><dt><b>
Parameters: </b><dd>
<table border=0 cellspacing=2 cellpadding=0>
<tr><td valign=top><em>object</em> </td><td>
@@ -1118,15 +1138,15 @@
</dl><dl compact><dt><b>
Assertions:</b><dd>
<div class="fragment"><pre>object != NULL
-</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a94a101">FLAC__METADATA_TYPE_VORBIS_COMMENT</a>
+</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a97a101">FLAC__METADATA_TYPE_VORBIS_COMMENT</a>
</pre></div> <div class="fragment"><pre>comment_num < object->data.vorbis_comment.num_comments
-</pre></div> <div class="fragment"><pre>(entry->entry != NULL && entry->length > 0) ||
- (entry->entry == NULL && entry->length == 0)
+</pre></div> <div class="fragment"><pre>(entry.entry != NULL && entry.length > 0) ||
+ (entry.entry == NULL && entry.length == 0)
</pre></div> </dl><dl compact><dt><b>
Return values: </b><dd>
<table border=0 cellspacing=2 cellpadding=0>
<tr><td valign=top><em>FLAC__bool</em> </td><td>
-<code>false</code> if <em>copy</em> is <code>true</code> and malloc fails, else <code>true</code>. </td></tr>
+<code>false</code> if memory allocation fails or <em>entry</em> does not comply with the Vorbis comment specification, else <code>true</code>. </td></tr>
</table>
</dl> </td>
</tr>
@@ -1180,7 +1200,13 @@
<p>
Insert a comment in a VORBIS_COMMENT block at the given index.
<p>
-If <em>copy</em> is <code>true</code>, a copy of the entry is stored; otherwise, the object takes ownership of the <code>entry->entry</code> pointer. Returns <code>false</code> if <em>copy</em> == <code>true</code> and malloc fails.<dl compact><dt><b>
+For convenience, a trailing NUL is added to the entry if it doesn't have one already.
+<p>
+If <em>copy</em> is <code>true</code>, a copy of the entry is stored; otherwise, the object takes ownership of the <code>entry.entry</code> pointer.
+<p>
+<dl compact><dt><b>
+Note: </b><dd>
+If this function returns <code>false</code>, the caller still owns the pointer.</dl><dl compact><dt><b>
Parameters: </b><dd>
<table border=0 cellspacing=2 cellpadding=0>
<tr><td valign=top><em>object</em> </td><td>
@@ -1195,25 +1221,183 @@
</dl><dl compact><dt><b>
Assertions:</b><dd>
<div class="fragment"><pre>object != NULL
-</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a94a101">FLAC__METADATA_TYPE_VORBIS_COMMENT</a>
+</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a97a101">FLAC__METADATA_TYPE_VORBIS_COMMENT</a>
</pre></div> <div class="fragment"><pre>object->data.vorbis_comment.num_comments >= comment_num
-</pre></div> <div class="fragment"><pre>(entry->entry != NULL && entry->length > 0) ||
- (entry->entry == NULL && entry->length == 0 && copy == <font class="keyword">false</font>)
+</pre></div> <div class="fragment"><pre>(entry.entry != NULL && entry.length > 0) ||
+ (entry.entry == NULL && entry.length == 0 && copy == <font class="keyword">false</font>)
</pre></div> </dl><dl compact><dt><b>
Return values: </b><dd>
<table border=0 cellspacing=2 cellpadding=0>
<tr><td valign=top><em>FLAC__bool</em> </td><td>
-<code>false</code> if <em>copy</em> is <code>true</code> and malloc fails, else <code>true</code>. </td></tr>
+<code>false</code> if memory allocation fails or <em>entry</em> does not comply with the Vorbis comment specification, else <code>true</code>. </td></tr>
</table>
</dl> </td>
</tr>
</table>
-<a name="a19" doxytag="metadata.h::FLAC__metadata_object_vorbiscomment_delete_comment"></a><p>
+<a name="a19" doxytag="metadata.h::FLAC__metadata_object_vorbiscomment_append_comment"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
+ <td class="md" nowrap valign="top"> FLAC__bool FLAC__metadata_object_vorbiscomment_append_comment </td>
+ <td class="md" valign="top">( </td>
+ <td class="md" nowrap valign="top"><a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> * </td>
+ <td class="mdname" nowrap> <em>object</em>, </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td class="md" nowrap><a class="el" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> </td>
+ <td class="mdname" nowrap> <em>entry</em>, </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td class="md" nowrap>FLAC__bool </td>
+ <td class="mdname" nowrap> <em>copy</em></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td class="md">) </td>
+ <td class="md" colspan="2"></td>
+ </tr>
+
+ </table>
+ </td>
+ </tr>
+</table>
+<table cellspacing=5 cellpadding=0 border=0>
+ <tr>
+ <td>
+
+ </td>
+ <td>
+
+<p>
+Appends a comment to a VORBIS_COMMENT block.
+<p>
+For convenience, a trailing NUL is added to the entry if it doesn't have one already.
+<p>
+If <em>copy</em> is <code>true</code>, a copy of the entry is stored; otherwise, the object takes ownership of the <code>entry.entry</code> pointer.
+<p>
+<dl compact><dt><b>
+Note: </b><dd>
+If this function returns <code>false</code>, the caller still owns the pointer.</dl><dl compact><dt><b>
+Parameters: </b><dd>
+<table border=0 cellspacing=2 cellpadding=0>
+<tr><td valign=top><em>object</em> </td><td>
+A pointer to an existing VORBIS_COMMENT object. </td></tr>
+<tr><td valign=top><em>entry</em> </td><td>
+The comment to insert. </td></tr>
+<tr><td valign=top><em>copy</em> </td><td>
+See above. </td></tr>
+</table>
+</dl><dl compact><dt><b>
+Assertions:</b><dd>
+ <div class="fragment"><pre>object != NULL
+</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a97a101">FLAC__METADATA_TYPE_VORBIS_COMMENT</a>
+</pre></div> <div class="fragment"><pre>(entry.entry != NULL && entry.length > 0) ||
+ (entry.entry == NULL && entry.length == 0 && copy == <font class="keyword">false</font>)
+</pre></div> </dl><dl compact><dt><b>
+Return values: </b><dd>
+<table border=0 cellspacing=2 cellpadding=0>
+<tr><td valign=top><em>FLAC__bool</em> </td><td>
+<code>false</code> if memory allocation fails or <em>entry</em> does not comply with the Vorbis comment specification, else <code>true</code>. </td></tr>
+</table>
+</dl> </td>
+ </tr>
+</table>
+<a name="a20" doxytag="metadata.h::FLAC__metadata_object_vorbiscomment_replace_comment"></a><p>
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
+ <tr>
+ <td class="md">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <td class="md" nowrap valign="top"> FLAC__bool FLAC__metadata_object_vorbiscomment_replace_comment </td>
+ <td class="md" valign="top">( </td>
+ <td class="md" nowrap valign="top"><a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> * </td>
+ <td class="mdname" nowrap> <em>object</em>, </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td class="md" nowrap><a class="el" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> </td>
+ <td class="mdname" nowrap> <em>entry</em>, </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td class="md" nowrap>FLAC__bool </td>
+ <td class="mdname" nowrap> <em>all</em>, </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td class="md" nowrap>FLAC__bool </td>
+ <td class="mdname" nowrap> <em>copy</em></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td class="md">) </td>
+ <td class="md" colspan="2"></td>
+ </tr>
+
+ </table>
+ </td>
+ </tr>
+</table>
+<table cellspacing=5 cellpadding=0 border=0>
+ <tr>
+ <td>
+
+ </td>
+ <td>
+
+<p>
+Replaces comments in a VORBIS_COMMENT block with a new one.
+<p>
+For convenience, a trailing NUL is added to the entry if it doesn't have one already.
+<p>
+Depending on the the value of <em>all</em>, either all or just the first comment whose field name(s) match the given entry's name will be replaced by the given entry. If no comments match, <em>entry</em> will simply be appended.
+<p>
+If <em>copy</em> is <code>true</code>, a copy of the entry is stored; otherwise, the object takes ownership of the <code>entry.entry</code> pointer.
+<p>
+<dl compact><dt><b>
+Note: </b><dd>
+If this function returns <code>false</code>, the caller still owns the pointer.</dl><dl compact><dt><b>
+Parameters: </b><dd>
+<table border=0 cellspacing=2 cellpadding=0>
+<tr><td valign=top><em>object</em> </td><td>
+A pointer to an existing VORBIS_COMMENT object. </td></tr>
+<tr><td valign=top><em>entry</em> </td><td>
+The comment to insert. </td></tr>
+<tr><td valign=top><em>all</em> </td><td>
+If <code>true</code>, all comments whose field name matches <em>entry's</em> field name will be removed, and <em>entry</em> will be inserted at the position of the first matching comment. If <code>false</code>, only the first comment whose field name matches <em>entry's</em> field name will be replaced with <em>entry</em>. </td></tr>
+<tr><td valign=top><em>copy</em> </td><td>
+See above. </td></tr>
+</table>
+</dl><dl compact><dt><b>
+Assertions:</b><dd>
+ <div class="fragment"><pre>object != NULL
+</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a97a101">FLAC__METADATA_TYPE_VORBIS_COMMENT</a>
+</pre></div> <div class="fragment"><pre>(entry.entry != NULL && entry.length > 0) ||
+ (entry.entry == NULL && entry.length == 0 && copy == <font class="keyword">false</font>)
+</pre></div> </dl><dl compact><dt><b>
+Return values: </b><dd>
+<table border=0 cellspacing=2 cellpadding=0>
+<tr><td valign=top><em>FLAC__bool</em> </td><td>
+<code>false</code> if memory allocation fails or <em>entry</em> does not comply with the Vorbis comment specification, else <code>true</code>. </td></tr>
+</table>
+</dl> </td>
+ </tr>
+</table>
+<a name="a21" doxytag="metadata.h::FLAC__metadata_object_vorbiscomment_delete_comment"></a><p>
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
+ <tr>
+ <td class="md">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
<td class="md" nowrap valign="top"> FLAC__bool FLAC__metadata_object_vorbiscomment_delete_comment </td>
<td class="md" valign="top">( </td>
<td class="md" nowrap valign="top"><a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> * </td>
@@ -1254,28 +1438,161 @@
</dl><dl compact><dt><b>
Assertions:</b><dd>
<div class="fragment"><pre>object != NULL
-</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a94a101">FLAC__METADATA_TYPE_VORBIS_COMMENT</a>
+</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a97a101">FLAC__METADATA_TYPE_VORBIS_COMMENT</a>
</pre></div> <div class="fragment"><pre>object->data.vorbis_comment.num_comments > comment_num
-</pre></div> <div class="fragment"><pre>(entry->entry != NULL && entry->length > 0) ||
- (entry->entry == NULL && entry->length == 0 && copy == <font class="keyword">false</font>)
</pre></div> </dl><dl compact><dt><b>
Return values: </b><dd>
<table border=0 cellspacing=2 cellpadding=0>
<tr><td valign=top><em>FLAC__bool</em> </td><td>
-<code>false</code> if realloc fails, else <code>true</code>. </td></tr>
+<code>false</code> if realloc() fails, else <code>true</code>. </td></tr>
</table>
</dl> </td>
</tr>
</table>
-<a name="a20" doxytag="metadata.h::FLAC__metadata_object_vorbiscomment_entry_matches"></a><p>
+<a name="a22" doxytag="metadata.h::FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
+ <td class="md" nowrap valign="top"> FLAC__bool FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair </td>
+ <td class="md" valign="top">( </td>
+ <td class="md" nowrap valign="top"><a class="el" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> * </td>
+ <td class="mdname" nowrap> <em>entry</em>, </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td class="md" nowrap>const char * </td>
+ <td class="mdname" nowrap> <em>field_name</em>, </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td class="md" nowrap>const char * </td>
+ <td class="mdname" nowrap> <em>field_value</em></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td class="md">) </td>
+ <td class="md" colspan="2"></td>
+ </tr>
+
+ </table>
+ </td>
+ </tr>
+</table>
+<table cellspacing=5 cellpadding=0 border=0>
+ <tr>
+ <td>
+
+ </td>
+ <td>
+
+<p>
+Creates a Vorbis comment entry from NUL-terminated name and value strings.
+<p>
+On return, the filled-in <em>entry->entry</em> pointer will point to malloc()ed memory and shall be owned by the caller. For convenience the entry will have a terminating NUL.<dl compact><dt><b>
+Parameters: </b><dd>
+<table border=0 cellspacing=2 cellpadding=0>
+<tr><td valign=top><em>entry</em> </td><td>
+A pointer to a Vorbis comment entry. The entry's <code>entry</code> pointer should not point to allocated memory as it will be overwritten. </td></tr>
+<tr><td valign=top><em>field_name</em> </td><td>
+The field name in ASCII, <code>NUL</code> terminated. </td></tr>
+<tr><td valign=top><em>field_value</em> </td><td>
+The field value in UTF-8, <code>NUL</code> terminated. </td></tr>
+</table>
+</dl><dl compact><dt><b>
+Assertions:</b><dd>
+ <div class="fragment"><pre>entry != NULL
+</pre></div> <div class="fragment"><pre>field_name != NULL
+</pre></div> <div class="fragment"><pre>field_value != NULL
+</pre></div> </dl><dl compact><dt><b>
+Return values: </b><dd>
+<table border=0 cellspacing=2 cellpadding=0>
+<tr><td valign=top><em>FLAC__bool</em> </td><td>
+<code>false</code> if malloc() fails, or if <em>field_name</em> or <em>field_value</em> does not comply with the Vorbis comment specification, else <code>true</code>. </td></tr>
+</table>
+</dl> </td>
+ </tr>
+</table>
+<a name="a23" doxytag="metadata.h::FLAC__metadata_object_vorbiscomment_entry_to_name_value_pair"></a><p>
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
+ <tr>
+ <td class="md">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <td class="md" nowrap valign="top"> FLAC__bool FLAC__metadata_object_vorbiscomment_entry_to_name_value_pair </td>
+ <td class="md" valign="top">( </td>
+ <td class="md" nowrap valign="top">const <a class="el" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> </td>
+ <td class="mdname" nowrap> <em>entry</em>, </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td class="md" nowrap>char ** </td>
+ <td class="mdname" nowrap> <em>field_name</em>, </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td class="md" nowrap>char ** </td>
+ <td class="mdname" nowrap> <em>field_value</em></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td class="md">) </td>
+ <td class="md" colspan="2"></td>
+ </tr>
+
+ </table>
+ </td>
+ </tr>
+</table>
+<table cellspacing=5 cellpadding=0 border=0>
+ <tr>
+ <td>
+
+ </td>
+ <td>
+
+<p>
+Splits a Vorbis comment entry into NUL-terminated name and value strings.
+<p>
+The returned pointers to name and value will be allocated by malloc() and shall be owned by the caller.<dl compact><dt><b>
+Parameters: </b><dd>
+<table border=0 cellspacing=2 cellpadding=0>
+<tr><td valign=top><em>entry</em> </td><td>
+An existing Vorbis comment entry. </td></tr>
+<tr><td valign=top><em>field_name</em> </td><td>
+The address of where the returned pointer to the field name will be stored. </td></tr>
+<tr><td valign=top><em>field_value</em> </td><td>
+The address of where the returned pointer to the field value will be stored. </td></tr>
+</table>
+</dl><dl compact><dt><b>
+Assertions:</b><dd>
+ <div class="fragment"><pre>(entry.entry != NULL && entry.length > 0)
+</pre></div> <div class="fragment"><pre>memchr(entry.entry, <font class="charliteral">'='</font>, entry.length) != NULL
+</pre></div> <div class="fragment"><pre>field_name != NULL
+</pre></div> <div class="fragment"><pre>field_value != NULL
+</pre></div> </dl><dl compact><dt><b>
+Return values: </b><dd>
+<table border=0 cellspacing=2 cellpadding=0>
+<tr><td valign=top><em>FLAC__bool</em> </td><td>
+<code>false</code> if memory allocation fails or <em>entry</em> does not comply with the Vorbis comment specification, else <code>true</code>. </td></tr>
+</table>
+</dl> </td>
+ </tr>
+</table>
+<a name="a24" doxytag="metadata.h::FLAC__metadata_object_vorbiscomment_entry_matches"></a><p>
+<table width="100%" cellpadding="2" cellspacing="0" border="0">
+ <tr>
+ <td class="md">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
<td class="md" nowrap valign="top"> FLAC__bool FLAC__metadata_object_vorbiscomment_entry_matches </td>
<td class="md" valign="top">( </td>
- <td class="md" nowrap valign="top">const <a class="el" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> * </td>
+ <td class="md" nowrap valign="top">const <a class="el" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> </td>
<td class="mdname" nowrap> <em>entry</em>, </td>
</tr>
<tr>
@@ -1312,16 +1629,15 @@
Parameters: </b><dd>
<table border=0 cellspacing=2 cellpadding=0>
<tr><td valign=top><em>entry</em> </td><td>
-A pointer to an existing Vorbis comment entry. </td></tr>
+An existing Vorbis comment entry. </td></tr>
<tr><td valign=top><em>field_name</em> </td><td>
The field name to check. </td></tr>
<tr><td valign=top><em>field_name_length</em> </td><td>
-The length of <em>field_name</em>, not including the terminating <code>NULL</code>. </td></tr>
+The length of <em>field_name</em>, not including the terminating <code>NUL</code>. </td></tr>
</table>
</dl><dl compact><dt><b>
Assertions:</b><dd>
- <div class="fragment"><pre>entry != NULL
-</pre></div> <div class="fragment"><pre>(entry->entry != NULL && entry->length > 0)
+ <div class="fragment"><pre>(entry.entry != NULL && entry.length > 0)
</pre></div> </dl><dl compact><dt><b>
Return values: </b><dd>
<table border=0 cellspacing=2 cellpadding=0>
@@ -1331,7 +1647,7 @@
</dl> </td>
</tr>
</table>
-<a name="a21" doxytag="metadata.h::FLAC__metadata_object_vorbiscomment_find_entry_from"></a><p>
+<a name="a25" doxytag="metadata.h::FLAC__metadata_object_vorbiscomment_find_entry_from"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -1387,7 +1703,8 @@
</dl><dl compact><dt><b>
Assertions:</b><dd>
<div class="fragment"><pre>object != NULL
-</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a94a101">FLAC__METADATA_TYPE_VORBIS_COMMENT</a>
+</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a97a101">FLAC__METADATA_TYPE_VORBIS_COMMENT</a>
+</pre></div> <div class="fragment"><pre>field_name != NULL
</pre></div> </dl><dl compact><dt><b>
Return values: </b><dd>
<table border=0 cellspacing=2 cellpadding=0>
@@ -1397,7 +1714,7 @@
</dl> </td>
</tr>
</table>
-<a name="a22" doxytag="metadata.h::FLAC__metadata_object_vorbiscomment_remove_entry_matching"></a><p>
+<a name="a26" doxytag="metadata.h::FLAC__metadata_object_vorbiscomment_remove_entry_matching"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -1443,7 +1760,7 @@
</dl><dl compact><dt><b>
Assertions:</b><dd>
<div class="fragment"><pre>object != NULL
-</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a94a101">FLAC__METADATA_TYPE_VORBIS_COMMENT</a>
+</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a97a101">FLAC__METADATA_TYPE_VORBIS_COMMENT</a>
</pre></div> </dl><dl compact><dt><b>
Return values: </b><dd>
<table border=0 cellspacing=2 cellpadding=0>
@@ -1453,7 +1770,7 @@
</dl> </td>
</tr>
</table>
-<a name="a23" doxytag="metadata.h::FLAC__metadata_object_vorbiscomment_remove_entries_matching"></a><p>
+<a name="a27" doxytag="metadata.h::FLAC__metadata_object_vorbiscomment_remove_entries_matching"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -1499,7 +1816,7 @@
</dl><dl compact><dt><b>
Assertions:</b><dd>
<div class="fragment"><pre>object != NULL
-</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a94a101">FLAC__METADATA_TYPE_VORBIS_COMMENT</a>
+</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a97a101">FLAC__METADATA_TYPE_VORBIS_COMMENT</a>
</pre></div> </dl><dl compact><dt><b>
Return values: </b><dd>
<table border=0 cellspacing=2 cellpadding=0>
@@ -1509,7 +1826,7 @@
</dl> </td>
</tr>
</table>
-<a name="a24" doxytag="metadata.h::FLAC__metadata_object_cuesheet_track_new"></a><p>
+<a name="a28" doxytag="metadata.h::FLAC__metadata_object_cuesheet_track_new"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -1545,7 +1862,7 @@
</dl> </td>
</tr>
</table>
-<a name="a25" doxytag="metadata.h::FLAC__metadata_object_cuesheet_track_clone"></a><p>
+<a name="a29" doxytag="metadata.h::FLAC__metadata_object_cuesheet_track_clone"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -1573,7 +1890,7 @@
<p>
Create a copy of an existing CUESHEET track object.
<p>
-The copy is a "deep" copy, i.e. dynamically allocated data within the object is also copied. The caller takes ownership of the new object and is responsible for freeing it with <a class="el" href="group__flac__metadata__object.html#a26">FLAC__metadata_object_cuesheet_track_delete</a>().<dl compact><dt><b>
+The copy is a "deep" copy, i.e. dynamically allocated data within the object is also copied. The caller takes ownership of the new object and is responsible for freeing it with <a class="el" href="group__flac__metadata__object.html#a30">FLAC__metadata_object_cuesheet_track_delete</a>().<dl compact><dt><b>
Parameters: </b><dd>
<table border=0 cellspacing=2 cellpadding=0>
<tr><td valign=top><em>object</em> </td><td>
@@ -1591,7 +1908,7 @@
</dl> </td>
</tr>
</table>
-<a name="a26" doxytag="metadata.h::FLAC__metadata_object_cuesheet_track_delete"></a><p>
+<a name="a30" doxytag="metadata.h::FLAC__metadata_object_cuesheet_track_delete"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -1629,7 +1946,7 @@
</pre></div> </dl> </td>
</tr>
</table>
-<a name="a27" doxytag="metadata.h::FLAC__metadata_object_cuesheet_track_resize_indices"></a><p>
+<a name="a31" doxytag="metadata.h::FLAC__metadata_object_cuesheet_track_resize_indices"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -1685,7 +2002,7 @@
</dl><dl compact><dt><b>
Assertions:</b><dd>
<div class="fragment"><pre>object != NULL
-</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a94a102">FLAC__METADATA_TYPE_CUESHEET</a>
+</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a97a102">FLAC__METADATA_TYPE_CUESHEET</a>
</pre></div> <div class="fragment"><pre>object->data.cue_sheet.num_tracks > track_num
</pre></div> <div class="fragment"><pre>(object->data.cue_sheet.tracks[track_num].indices == NULL && object->data.cue_sheet.tracks[track_num].num_indices == 0) ||
(object->data.cue_sheet.tracks[track_num].indices != NULL && object->data.cue_sheet.tracks[track_num].num_indices > 0)
@@ -1698,7 +2015,7 @@
</dl> </td>
</tr>
</table>
-<a name="a28" doxytag="metadata.h::FLAC__metadata_object_cuesheet_track_insert_index"></a><p>
+<a name="a32" doxytag="metadata.h::FLAC__metadata_object_cuesheet_track_insert_index"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -1760,19 +2077,19 @@
</dl><dl compact><dt><b>
Assertions:</b><dd>
<div class="fragment"><pre>object != NULL
-</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a94a102">FLAC__METADATA_TYPE_CUESHEET</a>
+</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a97a102">FLAC__METADATA_TYPE_CUESHEET</a>
</pre></div> <div class="fragment"><pre>object->data.cue_sheet.num_tracks > track_num
</pre></div> <div class="fragment"><pre>object->data.cue_sheet.tracks[track_num].num_indices >= index_num
</pre></div> </dl><dl compact><dt><b>
Return values: </b><dd>
<table border=0 cellspacing=2 cellpadding=0>
<tr><td valign=top><em>FLAC__bool</em> </td><td>
-<code>false</code> if realloc fails, else <code>true</code>. </td></tr>
+<code>false</code> if realloc() fails, else <code>true</code>. </td></tr>
</table>
</dl> </td>
</tr>
</table>
-<a name="a29" doxytag="metadata.h::FLAC__metadata_object_cuesheet_track_insert_blank_index"></a><p>
+<a name="a33" doxytag="metadata.h::FLAC__metadata_object_cuesheet_track_insert_blank_index"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -1828,19 +2145,19 @@
</dl><dl compact><dt><b>
Assertions:</b><dd>
<div class="fragment"><pre>object != NULL
-</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a94a102">FLAC__METADATA_TYPE_CUESHEET</a>
+</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a97a102">FLAC__METADATA_TYPE_CUESHEET</a>
</pre></div> <div class="fragment"><pre>object->data.cue_sheet.num_tracks > track_num
</pre></div> <div class="fragment"><pre>object->data.cue_sheet.tracks[track_num].num_indices >= index_num
</pre></div> </dl><dl compact><dt><b>
Return values: </b><dd>
<table border=0 cellspacing=2 cellpadding=0>
<tr><td valign=top><em>FLAC__bool</em> </td><td>
-<code>false</code> if realloc fails, else <code>true</code>. </td></tr>
+<code>false</code> if realloc() fails, else <code>true</code>. </td></tr>
</table>
</dl> </td>
</tr>
</table>
-<a name="a30" doxytag="metadata.h::FLAC__metadata_object_cuesheet_track_delete_index"></a><p>
+<a name="a34" doxytag="metadata.h::FLAC__metadata_object_cuesheet_track_delete_index"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -1894,19 +2211,19 @@
</dl><dl compact><dt><b>
Assertions:</b><dd>
<div class="fragment"><pre>object != NULL
-</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a94a102">FLAC__METADATA_TYPE_CUESHEET</a>
+</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a97a102">FLAC__METADATA_TYPE_CUESHEET</a>
</pre></div> <div class="fragment"><pre>object->data.cue_sheet.num_tracks > track_num
</pre></div> <div class="fragment"><pre>object->data.cue_sheet.tracks[track_num].num_indices > index_num
</pre></div> </dl><dl compact><dt><b>
Return values: </b><dd>
<table border=0 cellspacing=2 cellpadding=0>
<tr><td valign=top><em>FLAC__bool</em> </td><td>
-<code>false</code> if realloc fails, else <code>true</code>. </td></tr>
+<code>false</code> if realloc() fails, else <code>true</code>. </td></tr>
</table>
</dl> </td>
</tr>
</table>
-<a name="a31" doxytag="metadata.h::FLAC__metadata_object_cuesheet_resize_tracks"></a><p>
+<a name="a35" doxytag="metadata.h::FLAC__metadata_object_cuesheet_resize_tracks"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -1954,7 +2271,7 @@
</dl><dl compact><dt><b>
Assertions:</b><dd>
<div class="fragment"><pre>object != NULL
-</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a94a102">FLAC__METADATA_TYPE_CUESHEET</a>
+</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a97a102">FLAC__METADATA_TYPE_CUESHEET</a>
</pre></div> <div class="fragment"><pre>(object->data.cue_sheet.tracks == NULL && object->data.cue_sheet.num_tracks == 0) ||
(object->data.cue_sheet.tracks != NULL && object->data.cue_sheet.num_tracks > 0)
</pre></div> </dl><dl compact><dt><b>
@@ -1966,7 +2283,7 @@
</dl> </td>
</tr>
</table>
-<a name="a32" doxytag="metadata.h::FLAC__metadata_object_cuesheet_insert_track"></a><p>
+<a name="a36" doxytag="metadata.h::FLAC__metadata_object_cuesheet_insert_track"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -2015,7 +2332,7 @@
<p>
Sets a track in a CUESHEET block.
<p>
-If <em>copy</em> is <code>true</code>, a copy of the track is stored; otherwise, the object takes ownership of the <em>track</em> pointer. Returns <code>false</code> if <em>copy</em> == <code>true</code> and malloc fails.<dl compact><dt><b>
+If <em>copy</em> is <code>true</code>, a copy of the track is stored; otherwise, the object takes ownership of the <em>track</em> pointer.<dl compact><dt><b>
Parameters: </b><dd>
<table border=0 cellspacing=2 cellpadding=0>
<tr><td valign=top><em>object</em> </td><td>
@@ -2030,26 +2347,26 @@
</dl><dl compact><dt><b>
Assertions:</b><dd>
<div class="fragment"><pre>object != NULL
-</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a94a102">FLAC__METADATA_TYPE_CUESHEET</a>
+</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a97a102">FLAC__METADATA_TYPE_CUESHEET</a>
</pre></div> <div class="fragment"><pre>track_num < object->data.cue_sheet.num_tracks
</pre></div> <div class="fragment"><pre>(track->indices != NULL && track->num_indices > 0) ||
(track->indices == NULL && track->num_indices == 0)
\retval FLAC__bool
- \c <font class="keyword">false</font> <font class="keywordflow">if</font> \a copy is \c <font class="keyword">true</font> and malloc fails, <font class="keywordflow">else</font> \c <font class="keyword">true</font>.
+ \c <font class="keyword">false</font> <font class="keywordflow">if</font> \a copy is \c <font class="keyword">true</font> and malloc() fails, <font class="keywordflow">else</font> \c <font class="keyword">true</font>.
*/
FLAC__bool FLAC__metadata_object_cuesheet_set_track(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> track_num, <a class="code" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> *track, FLAC__bool copy);
-</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a94a102">FLAC__METADATA_TYPE_CUESHEET</a>
+</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a97a102">FLAC__METADATA_TYPE_CUESHEET</a>
</pre></div> <div class="fragment"><pre>object->data.cue_sheet.num_tracks >= track_num
</pre></div> </dl><dl compact><dt><b>
Return values: </b><dd>
<table border=0 cellspacing=2 cellpadding=0>
<tr><td valign=top><em>FLAC__bool</em> </td><td>
-<code>false</code> if <em>copy</em> is <code>true</code> and malloc fails, else <code>true</code>. </td></tr>
+<code>false</code> if <em>copy</em> is <code>true</code> and malloc() fails, else <code>true</code>. </td></tr>
</table>
</dl> </td>
</tr>
</table>
-<a name="a33" doxytag="metadata.h::FLAC__metadata_object_cuesheet_insert_blank_track"></a><p>
+<a name="a37" doxytag="metadata.h::FLAC__metadata_object_cuesheet_insert_blank_track"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -2097,18 +2414,18 @@
</dl><dl compact><dt><b>
Assertions:</b><dd>
<div class="fragment"><pre>object != NULL
-</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a94a102">FLAC__METADATA_TYPE_CUESHEET</a>
+</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a97a102">FLAC__METADATA_TYPE_CUESHEET</a>
</pre></div> <div class="fragment"><pre>object->data.cue_sheet.num_tracks >= track_num
</pre></div> </dl><dl compact><dt><b>
Return values: </b><dd>
<table border=0 cellspacing=2 cellpadding=0>
<tr><td valign=top><em>FLAC__bool</em> </td><td>
-<code>false</code> if <em>copy</em> is <code>true</code> and malloc fails, else <code>true</code>. </td></tr>
+<code>false</code> if <em>copy</em> is <code>true</code> and malloc() fails, else <code>true</code>. </td></tr>
</table>
</dl> </td>
</tr>
</table>
-<a name="a34" doxytag="metadata.h::FLAC__metadata_object_cuesheet_delete_track"></a><p>
+<a name="a38" doxytag="metadata.h::FLAC__metadata_object_cuesheet_delete_track"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -2154,18 +2471,18 @@
</dl><dl compact><dt><b>
Assertions:</b><dd>
<div class="fragment"><pre>object != NULL
-</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a94a102">FLAC__METADATA_TYPE_CUESHEET</a>
+</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a97a102">FLAC__METADATA_TYPE_CUESHEET</a>
</pre></div> <div class="fragment"><pre>object->data.cue_sheet.num_tracks > track_num
</pre></div> </dl><dl compact><dt><b>
Return values: </b><dd>
<table border=0 cellspacing=2 cellpadding=0>
<tr><td valign=top><em>FLAC__bool</em> </td><td>
-<code>false</code> if realloc fails, else <code>true</code>. </td></tr>
+<code>false</code> if realloc() fails, else <code>true</code>. </td></tr>
</table>
</dl> </td>
</tr>
</table>
-<a name="a35" doxytag="metadata.h::FLAC__metadata_object_cuesheet_is_legal"></a><p>
+<a name="a39" doxytag="metadata.h::FLAC__metadata_object_cuesheet_is_legal"></a><p>
<table width="100%" cellpadding="2" cellspacing="0" border="0">
<tr>
<td class="md">
@@ -2219,7 +2536,7 @@
</dl><dl compact><dt><b>
Assertions:</b><dd>
<div class="fragment"><pre>object != NULL
-</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a94a102">FLAC__METADATA_TYPE_CUESHEET</a>
+</pre></div> <div class="fragment"><pre>object->type == <a class="code" href="format_8h.html#a97a102">FLAC__METADATA_TYPE_CUESHEET</a>
</pre></div> </dl><dl compact><dt><b>
Return values: </b><dd>
<table border=0 cellspacing=2 cellpadding=0>
@@ -2229,7 +2546,7 @@
</dl> </td>
</tr>
</table>
-<hr><address><small>Generated on Tue Sep 28 21:19:44 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:16 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__seekable__stream__decoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__seekable__stream__decoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__seekable__stream__decoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -63,10 +63,10 @@
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a22">FLAC__seekable_stream_decoder_set_metadata_callback</a> (<a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder, <a class="el" href="group__flac__seekable__stream__decoder.html#a11">FLAC__SeekableStreamDecoderMetadataCallback</a> value)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a23">FLAC__seekable_stream_decoder_set_error_callback</a> (<a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder, <a class="el" href="group__flac__seekable__stream__decoder.html#a12">FLAC__SeekableStreamDecoderErrorCallback</a> value)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a24">FLAC__seekable_stream_decoder_set_client_data</a> (<a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder, void *value)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a25">FLAC__seekable_stream_decoder_set_metadata_respond</a> (<a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder, <a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> type)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a25">FLAC__seekable_stream_decoder_set_metadata_respond</a> (<a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder, <a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> type)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a26">FLAC__seekable_stream_decoder_set_metadata_respond_application</a> (<a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder, const FLAC__byte id[4])</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a27">FLAC__seekable_stream_decoder_set_metadata_respond_all</a> (<a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a28">FLAC__seekable_stream_decoder_set_metadata_ignore</a> (<a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder, <a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> type)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a28">FLAC__seekable_stream_decoder_set_metadata_ignore</a> (<a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder, <a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> type)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a29">FLAC__seekable_stream_decoder_set_metadata_ignore_application</a> (<a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder, const FLAC__byte id[4])</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a30">FLAC__seekable_stream_decoder_set_metadata_ignore_all</a> (<a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top><a class="el" href="group__flac__seekable__stream__decoder.html#a50">FLAC__SeekableStreamDecoderState</a> </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a31">FLAC__seekable_stream_decoder_get_state</a> (const <a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder)</td></tr>
@@ -74,7 +74,7 @@
<tr><td nowrap align=right valign=top>const char * </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a33">FLAC__seekable_stream_decoder_get_resolved_state_string</a> (const <a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a34">FLAC__seekable_stream_decoder_get_md5_checking</a> (const <a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>unsigned </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a35">FLAC__seekable_stream_decoder_get_channels</a> (const <a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder)</td></tr>
-<tr><td nowrap align=right valign=top><a class="el" href="group__flac__format.html#a92">FLAC__ChannelAssignment</a> </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a36">FLAC__seekable_stream_decoder_get_channel_assignment</a> (const <a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder)</td></tr>
+<tr><td nowrap align=right valign=top><a class="el" href="group__flac__format.html#a95">FLAC__ChannelAssignment</a> </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a36">FLAC__seekable_stream_decoder_get_channel_assignment</a> (const <a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>unsigned </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a37">FLAC__seekable_stream_decoder_get_bits_per_sample</a> (const <a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>unsigned </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a38">FLAC__seekable_stream_decoder_get_sample_rate</a> (const <a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>unsigned </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a39">FLAC__seekable_stream_decoder_get_blocksize</a> (const <a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder)</td></tr>
@@ -1284,7 +1284,7 @@
<tr>
<td></td>
<td></td>
- <td class="md" nowrap><a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> </td>
+ <td class="md" nowrap><a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> </td>
<td class="mdname" nowrap> <em>type</em></td>
</tr>
<tr>
@@ -1445,7 +1445,7 @@
<tr>
<td></td>
<td></td>
- <td class="md" nowrap><a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> </td>
+ <td class="md" nowrap><a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> </td>
<td class="mdname" nowrap> <em>type</em></td>
</tr>
<tr>
@@ -1818,7 +1818,7 @@
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> <a class="el" href="group__flac__format.html#a92">FLAC__ChannelAssignment</a> FLAC__seekable_stream_decoder_get_channel_assignment </td>
+ <td class="md" nowrap valign="top"> <a class="el" href="group__flac__format.html#a95">FLAC__ChannelAssignment</a> FLAC__seekable_stream_decoder_get_channel_assignment </td>
<td class="md" valign="top">( </td>
<td class="md" nowrap valign="top">const <a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> * </td>
<td class="mdname1" valign="top" nowrap> <em>decoder</em> </td>
@@ -2574,7 +2574,7 @@
Using a FLAC__SeekableStreamDecoderLengthStatus as the index to this array will give the string equivalent. The contents should not be modified. </td>
</tr>
</table>
-<hr><address><small>Generated on Tue Sep 28 21:19:44 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:16 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__seekable__stream__encoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__seekable__stream__encoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__seekable__stream__encoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -3016,7 +3016,7 @@
Using a FLAC__SeekableStreamEncoderTellStatus as the index to this array will give the string equivalent. The contents should not be modified. </td>
</tr>
</table>
-<hr><address><small>Generated on Tue Sep 28 21:19:44 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:17 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__stream__decoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__stream__decoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__stream__decoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -54,16 +54,16 @@
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a12">FLAC__stream_decoder_set_metadata_callback</a> (<a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder, <a class="el" href="group__flac__stream__decoder.html#a6">FLAC__StreamDecoderMetadataCallback</a> value)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a13">FLAC__stream_decoder_set_error_callback</a> (<a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder, <a class="el" href="group__flac__stream__decoder.html#a7">FLAC__StreamDecoderErrorCallback</a> value)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a14">FLAC__stream_decoder_set_client_data</a> (<a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder, void *value)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a15">FLAC__stream_decoder_set_metadata_respond</a> (<a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder, <a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> type)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a15">FLAC__stream_decoder_set_metadata_respond</a> (<a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder, <a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> type)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a16">FLAC__stream_decoder_set_metadata_respond_application</a> (<a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder, const FLAC__byte id[4])</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a17">FLAC__stream_decoder_set_metadata_respond_all</a> (<a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a18">FLAC__stream_decoder_set_metadata_ignore</a> (<a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder, <a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> type)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a18">FLAC__stream_decoder_set_metadata_ignore</a> (<a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder, <a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> type)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a19">FLAC__stream_decoder_set_metadata_ignore_application</a> (<a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder, const FLAC__byte id[4])</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a20">FLAC__stream_decoder_set_metadata_ignore_all</a> (<a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top><a class="el" href="group__flac__stream__decoder.html#a36">FLAC__StreamDecoderState</a> </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a21">FLAC__stream_decoder_get_state</a> (const <a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>const char * </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a22">FLAC__stream_decoder_get_resolved_state_string</a> (const <a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>unsigned </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a23">FLAC__stream_decoder_get_channels</a> (const <a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder)</td></tr>
-<tr><td nowrap align=right valign=top><a class="el" href="group__flac__format.html#a92">FLAC__ChannelAssignment</a> </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a24">FLAC__stream_decoder_get_channel_assignment</a> (const <a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder)</td></tr>
+<tr><td nowrap align=right valign=top><a class="el" href="group__flac__format.html#a95">FLAC__ChannelAssignment</a> </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a24">FLAC__stream_decoder_get_channel_assignment</a> (const <a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>unsigned </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a25">FLAC__stream_decoder_get_bits_per_sample</a> (const <a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>unsigned </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a26">FLAC__stream_decoder_get_sample_rate</a> (const <a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>unsigned </td><td valign=bottom><a class="el" href="group__flac__stream__decoder.html#a27">FLAC__stream_decoder_get_blocksize</a> (const <a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> *decoder)</td></tr>
@@ -794,7 +794,7 @@
<tr>
<td></td>
<td></td>
- <td class="md" nowrap><a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> </td>
+ <td class="md" nowrap><a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> </td>
<td class="mdname" nowrap> <em>type</em></td>
</tr>
<tr>
@@ -955,7 +955,7 @@
<tr>
<td></td>
<td></td>
- <td class="md" nowrap><a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> </td>
+ <td class="md" nowrap><a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> </td>
<td class="mdname" nowrap> <em>type</em></td>
</tr>
<tr>
@@ -1240,7 +1240,7 @@
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> <a class="el" href="group__flac__format.html#a92">FLAC__ChannelAssignment</a> FLAC__stream_decoder_get_channel_assignment </td>
+ <td class="md" nowrap valign="top"> <a class="el" href="group__flac__format.html#a95">FLAC__ChannelAssignment</a> FLAC__stream_decoder_get_channel_assignment </td>
<td class="md" valign="top">( </td>
<td class="md" nowrap valign="top">const <a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a> * </td>
<td class="mdname1" valign="top" nowrap> <em>decoder</em> </td>
@@ -1754,7 +1754,7 @@
<p>
This function will return once one whole frame is skipped, in the same way that <a class="el" href="group__flac__stream__decoder.html#a32">FLAC__stream_decoder_process_single</a>() will return once one whole frame is decoded.
<p>
-This function, when used from the higher <a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> layer, can be used in more quickly determining FLAC frame boundaries when decoding of the actual data is not needed, for example when a application is separating a FLAC stream into frames for editing or storing in a container. To do this, the application can use <a class="el" href="group__flac__seekable__stream__decoder.html#a48">FLAC__seekable_stream_decoder_skip_single_frame</a>() to quickly advance to the next frame, then use <a class="el" href="group__flac__seekable__stream__decoder.html#a40">FLAC__seekable_stream_decoder_get_decode_position</a>() to find the new frame boundary.
+This function, when used from the higher <a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> layer, can be used in more quickly determining FLAC frame boundaries 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 <a class="el" href="group__flac__seekable__stream__decoder.html#a48">FLAC__seekable_stream_decoder_skip_single_frame</a>() to quickly advance to the next frame, then use <a class="el" href="group__flac__seekable__stream__decoder.html#a40">FLAC__seekable_stream_decoder_get_decode_position</a>() to find the new frame boundary.
<p>
This function should only be called when the stream has advanced past all the metadata, otherwise it will return <code>false</code>.<dl compact><dt><b>
Parameters: </b><dd>
@@ -1871,7 +1871,7 @@
Using a FLAC__StreamDecoderErrorStatus as the index to this array will give the string equivalent. The contents should not be modified. </td>
</tr>
</table>
-<hr><address><small>Generated on Tue Sep 28 21:19:45 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:17 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__stream__encoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__stream__encoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flac__stream__encoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -270,7 +270,7 @@
An error occurred while writing the stream; usually, the write_callback returned an error. </td></tr>
<tr><td valign=top><em><a name="a52a20" doxytag="FLAC__STREAM_ENCODER_INVALID_METADATA"></a><em>FLAC__STREAM_ENCODER_INVALID_METADATA</em></em> </td><td>
The metadata input to the encoder is invalid, in one of the following ways:<ul>
-<li><a class="el" href="group__flac__stream__encoder.html#a23">FLAC__stream_encoder_set_metadata</a>() was called with a null pointer but a block count > 0<li>One of the metadata blocks contains an undefined type<li>It contains an illegal CUESHEET as checked by <a class="el" href="group__flac__format.html#a71">FLAC__format_cuesheet_is_legal</a>()<li>It contains an illegal SEEKTABLE as checked by <a class="el" href="group__flac__format.html#a69">FLAC__format_seektable_is_legal</a>()<li>It contains more than one SEEKTABLE block or more than one VORBIS_COMMENT block </ul>
+<li><a class="el" href="group__flac__stream__encoder.html#a23">FLAC__stream_encoder_set_metadata</a>() was called with a null pointer but a block count > 0<li>One of the metadata blocks contains an undefined type<li>It contains an illegal CUESHEET as checked by <a class="el" href="group__flac__format.html#a74">FLAC__format_cuesheet_is_legal</a>()<li>It contains an illegal SEEKTABLE as checked by <a class="el" href="group__flac__format.html#a72">FLAC__format_seektable_is_legal</a>()<li>It contains more than one SEEKTABLE block or more than one VORBIS_COMMENT block </ul>
</td></tr>
<tr><td valign=top><em><a name="a52a21" doxytag="FLAC__STREAM_ENCODER_FATAL_ERROR_WHILE_ENCODING"></a><em>FLAC__STREAM_ENCODER_FATAL_ERROR_WHILE_ENCODING</em></em> </td><td>
An error occurred while writing the stream; usually, the write_callback returned an error. </td></tr>
@@ -2868,7 +2868,7 @@
Using a FLAC__StreamEncoderWriteStatus as the index to this array will give the string equivalent. The contents should not be modified. </td>
</tr>
</table>
-<hr><address><small>Generated on Tue Sep 28 21:19:45 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:18 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -24,7 +24,7 @@
<hr><a name="_details"></a><h2>Detailed Description</h2>
The FLAC C++ API is the interface to libFLAC++, a set of classes that encapsulate the encoders, decoders, and metadata interfaces in libFLAC.
<p>
-Note that Doxygen currently has some quirks (bugs?) in the way it deals with some member groups and C++ constructs. You will find some document entries in the wrong place under [NOHEADER] sections. Hopefully this is not too distracting. <hr><address><small>Generated on Tue Sep 28 21:19:45 2004 for FLAC by
+Note that Doxygen currently has some quirks (bugs?) in the way it deals with some member groups and C++ constructs. You will find some document entries in the wrong place under [NOHEADER] sections. Hopefully this is not too distracting. <hr><address><small>Generated on Fri Feb 4 18:39:18 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__decoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__decoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__decoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -32,7 +32,7 @@
<p>
The libFLAC++ decoder classes are object wrappers around their counterparts in libFLAC. All three decoding layers available in libFLAC are also provided here. The interface is very similar; make sure to read the <a class="el" href="group__flac__decoder.html">libFLAC decoder module</a>.
<p>
-The only real difference here is that instead of passing in C function pointers for callbacks, you inherit from the decoder class and provide implementations for the callbacks in the derived class; because of this there is no need for a 'client_data' property. <hr><address><small>Generated on Tue Sep 28 21:19:45 2004 for FLAC by
+The only real difference here is that instead of passing in C function pointers for callbacks, you inherit from the decoder class and provide implementations for the callbacks in the derived class; because of this there is no need for a 'client_data' property. <hr><address><small>Generated on Fri Feb 4 18:39:18 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__encoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__encoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__encoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -32,7 +32,7 @@
<p>
The libFLAC++ encoder classes are object wrappers around their counterparts in libFLAC. All three encoding layers available in libFLAC are also provided here. The interface is very similar; make sure to read the <a class="el" href="group__flac__encoder.html">libFLAC encoder module</a>.
<p>
-The only real difference here is that instead of passing in C function pointers for callbacks, you inherit from the encoder class and provide implementations for the callbacks in the derived class; because of this there is no need for a 'client_data' property. <hr><address><small>Generated on Tue Sep 28 21:19:45 2004 for FLAC by
+The only real difference here is that instead of passing in C function pointers for callbacks, you inherit from the encoder class and provide implementations for the callbacks in the derived class; because of this there is no need for a 'client_data' property. <hr><address><small>Generated on Fri Feb 4 18:39:18 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__file__decoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__file__decoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__file__decoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -19,7 +19,7 @@
<p>
<p>
- See the <a class="el" href="group__flac__file__decoder.html">libFLAC file decoder module</a>. <hr><address><small>Generated on Tue Sep 28 21:19:45 2004 for FLAC by
+ See the <a class="el" href="group__flac__file__decoder.html">libFLAC file decoder module</a>. <hr><address><small>Generated on Fri Feb 4 18:39:18 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__file__encoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__file__encoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__file__encoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -19,7 +19,7 @@
<p>
<p>
- See the <a class="el" href="group__flac__file__encoder.html">libFLAC file encoder module</a>. <hr><address><small>Generated on Tue Sep 28 21:19:45 2004 for FLAC by
+ See the <a class="el" href="group__flac__file__encoder.html">libFLAC file encoder module</a>. <hr><address><small>Generated on Fri Feb 4 18:39:18 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__metadata.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__metadata.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__metadata.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -31,7 +31,7 @@
<p>
<p>
- The behavior closely mimics the C layer interface; be sure to read the detailed description of the <a class="el" href="group__flac__metadata.html">C metadata module</a>. <hr><address><small>Generated on Tue Sep 28 21:19:45 2004 for FLAC by
+ The behavior closely mimics the C layer interface; be sure to read the detailed description of the <a class="el" href="group__flac__metadata.html">C metadata module</a>. <hr><address><small>Generated on Fri Feb 4 18:39:18 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__metadata__level0.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__metadata__level0.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__metadata__level0.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -18,13 +18,15 @@
<tr><td nowrap align=right valign=top><a name="a1" doxytag="flacpp_metadata_level0::get_tags"></a>
FLACPP_API bool </td><td valign=bottom><a class="el" href="group__flacpp__metadata__level0.html#a1">get_tags</a> (const char *filename, VorbisComment *&tags)</td></tr>
<tr><td> </td><td><font size=-1><em>See <a class="el" href="group__flac__metadata__level0.html#a1">FLAC__metadata_get_tags</a>().</em></font><br><br></td></tr>
+<tr><td nowrap align=right valign=top><a name="a2" doxytag="flacpp_metadata_level0::get_tags"></a>
+FLACPP_API bool </td><td valign=bottom><b>get_tags</b> (const char *filename, VorbisComment &tags)</td></tr>
</table>
<hr><a name="_details"></a><h2>Detailed Description</h2>
Level 0 metadata iterators.
<p>
<p>
- See the <a class="el" href="group__flac__metadata__level0.html">C layer equivalent</a> for more. <hr><address><small>Generated on Tue Sep 28 21:19:45 2004 for FLAC by
+ See the <a class="el" href="group__flac__metadata__level0.html">C layer equivalent</a> for more. <hr><address><small>Generated on Fri Feb 4 18:39:18 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__metadata__level1.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__metadata__level1.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__metadata__level1.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -23,7 +23,7 @@
<li>Create a SimpleIterator instance<li>Check SimpleIterator::is_valid()<li>Call SimpleIterator::init() and check the return<li>Traverse and/or edit. Edits are written to file immediately.<li>Destroy the SimpleIterator instance</ul>
The ownership of pointers in the C++ layer follows that in the C layer, i.e.<ul>
<li>The objects returned by get_block() are yours to modify, but changes are not reflected in the FLAC file until you call set_block(). The objects are also yours to delete; they are not automatically deleted when passed to set_block() or insert_block_after().</ul>
-See the <a class="el" href="group__flac__metadata__level1.html">C layer equivalent</a> for more. <hr><address><small>Generated on Tue Sep 28 21:19:45 2004 for FLAC by
+See the <a class="el" href="group__flac__metadata__level1.html">C layer equivalent</a> for more. <hr><address><small>Generated on Fri Feb 4 18:39:18 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__metadata__level2.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__metadata__level2.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__metadata__level2.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -24,7 +24,7 @@
<li>Create a Chain instance<li>Check Chain::is_valid()<li>Call Chain::read() and check the return<li>Traverse and/or edit with an Iterator or with Chain::merge_padding() or Chain::sort_padding()<li>Write changes back to FLAC file with Chain::write()<li>Destroy the Chain instance</ul>
The ownership of pointers in the C++ layer is slightly different than in the C layer, i.e.<ul>
<li>The objects returned by Iterator::get_block() are NOT owned by the iterator and should be deleted by the caller when finished, BUT, when you modify the block, it will directly edit what's in the chain and you do not need to call Iterator::set_block(). However the changes will not be reflected in the FLAC file until the chain is written with Chain::write().<li>When you pass an object to Iterator::set_block(), Iterator::insert_block_before(), or Iterator::insert_block_after(), the iterator takes ownership of the block and it will be deleted by the chain.</ul>
-See the <a class="el" href="group__flac__metadata__level2.html">C layer equivalent</a> for more. <hr><address><small>Generated on Tue Sep 28 21:19:45 2004 for FLAC by
+See the <a class="el" href="group__flac__metadata__level2.html">C layer equivalent</a> for more. <hr><address><small>Generated on Fri Feb 4 18:39:18 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__metadata__object.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__metadata__object.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__metadata__object.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -312,7 +312,7 @@
</pre></div> </dl> </td>
</tr>
</table>
-<hr><address><small>Generated on Tue Sep 28 21:19:45 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:18 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__seekable__stream__decoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__seekable__stream__decoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__seekable__stream__decoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -19,7 +19,7 @@
<p>
<p>
- See the <a class="el" href="group__flac__seekable__stream__decoder.html">libFLAC seekable stream decoder module</a>. <hr><address><small>Generated on Tue Sep 28 21:19:45 2004 for FLAC by
+ See the <a class="el" href="group__flac__seekable__stream__decoder.html">libFLAC seekable stream decoder module</a>. <hr><address><small>Generated on Fri Feb 4 18:39:18 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__seekable__stream__encoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__seekable__stream__encoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__seekable__stream__encoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -19,7 +19,7 @@
<p>
<p>
- See the <a class="el" href="group__flac__seekable__stream__encoder.html">libFLAC seekable stream encoder module</a>. <hr><address><small>Generated on Tue Sep 28 21:19:45 2004 for FLAC by
+ See the <a class="el" href="group__flac__seekable__stream__encoder.html">libFLAC seekable stream encoder module</a>. <hr><address><small>Generated on Fri Feb 4 18:39:18 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__stream__decoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__stream__decoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__stream__decoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -19,7 +19,7 @@
<p>
<p>
- See the <a class="el" href="group__flac__stream__decoder.html">libFLAC stream decoder module</a>. <hr><address><small>Generated on Tue Sep 28 21:19:45 2004 for FLAC by
+ See the <a class="el" href="group__flac__stream__decoder.html">libFLAC stream decoder module</a>. <hr><address><small>Generated on Fri Feb 4 18:39:18 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__stream__encoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__stream__encoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__flacpp__stream__encoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -19,7 +19,7 @@
<p>
<p>
- See the <a class="el" href="group__flac__stream__encoder.html">libFLAC stream encoder module</a>. <hr><address><small>Generated on Tue Sep 28 21:19:45 2004 for FLAC by
+ See the <a class="el" href="group__flac__stream__encoder.html">libFLAC stream encoder module</a>. <hr><address><small>Generated on Fri Feb 4 18:39:18 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflac.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflac.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflac.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -18,7 +18,7 @@
<p>
</table>
<hr><a name="_details"></a><h2>Detailed Description</h2>
-The OggFLAC C API is the interface to libOggFLAC, a set of encoders and decoders that wrap around the libFLAC API to provide encoding to and decoding from FLAC streams in an Ogg transport. <hr><address><small>Generated on Tue Sep 28 21:19:45 2004 for FLAC by
+The OggFLAC C API is the interface to libOggFLAC, a set of encoders and decoders that wrap around the libFLAC API to provide encoding to and decoding from FLAC streams in an Ogg transport. <hr><address><small>Generated on Fri Feb 4 18:39:18 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflac__decoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflac__decoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflac__decoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -22,7 +22,7 @@
<p>
<p>
- libOggFLAC currently provides the same three layers of access as libFLAC; the interfaces are nearly identical, with th addition of a method for specifying the Ogg serial number. See the <a class="el" href="group__flac__decoder.html">FLAC decoder module</a> for full documentation. <hr><address><small>Generated on Tue Sep 28 21:19:46 2004 for FLAC by
+ libOggFLAC currently provides the same three layers of access as libFLAC; the interfaces are nearly identical, with th addition of a method for specifying the Ogg serial number. See the <a class="el" href="group__flac__decoder.html">FLAC decoder module</a> for full documentation. <hr><address><small>Generated on Fri Feb 4 18:39:19 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflac__encoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflac__encoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflac__encoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -30,7 +30,7 @@
<p>
<p>
- libOggFLAC currently provides the same three layers of access as libFLAC; the interfaces are nearly identical, with the addition of a method for specifying the Ogg serial number. See the <a class="el" href="group__flac__encoder.html">FLAC encoder module</a> for full documentation. <hr><address><small>Generated on Tue Sep 28 21:19:46 2004 for FLAC by
+ libOggFLAC currently provides the same three layers of access as libFLAC; the interfaces are nearly identical, with the addition of a method for specifying the Ogg serial number. See the <a class="el" href="group__flac__encoder.html">FLAC encoder module</a> for full documentation. <hr><address><small>Generated on Fri Feb 4 18:39:19 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflac__file__encoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflac__file__encoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflac__file__encoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -2828,7 +2828,7 @@
Using a FLAC__FileEncoderState as the index to this array will give the string equivalent. The contents should not be modified. </td>
</tr>
</table>
-<hr><address><small>Generated on Tue Sep 28 21:19:45 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:19 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflac__seekable__stream__encoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflac__seekable__stream__encoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflac__seekable__stream__encoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -3108,7 +3108,7 @@
Using a OggFLAC__SeekableStreamEncoderReadStatus as the index to this array will give the string equivalent. The contents should not be modified. </td>
</tr>
</table>
-<hr><address><small>Generated on Tue Sep 28 21:19:46 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:19 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflac__stream__decoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflac__stream__decoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflac__stream__decoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -42,17 +42,17 @@
<tr><td nowrap align=right valign=top>OggFLAC_API FLAC__bool </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a10">OggFLAC__stream_decoder_set_error_callback</a> (<a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder, <a class="el" href="group__oggflac__stream__decoder.html#a4">OggFLAC__StreamDecoderErrorCallback</a> value)</td></tr>
<tr><td nowrap align=right valign=top>OggFLAC_API FLAC__bool </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a11">OggFLAC__stream_decoder_set_client_data</a> (<a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder, void *value)</td></tr>
<tr><td nowrap align=right valign=top>OggFLAC_API FLAC__bool </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a12">OggFLAC__stream_decoder_set_serial_number</a> (<a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder, long serial_number)</td></tr>
-<tr><td nowrap align=right valign=top>OggFLAC_API FLAC__bool </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a13">OggFLAC__stream_decoder_set_metadata_respond</a> (<a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder, <a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> type)</td></tr>
+<tr><td nowrap align=right valign=top>OggFLAC_API FLAC__bool </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a13">OggFLAC__stream_decoder_set_metadata_respond</a> (<a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder, <a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> type)</td></tr>
<tr><td nowrap align=right valign=top>OggFLAC_API FLAC__bool </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a14">OggFLAC__stream_decoder_set_metadata_respond_application</a> (<a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder, const FLAC__byte id[4])</td></tr>
<tr><td nowrap align=right valign=top>OggFLAC_API FLAC__bool </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a15">OggFLAC__stream_decoder_set_metadata_respond_all</a> (<a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder)</td></tr>
-<tr><td nowrap align=right valign=top>OggFLAC_API FLAC__bool </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a16">OggFLAC__stream_decoder_set_metadata_ignore</a> (<a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder, <a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> type)</td></tr>
+<tr><td nowrap align=right valign=top>OggFLAC_API FLAC__bool </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a16">OggFLAC__stream_decoder_set_metadata_ignore</a> (<a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder, <a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> type)</td></tr>
<tr><td nowrap align=right valign=top>OggFLAC_API FLAC__bool </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a17">OggFLAC__stream_decoder_set_metadata_ignore_application</a> (<a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder, const FLAC__byte id[4])</td></tr>
<tr><td nowrap align=right valign=top>OggFLAC_API FLAC__bool </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a18">OggFLAC__stream_decoder_set_metadata_ignore_all</a> (<a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>OggFLAC_API <a class="el" href="group__oggflac__stream__decoder.html#a34">OggFLAC__StreamDecoderState</a> </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a19">OggFLAC__stream_decoder_get_state</a> (const <a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>OggFLAC_API <a class="el" href="group__flac__stream__decoder.html#a36">FLAC__StreamDecoderState</a> </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a20">OggFLAC__stream_decoder_get_FLAC_stream_decoder_state</a> (const <a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>OggFLAC_API const char * </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a21">OggFLAC__stream_decoder_get_resolved_state_string</a> (const <a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>OggFLAC_API unsigned </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a22">OggFLAC__stream_decoder_get_channels</a> (const <a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder)</td></tr>
-<tr><td nowrap align=right valign=top>OggFLAC_API <a class="el" href="group__flac__format.html#a92">FLAC__ChannelAssignment</a> </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a23">OggFLAC__stream_decoder_get_channel_assignment</a> (const <a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder)</td></tr>
+<tr><td nowrap align=right valign=top>OggFLAC_API <a class="el" href="group__flac__format.html#a95">FLAC__ChannelAssignment</a> </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a23">OggFLAC__stream_decoder_get_channel_assignment</a> (const <a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>OggFLAC_API unsigned </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a24">OggFLAC__stream_decoder_get_bits_per_sample</a> (const <a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>OggFLAC_API unsigned </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a25">OggFLAC__stream_decoder_get_sample_rate</a> (const <a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>OggFLAC_API unsigned </td><td valign=bottom><a class="el" href="group__oggflac__stream__decoder.html#a26">OggFLAC__stream_decoder_get_blocksize</a> (const <a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> *decoder)</td></tr>
@@ -713,7 +713,7 @@
<tr>
<td></td>
<td></td>
- <td class="md" nowrap><a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> </td>
+ <td class="md" nowrap><a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> </td>
<td class="mdname" nowrap> <em>type</em></td>
</tr>
<tr>
@@ -874,7 +874,7 @@
<tr>
<td></td>
<td></td>
- <td class="md" nowrap><a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> </td>
+ <td class="md" nowrap><a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> </td>
<td class="mdname" nowrap> <em>type</em></td>
</tr>
<tr>
@@ -1203,7 +1203,7 @@
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> OggFLAC_API <a class="el" href="group__flac__format.html#a92">FLAC__ChannelAssignment</a> OggFLAC__stream_decoder_get_channel_assignment </td>
+ <td class="md" nowrap valign="top"> OggFLAC_API <a class="el" href="group__flac__format.html#a95">FLAC__ChannelAssignment</a> OggFLAC__stream_decoder_get_channel_assignment </td>
<td class="md" valign="top">( </td>
<td class="md" nowrap valign="top">const <a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a> * </td>
<td class="mdname1" valign="top" nowrap> <em>decoder</em> </td>
@@ -1705,7 +1705,7 @@
Using an OggFLAC__StreamDecoderState as the index to this array will give the string equivalent. The contents should not be modified. </td>
</tr>
</table>
-<hr><address><small>Generated on Tue Sep 28 21:19:46 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:19 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflac__stream__encoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflac__stream__encoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflac__stream__encoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -2822,7 +2822,7 @@
Using an OggFLAC__StreamEncoderState as the index to this array will give the string equivalent. The contents should not be modified. </td>
</tr>
</table>
-<hr><address><small>Generated on Tue Sep 28 21:19:46 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:20 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -18,7 +18,7 @@
<p>
</table>
<hr><a name="_details"></a><h2>Detailed Description</h2>
-The OggFLAC C++ API is the interface to libOggFLAC++, a set of classes that encapsulate the encoders and decoders in libOggFLAC. <hr><address><small>Generated on Tue Sep 28 21:19:46 2004 for FLAC by
+The OggFLAC C++ API is the interface to libOggFLAC++, a set of classes that encapsulate the encoders and decoders in libOggFLAC. <hr><address><small>Generated on Fri Feb 4 18:39:20 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp__decoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp__decoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp__decoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -32,7 +32,7 @@
<p>
The libOggFLAC++ decoder classes are object wrappers around their counterparts in libOggFLAC. All three decoding layers available in libOggFLAC are also provided here. The interface is very similar; make sure to read the <a class="el" href="group__oggflac__decoder.html">libOggFLAC decoder module</a>.
<p>
-The only real difference here is that instead of passing in C function pointers for callbacks, you inherit from the decoder class and provide implementations for the callbacks in the derived class; because of this there is no need for a 'client_data' property. <hr><address><small>Generated on Tue Sep 28 21:19:46 2004 for FLAC by
+The only real difference here is that instead of passing in C function pointers for callbacks, you inherit from the decoder class and provide implementations for the callbacks in the derived class; because of this there is no need for a 'client_data' property. <hr><address><small>Generated on Fri Feb 4 18:39:20 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp__encoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp__encoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp__encoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -32,7 +32,7 @@
<p>
The libOggFLAC++ encoder classes are object wrappers around their counterparts in libOggFLAC. All three encoding layers available in libOggFLAC are also provided here. The interface is very similar; make sure to read the <a class="el" href="group__oggflac__encoder.html">libOggFLAC encoder module</a>.
<p>
-The only real difference here is that instead of passing in C function pointers for callbacks, you inherit from the encoder class and provide implementations for the callbacks in the derived class; because of this there is no need for a 'client_data' property. <hr><address><small>Generated on Tue Sep 28 21:19:46 2004 for FLAC by
+The only real difference here is that instead of passing in C function pointers for callbacks, you inherit from the encoder class and provide implementations for the callbacks in the derived class; because of this there is no need for a 'client_data' property. <hr><address><small>Generated on Fri Feb 4 18:39:20 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp__file__decoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp__file__decoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp__file__decoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -19,7 +19,7 @@
<p>
<p>
- See the libOggFLAC file decoder module. <hr><address><small>Generated on Tue Sep 28 21:19:46 2004 for FLAC by
+ See the libOggFLAC file decoder module. <hr><address><small>Generated on Fri Feb 4 18:39:20 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp__file__encoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp__file__encoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp__file__encoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -19,7 +19,7 @@
<p>
<p>
- See the <a class="el" href="group__oggflac__file__encoder.html">libOggFLAC file encoder module</a>. <hr><address><small>Generated on Tue Sep 28 21:19:46 2004 for FLAC by
+ See the <a class="el" href="group__oggflac__file__encoder.html">libOggFLAC file encoder module</a>. <hr><address><small>Generated on Fri Feb 4 18:39:20 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp__seekable__stream__decoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp__seekable__stream__decoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp__seekable__stream__decoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -19,7 +19,7 @@
<p>
<p>
- See the libOggFLAC seekable stream decoder module. <hr><address><small>Generated on Tue Sep 28 21:19:46 2004 for FLAC by
+ See the libOggFLAC seekable stream decoder module. <hr><address><small>Generated on Fri Feb 4 18:39:20 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp__seekable__stream__encoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp__seekable__stream__encoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp__seekable__stream__encoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -19,7 +19,7 @@
<p>
<p>
- See the <a class="el" href="group__oggflac__seekable__stream__encoder.html">libOggFLAC seekable stream encoder module</a>. <hr><address><small>Generated on Tue Sep 28 21:19:46 2004 for FLAC by
+ See the <a class="el" href="group__oggflac__seekable__stream__encoder.html">libOggFLAC seekable stream encoder module</a>. <hr><address><small>Generated on Fri Feb 4 18:39:20 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp__stream__decoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp__stream__decoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp__stream__decoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -19,7 +19,7 @@
<p>
<p>
- See the <a class="el" href="group__oggflac__stream__decoder.html">libOggFLAC stream decoder module</a>. <hr><address><small>Generated on Tue Sep 28 21:19:46 2004 for FLAC by
+ See the <a class="el" href="group__oggflac__stream__decoder.html">libOggFLAC stream decoder module</a>. <hr><address><small>Generated on Fri Feb 4 18:39:20 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp__stream__encoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp__stream__encoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/group__oggflacpp__stream__encoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -19,7 +19,7 @@
<p>
<p>
- See the <a class="el" href="group__oggflac__stream__encoder.html">libOggFLAC stream encoder module</a>. <hr><address><small>Generated on Tue Sep 28 21:19:46 2004 for FLAC by
+ See the <a class="el" href="group__oggflac__stream__encoder.html">libOggFLAC stream encoder module</a>. <hr><address><small>Generated on Fri Feb 4 18:39:20 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/hierarchy.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/hierarchy.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/hierarchy.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -69,7 +69,7 @@
<li><a class="el" href="classFLAC_1_1Encoder_1_1Stream.html">FLAC::Encoder::Stream</a>
<li><b>FLAC::Encoder::Stream::State</b><li><b>FLAC::Decoder::Stream::State</b><li><b>OggFLAC::Decoder::Stream::State</b><li><b>OggFLAC::Encoder::Stream::State</b><li><a class="el" href="classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html">FLAC::Metadata::VorbisComment::Entry</a>
</ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:12 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/index.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/index.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/index.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -8,7 +8,7 @@
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>FLAC Documentation</h1>
<p>
-<h3 align="center">1.1.1</h3> <a name="intro"><h2>Introduction</h2></a>
+<h3 align="center">1.1.2</h3> <a name="intro"><h2>Introduction</h2></a>
<p>
This is the documentation for the FLAC C and C++ APIs. It is highly interconnected; this introduction should give you a top level idea of the structure and how to find the information you need. As a prerequisite you should have at least a basic knowledge of the FLAC format, documented <a href="../format.html">here</a>.
@@ -53,7 +53,7 @@
<li>All modules depend on the <a class="el" href="group__flac__format.html">Format</a> module.<li>The decoders and encoders are independent of each other.<li>The metadata interface requires the file decoder.<li>The decoder and encoder layers depend on the layers below them, but not above them; e.g. the seekable stream decoder depends on the stream decoder but not the file decoder</ul>
For example, if your application only requires the stream decoder, no encoders, and no metadata interface, you can remove the seekable stream decoder, file decoder, all encoders, and the metadata interface, which will greatly reduce the size of the library.
<p>
-<hr><address><small>Generated on Tue Sep 28 21:19:40 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:08 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/metadata_8h-source.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/metadata_8h-source.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/metadata_8h-source.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,7 +7,7 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>include/FLAC/metadata.h</h1><a href="metadata_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <font class="comment">/* libFLAC - Free Lossless Audio Codec library</font>
-00002 <font class="comment"> * Copyright (C) 2001,2002,2003,2004 Josh Coalson</font>
+00002 <font class="comment"> * Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson</font>
00003 <font class="comment"> *</font>
00004 <font class="comment"> * Redistribution and use in source and binary forms, with or without</font>
00005 <font class="comment"> * modification, are permitted provided that the following conditions</font>
@@ -99,7 +99,7 @@
00366
00379 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a8">FLAC__metadata_simple_iterator_prev</a>(<a class="code" href="metadata_8h.html#a0">FLAC__Metadata_SimpleIterator</a> *iterator);
00380
-00394 FLAC_API <a class="code" href="format_8h.html#a94">FLAC__MetadataType</a> <a class="code" href="metadata_8h.html#a9">FLAC__metadata_simple_iterator_get_block_type</a>(<font class="keyword">const</font> <a class="code" href="metadata_8h.html#a0">FLAC__Metadata_SimpleIterator</a> *iterator);
+00394 FLAC_API <a class="code" href="format_8h.html#a97">FLAC__MetadataType</a> <a class="code" href="metadata_8h.html#a9">FLAC__metadata_simple_iterator_get_block_type</a>(<font class="keyword">const</font> <a class="code" href="metadata_8h.html#a0">FLAC__Metadata_SimpleIterator</a> *iterator);
00395
00411 FLAC_API <a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *<a class="code" href="metadata_8h.html#a10">FLAC__metadata_simple_iterator_get_block</a>(<a class="code" href="metadata_8h.html#a0">FLAC__Metadata_SimpleIterator</a> *iterator);
00412
@@ -176,7 +176,7 @@
00936
00949 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a18">FLAC__metadata_iterator_prev</a>(<a class="code" href="metadata_8h.html#a1">FLAC__Metadata_Iterator</a> *iterator);
00950
-00961 FLAC_API <a class="code" href="format_8h.html#a94">FLAC__MetadataType</a> <a class="code" href="metadata_8h.html#a19">FLAC__metadata_iterator_get_block_type</a>(<font class="keyword">const</font> <a class="code" href="metadata_8h.html#a1">FLAC__Metadata_Iterator</a> *iterator);
+00961 FLAC_API <a class="code" href="format_8h.html#a97">FLAC__MetadataType</a> <a class="code" href="metadata_8h.html#a19">FLAC__metadata_iterator_get_block_type</a>(<font class="keyword">const</font> <a class="code" href="metadata_8h.html#a1">FLAC__Metadata_Iterator</a> *iterator);
00962
00982 FLAC_API <a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *<a class="code" href="metadata_8h.html#a20">FLAC__metadata_iterator_get_block</a>(<a class="code" href="metadata_8h.html#a1">FLAC__Metadata_Iterator</a> *iterator);
00983
@@ -191,92 +191,96 @@
01056 <font class="comment">/* \} */</font>
01057
01058
-01113 FLAC_API <a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *<a class="code" href="metadata_8h.html#a0">FLAC__metadata_object_new</a>(<a class="code" href="format_8h.html#a94">FLAC__MetadataType</a> type);
-01114
-01127 FLAC_API <a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *<a class="code" href="metadata_8h.html#a1">FLAC__metadata_object_clone</a>(<font class="keyword">const</font> <a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object);
-01128
-01138 FLAC_API <font class="keywordtype">void</font> <a class="code" href="metadata_8h.html#a2">FLAC__metadata_object_delete</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object);
+01124 FLAC_API <a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *<a class="code" href="metadata_8h.html#a0">FLAC__metadata_object_new</a>(<a class="code" href="format_8h.html#a97">FLAC__MetadataType</a> type);
+01125
+01138 FLAC_API <a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *<a class="code" href="metadata_8h.html#a1">FLAC__metadata_object_clone</a>(<font class="keyword">const</font> <a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object);
01139
-01153 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a3">FLAC__metadata_object_is_equal</a>(<font class="keyword">const</font> <a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *block1, <font class="keyword">const</font> <a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *block2);
-01154
-01173 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a4">FLAC__metadata_object_application_set_data</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, FLAC__byte *data, <font class="keywordtype">unsigned</font> length, FLAC__bool copy);
-01174
-01190 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a5">FLAC__metadata_object_seektable_resize_points</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> new_num_points);
-01191
-01202 FLAC_API <font class="keywordtype">void</font> <a class="code" href="metadata_8h.html#a6">FLAC__metadata_object_seektable_set_point</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> point_num, <a class="code" href="structFLAC____StreamMetadata__SeekPoint.html">FLAC__StreamMetadata_SeekPoint</a> point);
-01203
-01216 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a7">FLAC__metadata_object_seektable_insert_point</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> point_num, <a class="code" href="structFLAC____StreamMetadata__SeekPoint.html">FLAC__StreamMetadata_SeekPoint</a> point);
-01217
-01229 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a8">FLAC__metadata_object_seektable_delete_point</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> point_num);
-01230
-01242 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a9">FLAC__metadata_object_seektable_is_legal</a>(<font class="keyword">const</font> <a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object);
-01243
-01259 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a10">FLAC__metadata_object_seektable_template_append_placeholders</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> num);
-01260
-01276 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a11">FLAC__metadata_object_seektable_template_append_point</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, FLAC__uint64 sample_number);
-01277
-01294 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a12">FLAC__metadata_object_seektable_template_append_points</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, FLAC__uint64 sample_numbers[], <font class="keywordtype">unsigned</font> num);
-01295
-01315 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a13">FLAC__metadata_object_seektable_template_append_spaced_points</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> num, FLAC__uint64 total_samples);
-01316
-01332 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a14">FLAC__metadata_object_seektable_template_sort</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, FLAC__bool compact);
-01333
-01351 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a15">FLAC__metadata_object_vorbiscomment_set_vendor_string</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <a class="code" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> entry, FLAC__bool copy);
-01352
-01368 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a16">FLAC__metadata_object_vorbiscomment_resize_comments</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> new_num_comments);
-01369
-01389 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a17">FLAC__metadata_object_vorbiscomment_set_comment</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> comment_num, <a class="code" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> entry, FLAC__bool copy);
-01390
-01413 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a18">FLAC__metadata_object_vorbiscomment_insert_comment</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> comment_num, <a class="code" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> entry, FLAC__bool copy);
-01414
-01428 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a19">FLAC__metadata_object_vorbiscomment_delete_comment</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> comment_num);
-01429
-01430 <font class="comment">/*@@@@ add to unit tests */</font>
-01444 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a20">FLAC__metadata_object_vorbiscomment_entry_matches</a>(<font class="keyword">const</font> <a class="code" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> *entry, <font class="keyword">const</font> <font class="keywordtype">char</font> *field_name, <font class="keywordtype">unsigned</font> field_name_length);
-01445
-01446 <font class="comment">/*@@@@ add to unit tests */</font>
-01463 FLAC_API <font class="keywordtype">int</font> <a class="code" href="metadata_8h.html#a21">FLAC__metadata_object_vorbiscomment_find_entry_from</a>(<font class="keyword">const</font> <a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> offset, <font class="keyword">const</font> <font class="keywordtype">char</font> *field_name);
-01464
-01465 <font class="comment">/*@@@@ add to unit tests */</font>
-01477 FLAC_API <font class="keywordtype">int</font> <a class="code" href="metadata_8h.html#a22">FLAC__metadata_object_vorbiscomment_remove_entry_matching</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keyword">const</font> <font class="keywordtype">char</font> *field_name);
-01478
-01479 <font class="comment">/*@@@@ add to unit tests */</font>
-01491 FLAC_API <font class="keywordtype">int</font> <a class="code" href="metadata_8h.html#a23">FLAC__metadata_object_vorbiscomment_remove_entries_matching</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keyword">const</font> <font class="keywordtype">char</font> *field_name);
-01492
-01500 FLAC_API <a class="code" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> *<a class="code" href="metadata_8h.html#a24">FLAC__metadata_object_cuesheet_track_new</a>();
-01501
-01515 FLAC_API <a class="code" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> *<a class="code" href="metadata_8h.html#a25">FLAC__metadata_object_cuesheet_track_clone</a>(<font class="keyword">const</font> <a class="code" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> *object);
-01516
-01523 FLAC_API <font class="keywordtype">void</font> <a class="code" href="metadata_8h.html#a26">FLAC__metadata_object_cuesheet_track_delete</a>(<a class="code" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> *object);
-01524
-01543 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a27">FLAC__metadata_object_cuesheet_track_resize_indices</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> track_num, <font class="keywordtype">unsigned</font> new_num_indices);
-01544
-01566 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a28">FLAC__metadata_object_cuesheet_track_insert_index</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> track_num, <font class="keywordtype">unsigned</font> index_num, <a class="code" href="structFLAC____StreamMetadata__CueSheet__Index.html">FLAC__StreamMetadata_CueSheet_Index</a> index);
-01567
-01590 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a29">FLAC__metadata_object_cuesheet_track_insert_blank_index</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> track_num, <font class="keywordtype">unsigned</font> index_num);
-01591
-01609 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a30">FLAC__metadata_object_cuesheet_track_delete_index</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> track_num, <font class="keywordtype">unsigned</font> index_num);
-01610
-01626 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a31">FLAC__metadata_object_cuesheet_resize_tracks</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> new_num_tracks);
-01627
-01649 FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_set_track(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> track_num, <a class="code" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> *track, FLAC__bool copy);
-01650
-01673 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a32">FLAC__metadata_object_cuesheet_insert_track</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> track_num, <a class="code" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> *track, FLAC__bool copy);
-01674
-01692 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a33">FLAC__metadata_object_cuesheet_insert_blank_track</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> track_num);
-01693
-01707 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a34">FLAC__metadata_object_cuesheet_delete_track</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> track_num);
-01708
-01728 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a35">FLAC__metadata_object_cuesheet_is_legal</a>(<font class="keyword">const</font> <a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, FLAC__bool check_cd_da_subset, <font class="keyword">const</font> <font class="keywordtype">char</font> **violation);
-01729
-01730 <font class="comment">/* \} */</font>
-01731
-01732 <font class="preprocessor">#ifdef __cplusplus</font>
-01733 <font class="preprocessor"></font>}
-01734 <font class="preprocessor">#endif</font>
-01735 <font class="preprocessor"></font>
-01736 <font class="preprocessor">#endif</font>
-</pre></div><hr><address><small>Generated on Tue Sep 28 21:19:41 2004 for FLAC by
+01149 FLAC_API <font class="keywordtype">void</font> <a class="code" href="metadata_8h.html#a2">FLAC__metadata_object_delete</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object);
+01150
+01164 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a3">FLAC__metadata_object_is_equal</a>(<font class="keyword">const</font> <a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *block1, <font class="keyword">const</font> <a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *block2);
+01165
+01183 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a4">FLAC__metadata_object_application_set_data</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, FLAC__byte *data, <font class="keywordtype">unsigned</font> length, FLAC__bool copy);
+01184
+01200 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a5">FLAC__metadata_object_seektable_resize_points</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> new_num_points);
+01201
+01212 FLAC_API <font class="keywordtype">void</font> <a class="code" href="metadata_8h.html#a6">FLAC__metadata_object_seektable_set_point</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> point_num, <a class="code" href="structFLAC____StreamMetadata__SeekPoint.html">FLAC__StreamMetadata_SeekPoint</a> point);
+01213
+01226 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a7">FLAC__metadata_object_seektable_insert_point</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> point_num, <a class="code" href="structFLAC____StreamMetadata__SeekPoint.html">FLAC__StreamMetadata_SeekPoint</a> point);
+01227
+01239 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a8">FLAC__metadata_object_seektable_delete_point</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> point_num);
+01240
+01252 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a9">FLAC__metadata_object_seektable_is_legal</a>(<font class="keyword">const</font> <a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object);
+01253
+01269 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a10">FLAC__metadata_object_seektable_template_append_placeholders</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> num);
+01270
+01286 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a11">FLAC__metadata_object_seektable_template_append_point</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, FLAC__uint64 sample_number);
+01287
+01304 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a12">FLAC__metadata_object_seektable_template_append_points</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, FLAC__uint64 sample_numbers[], <font class="keywordtype">unsigned</font> num);
+01305
+01325 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a13">FLAC__metadata_object_seektable_template_append_spaced_points</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> num, FLAC__uint64 total_samples);
+01326
+01342 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a14">FLAC__metadata_object_seektable_template_sort</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, FLAC__bool compact);
+01343
+01367 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a15">FLAC__metadata_object_vorbiscomment_set_vendor_string</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <a class="code" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> entry, FLAC__bool copy);
+01368
+01384 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a16">FLAC__metadata_object_vorbiscomment_resize_comments</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> new_num_comments);
+01385
+01411 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a17">FLAC__metadata_object_vorbiscomment_set_comment</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> comment_num, <a class="code" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> entry, FLAC__bool copy);
+01412
+01441 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a18">FLAC__metadata_object_vorbiscomment_insert_comment</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> comment_num, <a class="code" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> entry, FLAC__bool copy);
+01442
+01466 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a19">FLAC__metadata_object_vorbiscomment_append_comment</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <a class="code" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> entry, FLAC__bool copy);
+01467
+01501 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a20">FLAC__metadata_object_vorbiscomment_replace_comment</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <a class="code" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> entry, FLAC__bool all, FLAC__bool copy);
+01502
+01514 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a21">FLAC__metadata_object_vorbiscomment_delete_comment</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> comment_num);
+01515
+01535 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a22">FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair</a>(<a class="code" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> *entry, <font class="keyword">const</font> <font class="keywordtype">char</font> *field_name, <font class="keyword">const</font> <font class="keywordtype">char</font> *field_value);
+01536
+01556 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a23">FLAC__metadata_object_vorbiscomment_entry_to_name_value_pair</a>(<font class="keyword">const</font> <a class="code" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> entry, <font class="keywordtype">char</font> **field_name, <font class="keywordtype">char</font> **field_value);
+01557
+01570 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a24">FLAC__metadata_object_vorbiscomment_entry_matches</a>(<font class="keyword">const</font> <a class="code" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> entry, <font class="keyword">const</font> <font class="keywordtype">char</font> *field_name, <font class="keywordtype">unsigned</font> field_name_length);
+01571
+01589 FLAC_API <font class="keywordtype">int</font> <a class="code" href="metadata_8h.html#a25">FLAC__metadata_object_vorbiscomment_find_entry_from</a>(<font class="keyword">const</font> <a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> offset, <font class="keyword">const</font> <font class="keywordtype">char</font> *field_name);
+01590
+01602 FLAC_API <font class="keywordtype">int</font> <a class="code" href="metadata_8h.html#a26">FLAC__metadata_object_vorbiscomment_remove_entry_matching</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keyword">const</font> <font class="keywordtype">char</font> *field_name);
+01603
+01615 FLAC_API <font class="keywordtype">int</font> <a class="code" href="metadata_8h.html#a27">FLAC__metadata_object_vorbiscomment_remove_entries_matching</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keyword">const</font> <font class="keywordtype">char</font> *field_name);
+01616
+01624 FLAC_API <a class="code" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> *<a class="code" href="metadata_8h.html#a28">FLAC__metadata_object_cuesheet_track_new</a>();
+01625
+01639 FLAC_API <a class="code" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> *<a class="code" href="metadata_8h.html#a29">FLAC__metadata_object_cuesheet_track_clone</a>(<font class="keyword">const</font> <a class="code" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> *object);
+01640
+01647 FLAC_API <font class="keywordtype">void</font> <a class="code" href="metadata_8h.html#a30">FLAC__metadata_object_cuesheet_track_delete</a>(<a class="code" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> *object);
+01648
+01667 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a31">FLAC__metadata_object_cuesheet_track_resize_indices</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> track_num, <font class="keywordtype">unsigned</font> new_num_indices);
+01668
+01690 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a32">FLAC__metadata_object_cuesheet_track_insert_index</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> track_num, <font class="keywordtype">unsigned</font> index_num, <a class="code" href="structFLAC____StreamMetadata__CueSheet__Index.html">FLAC__StreamMetadata_CueSheet_Index</a> index);
+01691
+01714 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a33">FLAC__metadata_object_cuesheet_track_insert_blank_index</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> track_num, <font class="keywordtype">unsigned</font> index_num);
+01715
+01733 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a34">FLAC__metadata_object_cuesheet_track_delete_index</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> track_num, <font class="keywordtype">unsigned</font> index_num);
+01734
+01750 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a35">FLAC__metadata_object_cuesheet_resize_tracks</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> new_num_tracks);
+01751
+01772 FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_set_track(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> track_num, <a class="code" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> *track, FLAC__bool copy);
+01773
+01795 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a36">FLAC__metadata_object_cuesheet_insert_track</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> track_num, <a class="code" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> *track, FLAC__bool copy);
+01796
+01814 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a37">FLAC__metadata_object_cuesheet_insert_blank_track</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> track_num);
+01815
+01829 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a38">FLAC__metadata_object_cuesheet_delete_track</a>(<a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <font class="keywordtype">unsigned</font> track_num);
+01830
+01850 FLAC_API FLAC__bool <a class="code" href="metadata_8h.html#a39">FLAC__metadata_object_cuesheet_is_legal</a>(<font class="keyword">const</font> <a class="code" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, FLAC__bool check_cd_da_subset, <font class="keyword">const</font> <font class="keywordtype">char</font> **violation);
+01851
+01852 <font class="comment">/* \} */</font>
+01853
+01854 <font class="preprocessor">#ifdef __cplusplus</font>
+01855 <font class="preprocessor"></font>}
+01856 <font class="preprocessor">#endif</font>
+01857 <font class="preprocessor"></font>
+01858 <font class="preprocessor">#endif</font>
+</pre></div><hr><address><small>Generated on Fri Feb 4 18:39:10 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/metadata_8h.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/metadata_8h.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/metadata_8h.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -71,7 +71,7 @@
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__level1.html#a6">FLAC__metadata_simple_iterator_is_writable</a> (const <a class="el" href="group__flac__metadata__level1.html#a0">FLAC__Metadata_SimpleIterator</a> *iterator)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__level1.html#a7">FLAC__metadata_simple_iterator_next</a> (<a class="el" href="group__flac__metadata__level1.html#a0">FLAC__Metadata_SimpleIterator</a> *iterator)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__level1.html#a8">FLAC__metadata_simple_iterator_prev</a> (<a class="el" href="group__flac__metadata__level1.html#a0">FLAC__Metadata_SimpleIterator</a> *iterator)</td></tr>
-<tr><td nowrap align=right valign=top><a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> </td><td valign=bottom><a class="el" href="group__flac__metadata__level1.html#a9">FLAC__metadata_simple_iterator_get_block_type</a> (const <a class="el" href="group__flac__metadata__level1.html#a0">FLAC__Metadata_SimpleIterator</a> *iterator)</td></tr>
+<tr><td nowrap align=right valign=top><a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> </td><td valign=bottom><a class="el" href="group__flac__metadata__level1.html#a9">FLAC__metadata_simple_iterator_get_block_type</a> (const <a class="el" href="group__flac__metadata__level1.html#a0">FLAC__Metadata_SimpleIterator</a> *iterator)</td></tr>
<tr><td nowrap align=right valign=top><a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> * </td><td valign=bottom><a class="el" href="group__flac__metadata__level1.html#a10">FLAC__metadata_simple_iterator_get_block</a> (<a class="el" href="group__flac__metadata__level1.html#a0">FLAC__Metadata_SimpleIterator</a> *iterator)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__level1.html#a11">FLAC__metadata_simple_iterator_set_block</a> (<a class="el" href="group__flac__metadata__level1.html#a0">FLAC__Metadata_SimpleIterator</a> *iterator, <a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *block, FLAC__bool use_padding)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__level1.html#a12">FLAC__metadata_simple_iterator_insert_block_after</a> (<a class="el" href="group__flac__metadata__level1.html#a0">FLAC__Metadata_SimpleIterator</a> *iterator, <a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *block, FLAC__bool use_padding)</td></tr>
@@ -92,13 +92,13 @@
<tr><td nowrap align=right valign=top>void </td><td valign=bottom><a class="el" href="group__flac__metadata__level2.html#a16">FLAC__metadata_iterator_init</a> (<a class="el" href="group__flac__metadata__level2.html#a1">FLAC__Metadata_Iterator</a> *iterator, <a class="el" href="group__flac__metadata__level2.html#a0">FLAC__Metadata_Chain</a> *chain)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__level2.html#a17">FLAC__metadata_iterator_next</a> (<a class="el" href="group__flac__metadata__level2.html#a1">FLAC__Metadata_Iterator</a> *iterator)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__level2.html#a18">FLAC__metadata_iterator_prev</a> (<a class="el" href="group__flac__metadata__level2.html#a1">FLAC__Metadata_Iterator</a> *iterator)</td></tr>
-<tr><td nowrap align=right valign=top><a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> </td><td valign=bottom><a class="el" href="group__flac__metadata__level2.html#a19">FLAC__metadata_iterator_get_block_type</a> (const <a class="el" href="group__flac__metadata__level2.html#a1">FLAC__Metadata_Iterator</a> *iterator)</td></tr>
+<tr><td nowrap align=right valign=top><a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> </td><td valign=bottom><a class="el" href="group__flac__metadata__level2.html#a19">FLAC__metadata_iterator_get_block_type</a> (const <a class="el" href="group__flac__metadata__level2.html#a1">FLAC__Metadata_Iterator</a> *iterator)</td></tr>
<tr><td nowrap align=right valign=top><a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> * </td><td valign=bottom><a class="el" href="group__flac__metadata__level2.html#a20">FLAC__metadata_iterator_get_block</a> (<a class="el" href="group__flac__metadata__level2.html#a1">FLAC__Metadata_Iterator</a> *iterator)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__level2.html#a21">FLAC__metadata_iterator_set_block</a> (<a class="el" href="group__flac__metadata__level2.html#a1">FLAC__Metadata_Iterator</a> *iterator, <a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *block)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__level2.html#a22">FLAC__metadata_iterator_delete_block</a> (<a class="el" href="group__flac__metadata__level2.html#a1">FLAC__Metadata_Iterator</a> *iterator, FLAC__bool replace_with_padding)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__level2.html#a23">FLAC__metadata_iterator_insert_block_before</a> (<a class="el" href="group__flac__metadata__level2.html#a1">FLAC__Metadata_Iterator</a> *iterator, <a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *block)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__level2.html#a24">FLAC__metadata_iterator_insert_block_after</a> (<a class="el" href="group__flac__metadata__level2.html#a1">FLAC__Metadata_Iterator</a> *iterator, <a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *block)</td></tr>
-<tr><td nowrap align=right valign=top><a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> * </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a0">FLAC__metadata_object_new</a> (<a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> type)</td></tr>
+<tr><td nowrap align=right valign=top><a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> * </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a0">FLAC__metadata_object_new</a> (<a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> type)</td></tr>
<tr><td nowrap align=right valign=top><a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> * </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a1">FLAC__metadata_object_clone</a> (const <a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)</td></tr>
<tr><td nowrap align=right valign=top>void </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a2">FLAC__metadata_object_delete</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a3">FLAC__metadata_object_is_equal</a> (const <a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *block1, const <a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *block2)</td></tr>
@@ -117,23 +117,27 @@
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a16">FLAC__metadata_object_vorbiscomment_resize_comments</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned new_num_comments)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a17">FLAC__metadata_object_vorbiscomment_set_comment</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned comment_num, <a class="el" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> entry, FLAC__bool copy)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a18">FLAC__metadata_object_vorbiscomment_insert_comment</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned comment_num, <a class="el" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> entry, FLAC__bool copy)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a19">FLAC__metadata_object_vorbiscomment_delete_comment</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned comment_num)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a20">FLAC__metadata_object_vorbiscomment_entry_matches</a> (const <a class="el" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> *entry, const char *field_name, unsigned field_name_length)</td></tr>
-<tr><td nowrap align=right valign=top>int </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a21">FLAC__metadata_object_vorbiscomment_find_entry_from</a> (const <a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned offset, const char *field_name)</td></tr>
-<tr><td nowrap align=right valign=top>int </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a22">FLAC__metadata_object_vorbiscomment_remove_entry_matching</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, const char *field_name)</td></tr>
-<tr><td nowrap align=right valign=top>int </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a23">FLAC__metadata_object_vorbiscomment_remove_entries_matching</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, const char *field_name)</td></tr>
-<tr><td nowrap align=right valign=top><a class="el" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> * </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a24">FLAC__metadata_object_cuesheet_track_new</a> ()</td></tr>
-<tr><td nowrap align=right valign=top><a class="el" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> * </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a25">FLAC__metadata_object_cuesheet_track_clone</a> (const <a class="el" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> *object)</td></tr>
-<tr><td nowrap align=right valign=top>void </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a26">FLAC__metadata_object_cuesheet_track_delete</a> (<a class="el" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> *object)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a27">FLAC__metadata_object_cuesheet_track_resize_indices</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned track_num, unsigned new_num_indices)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a28">FLAC__metadata_object_cuesheet_track_insert_index</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned track_num, unsigned index_num, <a class="el" href="structFLAC____StreamMetadata__CueSheet__Index.html">FLAC__StreamMetadata_CueSheet_Index</a> index)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a29">FLAC__metadata_object_cuesheet_track_insert_blank_index</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned track_num, unsigned index_num)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a30">FLAC__metadata_object_cuesheet_track_delete_index</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned track_num, unsigned index_num)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a31">FLAC__metadata_object_cuesheet_resize_tracks</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned new_num_tracks)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a32">FLAC__metadata_object_cuesheet_insert_track</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned track_num, <a class="el" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> *track, FLAC__bool copy)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a33">FLAC__metadata_object_cuesheet_insert_blank_track</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned track_num)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a34">FLAC__metadata_object_cuesheet_delete_track</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned track_num)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a35">FLAC__metadata_object_cuesheet_is_legal</a> (const <a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, FLAC__bool check_cd_da_subset, const char **violation)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a19">FLAC__metadata_object_vorbiscomment_append_comment</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <a class="el" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> entry, FLAC__bool copy)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a20">FLAC__metadata_object_vorbiscomment_replace_comment</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, <a class="el" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> entry, FLAC__bool all, FLAC__bool copy)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a21">FLAC__metadata_object_vorbiscomment_delete_comment</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned comment_num)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a22">FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair</a> (<a class="el" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> *entry, const char *field_name, const char *field_value)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a23">FLAC__metadata_object_vorbiscomment_entry_to_name_value_pair</a> (const <a class="el" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> entry, char **field_name, char **field_value)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a24">FLAC__metadata_object_vorbiscomment_entry_matches</a> (const <a class="el" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a> entry, const char *field_name, unsigned field_name_length)</td></tr>
+<tr><td nowrap align=right valign=top>int </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a25">FLAC__metadata_object_vorbiscomment_find_entry_from</a> (const <a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned offset, const char *field_name)</td></tr>
+<tr><td nowrap align=right valign=top>int </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a26">FLAC__metadata_object_vorbiscomment_remove_entry_matching</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, const char *field_name)</td></tr>
+<tr><td nowrap align=right valign=top>int </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a27">FLAC__metadata_object_vorbiscomment_remove_entries_matching</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, const char *field_name)</td></tr>
+<tr><td nowrap align=right valign=top><a class="el" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> * </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a28">FLAC__metadata_object_cuesheet_track_new</a> ()</td></tr>
+<tr><td nowrap align=right valign=top><a class="el" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> * </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a29">FLAC__metadata_object_cuesheet_track_clone</a> (const <a class="el" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> *object)</td></tr>
+<tr><td nowrap align=right valign=top>void </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a30">FLAC__metadata_object_cuesheet_track_delete</a> (<a class="el" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> *object)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a31">FLAC__metadata_object_cuesheet_track_resize_indices</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned track_num, unsigned new_num_indices)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a32">FLAC__metadata_object_cuesheet_track_insert_index</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned track_num, unsigned index_num, <a class="el" href="structFLAC____StreamMetadata__CueSheet__Index.html">FLAC__StreamMetadata_CueSheet_Index</a> index)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a33">FLAC__metadata_object_cuesheet_track_insert_blank_index</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned track_num, unsigned index_num)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a34">FLAC__metadata_object_cuesheet_track_delete_index</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned track_num, unsigned index_num)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a35">FLAC__metadata_object_cuesheet_resize_tracks</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned new_num_tracks)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a36">FLAC__metadata_object_cuesheet_insert_track</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned track_num, <a class="el" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a> *track, FLAC__bool copy)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a37">FLAC__metadata_object_cuesheet_insert_blank_track</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned track_num)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a38">FLAC__metadata_object_cuesheet_delete_track</a> (<a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, unsigned track_num)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__metadata__object.html#a39">FLAC__metadata_object_cuesheet_is_legal</a> (const <a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a> *object, FLAC__bool check_cd_da_subset, const char **violation)</td></tr>
<tr><td colspan=2><br><h2>Variables</h2></td></tr>
<tr><td nowrap align=right valign=top>const char *const </td><td valign=bottom><a class="el" href="group__flac__metadata__level1.html#a1">FLAC__Metadata_SimpleIteratorStatusString</a> []</td></tr>
<tr><td nowrap align=right valign=top>const char *const </td><td valign=bottom><a class="el" href="group__flac__metadata__level2.html#a2">FLAC__Metadata_ChainStatusString</a> []</td></tr>
@@ -147,7 +151,7 @@
<p>
See the detailed documentation for each interface in the <a class="el" href="group__flac__metadata.html">metadata</a> module.
<p>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:12 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/modules.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/modules.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/modules.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -82,7 +82,7 @@
</ul>
</ul>
</ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:48 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:23 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/ordinals_8h-source.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/ordinals_8h-source.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/ordinals_8h-source.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,7 +7,7 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>include/FLAC/ordinals.h</h1><div class="fragment"><pre>00001 <font class="comment">/* libFLAC - Free Lossless Audio Codec library</font>
-00002 <font class="comment"> * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson</font>
+00002 <font class="comment"> * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson</font>
00003 <font class="comment"> *</font>
00004 <font class="comment"> * Redistribution and use in source and binary forms, with or without</font>
00005 <font class="comment"> * modification, are permitted provided that the following conditions</font>
@@ -66,21 +66,20 @@
00058 <font class="keyword">typedef</font> <font class="keywordtype">int</font> FLAC__bool;
00059
00060 <font class="keyword">typedef</font> FLAC__uint8 FLAC__byte;
-00061 <font class="keyword">typedef</font> <font class="keywordtype">float</font> FLAC__real;
-00062
-00063 <font class="preprocessor">#ifdef true</font>
-00064 <font class="preprocessor"></font><font class="preprocessor">#undef true</font>
-00065 <font class="preprocessor"></font><font class="preprocessor">#endif</font>
-00066 <font class="preprocessor"></font><font class="preprocessor">#ifdef false</font>
-00067 <font class="preprocessor"></font><font class="preprocessor">#undef false</font>
-00068 <font class="preprocessor"></font><font class="preprocessor">#endif</font>
-00069 <font class="preprocessor"></font><font class="preprocessor">#ifndef __cplusplus</font>
-00070 <font class="preprocessor"></font><font class="preprocessor">#define true 1</font>
-00071 <font class="preprocessor"></font><font class="preprocessor">#define false 0</font>
-00072 <font class="preprocessor"></font><font class="preprocessor">#endif</font>
-00073 <font class="preprocessor"></font>
-00074 <font class="preprocessor">#endif</font>
-</pre></div><hr><address><small>Generated on Tue Sep 28 21:19:41 2004 for FLAC by
+00061
+00062 <font class="preprocessor">#ifdef true</font>
+00063 <font class="preprocessor"></font><font class="preprocessor">#undef true</font>
+00064 <font class="preprocessor"></font><font class="preprocessor">#endif</font>
+00065 <font class="preprocessor"></font><font class="preprocessor">#ifdef false</font>
+00066 <font class="preprocessor"></font><font class="preprocessor">#undef false</font>
+00067 <font class="preprocessor"></font><font class="preprocessor">#endif</font>
+00068 <font class="preprocessor"></font><font class="preprocessor">#ifndef __cplusplus</font>
+00069 <font class="preprocessor"></font><font class="preprocessor">#define true 1</font>
+00070 <font class="preprocessor"></font><font class="preprocessor">#define false 0</font>
+00071 <font class="preprocessor"></font><font class="preprocessor">#endif</font>
+00072 <font class="preprocessor"></font>
+00073 <font class="preprocessor">#endif</font>
+</pre></div><hr><address><small>Generated on Fri Feb 4 18:39:10 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/seekable__stream__decoder_8h-source.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/seekable__stream__decoder_8h-source.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/seekable__stream__decoder_8h-source.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -7,7 +7,7 @@
<center>
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>include/FLAC/seekable_stream_decoder.h</h1><a href="seekable__stream__decoder_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre>00001 <font class="comment">/* libFLAC - Free Lossless Audio Codec library</font>
-00002 <font class="comment"> * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson</font>
+00002 <font class="comment"> * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson</font>
00003 <font class="comment"> *</font>
00004 <font class="comment"> * Redistribution and use in source and binary forms, with or without</font>
00005 <font class="comment"> * modification, are permitted provided that the following conditions</font>
@@ -168,13 +168,13 @@
00576
00589 FLAC_API FLAC__bool <a class="code" href="seekable__stream__decoder_8h.html#a24">FLAC__seekable_stream_decoder_set_client_data</a>(<a class="code" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder, <font class="keywordtype">void</font> *value);
00590
-00604 FLAC_API FLAC__bool <a class="code" href="seekable__stream__decoder_8h.html#a25">FLAC__seekable_stream_decoder_set_metadata_respond</a>(<a class="code" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder, <a class="code" href="format_8h.html#a94">FLAC__MetadataType</a> type);
+00604 FLAC_API FLAC__bool <a class="code" href="seekable__stream__decoder_8h.html#a25">FLAC__seekable_stream_decoder_set_metadata_respond</a>(<a class="code" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder, <a class="code" href="format_8h.html#a97">FLAC__MetadataType</a> type);
00605
00619 FLAC_API FLAC__bool <a class="code" href="seekable__stream__decoder_8h.html#a26">FLAC__seekable_stream_decoder_set_metadata_respond_application</a>(<a class="code" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder, <font class="keyword">const</font> FLAC__byte id[4]);
00620
00632 FLAC_API FLAC__bool <a class="code" href="seekable__stream__decoder_8h.html#a27">FLAC__seekable_stream_decoder_set_metadata_respond_all</a>(<a class="code" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder);
00633
-00647 FLAC_API FLAC__bool <a class="code" href="seekable__stream__decoder_8h.html#a28">FLAC__seekable_stream_decoder_set_metadata_ignore</a>(<a class="code" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder, <a class="code" href="format_8h.html#a94">FLAC__MetadataType</a> type);
+00647 FLAC_API FLAC__bool <a class="code" href="seekable__stream__decoder_8h.html#a28">FLAC__seekable_stream_decoder_set_metadata_ignore</a>(<a class="code" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder, <a class="code" href="format_8h.html#a97">FLAC__MetadataType</a> type);
00648
00662 FLAC_API FLAC__bool <a class="code" href="seekable__stream__decoder_8h.html#a29">FLAC__seekable_stream_decoder_set_metadata_ignore_application</a>(<a class="code" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder, <font class="keyword">const</font> FLAC__byte id[4]);
00663
@@ -190,7 +190,7 @@
00725
00735 FLAC_API <font class="keywordtype">unsigned</font> <a class="code" href="seekable__stream__decoder_8h.html#a35">FLAC__seekable_stream_decoder_get_channels</a>(<font class="keyword">const</font> <a class="code" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder);
00736
-00746 FLAC_API <a class="code" href="format_8h.html#a92">FLAC__ChannelAssignment</a> <a class="code" href="seekable__stream__decoder_8h.html#a36">FLAC__seekable_stream_decoder_get_channel_assignment</a>(<font class="keyword">const</font> <a class="code" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder);
+00746 FLAC_API <a class="code" href="format_8h.html#a95">FLAC__ChannelAssignment</a> <a class="code" href="seekable__stream__decoder_8h.html#a36">FLAC__seekable_stream_decoder_get_channel_assignment</a>(<font class="keyword">const</font> <a class="code" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder);
00747
00757 FLAC_API <font class="keywordtype">unsigned</font> <a class="code" href="seekable__stream__decoder_8h.html#a37">FLAC__seekable_stream_decoder_get_bits_per_sample</a>(<font class="keyword">const</font> <a class="code" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder);
00758
@@ -225,7 +225,7 @@
00929 <font class="preprocessor">#endif</font>
00930 <font class="preprocessor"></font>
00931 <font class="preprocessor">#endif</font>
-</pre></div><hr><address><small>Generated on Tue Sep 28 21:19:41 2004 for FLAC by
+</pre></div><hr><address><small>Generated on Fri Feb 4 18:39:10 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/seekable__stream__decoder_8h.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/seekable__stream__decoder_8h.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/seekable__stream__decoder_8h.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -66,10 +66,10 @@
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a22">FLAC__seekable_stream_decoder_set_metadata_callback</a> (<a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder, <a class="el" href="group__flac__seekable__stream__decoder.html#a11">FLAC__SeekableStreamDecoderMetadataCallback</a> value)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a23">FLAC__seekable_stream_decoder_set_error_callback</a> (<a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder, <a class="el" href="group__flac__seekable__stream__decoder.html#a12">FLAC__SeekableStreamDecoderErrorCallback</a> value)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a24">FLAC__seekable_stream_decoder_set_client_data</a> (<a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder, void *value)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a25">FLAC__seekable_stream_decoder_set_metadata_respond</a> (<a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder, <a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> type)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a25">FLAC__seekable_stream_decoder_set_metadata_respond</a> (<a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder, <a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> type)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a26">FLAC__seekable_stream_decoder_set_metadata_respond_application</a> (<a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder, const FLAC__byte id[4])</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a27">FLAC__seekable_stream_decoder_set_metadata_respond_all</a> (<a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder)</td></tr>
-<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a28">FLAC__seekable_stream_decoder_set_metadata_ignore</a> (<a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder, <a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> type)</td></tr>
+<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a28">FLAC__seekable_stream_decoder_set_metadata_ignore</a> (<a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder, <a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> type)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a29">FLAC__seekable_stream_decoder_set_metadata_ignore_application</a> (<a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder, const FLAC__byte id[4])</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a30">FLAC__seekable_stream_decoder_set_metadata_ignore_all</a> (<a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top><a class="el" href="group__flac__seekable__stream__decoder.html#a50">FLAC__SeekableStreamDecoderState</a> </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a31">FLAC__seekable_stream_decoder_get_state</a> (const <a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder)</td></tr>
@@ -77,7 +77,7 @@
<tr><td nowrap align=right valign=top>const char * </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a33">FLAC__seekable_stream_decoder_get_resolved_state_string</a> (const <a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a34">FLAC__seekable_stream_decoder_get_md5_checking</a> (const <a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>unsigned </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a35">FLAC__seekable_stream_decoder_get_channels</a> (const <a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder)</td></tr>
-<tr><td nowrap align=right valign=top><a class="el" href="group__flac__format.html#a92">FLAC__ChannelAssignment</a> </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a36">FLAC__seekable_stream_decoder_get_channel_assignment</a> (const <a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder)</td></tr>
+<tr><td nowrap align=right valign=top><a class="el" href="group__flac__format.html#a95">FLAC__ChannelAssignment</a> </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a36">FLAC__seekable_stream_decoder_get_channel_assignment</a> (const <a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>unsigned </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a37">FLAC__seekable_stream_decoder_get_bits_per_sample</a> (const <a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>unsigned </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a38">FLAC__seekable_stream_decoder_get_sample_rate</a> (const <a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder)</td></tr>
<tr><td nowrap align=right valign=top>unsigned </td><td valign=bottom><a class="el" href="group__flac__seekable__stream__decoder.html#a39">FLAC__seekable_stream_decoder_get_blocksize</a> (const <a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a> *decoder)</td></tr>
@@ -107,7 +107,7 @@
<p>
See the detailed documentation in the <a class="el" href="group__flac__seekable__stream__decoder.html">seekable stream decoder</a> module.
<p>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:12 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____EntropyCodingMethod-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____EntropyCodingMethod-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____EntropyCodingMethod-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -10,7 +10,7 @@
<tr bgcolor="#f0f0f0"><td><b>data</b> (defined in <a class="el" href="structFLAC____EntropyCodingMethod.html">FLAC__EntropyCodingMethod</a>)</td><td><a class="el" href="structFLAC____EntropyCodingMethod.html">FLAC__EntropyCodingMethod</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>partitioned_rice</b> (defined in <a class="el" href="structFLAC____EntropyCodingMethod.html">FLAC__EntropyCodingMethod</a>)</td><td><a class="el" href="structFLAC____EntropyCodingMethod.html">FLAC__EntropyCodingMethod</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>type</b> (defined in <a class="el" href="structFLAC____EntropyCodingMethod.html">FLAC__EntropyCodingMethod</a>)</td><td><a class="el" href="structFLAC____EntropyCodingMethod.html">FLAC__EntropyCodingMethod</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____EntropyCodingMethod.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____EntropyCodingMethod.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____EntropyCodingMethod.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -14,7 +14,7 @@
<a href="structFLAC____EntropyCodingMethod-members.html">List of all members.</a><table border=0 cellpadding=0 cellspacing=0>
<tr><td colspan=2><br><h2>Public Attributes</h2></td></tr>
<tr><td nowrap align=right valign=top><a name="m0" doxytag="FLAC__EntropyCodingMethod::type"></a>
-<a class="el" href="group__flac__format.html#a90">FLAC__EntropyCodingMethodType</a> </td><td valign=bottom><b>type</b></td></tr>
+<a class="el" href="group__flac__format.html#a93">FLAC__EntropyCodingMethodType</a> </td><td valign=bottom><b>type</b></td></tr>
<tr><td nowrap><a name="m2" doxytag="FLAC__EntropyCodingMethod::data"></a>
union {</td></tr>
<tr><td nowrap> <a class="el" href="structFLAC____EntropyCodingMethod__PartitionedRice.html">FLAC__EntropyCodingMethod_PartitionedRice</a> <b>partitioned_rice</b></td></tr>
@@ -25,7 +25,7 @@
<p>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/FLAC/<a class="el" href="format_8h-source.html">format.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____EntropyCodingMethod__PartitionedRice-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____EntropyCodingMethod__PartitionedRice-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____EntropyCodingMethod__PartitionedRice-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -9,7 +9,7 @@
<hr><h1>FLAC__EntropyCodingMethod_PartitionedRice Member List</h1>This is the complete list of members for <a class="el" href="structFLAC____EntropyCodingMethod__PartitionedRice.html">FLAC__EntropyCodingMethod_PartitionedRice</a>, including all inherited members.<table>
<tr bgcolor="#f0f0f0"><td><a class="el" href="structFLAC____EntropyCodingMethod__PartitionedRice.html#m1">contents</a></td><td><a class="el" href="structFLAC____EntropyCodingMethod__PartitionedRice.html">FLAC__EntropyCodingMethod_PartitionedRice</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="structFLAC____EntropyCodingMethod__PartitionedRice.html#m0">order</a></td><td><a class="el" href="structFLAC____EntropyCodingMethod__PartitionedRice.html">FLAC__EntropyCodingMethod_PartitionedRice</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____EntropyCodingMethod__PartitionedRice.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____EntropyCodingMethod__PartitionedRice.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____EntropyCodingMethod__PartitionedRice.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -66,7 +66,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/FLAC/<a class="el" href="format_8h-source.html">format.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -10,7 +10,7 @@
<tr bgcolor="#f0f0f0"><td><a class="el" href="structFLAC____EntropyCodingMethod__PartitionedRiceContents.html#m2">capacity_by_order</a></td><td><a class="el" href="structFLAC____EntropyCodingMethod__PartitionedRiceContents.html">FLAC__EntropyCodingMethod_PartitionedRiceContents</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="structFLAC____EntropyCodingMethod__PartitionedRiceContents.html#m0">parameters</a></td><td><a class="el" href="structFLAC____EntropyCodingMethod__PartitionedRiceContents.html">FLAC__EntropyCodingMethod_PartitionedRiceContents</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="structFLAC____EntropyCodingMethod__PartitionedRiceContents.html#m1">raw_bits</a></td><td><a class="el" href="structFLAC____EntropyCodingMethod__PartitionedRiceContents.html">FLAC__EntropyCodingMethod_PartitionedRiceContents</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -89,7 +89,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/FLAC/<a class="el" href="format_8h-source.html">format.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____FileDecoder-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____FileDecoder-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____FileDecoder-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -9,7 +9,7 @@
<hr><h1>FLAC__FileDecoder Member List</h1>This is the complete list of members for <a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a>, including all inherited members.<table>
<tr bgcolor="#f0f0f0"><td><b>private_</b> (defined in <a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a>)</td><td><a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>protected_</b> (defined in <a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a>)</td><td><a class="el" href="structFLAC____FileDecoder.html">FLAC__FileDecoder</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____FileDecoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____FileDecoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____FileDecoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -23,7 +23,7 @@
<p>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/FLAC/<a class="el" href="file__decoder_8h-source.html">file_decoder.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____FileEncoder-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____FileEncoder-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____FileEncoder-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -9,7 +9,7 @@
<hr><h1>FLAC__FileEncoder Member List</h1>This is the complete list of members for <a class="el" href="structFLAC____FileEncoder.html">FLAC__FileEncoder</a>, including all inherited members.<table>
<tr bgcolor="#f0f0f0"><td><b>private_</b> (defined in <a class="el" href="structFLAC____FileEncoder.html">FLAC__FileEncoder</a>)</td><td><a class="el" href="structFLAC____FileEncoder.html">FLAC__FileEncoder</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>protected_</b> (defined in <a class="el" href="structFLAC____FileEncoder.html">FLAC__FileEncoder</a>)</td><td><a class="el" href="structFLAC____FileEncoder.html">FLAC__FileEncoder</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____FileEncoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____FileEncoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____FileEncoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -23,7 +23,7 @@
<p>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/FLAC/<a class="el" href="FLAC_2file__encoder_8h-source.html">file_encoder.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Frame-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Frame-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Frame-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -10,7 +10,7 @@
<tr bgcolor="#f0f0f0"><td><b>footer</b> (defined in <a class="el" href="structFLAC____Frame.html">FLAC__Frame</a>)</td><td><a class="el" href="structFLAC____Frame.html">FLAC__Frame</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>header</b> (defined in <a class="el" href="structFLAC____Frame.html">FLAC__Frame</a>)</td><td><a class="el" href="structFLAC____Frame.html">FLAC__Frame</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>subframes</b> (defined in <a class="el" href="structFLAC____Frame.html">FLAC__Frame</a>)</td><td><a class="el" href="structFLAC____Frame.html">FLAC__Frame</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Frame.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Frame.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Frame.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -25,7 +25,7 @@
<p>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/FLAC/<a class="el" href="format_8h-source.html">format.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____FrameFooter-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____FrameFooter-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____FrameFooter-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -8,7 +8,7 @@
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>FLAC__FrameFooter Member List</h1>This is the complete list of members for <a class="el" href="structFLAC____FrameFooter.html">FLAC__FrameFooter</a>, including all inherited members.<table>
<tr bgcolor="#f0f0f0"><td><a class="el" href="structFLAC____FrameFooter.html#m0">crc</a></td><td><a class="el" href="structFLAC____FrameFooter.html">FLAC__FrameFooter</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____FrameFooter.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____FrameFooter.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____FrameFooter.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -43,7 +43,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/FLAC/<a class="el" href="format_8h-source.html">format.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____FrameHeader-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____FrameHeader-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____FrameHeader-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -17,7 +17,7 @@
<tr bgcolor="#f0f0f0"><td><a class="el" href="structFLAC____FrameHeader.html#m5">number_type</a></td><td><a class="el" href="structFLAC____FrameHeader.html">FLAC__FrameHeader</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>sample_number</b> (defined in <a class="el" href="structFLAC____FrameHeader.html">FLAC__FrameHeader</a>)</td><td><a class="el" href="structFLAC____FrameHeader.html">FLAC__FrameHeader</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="structFLAC____FrameHeader.html#m1">sample_rate</a></td><td><a class="el" href="structFLAC____FrameHeader.html">FLAC__FrameHeader</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____FrameHeader.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____FrameHeader.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____FrameHeader.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -16,9 +16,9 @@
<tr><td nowrap align=right valign=top>unsigned </td><td valign=bottom><a class="el" href="structFLAC____FrameHeader.html#m0">blocksize</a></td></tr>
<tr><td nowrap align=right valign=top>unsigned </td><td valign=bottom><a class="el" href="structFLAC____FrameHeader.html#m1">sample_rate</a></td></tr>
<tr><td nowrap align=right valign=top>unsigned </td><td valign=bottom><a class="el" href="structFLAC____FrameHeader.html#m2">channels</a></td></tr>
-<tr><td nowrap align=right valign=top><a class="el" href="group__flac__format.html#a92">FLAC__ChannelAssignment</a> </td><td valign=bottom><a class="el" href="structFLAC____FrameHeader.html#m3">channel_assignment</a></td></tr>
+<tr><td nowrap align=right valign=top><a class="el" href="group__flac__format.html#a95">FLAC__ChannelAssignment</a> </td><td valign=bottom><a class="el" href="structFLAC____FrameHeader.html#m3">channel_assignment</a></td></tr>
<tr><td nowrap align=right valign=top>unsigned </td><td valign=bottom><a class="el" href="structFLAC____FrameHeader.html#m4">bits_per_sample</a></td></tr>
-<tr><td nowrap align=right valign=top><a class="el" href="group__flac__format.html#a93">FLAC__FrameNumberType</a> </td><td valign=bottom><a class="el" href="structFLAC____FrameHeader.html#m5">number_type</a></td></tr>
+<tr><td nowrap align=right valign=top><a class="el" href="group__flac__format.html#a96">FLAC__FrameNumberType</a> </td><td valign=bottom><a class="el" href="structFLAC____FrameHeader.html#m5">number_type</a></td></tr>
<tr><td nowrap>union {</td></tr>
<tr><td nowrap> FLAC__uint32 <b>frame_number</b></td></tr>
<tr><td nowrap> FLAC__uint64 <b>sample_number</b></td></tr>
@@ -101,7 +101,7 @@
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> <a class="el" href="group__flac__format.html#a92">FLAC__ChannelAssignment</a> FLAC__FrameHeader::channel_assignment
+ <td class="md" nowrap valign="top"> <a class="el" href="group__flac__format.html#a95">FLAC__ChannelAssignment</a> FLAC__FrameHeader::channel_assignment
</table>
</td>
</tr>
@@ -145,7 +145,7 @@
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> <a class="el" href="group__flac__format.html#a93">FLAC__FrameNumberType</a> FLAC__FrameHeader::number_type
+ <td class="md" nowrap valign="top"> <a class="el" href="group__flac__format.html#a96">FLAC__FrameNumberType</a> FLAC__FrameHeader::number_type
</table>
</td>
</tr>
@@ -207,7 +207,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/FLAC/<a class="el" href="format_8h-source.html">format.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____IOCallbacks-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____IOCallbacks-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____IOCallbacks-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -13,7 +13,7 @@
<tr bgcolor="#f0f0f0"><td><b>seek</b> (defined in <a class="el" href="structFLAC____IOCallbacks.html">FLAC__IOCallbacks</a>)</td><td><a class="el" href="structFLAC____IOCallbacks.html">FLAC__IOCallbacks</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>tell</b> (defined in <a class="el" href="structFLAC____IOCallbacks.html">FLAC__IOCallbacks</a>)</td><td><a class="el" href="structFLAC____IOCallbacks.html">FLAC__IOCallbacks</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>write</b> (defined in <a class="el" href="structFLAC____IOCallbacks.html">FLAC__IOCallbacks</a>)</td><td><a class="el" href="structFLAC____IOCallbacks.html">FLAC__IOCallbacks</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____IOCallbacks.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____IOCallbacks.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____IOCallbacks.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -33,7 +33,7 @@
<p>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/FLAC/<a class="el" href="callback_8h-source.html">callback.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____SeekableStreamDecoder-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____SeekableStreamDecoder-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____SeekableStreamDecoder-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -9,7 +9,7 @@
<hr><h1>FLAC__SeekableStreamDecoder Member List</h1>This is the complete list of members for <a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a>, including all inherited members.<table>
<tr bgcolor="#f0f0f0"><td><b>private_</b> (defined in <a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a>)</td><td><a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>protected_</b> (defined in <a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a>)</td><td><a class="el" href="structFLAC____SeekableStreamDecoder.html">FLAC__SeekableStreamDecoder</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____SeekableStreamDecoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____SeekableStreamDecoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____SeekableStreamDecoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -23,7 +23,7 @@
<p>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/FLAC/<a class="el" href="seekable__stream__decoder_8h-source.html">seekable_stream_decoder.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____SeekableStreamEncoder-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____SeekableStreamEncoder-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____SeekableStreamEncoder-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -9,7 +9,7 @@
<hr><h1>FLAC__SeekableStreamEncoder Member List</h1>This is the complete list of members for <a class="el" href="structFLAC____SeekableStreamEncoder.html">FLAC__SeekableStreamEncoder</a>, including all inherited members.<table>
<tr bgcolor="#f0f0f0"><td><b>private_</b> (defined in <a class="el" href="structFLAC____SeekableStreamEncoder.html">FLAC__SeekableStreamEncoder</a>)</td><td><a class="el" href="structFLAC____SeekableStreamEncoder.html">FLAC__SeekableStreamEncoder</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>protected_</b> (defined in <a class="el" href="structFLAC____SeekableStreamEncoder.html">FLAC__SeekableStreamEncoder</a>)</td><td><a class="el" href="structFLAC____SeekableStreamEncoder.html">FLAC__SeekableStreamEncoder</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____SeekableStreamEncoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____SeekableStreamEncoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____SeekableStreamEncoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -23,7 +23,7 @@
<p>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/FLAC/<a class="el" href="FLAC_2seekable__stream__encoder_8h-source.html">seekable_stream_encoder.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamDecoder-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamDecoder-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamDecoder-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -9,7 +9,7 @@
<hr><h1>FLAC__StreamDecoder Member List</h1>This is the complete list of members for <a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a>, including all inherited members.<table>
<tr bgcolor="#f0f0f0"><td><b>private_</b> (defined in <a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a>)</td><td><a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>protected_</b> (defined in <a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a>)</td><td><a class="el" href="structFLAC____StreamDecoder.html">FLAC__StreamDecoder</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamDecoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamDecoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamDecoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -23,7 +23,7 @@
<p>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/FLAC/<a class="el" href="FLAC_2stream__decoder_8h-source.html">stream_decoder.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamEncoder-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamEncoder-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamEncoder-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -9,7 +9,7 @@
<hr><h1>FLAC__StreamEncoder Member List</h1>This is the complete list of members for <a class="el" href="structFLAC____StreamEncoder.html">FLAC__StreamEncoder</a>, including all inherited members.<table>
<tr bgcolor="#f0f0f0"><td><b>private_</b> (defined in <a class="el" href="structFLAC____StreamEncoder.html">FLAC__StreamEncoder</a>)</td><td><a class="el" href="structFLAC____StreamEncoder.html">FLAC__StreamEncoder</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>protected_</b> (defined in <a class="el" href="structFLAC____StreamEncoder.html">FLAC__StreamEncoder</a>)</td><td><a class="el" href="structFLAC____StreamEncoder.html">FLAC__StreamEncoder</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamEncoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamEncoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamEncoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -23,7 +23,7 @@
<p>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/FLAC/<a class="el" href="FLAC_2stream__encoder_8h-source.html">stream_encoder.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -18,7 +18,7 @@
<tr bgcolor="#f0f0f0"><td><a class="el" href="structFLAC____StreamMetadata.html#m0">type</a></td><td><a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>unknown</b> (defined in <a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a>)</td><td><a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>vorbis_comment</b> (defined in <a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a>)</td><td><a class="el" href="structFLAC____StreamMetadata.html">FLAC__StreamMetadata</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -13,7 +13,7 @@
<p>
<a href="structFLAC____StreamMetadata-members.html">List of all members.</a><table border=0 cellpadding=0 cellspacing=0>
<tr><td colspan=2><br><h2>Public Attributes</h2></td></tr>
-<tr><td nowrap align=right valign=top><a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> </td><td valign=bottom><a class="el" href="structFLAC____StreamMetadata.html#m0">type</a></td></tr>
+<tr><td nowrap align=right valign=top><a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> </td><td valign=bottom><a class="el" href="structFLAC____StreamMetadata.html#m0">type</a></td></tr>
<tr><td nowrap align=right valign=top>FLAC__bool </td><td valign=bottom><a class="el" href="structFLAC____StreamMetadata.html#m1">is_last</a></td></tr>
<tr><td nowrap align=right valign=top>unsigned </td><td valign=bottom><a class="el" href="structFLAC____StreamMetadata.html#m2">length</a></td></tr>
<tr><td nowrap>union {</td></tr>
@@ -36,7 +36,7 @@
<td class="md">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> <a class="el" href="group__flac__format.html#a94">FLAC__MetadataType</a> FLAC__StreamMetadata::type
+ <td class="md" nowrap valign="top"> <a class="el" href="group__flac__format.html#a97">FLAC__MetadataType</a> FLAC__StreamMetadata::type
</table>
</td>
</tr>
@@ -120,7 +120,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/FLAC/<a class="el" href="format_8h-source.html">format.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__Application-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__Application-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__Application-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -9,7 +9,7 @@
<hr><h1>FLAC__StreamMetadata_Application Member List</h1>This is the complete list of members for <a class="el" href="structFLAC____StreamMetadata__Application.html">FLAC__StreamMetadata_Application</a>, including all inherited members.<table>
<tr bgcolor="#f0f0f0"><td><b>data</b> (defined in <a class="el" href="structFLAC____StreamMetadata__Application.html">FLAC__StreamMetadata_Application</a>)</td><td><a class="el" href="structFLAC____StreamMetadata__Application.html">FLAC__StreamMetadata_Application</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>id</b> (defined in <a class="el" href="structFLAC____StreamMetadata__Application.html">FLAC__StreamMetadata_Application</a>)</td><td><a class="el" href="structFLAC____StreamMetadata__Application.html">FLAC__StreamMetadata_Application</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__Application.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__Application.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__Application.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -23,7 +23,7 @@
<p>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/FLAC/<a class="el" href="format_8h-source.html">format.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -12,7 +12,7 @@
<tr bgcolor="#f0f0f0"><td><a class="el" href="structFLAC____StreamMetadata__CueSheet.html#m0">media_catalog_number</a></td><td><a class="el" href="structFLAC____StreamMetadata__CueSheet.html">FLAC__StreamMetadata_CueSheet</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="structFLAC____StreamMetadata__CueSheet.html#m3">num_tracks</a></td><td><a class="el" href="structFLAC____StreamMetadata__CueSheet.html">FLAC__StreamMetadata_CueSheet</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="structFLAC____StreamMetadata__CueSheet.html#m4">tracks</a></td><td><a class="el" href="structFLAC____StreamMetadata__CueSheet.html">FLAC__StreamMetadata_CueSheet</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -135,7 +135,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/FLAC/<a class="el" href="format_8h-source.html">format.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet__Index-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet__Index-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet__Index-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -9,7 +9,7 @@
<hr><h1>FLAC__StreamMetadata_CueSheet_Index Member List</h1>This is the complete list of members for <a class="el" href="structFLAC____StreamMetadata__CueSheet__Index.html">FLAC__StreamMetadata_CueSheet_Index</a>, including all inherited members.<table>
<tr bgcolor="#f0f0f0"><td><a class="el" href="structFLAC____StreamMetadata__CueSheet__Index.html#m1">number</a></td><td><a class="el" href="structFLAC____StreamMetadata__CueSheet__Index.html">FLAC__StreamMetadata_CueSheet_Index</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="structFLAC____StreamMetadata__CueSheet__Index.html#m0">offset</a></td><td><a class="el" href="structFLAC____StreamMetadata__CueSheet__Index.html">FLAC__StreamMetadata_CueSheet_Index</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet__Index.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet__Index.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet__Index.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -66,7 +66,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/FLAC/<a class="el" href="format_8h-source.html">format.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet__Track-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet__Track-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet__Track-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -14,7 +14,7 @@
<tr bgcolor="#f0f0f0"><td><a class="el" href="structFLAC____StreamMetadata__CueSheet__Track.html#m0">offset</a></td><td><a class="el" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="structFLAC____StreamMetadata__CueSheet__Track.html#m4">pre_emphasis</a></td><td><a class="el" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="structFLAC____StreamMetadata__CueSheet__Track.html#m3">type</a></td><td><a class="el" href="structFLAC____StreamMetadata__CueSheet__Track.html">FLAC__StreamMetadata_CueSheet_Track</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet__Track.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet__Track.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet__Track.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -181,7 +181,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/FLAC/<a class="el" href="format_8h-source.html">format.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__Padding-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__Padding-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__Padding-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -8,7 +8,7 @@
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>FLAC__StreamMetadata_Padding Member List</h1>This is the complete list of members for <a class="el" href="structFLAC____StreamMetadata__Padding.html">FLAC__StreamMetadata_Padding</a>, including all inherited members.<table>
<tr bgcolor="#f0f0f0"><td><a class="el" href="structFLAC____StreamMetadata__Padding.html#m0">dummy</a></td><td><a class="el" href="structFLAC____StreamMetadata__Padding.html">FLAC__StreamMetadata_Padding</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__Padding.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__Padding.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__Padding.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -43,7 +43,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/FLAC/<a class="el" href="format_8h-source.html">format.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__SeekPoint-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__SeekPoint-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__SeekPoint-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -10,7 +10,7 @@
<tr bgcolor="#f0f0f0"><td><a class="el" href="structFLAC____StreamMetadata__SeekPoint.html#m2">frame_samples</a></td><td><a class="el" href="structFLAC____StreamMetadata__SeekPoint.html">FLAC__StreamMetadata_SeekPoint</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="structFLAC____StreamMetadata__SeekPoint.html#m0">sample_number</a></td><td><a class="el" href="structFLAC____StreamMetadata__SeekPoint.html">FLAC__StreamMetadata_SeekPoint</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="structFLAC____StreamMetadata__SeekPoint.html#m1">stream_offset</a></td><td><a class="el" href="structFLAC____StreamMetadata__SeekPoint.html">FLAC__StreamMetadata_SeekPoint</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__SeekPoint.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__SeekPoint.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__SeekPoint.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -89,7 +89,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/FLAC/<a class="el" href="format_8h-source.html">format.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__SeekTable-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__SeekTable-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__SeekTable-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -9,7 +9,7 @@
<hr><h1>FLAC__StreamMetadata_SeekTable Member List</h1>This is the complete list of members for <a class="el" href="structFLAC____StreamMetadata__SeekTable.html">FLAC__StreamMetadata_SeekTable</a>, including all inherited members.<table>
<tr bgcolor="#f0f0f0"><td><b>num_points</b> (defined in <a class="el" href="structFLAC____StreamMetadata__SeekTable.html">FLAC__StreamMetadata_SeekTable</a>)</td><td><a class="el" href="structFLAC____StreamMetadata__SeekTable.html">FLAC__StreamMetadata_SeekTable</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>points</b> (defined in <a class="el" href="structFLAC____StreamMetadata__SeekTable.html">FLAC__StreamMetadata_SeekTable</a>)</td><td><a class="el" href="structFLAC____StreamMetadata__SeekTable.html">FLAC__StreamMetadata_SeekTable</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__SeekTable.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__SeekTable.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__SeekTable.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -29,7 +29,7 @@
<p>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/FLAC/<a class="el" href="format_8h-source.html">format.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__StreamInfo-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__StreamInfo-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__StreamInfo-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -16,7 +16,7 @@
<tr bgcolor="#f0f0f0"><td><b>min_framesize</b> (defined in <a class="el" href="structFLAC____StreamMetadata__StreamInfo.html">FLAC__StreamMetadata_StreamInfo</a>)</td><td><a class="el" href="structFLAC____StreamMetadata__StreamInfo.html">FLAC__StreamMetadata_StreamInfo</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>sample_rate</b> (defined in <a class="el" href="structFLAC____StreamMetadata__StreamInfo.html">FLAC__StreamMetadata_StreamInfo</a>)</td><td><a class="el" href="structFLAC____StreamMetadata__StreamInfo.html">FLAC__StreamMetadata_StreamInfo</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>total_samples</b> (defined in <a class="el" href="structFLAC____StreamMetadata__StreamInfo.html">FLAC__StreamMetadata_StreamInfo</a>)</td><td><a class="el" href="structFLAC____StreamMetadata__StreamInfo.html">FLAC__StreamMetadata_StreamInfo</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__StreamInfo.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__StreamInfo.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__StreamInfo.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -37,7 +37,7 @@
<p>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/FLAC/<a class="el" href="format_8h-source.html">format.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__Unknown-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__Unknown-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__Unknown-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -8,7 +8,7 @@
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>FLAC__StreamMetadata_Unknown Member List</h1>This is the complete list of members for <a class="el" href="structFLAC____StreamMetadata__Unknown.html">FLAC__StreamMetadata_Unknown</a>, including all inherited members.<table>
<tr bgcolor="#f0f0f0"><td><b>data</b> (defined in <a class="el" href="structFLAC____StreamMetadata__Unknown.html">FLAC__StreamMetadata_Unknown</a>)</td><td><a class="el" href="structFLAC____StreamMetadata__Unknown.html">FLAC__StreamMetadata_Unknown</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__Unknown.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__Unknown.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__Unknown.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -21,7 +21,7 @@
<p>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/FLAC/<a class="el" href="format_8h-source.html">format.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__VorbisComment-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__VorbisComment-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__VorbisComment-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -10,7 +10,7 @@
<tr bgcolor="#f0f0f0"><td><b>comments</b> (defined in <a class="el" href="structFLAC____StreamMetadata__VorbisComment.html">FLAC__StreamMetadata_VorbisComment</a>)</td><td><a class="el" href="structFLAC____StreamMetadata__VorbisComment.html">FLAC__StreamMetadata_VorbisComment</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>num_comments</b> (defined in <a class="el" href="structFLAC____StreamMetadata__VorbisComment.html">FLAC__StreamMetadata_VorbisComment</a>)</td><td><a class="el" href="structFLAC____StreamMetadata__VorbisComment.html">FLAC__StreamMetadata_VorbisComment</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>vendor_string</b> (defined in <a class="el" href="structFLAC____StreamMetadata__VorbisComment.html">FLAC__StreamMetadata_VorbisComment</a>)</td><td><a class="el" href="structFLAC____StreamMetadata__VorbisComment.html">FLAC__StreamMetadata_VorbisComment</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__VorbisComment.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__VorbisComment.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__VorbisComment.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -25,7 +25,7 @@
<p>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/FLAC/<a class="el" href="format_8h-source.html">format.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:42 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__VorbisComment__Entry-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__VorbisComment__Entry-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__VorbisComment__Entry-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -9,7 +9,7 @@
<hr><h1>FLAC__StreamMetadata_VorbisComment_Entry Member List</h1>This is the complete list of members for <a class="el" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a>, including all inherited members.<table>
<tr bgcolor="#f0f0f0"><td><b>entry</b> (defined in <a class="el" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a>)</td><td><a class="el" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>length</b> (defined in <a class="el" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a>)</td><td><a class="el" href="structFLAC____StreamMetadata__VorbisComment__Entry.html">FLAC__StreamMetadata_VorbisComment_Entry</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:43 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__VorbisComment__Entry.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__VorbisComment__Entry.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____StreamMetadata__VorbisComment__Entry.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -19,11 +19,14 @@
FLAC__byte * </td><td valign=bottom><b>entry</b></td></tr>
</table>
<hr><a name="_details"></a><h2>Detailed Description</h2>
-Vorbis comment entry structure used in VORBIS_COMMENT blocks. (c.f. <a href="../format.html#metadata_block_vorbis_comment">format specification</a>)
+Vorbis comment entry structure used in VORBIS_COMMENT blocks. (c.f. <a href="../format.html#metadata_block_vorbis_comment">format specification</a>)
<p>
+For convenience, the APIs maintain a trailing NUL character at the end of <em>entry</em> which is not counted toward <em>length</em>, i.e. <div class="fragment"><pre>strlen(entry) == length
+</pre></div>
+<p>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/FLAC/<a class="el" href="format_8h-source.html">format.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:43 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -14,7 +14,7 @@
<tr bgcolor="#f0f0f0"><td><b>type</b> (defined in <a class="el" href="structFLAC____Subframe.html">FLAC__Subframe</a>)</td><td><a class="el" href="structFLAC____Subframe.html">FLAC__Subframe</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>verbatim</b> (defined in <a class="el" href="structFLAC____Subframe.html">FLAC__Subframe</a>)</td><td><a class="el" href="structFLAC____Subframe.html">FLAC__Subframe</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>wasted_bits</b> (defined in <a class="el" href="structFLAC____Subframe.html">FLAC__Subframe</a>)</td><td><a class="el" href="structFLAC____Subframe.html">FLAC__Subframe</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:43 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -14,7 +14,7 @@
<a href="structFLAC____Subframe-members.html">List of all members.</a><table border=0 cellpadding=0 cellspacing=0>
<tr><td colspan=2><br><h2>Public Attributes</h2></td></tr>
<tr><td nowrap align=right valign=top><a name="m0" doxytag="FLAC__Subframe::type"></a>
-<a class="el" href="group__flac__format.html#a91">FLAC__SubframeType</a> </td><td valign=bottom><b>type</b></td></tr>
+<a class="el" href="group__flac__format.html#a94">FLAC__SubframeType</a> </td><td valign=bottom><b>type</b></td></tr>
<tr><td nowrap><a name="m5" doxytag="FLAC__Subframe::data"></a>
union {</td></tr>
<tr><td nowrap> <a class="el" href="structFLAC____Subframe__Constant.html">FLAC__Subframe_Constant</a> <b>constant</b></td></tr>
@@ -30,7 +30,7 @@
<p>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/FLAC/<a class="el" href="format_8h-source.html">format.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:43 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe__Constant-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe__Constant-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe__Constant-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -8,7 +8,7 @@
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>FLAC__Subframe_Constant Member List</h1>This is the complete list of members for <a class="el" href="structFLAC____Subframe__Constant.html">FLAC__Subframe_Constant</a>, including all inherited members.<table>
<tr bgcolor="#f0f0f0"><td><a class="el" href="structFLAC____Subframe__Constant.html#m0">value</a></td><td><a class="el" href="structFLAC____Subframe__Constant.html">FLAC__Subframe_Constant</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:43 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe__Constant.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe__Constant.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe__Constant.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -43,7 +43,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/FLAC/<a class="el" href="format_8h-source.html">format.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:43 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe__Fixed-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe__Fixed-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe__Fixed-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -11,7 +11,7 @@
<tr bgcolor="#f0f0f0"><td><a class="el" href="structFLAC____Subframe__Fixed.html#m1">order</a></td><td><a class="el" href="structFLAC____Subframe__Fixed.html">FLAC__Subframe_Fixed</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="structFLAC____Subframe__Fixed.html#m3">residual</a></td><td><a class="el" href="structFLAC____Subframe__Fixed.html">FLAC__Subframe_Fixed</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="structFLAC____Subframe__Fixed.html#m2">warmup</a></td><td><a class="el" href="structFLAC____Subframe__Fixed.html">FLAC__Subframe_Fixed</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:43 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe__Fixed.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe__Fixed.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe__Fixed.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -112,7 +112,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/FLAC/<a class="el" href="format_8h-source.html">format.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:43 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe__LPC-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe__LPC-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe__LPC-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -14,7 +14,7 @@
<tr bgcolor="#f0f0f0"><td><a class="el" href="structFLAC____Subframe__LPC.html#m3">quantization_level</a></td><td><a class="el" href="structFLAC____Subframe__LPC.html">FLAC__Subframe_LPC</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="structFLAC____Subframe__LPC.html#m6">residual</a></td><td><a class="el" href="structFLAC____Subframe__LPC.html">FLAC__Subframe_LPC</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><a class="el" href="structFLAC____Subframe__LPC.html#m5">warmup</a></td><td><a class="el" href="structFLAC____Subframe__LPC.html">FLAC__Subframe_LPC</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:43 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe__LPC.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe__LPC.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe__LPC.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -181,7 +181,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/FLAC/<a class="el" href="format_8h-source.html">format.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:43 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe__Verbatim-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe__Verbatim-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe__Verbatim-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -8,7 +8,7 @@
<a class="qindex" href="index.html">Main Page</a> <a class="qindex" href="modules.html">Modules</a> <a class="qindex" href="hierarchy.html">Class Hierarchy</a> <a class="qindex" href="classes.html">Alphabetical List</a> <a class="qindex" href="annotated.html">Compound List</a> <a class="qindex" href="files.html">File List</a> <a class="qindex" href="functions.html">Compound Members</a> <a class="qindex" href="globals.html">File Members</a> </center>
<hr><h1>FLAC__Subframe_Verbatim Member List</h1>This is the complete list of members for <a class="el" href="structFLAC____Subframe__Verbatim.html">FLAC__Subframe_Verbatim</a>, including all inherited members.<table>
<tr bgcolor="#f0f0f0"><td><a class="el" href="structFLAC____Subframe__Verbatim.html#m0">data</a></td><td><a class="el" href="structFLAC____Subframe__Verbatim.html">FLAC__Subframe_Verbatim</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:43 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe__Verbatim.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe__Verbatim.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structFLAC____Subframe__Verbatim.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -43,7 +43,7 @@
</table>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/FLAC/<a class="el" href="format_8h-source.html">format.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:43 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structOggFLAC____FileEncoder-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structOggFLAC____FileEncoder-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structOggFLAC____FileEncoder-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -9,7 +9,7 @@
<hr><h1>OggFLAC__FileEncoder Member List</h1>This is the complete list of members for <a class="el" href="structOggFLAC____FileEncoder.html">OggFLAC__FileEncoder</a>, including all inherited members.<table>
<tr bgcolor="#f0f0f0"><td><b>private_</b> (defined in <a class="el" href="structOggFLAC____FileEncoder.html">OggFLAC__FileEncoder</a>)</td><td><a class="el" href="structOggFLAC____FileEncoder.html">OggFLAC__FileEncoder</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>protected_</b> (defined in <a class="el" href="structOggFLAC____FileEncoder.html">OggFLAC__FileEncoder</a>)</td><td><a class="el" href="structOggFLAC____FileEncoder.html">OggFLAC__FileEncoder</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:43 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structOggFLAC____FileEncoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structOggFLAC____FileEncoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structOggFLAC____FileEncoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -23,7 +23,7 @@
<p>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/OggFLAC/<a class="el" href="OggFLAC_2file__encoder_8h-source.html">file_encoder.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:43 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structOggFLAC____SeekableStreamEncoder-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structOggFLAC____SeekableStreamEncoder-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structOggFLAC____SeekableStreamEncoder-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -9,7 +9,7 @@
<hr><h1>OggFLAC__SeekableStreamEncoder Member List</h1>This is the complete list of members for <a class="el" href="structOggFLAC____SeekableStreamEncoder.html">OggFLAC__SeekableStreamEncoder</a>, including all inherited members.<table>
<tr bgcolor="#f0f0f0"><td><b>private_</b> (defined in <a class="el" href="structOggFLAC____SeekableStreamEncoder.html">OggFLAC__SeekableStreamEncoder</a>)</td><td><a class="el" href="structOggFLAC____SeekableStreamEncoder.html">OggFLAC__SeekableStreamEncoder</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>protected_</b> (defined in <a class="el" href="structOggFLAC____SeekableStreamEncoder.html">OggFLAC__SeekableStreamEncoder</a>)</td><td><a class="el" href="structOggFLAC____SeekableStreamEncoder.html">OggFLAC__SeekableStreamEncoder</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:43 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structOggFLAC____SeekableStreamEncoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structOggFLAC____SeekableStreamEncoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structOggFLAC____SeekableStreamEncoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -23,7 +23,7 @@
<p>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/OggFLAC/<a class="el" href="OggFLAC_2seekable__stream__encoder_8h-source.html">seekable_stream_encoder.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:43 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structOggFLAC____StreamDecoder-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structOggFLAC____StreamDecoder-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structOggFLAC____StreamDecoder-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -9,7 +9,7 @@
<hr><h1>OggFLAC__StreamDecoder Member List</h1>This is the complete list of members for <a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a>, including all inherited members.<table>
<tr bgcolor="#f0f0f0"><td><b>private_</b> (defined in <a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a>)</td><td><a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>protected_</b> (defined in <a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a>)</td><td><a class="el" href="structOggFLAC____StreamDecoder.html">OggFLAC__StreamDecoder</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:43 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structOggFLAC____StreamDecoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structOggFLAC____StreamDecoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structOggFLAC____StreamDecoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -23,7 +23,7 @@
<p>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/OggFLAC/<a class="el" href="OggFLAC_2stream__decoder_8h-source.html">stream_decoder.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:43 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structOggFLAC____StreamEncoder-members.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structOggFLAC____StreamEncoder-members.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structOggFLAC____StreamEncoder-members.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -9,7 +9,7 @@
<hr><h1>OggFLAC__StreamEncoder Member List</h1>This is the complete list of members for <a class="el" href="structOggFLAC____StreamEncoder.html">OggFLAC__StreamEncoder</a>, including all inherited members.<table>
<tr bgcolor="#f0f0f0"><td><b>private_</b> (defined in <a class="el" href="structOggFLAC____StreamEncoder.html">OggFLAC__StreamEncoder</a>)</td><td><a class="el" href="structOggFLAC____StreamEncoder.html">OggFLAC__StreamEncoder</a></td><td></td></tr>
<tr bgcolor="#f0f0f0"><td><b>protected_</b> (defined in <a class="el" href="structOggFLAC____StreamEncoder.html">OggFLAC__StreamEncoder</a>)</td><td><a class="el" href="structOggFLAC____StreamEncoder.html">OggFLAC__StreamEncoder</a></td><td></td></tr>
-</table><hr><address><small>Generated on Tue Sep 28 21:19:43 2004 for FLAC by
+</table><hr><address><small>Generated on Fri Feb 4 18:39:14 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structOggFLAC____StreamEncoder.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structOggFLAC____StreamEncoder.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/api/structOggFLAC____StreamEncoder.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -23,7 +23,7 @@
<p>
<hr>The documentation for this struct was generated from the following file:<ul>
<li>include/OggFLAC/<a class="el" href="OggFLAC_2stream__encoder_8h-source.html">stream_encoder.h</a></ul>
-<hr><address><small>Generated on Tue Sep 28 21:19:43 2004 for FLAC by
+<hr><address><small>Generated on Fri Feb 4 18:39:13 2005 for FLAC by
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.gif" alt="doxygen" align="middle" border=0
width=110 height=53></a>1.2.14 written by <a href="mailto:dimitri at stack.nl">Dimitri van Heesch</a>,
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/changelog.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/changelog.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/changelog.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- Copyright (c) 2004 Josh Coalson -->
+<!-- Copyright (c) 2004,2005 Josh Coalson -->
<!-- Permission is granted to copy, distribute and/or modify this document -->
<!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
<!-- or any later version published by the Free Software Foundation; -->
@@ -85,6 +85,119 @@
</P>
<P>
+ <A NAME="flac_1_1_2"><B>FLAC 1.1.2</B></A>
+ </P>
+ <P>
+ <UL>
+ <LI>
+ General:
+ <UL>
+ <LI>Sped up decoding by a few percent overall.<LI>
+ <LI>Sped up encoding when not using LPC (i.e. when using <TT>flac</TT> options <TT>-0</TT>, <TT>-1</TT>, <TT>-2</TT>, or <TT>-l 0</TT>).</LI>
+ <LI>Fixed a decoding bug that could cause sync errors with some ID3v1-tagged FLAC files.</LI>
+ <LI>Added <A HREF="documentation.html#metaflac">HTML documentation for metaflac</A>.</LI>
+ </UL>
+ </LI>
+ <LI>
+ FLAC format:
+ <UL>
+ <LI>(none)</LI>
+ </UL>
+ </LI>
+ <LI>
+ Ogg FLAC format:
+ <UL>
+ <LI>(none)</LI>
+ </UL>
+ </LI>
+ <LI>
+ flac:
+ <UL>
+ <LI>New option <A HREF="documentation.html#flac_options_input_size"><TT>--input-size</TT></A> to manually specify the input size when encoding raw samples from stdin.</LI>
+ </UL>
+ </LI>
+ <LI>
+ metaflac:
+ <UL>
+ <LI>(none)</LI>
+ </UL>
+ </LI>
+ <LI>
+ plugins:
+ <UL>
+ <LI>Added support for HTTP streaming in XMMS plugin. <B>NOTE</B>: there is a <A HREF="http://bugs.xmms.org/show_bug.cgi?id=2038">bug</A> in the XMMS mpg123 plugin that hijacks FLAC streams; to fix it you will need to add the '.flac' extension to the list of exceptions in <TT>Input/mpg123/mpg123.c:is_our_file()</TT> in the XMMS sources and recompile.</LI>
+ </UL>
+ </LI>
+ <LI>
+ build system:
+ <UL>
+ <LI>(none)</LI>
+ </UL>
+ </LI>
+ <LI>
+ libraries:
+ <UL>
+ <LI>libFLAC: Sped up Rice block decoding in the bitbuffer, resulting in decoding speed gains of a few percent.</LI>
+ <LI>libFLAC: Sped up encoding when not using LPC (i.e. <TT>max_lpc_order == 0</TT>).</LI>
+ <LI>libFLAC: Trailing NUL characters maintained on Vorbis comment entries so they can be treated like C strings.</LI>
+ <LI>libFLAC: More FLAC tag (i.e. Vorbis comment) validation.</LI>
+ <LI>libFLAC: Fixed a bug in the logic that determines the frame or sample number in a frame header; the bug could cause sync errors with some ID3v1-tagged FLAC files.</LI>
+ <LI>libFLAC, libOggFLAC: Can now be compiled to use only integer instructions, including encoding. The decoder is almost completely integer anyway but there were a couple places that needed a fixed-point replacement. There is no fixed-point version of LPC analysis yet, so if libFLAC is compiled integer-only, the encoder will behave as if the max LPC order is 0 (i.e. used fixed predictors only). LPC decoding is supported in all cases as it always was integer-only.</LI>
+ </UL>
+ </LI>
+ <LI>
+ Interface changes:
+ <UL>
+ <LI>
+ libFLAC:
+ <UL>
+ <LI><B>Changed:</B> Metadata object interface now maintains a trailing NUL on Vorbis comment entries for convenience.</LI>
+ <LI><B>Changed:</B> Metadata object interface now validates all Vorbis comment entries on input and returns false if an entry does not conform to the Vorbis comment spec.</LI>
+ <LI><B>Added</B> FLAC__format_vorbiscomment_entry_name_is_legal()</LI>
+ <LI><B>Added</B> FLAC__format_vorbiscomment_entry_value_is_legal()</LI>
+ <LI><B>Added</B> FLAC__format_vorbiscomment_entry_is_legal()</LI>
+ <LI><B>Added</B> FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair()</LI>
+ <LI><B>Added</B> FLAC__metadata_object_vorbiscomment_entry_to_name_value_pair()</LI>
+ <LI><B>Changed</B> the signature of FLAC__metadata_object_vorbiscomment_entry_matches(): the first argument is now <TT>FLAC__StreamMetadata_VorbisComment_Entry entry</TT> (was <TT>const FLAC__StreamMetadata_VorbisComment_Entry *entry</TT>), i.e. <TT>entry</TT> is now pass-by-value.</LI>
+ </UL>
+ </LI>
+ <LI>
+ libFLAC++:
+ <UL>
+ <LI><B>Changed:</B> Metadata object interface now maintains a trailing NUL on Vorbis comment values for convenience.</LI>
+ <LI><B>Changed:</B> Metadata object interface now validates all Vorbis comment entries on input and returns false if an entry does not conform to the Vorbis comment spec.</LI>
+ <LI><B>Changed:</B> All Metadata objects' operator=() methods now return a reference to themselves.</LI>
+ <LI><B>Added</B> methods to FLAC::Metadata::VorbisComment::Entry for setting comment values from null-terminated strings:
+ <UL>
+ <LI>Entry(const char *field)</LI>
+ <LI>Entry(const char *field_name, const char *field_value)</LI>
+ <LI>bool set_field(const char *field)</LI>
+ <LI>bool set_field_value(const char *field_value)</LI>
+ </UL>
+ </LI>
+ <LI><B>Changed</B> the signature of FLAC::Metadata::VorbisComment::get_vendor_string() and FLAC::Metadata::VorbisComment::set_vendor_string() to use a UTF-8, NUL-terminated string <TT>const FLAC__byte *</TT> for the vendor string instead of <TT>FLAC::Metadata::VorbisComment::Entry</TT>.</LI>
+ <LI><B>Added</B> FLAC::Metadata::*::assign() to all Metadata objects.</LI>
+ <LI><B>Added</B> bool FLAC::Metadata::get_tags(const char *filename, VorbisComment &tags)</LI>
+ </UL>
+ </LI>
+ <LI>
+ libOggFLAC:
+ <UL>
+ <LI>(none)</LI>
+ </UL>
+ </LI>
+ <LI>
+ libOggFLAC++:
+ <UL>
+ <LI>(none)</LI>
+ </UL>
+ </LI>
+ </UL>
+ </LI>
+ </UL>
+ </P>
+
+ <P>
<A NAME="flac_1_1_1"><B>FLAC 1.1.1</B></A>
</P>
<P>
@@ -288,7 +401,7 @@
</CENTER>
-<P> Copyright (c) 2004 Josh Coalson</P>
+<P> Copyright (c) 2004,2005 Josh Coalson</P>
</BODY>
</HTML>
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/comparison.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/comparison.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/comparison.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson -->
+<!-- Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson -->
<!-- Permission is granted to copy, distribute and/or modify this document -->
<!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
<!-- or any later version published by the Free Software Foundation; -->
@@ -1223,7 +1223,7 @@
</CENTER>
-<P> Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson</P>
+<P> Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson</P>
</BODY>
</HTML>
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/developers.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/developers.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/developers.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson -->
+<!-- Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson -->
<!-- Permission is granted to copy, distribute and/or modify this document -->
<!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
<!-- or any later version published by the Free Software Foundation; -->
@@ -104,10 +104,13 @@
<A HREF="http://java.sun.com/products/java-media/jmf/">JMF</A> plugin.
</LI>
<LI>
- Streaming support in the plugins.
+ Streaming support in the Winamp plugin.
</LI>
</UL>
</P>
+ <P>
+ See also the <A HREF="http://sourceforge.net/projects/flac">FLAC project page</A> on Sourceforge.net.
+ </P>
</FONT>
</TD></TR>
</TABLE>
@@ -150,7 +153,7 @@
</CENTER>
-<P> Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson</P>
+<P> Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson</P>
</BODY>
</HTML>
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/documentation.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/documentation.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/documentation.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson -->
+<!-- Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson -->
<!-- Permission is granted to copy, distribute and/or modify this document -->
<!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
<!-- or any later version published by the Free Software Foundation; -->
@@ -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>
@@ -497,7 +497,7 @@
<TT>--cue=[#.#][-[#.#]]</TT>
</TD>
<TD>
- Set the beginning and ending cuepoints to decode. The optional first <TT>#.#</TT> is the track and index point at which decoding will start; the default is the beginning of the stream. The optional second <TT>#.#</TT> is the track and index point at which decoding will end; the default is the end of the stream. If the seekpoint does not exist, the closest one before it (for the start point) or after it (for the end point) will be used. If those don't exist, the start of the stream (for the start point) or end of the stream (for the end point) will be used. The cuepoints are merely translated into sample numbers then used as --skip and --until.<P>
+ Set the beginning and ending cuepoints to decode. The optional first <TT>#.#</TT> is the track and index point at which decoding will start; the default is the beginning of the stream. The optional second <TT>#.#</TT> is the track and index point at which decoding will end; the default is the end of the stream. If the cuepoint does not exist, the closest one before it (for the start point) or after it (for the end point) will be used. If those don't exist, the start of the stream (for the start point) or end of the stream (for the end point) will be used. The cuepoints are merely translated into sample numbers then used as --skip and --until.<P>
Examples:<P>
<TT>--cue=-</TT> : decode the entire stream<P>
<TT>--cue=4.1</TT> : decode from track 4, index 1 to the end of the stream<P>
@@ -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.
@@ -584,7 +584,7 @@
<TT>--lax</TT>
</TD>
<TD>
- Allow encoder to generate non-<A HREF="format.html#subset">Subset</A> files. The resulting FLAC file may not be streamable, so you should only use this option in combination with custom encoding options meant for archival. File decoders will still be able play (and seek in) such files.
+ Allow encoder to generate non-<A HREF="format.html#subset">Subset</A> files. The resulting FLAC file may not be streamable or might have trouble being played in all players (especially hardware devices), so you should only use this option in combination with custom encoding options meant for archival.
</TD>
</TR>
<TR>
@@ -678,7 +678,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.
</TD>
</TR>
<TR>
@@ -902,6 +902,15 @@
</TR>
<TR>
<TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <A NAME="flac_options_input_size">
+ <TT>--input-size=#</TT>
+ </TD>
+ <TD>
+ Specify the size of the raw input in bytes. If you are encoding raw samples from stdin, you must set this option in order to be able to use --skip, --until, --cue-sheet, or other options that need to know the size of the input beforehand. If the size given is greater than what is found in the input stream, the encoder will complain about an unexpected end-of-file. If the size given is less, samples will be truncated.
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
<A NAME="flac_options_force_aiff_format">
<TT>--force-aiff-format</TT>
</TD>
@@ -975,11 +984,408 @@
<TABLE CELLSPACING="0" CELLPADDING="3" WIDTH="100%" BORDER="0" BGCOLOR="#EEEED4">
<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
<P>
- <B><TT>metaflac</TT></B> is the command-line <TT>.flac</TT> file metadata editor. You can use it to list the contents of blocks, delete or insert blocks, and manage padding.
+ <B><TT>metaflac</TT></B> is the command-line <TT>.flac</TT> file metadata editor. You can use it to list the contents of metadata blocks, edit, delete or insert blocks, and manage padding.
</P>
<P>
- The HTML documentation for <B><TT>metaflac</TT></B> is currently being rewritten, but the usage screen should explain it pretty well, and there is a man page. Do <TT>metaflac --help</TT> to see the full usage.
+ <B><TT>metaflac</TT></B> takes a set of "options" (though some are not optional) and a set of FLAC files to operate on. There are three kinds of "options":
+ <UL>
+ <LI>
+ Major operations, which specify a mode of operation like listing blocks, removing blocks, etc. These will have sub-operations describing exactly what is to be done.
+ </LI>
+ <LI>
+ Shorthand operations, which are convenient synonyms for major operations. For example, there is a shorthand operation <TT>--show-sample-rate</TT> that shows just the sample rate field from the STREAMINFO metadata block.
+ </LI>
+ <LI>
+ Global options, which affect all the operations.
+ </LI>
+ </UL>
</P>
+ <P>
+ All of these are described in the tables below. At least one shorthand or major operation must be supplied. You can use multiple shorthand operations to do more than one thing to a file or set of files. Most of the common things to do to metadata have shorthand operations. As an example, here is how to show the MD5 signatures for a set of three FLAC files:
+ </P>
+ <P>
+ <TT>metaflac --show-md5sum file1.flac file2.flac file3.flac</TT>
+ </P>
+ <P>
+ Another example; this removes all DESCRIPTION and COMMENT tags in a set of FLAC files, and uses the <TT>--preserve-modtime</TT> global option to keep the FLAC file modification times the same (usually when files are edited the modification time is set to the current time):
+ </P>
+ <P>
+ <TT>metaflac --preserve-modtime --remove-tag=DESCRIPTION --remove-tag=COMMENT file1.flac file2.flac file3.flac</TT>
+ </P>
+ <P>
+ <TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0" BGCOLOR="#EEEED4"><TR><TD>
+ <TABLE WIDTH="100%" BORDER="1" BGCOLOR="#EEEED4">
+ <TR>
+ <TD COLSPAN="2" BGCOLOR="#D3D4C5">
+ <A NAME="global_options"><FONT SIZE="+1"><B>Global Options</B></FONT></A>
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <A NAME="metaflac_options_preserve_modtime">
+ <TT>--preserve-modtime</TT>
+ </TD>
+ <TD>
+ Preserve the original modification time in spite of edits.
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <A NAME="metaflac_options_with_filename">
+ <TT>--with-filename</TT>
+ </TD>
+ <TD>
+ Prefix each output line with the FLAC file name (the default if more than one FLAC file is specified).
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <A NAME="metaflac_options_no_filename">
+ <TT>--no-filename</TT>
+ </TD>
+ <TD>
+ Do not prefix each output line with the FLAC file name (the default if only one FLAC file is specified)
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <A NAME="metaflac_options_no_utf8_convert">
+ <TT>--no-utf8-convert</TT>
+ </TD>
+ <TD>
+ Do not convert tags from UTF-8 to local charset, or vice versa. This is useful for scripts.
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <A NAME="metaflac_options_dont_use_padding">
+ <TT>--dont-use-padding</TT>
+ </TD>
+ <TD>
+ By default <B><TT>metaflac</TT></B> tries to use padding where possible to avoid rewriting the entire file if the metadata size changes. Use this option to tell metaflac to not take advantage of padding this way.
+ </TD>
+ </TR>
+ </TABLE>
+ </TD></TR></TABLE>
+ </P>
+ <P>
+ <TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0" BGCOLOR="#EEEED4"><TR><TD>
+ <TABLE WIDTH="100%" BORDER="1" BGCOLOR="#EEEED4">
+ <TR>
+ <TD COLSPAN="2" BGCOLOR="#D3D4C5">
+ <A NAME="shorthand_operations"><FONT SIZE="+1"><B>Shorthand Operations</B></FONT></A>
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <A NAME="metaflac_shorthand_show_md5sum">
+ <TT>--show-md5sum</TT>
+ </TD>
+ <TD>
+ Show the MD5 signature from the STREAMINFO block.
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <A NAME="metaflac_shorthand_show_min_blocksize">
+ <TT>--show-min-blocksize</TT>
+ </TD>
+ <TD>
+ Show the minimum block size from the STREAMINFO block.
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <A NAME="metaflac_shorthand_show_max_blocksize">
+ <TT>--show-max-blocksize</TT>
+ </TD>
+ <TD>
+ Show the maximum block size from the STREAMINFO block.
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <A NAME="metaflac_shorthand_show_min_framesize">
+ <TT>--show-min-framesize</TT>
+ </TD>
+ <TD>
+ Show the minimum frame size from the STREAMINFO block.
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <A NAME="metaflac_shorthand_show_max_framesize">
+ <TT>--show-max-framesize</TT>
+ </TD>
+ <TD>
+ Show the maximum frame size from the STREAMINFO block.
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <A NAME="metaflac_shorthand_show_sample_rate">
+ <TT>--show-sample-rate</TT>
+ </TD>
+ <TD>
+ Show the sample rate from the STREAMINFO block.
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <A NAME="metaflac_shorthand_show_channels">
+ <TT>--show-channels</TT>
+ </TD>
+ <TD>
+ Show the number of channels from the STREAMINFO block.
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <A NAME="metaflac_shorthand_show_bps">
+ <TT>--show-bps</TT>
+ </TD>
+ <TD>
+ Show the # of bits per sample from the STREAMINFO block.
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <A NAME="metaflac_shorthand_show_total_samples">
+ <TT>--show-total-samples</TT>
+ </TD>
+ <TD>
+ Show the total # of samples from the STREAMINFO block.
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <A NAME="metaflac_shorthand_show_vendor_tag">
+ <TT>--show-vendor-tag</TT>
+ </TD>
+ <TD>
+ Show the vendor string from the VORBIS_COMMENT block.
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <A NAME="metaflac_shorthand_show_tag">
+ <TT>--show-tag=NAME</TT>
+ </TD>
+ <TD>
+ Show all tags where the the field name matches <TT>NAME</TT>.
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <A NAME="metaflac_shorthand_remove_tag">
+ <TT>--remove-tag=NAME</TT>
+ </TD>
+ <TD>
+ Remove all tags whose field name is <TT>NAME</TT>.
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <A NAME="metaflac_shorthand_remove_first_tag">
+ <TT>--remove-first-tag=NAME</TT>
+ </TD>
+ <TD>
+ Remove first tag whose field name is <TT>NAME</TT>.
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <A NAME="metaflac_shorthand_remove_all_tags">
+ <TT>--remove-all-tags</TT>
+ </TD>
+ <TD>
+ Remove all tags, leaving only the vendor string.
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <A NAME="metaflac_shorthand_set_tag">
+ <TT>--set-tag=FIELD</TT>
+ </TD>
+ <TD>
+ Add a tag. The <TT>FIELD</TT> must comply with the Vorbis comment spec, of the form <TT>NAME=VALUE</TT>. If there is currently no tag block, one will be created.
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <A NAME="metaflac_shorthand_import_tags_from">
+ <TT>--import-tags-from=FILE</TT>
+ </TD>
+ <TD>
+ Import tags from a file. Use '-' for stdin. Each line should be of the form <TT>NAME=VALUE</TT>. Multi-line comments are currently not supported. Specify <TT>--remove-all-tags</TT> and/or <TT>--no-utf8-convert</TT> before <TT>--import-tags-from</TT> if necessary.
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <A NAME="metaflac_shorthand_export_tags_to">
+ <TT>--export-tags-to=FILE</TT>
+ </TD>
+ <TD>
+ Export tags to a file. Use '-' for stdin. Each line will be of the form <TT>NAME=VALUE</TT>. Specify <TT>--no-utf8-convert</TT> if necessary.
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <A NAME="metaflac_shorthand_import_cuesheet_from">
+ <TT>--import-cuesheet-from=FILE</TT>
+ </TD>
+ <TD>
+ Import a cuesheet from a file. Use '-' for stdin. Only one FLAC file may be specified. A seekpoint will be added for each index point in the cuesheet to the SEEKTABLE unless <TT>--no-cued-seekpoints</TT> is specified.
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <A NAME="metaflac_shorthand_export_cuesheet_to">
+ <TT>--export-cuesheet-to=FILE</TT>
+ </TD>
+ <TD>
+ Export CUESHEET block to a cuesheet file, suitable for use by CD authoring software. Use '-' for stdout. Only one FLAC file may be specified on the command line.
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <A NAME="metaflac_shorthand_add_replay_gain">
+ <TT>--add-replay-gain</TT>
+ </TD>
+ <TD>
+ Calculates the title and album gains/peaks of the given FLAC files as if all the files were part of one album, then stores them in the VORBIS_COMMENT block. The tags are the same as those used by <TT>vorbisgain</TT>. Existing ReplayGain tags will be replaced. If only one FLAC file is given, the album and title gains will be the same. Since this operation requires two passes, it is always executed last, after all other operations have been completed and written to disk. All FLAC files specified must have the same resolution, sample rate, and number of channels. The sample rate must be one of 8, 11.025, 12, 16, 22.05, 24, 32, 44.1, or 48 kHz.
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <A NAME="metaflac_shorthand_add_seekpoint">
+ <TT>--add-seekpoint={#|X|#x|#s}</TT>
+ </TD>
+ <TD>
+ Add seek points to a SEEKTABLE block:<BR>
+ <UL>
+ <LI>
+ <TT># </TT> : a specific sample number for a seek point
+ </LI>
+ <LI>
+ <TT>X </TT> : a placeholder point (always goes at the end of the SEEKTABLE)
+ </LI>
+ <LI>
+ <TT>#x</TT> : # evenly spaced seekpoints, the first being at sample 0
+ </LI>
+ <LI>
+ <TT>#s</TT> : a seekpoint every # seconds; # does not have to be a whole number, it can be, for example, <TT>9.5</TT>, meaning a seekpoint every 9.5 seconds
+ </LI>
+ </UL>
+ If no SEEKTABLE block exists, one will be created. If one already exists, points will be added to the existing table, and any duplicates will be turned into placeholder points.<BR>
+ You may use many <TT>--add-seekpoint</TT> options; the resulting SEEKTABLE will be the unique-ified union of all such values. Example: <TT>--add-seekpoint=100x --add-seekpoint=3.5s</TT> will add 100 evenly spaced seekpoints and a seekpoint every 3.5 seconds.<BR>
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <A NAME="metaflac_shorthand_add_padding">
+ <TT>--add-padding=#</TT>
+ </TD>
+ <TD>
+ Add a padding block of the given length (in bytes). The overall length of the new block will be 4 + length; the extra 4 bytes is for the metadata block header.
+ </TD>
+ </TR>
+ </TABLE>
+ </TD></TR></TABLE>
+ </P>
+ <P>
+ <TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0" BGCOLOR="#EEEED4"><TR><TD>
+ <TABLE WIDTH="100%" BORDER="1" BGCOLOR="#EEEED4">
+ <TR>
+ <TD COLSPAN="2" BGCOLOR="#D3D4C5">
+ <A NAME="major_operations"><FONT SIZE="+1"><B>Major Operations</B></FONT></A>
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <A NAME="metaflac_operations_version">
+ <TT>--version</TT>
+ </TD>
+ <TD>
+ Show the metaflac version number.
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <A NAME="metaflac_operations_list">
+ <TT>--list</TT>
+ </TD>
+ <TD>
+ List the contents of one or more metadata blocks to stdout. By default, all metadata blocks are listed in text format. Use the following options to change this behavior:<P>
+
+ <TT>--block-number=#[,#[...]]</TT><BR>
+ An optional comma-separated list of block numbers to display. The first block, the STREAMINFO block, is block 0.<P>
+
+ <TT>--block-type=type[,type[...]]</TT><BR>
+ <TT>--except-block-type=type[,type[...]]</TT><BR>
+ An optional comma-separated list of block types to be included or ignored with this option. Use only one of <TT>--block-type</TT> or <TT>--except-block-type</TT>. The valid block types are: STREAMINFO, PADDING, APPLICATION, SEEKTABLE, VORBIS_COMMENT. You may narrow down the types of APPLICATION blocks displayed as follows:<BR>
+ <TABLE BORDER="1">
+ <TR>
+ <TD><TT>APPLICATION:abcd</TT></TD>
+ <TD>The APPLICATION block(s) whose textual representation of the 4-byte ID is "abcd"
+ <TR>
+ <TD><TT>APPLICATION:0xXXXXXXXX</TT></TD>
+ <TD>The APPLICATION block(s) whose hexadecimal big- endian representation of the 4-byte ID is "0xXXXXXXXX". For the example "abcd" above the hexadecimal equivalalent is 0x61626364
+ </TABLE>
+ <P>
+
+ NOTE: if both <TT>--block-number</TT> and <TT>--[except-]block-type</TT> are specified, the result is the logical AND of both arguments.<P>
+
+ <TT>--application-data-format=hexdump|text</TT><BR>
+ If the application block you are displaying contains binary data but your <TT>--data-format=text</TT>, you can display a hex dump of the application data contents instead using <TT>--application-data-format=hexdump</TT>.
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <A NAME="metaflac_operations_remove">
+ <TT>--remove</TT>
+ </TD>
+ <TD>
+ Remove one or more metadata blocks from the metadata. Unless <TT>--dont-use-padding</TT> is specified, the blocks will be replaced with padding. You may not remove the STREAMINFO block.<P>
+
+ <TT>--block-number=#[,#[...]]</TT><BR>
+ <TT>--block-type=type[,type[...]]</TT><BR>
+ <TT>--except-block-type=type[,type[...]]</TT><BR>
+ See <A HREF="#metaflac_operations_list"><TT>--list</TT></A> above for usage.<P>
+
+ NOTE: if both <TT>--block-number</TT> and <TT>--[except-]block-type</TT> are specified, the result is the logical AND of both arguments.
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <A NAME="metaflac_operations_remove_all">
+ <TT>--remove-all</TT>
+ </TD>
+ <TD>
+ Remove all metadata blocks (except the STREAMINFO block) from the metadata. Unless <TT>--dont-use-padding</TT> is specified, the blocks will be replaced with padding.
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <A NAME="metaflac_operations_merge_padding">
+ <TT>--merge-padding</TT>
+ </TD>
+ <TD>
+ Merge adjacent PADDING blocks into single blocks.
+ </TD>
+ </TR>
+ <TR>
+ <TD NOWRAP ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#F4F4CC">
+ <A NAME="metaflac_operations_sort_padding">
+ <TT>--sort-padding</TT>
+ </TD>
+ <TD>
+ Move all PADDING blocks to the end of the metadata and merge them into a single block.
+ </TD>
+ </TR>
+ </TABLE>
+ </TD></TR></TABLE>
+ </P>
</FONT>
</TD></TR>
</TABLE>
@@ -1048,7 +1454,7 @@
Bug tracking is done on the Sourceforge project page <A HREF="http://sourceforge.net/bugs/?group_id=13478">here</A>. If you submit a bug, make sure and provide an email contact or use the Monitor feature.
</P>
<P>
- The following are major known bugs in the current (1.1.1) release:
+ The following are major known bugs in the current (1.1.2) release:
</P>
<P>
<UL>
@@ -1131,7 +1537,7 @@
</CENTER>
-<P> Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson</P>
+<P> Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson</P>
</BODY>
</HTML>
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/download.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/download.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/download.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson -->
+<!-- Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson -->
<!-- Permission is granted to copy, distribute and/or modify this document -->
<!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
<!-- or any later version published by the Free Software Foundation; -->
@@ -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.2-linux-i386.tar.gz?download">FLAC 1.1.2 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,17 +95,18 @@
<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.2-osx-ppc.tar.gz?download">FLAC 1.1.2 for OS X (no installer)</A></LI>
</UL>
</LI>
<LI>
<B>Windows</B>
<UL>
- <LI><A HREF="http://cyberial.com/flacinstaller.asp">FLAC 1.1.1 for Windows with installer</A>. <B>NOTE: </B>Several virus scanners are reporting that FLAC contains a trojan; this is a FALSE POSITIVE. For more info see <A HREF="http://nsis.sourceforge.net/index.php?id=2&backPID=2&tt_news=14">here</A>, <A HREF="http://servicenews.symantec.com/cgi-bin/displayArticle.cgi?article=29991&group=symantec.support.generic.virus_corporate.general&tpre=ent&">here</A>, <A HREF="http://forums.mcafeehelp.com/viewtopic.php?p=164312">here</A>.</LI>
- <LI><A HREF="http://prdownloads.sourceforge.net/flac/flac-1.1.1-win.zip?download">FLAC 1.1.1 for Windows (tools only)</A></LI>
+ <LI><A HREF="http://cyberial.com/flacinstaller.asp">FLAC 1.1.2 for Windows with installer</A>. <B>NOTE: </B>Several virus scanners are reporting that FLAC contains a trojan; this is a FALSE POSITIVE. For more info see <A HREF="http://nsis.sourceforge.net/index.php?id=2&backPID=2&tt_news=14">here</A>, <A HREF="http://servicenews.symantec.com/cgi-bin/displayArticle.cgi?article=29991&group=symantec.support.generic.virus_corporate.general&tpre=ent&">here</A>, <A HREF="http://forums.mcafeehelp.com/viewtopic.php?p=164312">here</A>.</LI>
+ <LI><A HREF="http://prdownloads.sourceforge.net/flac/flac-1.1.2-win.zip?download">FLAC 1.1.2 for Windows (tools only)</A></LI>
</UL>
</LI>
<LI>
@@ -120,7 +121,7 @@
<LI>
<B>Source code</B>
<UL>
- <LI><A HREF="http://prdownloads.sourceforge.net/flac/flac-1.1.1.tar.gz?download">FLAC 1.1.1 full source code</A>; also includes documentation and build systems for Windows (MSVC++) and *nix,*BSD,OS/2,OS X (autotools)</LI>
+ <LI><A HREF="http://prdownloads.sourceforge.net/flac/flac-1.1.2.tar.gz?download">FLAC 1.1.2 full source code</A>; also includes documentation and build systems for Windows (MSVC++) and *nix,*BSD,OS/2,OS X (autotools)</LI>
<LI><A HREF="http://cvs.sourceforge.net/cvstarballs/flac-cvsroot.tar.bz2">Nightly CVS tarball</A>; this is the actual CVS repository used for development</LI>
</UL>
</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.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.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> and <A HREF="http://www.monsterfang.com/MCinFLAC/Encoding.htm">instructions</A> on how to encode to FLAC as well. 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>
@@ -251,7 +255,7 @@
</CENTER>
-<P> Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson</P>
+<P> Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson</P>
</BODY>
</HTML>
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/faq.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/faq.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/faq.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson -->
+<!-- Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson -->
<!-- Permission is granted to copy, distribute and/or modify this document -->
<!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
<!-- or any later version published by the Free Software Foundation; -->
@@ -85,9 +85,6 @@
<BR>
<UL>
<LI>
- <A HREF="#joke"><B>Your codec seems to have the momentum of a runaway freight train. Why is it so popular?</B></A>
- </LI>
- <LI>
<A HREF="#general__license"><B>What licensing applies to the FLAC format and software?</B></A>
</LI>
<LI>
@@ -109,6 +106,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>
@@ -193,12 +193,6 @@
<B>General</B>
</H2>
<P>
- <A NAME="joke"><B>Your codec seems to have the momentum of a runaway freight train. Why is it so popular?</B></A>
- </P>
- <P>
- Just kidding. Only real questions here.
- </P>
- <P>
<A NAME="general__license"><B>What licensing applies to the FLAC format and software?</B></A>
</P>
<P>
@@ -247,9 +241,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 +256,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 +366,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>
@@ -414,7 +420,7 @@
</CENTER>
-<P> Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson</P>
+<P> Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson</P>
</BODY>
</HTML>
Added: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/favicon.ico
===================================================================
(Binary files differ)
Property changes on: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/favicon.ico
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/features.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/features.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/features.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson -->
+<!-- Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson -->
<!-- Permission is granted to copy, distribute and/or modify this document -->
<!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
<!-- or any later version published by the Free Software Foundation; -->
@@ -153,7 +153,7 @@
</CENTER>
-<P> Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson</P>
+<P> Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson</P>
</BODY>
</HTML>
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/format.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/format.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/format.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson -->
+<!-- Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson -->
<!-- Permission is granted to copy, distribute and/or modify this document -->
<!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
<!-- or any later version published by the Free Software Foundation; -->
@@ -83,29 +83,11 @@
This is a detailed description of the FLAC format. There is also a companion document that describes <A HREF="ogg_mapping.html">FLAC-to-Ogg mapping</A>.
</P>
<P>
- First, as the original developer I have to say that I am not a compression expert and I feel obligated to give credit where it is due. FLAC owes a lot to the many people who have advanced the audio compression field so freely. For instance:
- </P>
- <P>
- <UL>
- <LI>
- <A HREF="http://svr-www.eng.cam.ac.uk/~ajr/">A. J. Robinson</A> for his work on <A HREF="http://www-svr.eng.cam.ac.uk/reports/abstracts/robinson_tr156.html">Shorten</A>; his paper is a good starting point on some of the basic methods used by FLAC. FLAC expands on the fixed predictors used in shorten.
- </LI>
- <LI>
- <A HREF="http://commsci.usc.edu/faculty/golomb.html">S. W. Golomb</A> and Robert F. Rice; their universal codes are used by FLAC's entropy coder.
- </LI>
- <LI>
- N. Levinson and J. Durbin; the reference encoder uses an algorithm developed and refined by them for determining the LPC coefficients from the autocorrelation coefficients.
- </LI>
- <LI>
- And of course, <A HREF="http://www.digitalcentury.com/encyclo/update/shannon.html">Claude Shannon</A>
- </LI>
- </UL>
- </P>
- <P>
<A NAME="toc"><FONT SIZE="+1"><B><U>Table of Contents</U></B></FONT></A>
</P>
<P>
<UL>
+ <LI><A HREF="#acknowledgments">Acknowledgments</A></LI>
<LI><A HREF="#scope">Scope</A></LI>
<LI><A HREF="#architecture">Architecture</A></LI>
<LI><A HREF="#definitions">Definitions</A></LI>
@@ -184,6 +166,28 @@
</UL>
</P>
<P>
+ <A NAME="acknowledgments"><FONT SIZE="+1"><B><U>Acknowledgments</U></B></FONT></A>
+ </P>
+ <P>
+ FLAC owes much to the many people who have advanced the audio compression field so freely. For instance:
+ </P>
+ <P>
+ <UL>
+ <LI>
+ <A HREF="http://svr-www.eng.cam.ac.uk/~ajr/">A. J. Robinson</A> for his work on <A HREF="http://www-svr.eng.cam.ac.uk/reports/abstracts/robinson_tr156.html">Shorten</A>; his paper is a good starting point on some of the basic methods used by FLAC. FLAC trivially extends and improves the fixed predictors, LPC coefficient quantization, and Rice coding used in Shorten.
+ </LI>
+ <LI>
+ <A HREF="http://commsci.usc.edu/faculty/golomb.html">S. W. Golomb</A> and Robert F. Rice; their universal codes are used by FLAC's entropy coder.
+ </LI>
+ <LI>
+ N. Levinson and J. Durbin; the reference encoder uses an algorithm developed and refined by them for determining the LPC coefficients from the autocorrelation coefficients.
+ </LI>
+ <LI>
+ And of course, <A HREF="http://www.digitalcentury.com/encyclo/update/shannon.html">Claude Shannon</A>
+ </LI>
+ </UL>
+ </P>
+ <P>
<A NAME="scope"><FONT SIZE="+1"><B><U>Scope</U></B></FONT></A>
</P>
<P>
@@ -353,6 +357,9 @@
<LI>
The bits-per-sample bits in the <A HREF="#frame_header">frame header</A> must be 001-111.
</LI>
+ <LI>
+ The Rice partition order in a <A HREF="#partitioned_rice">Rice-coded residual section</A> must be less than or equal to 8.
+ </LI>
</UL>
</LI></P>
</UL>
@@ -1592,7 +1599,7 @@
</CENTER>
-<P> Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson</P>
+<P> Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson</P>
</BODY>
</HTML>
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/goals.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/goals.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/goals.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson -->
+<!-- Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson -->
<!-- Permission is granted to copy, distribute and/or modify this document -->
<!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
<!-- or any later version published by the Free Software Foundation; -->
@@ -133,7 +133,7 @@
</CENTER>
-<P> Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson</P>
+<P> Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson</P>
</BODY>
</HTML>
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/id.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/id.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/id.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson -->
+<!-- Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson -->
<!-- Permission is granted to copy, distribute and/or modify this document -->
<!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
<!-- or any later version published by the Free Software Foundation; -->
@@ -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>
@@ -212,7 +220,7 @@
</CENTER>
-<P> Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson</P>
+<P> Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson</P>
</BODY>
</HTML>
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/images/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/images/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/images/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/images/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/images/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/images/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
@@ -71,6 +71,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -106,10 +107,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -122,12 +131,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/index.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/index.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/index.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson -->
+<!-- Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson -->
<!-- Permission is granted to copy, distribute and/or modify this document -->
<!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
<!-- or any later version published by the Free Software Foundation; -->
@@ -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,13 @@
<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.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>FLAC 1.1.2 is available. New in this release are small decoding speedups for all platforms, small encoding speedups in fast (non-LPC) mode, streaming support in the XMMS plugin, and several bug fixes. For developers there are also a few additions and changes to the metadata API to make working with tags easier. See the <A HREF="changelog.html#flac_1_1_2">changelog entry</A> for complete details. This release actually wasn't supposed to happen so soon, but needed to be made to fix library naming and build problems in FLAC 1.1.1 that caused trouble for package maintainers, so unless you are having trouble with one of the particular bugs that got fixed in 1.1.2 then there is not much of a need to upgrade.</P>
+ <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><I>last updated 2005-Feb-05</I></P><!-- @@@ remember to update the date after changes -->
</FONT>
</TD></TR>
</TABLE>
@@ -232,6 +230,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">
+ <TR><TD BGCOLOR="#EEEED4"><SMALL><FONT FACE="Lucida,Verdana,Helvetica,Arial"><A HREF="news.html#20050205">05-Feb-2005</A> :<BR> Version 1.1.2 released<BR></FONT></SMALL></TD></TR>
+ <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>
@@ -253,7 +255,7 @@
</TABLE><BR><P>
-<A HREF="http://sourceforge.net"><IMG SRC="http://sourceforge.net/sflogo.php?group_id=13478&type=1" WIDTH="88" HEIGHT="31" BORDER="0" ALT="SourceForge Logo"></A><BR><P>
+<A HREF="http://sourceforge.net"><IMG SRC="http://sflogo.sourceforge.net/sflogo.php?group_id=13478&type=1" WIDTH="88" HEIGHT="31" BORDER="0" ALT="SourceForge Logo"></A><BR><P>
<A HREF="http://www.eff.org/cafe/"><IMG SRC="images/cafebug.gif" ALT="CAFE Logo" BORDER=0></A><BR>
@@ -264,7 +266,7 @@
</CENTER>
-<P> Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson</P>
+<P> Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson</P>
</BODY>
</HTML>
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/license.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/license.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/license.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- Copyright (c) 2004 Josh Coalson -->
+<!-- Copyright (c) 2004,2005 Josh Coalson -->
<!-- Permission is granted to copy, distribute and/or modify this document -->
<!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
<!-- or any later version published by the Free Software Foundation; -->
@@ -113,7 +113,7 @@
</CENTER>
-<P> Copyright (c) 2004 Josh Coalson</P>
+<P> Copyright (c) 2004,2005 Josh Coalson</P>
</BODY>
</HTML>
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/links.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/links.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/links.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- Copyright (c) 2004 Josh Coalson -->
+<!-- Copyright (c) 2004,2005 Josh Coalson -->
<!-- Permission is granted to copy, distribute and/or modify this document -->
<!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
<!-- or any later version published by the Free Software Foundation; -->
@@ -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 at 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>
@@ -361,7 +373,7 @@
</CENTER>
-<P> Copyright (c) 2004 Josh Coalson</P>
+<P> Copyright (c) 2004,2005 Josh Coalson</P>
</BODY>
</HTML>
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/news.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/news.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/news.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson -->
+<!-- Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson -->
<!-- Permission is granted to copy, distribute and/or modify this document -->
<!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
<!-- or any later version published by the Free Software Foundation; -->
@@ -81,11 +81,61 @@
<TR><TD><FONT FACE="Lucida,Verdana,Helvetica,Arial">
<P>
- <A NAME="20041001">1-Oct-2004:</A>
+ <A NAME="20050205">05-Feb-2005:</A>
</P>
<P>
<UL>
<LI>
+ <B>FLAC 1.1.2 released</B> New in this release are small decoding speedups for all platforms, small encoding speedups in fast (non-LPC) mode, streaming support in the XMMS plugin, and several bug fixes. For developers there are also a few additions and changes to the metadata API to make working with tags easier. See the <A HREF="changelog.html#flac_1_1_2">changelog entry</A> for complete details. This release actually wasn't supposed to happen so soon, but needed to be made to fix library naming and build problems in FLAC 1.1.1 that caused trouble for package maintainers, so unless you are having trouble with one of the particular bugs that got fixed in 1.1.2 then there is not much of a need to upgrade.
+ </LI>
+ </UL>
+ </P>
+
+ <P>
+ <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>
+ <LI>
<B>FLAC 1.1.1 released</B> There is a new <A HREF="changelog.html#flac_1_1_1">changelog</A> with a complete list of changes/fixes/improvements, but here is a summary of some of the main ones:
<UL>
<LI>Better Ogg FLAC support including seeking and an official <A HREF="ogg_mapping.html">Ogg FLAC mapping</A>.</LI>
@@ -679,7 +729,7 @@
</CENTER>
-<P> Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson</P>
+<P> Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson</P>
</BODY>
</HTML>
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ogg_mapping.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ogg_mapping.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ogg_mapping.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- Copyright (c) 2004 Josh Coalson -->
+<!-- Copyright (c) 2004,2005 Josh Coalson -->
<!-- Permission is granted to copy, distribute and/or modify this document -->
<!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
<!-- or any later version published by the Free Software Foundation; -->
@@ -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>
@@ -158,7 +158,7 @@
</CENTER>
-<P> Copyright (c) 2004 Josh Coalson</P>
+<P> Copyright (c) 2004,2005 Josh Coalson</P>
</BODY>
</HTML>
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
@@ -71,6 +71,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -106,10 +107,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -122,12 +131,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/authors.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/authors.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/authors.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//RU">
-<!-- Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson -->
+<!-- Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson -->
<!-- Permission is granted to copy, distribute and/or modify this document -->
<!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
<!-- or any later version published by the Free Software Foundation; -->
@@ -106,7 +106,7 @@
</BLOCKQUOTE>
</BLOCKQUOTE>
-<P> Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson</P>
+<P> Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson</P>
</BODY>
</HTML>
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/comparison.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/comparison.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/comparison.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//RU">
-<!-- Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson -->
+<!-- Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson -->
<!-- Permission is granted to copy, distribute and/or modify this document -->
<!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
<!-- or any later version published by the Free Software Foundation; -->
@@ -858,7 +858,7 @@
</P>
-<P> Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson</P>
+<P> Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson</P>
</BODY>
</HTML>
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/developers.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/developers.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/developers.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//RU">
-<!-- Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson -->
+<!-- Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson -->
<!-- Permission is granted to copy, distribute and/or modify this document -->
<!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
<!-- or any later version published by the Free Software Foundation; -->
@@ -103,7 +103,7 @@
<P> èñõîäíûõ òåêñòàõ ïðîåêòà åñòü íåñêîëüêî ïðèìåðîâ èñïîëüçîâàíèÿ <B><TT>libFLAC</TT></B> è <B><TT>libFLAC++</TT></B>. Íà ñòðàíèöå <A HREF="download.html">ôàéëû</A> íàïèñàíî, êàê ìîæíî èõ ïîëó÷èòü.</P>
-<P> Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson</P>
+<P> Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson</P>
</BODY>
</HTML>
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/documentation.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/documentation.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/documentation.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//RU">
-<!-- Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson -->
+<!-- Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson -->
<!-- Permission is granted to copy, distribute and/or modify this document -->
<!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
<!-- or any later version published by the Free Software Foundation; -->
@@ -510,7 +510,7 @@
<P>Äðóãèå îáîëî÷êè ìîæíî èñïîëüçîâàòü ïðèìåðíî òàêèì æå ñïîñîáîì.</P>
-<P> Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson</P>
+<P> Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson</P>
</BODY>
</HTML>
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/download.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/download.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/download.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//RU">
-<!-- Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson -->
+<!-- Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson -->
<!-- Permission is granted to copy, distribute and/or modify this document -->
<!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
<!-- or any later version published by the Free Software Foundation; -->
@@ -103,7 +103,7 @@
</UL></BLOCKQUOTE></P>
-<P> Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson</P>
+<P> Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson</P>
</BODY>
</HTML>
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/features.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/features.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/features.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//RU">
-<!-- Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson -->
+<!-- Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson -->
<!-- Permission is granted to copy, distribute and/or modify this document -->
<!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
<!-- or any later version published by the Free Software Foundation; -->
@@ -118,7 +118,7 @@
</UL></BLOCKQUOTE></B>
-<P> Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson</P>
+<P> Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson</P>
</BODY>
</HTML>
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/format.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/format.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/format.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//RU">
-<!-- Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson -->
+<!-- Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson -->
<!-- Permission is granted to copy, distribute and/or modify this document -->
<!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
<!-- or any later version published by the Free Software Foundation; -->
@@ -1000,7 +1000,7 @@
</TABLE></P>
-<P> Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson</P>
+<P> Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson</P>
</BODY>
</HTML>
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/goals.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/goals.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/goals.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//RU">
-<!-- Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson -->
+<!-- Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson -->
<!-- Permission is granted to copy, distribute and/or modify this document -->
<!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
<!-- or any later version published by the Free Software Foundation; -->
@@ -98,7 +98,7 @@
<LI>Çàùèòà îò êîïèðîâàíèÿ â ëþáîì âèäå.</LI>
</UL></BLOCKQUOTE></P>
-<P> Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson</P>
+<P> Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson</P>
</BODY>
</HTML>
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/id.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/id.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/id.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//RU">
-<!-- Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson -->
+<!-- Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson -->
<!-- Permission is granted to copy, distribute and/or modify this document -->
<!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
<!-- or any later version published by the Free Software Foundation; -->
@@ -122,7 +122,7 @@
</TABLE>
-<P> Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson</P>
+<P> Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson</P>
</BODY>
</HTML>
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/index.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/index.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/index.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//RU">
-<!-- Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson -->
+<!-- Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson -->
<!-- Permission is granted to copy, distribute and/or modify this document -->
<!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
<!-- or any later version published by the Free Software Foundation; -->
@@ -115,7 +115,7 @@
<P>Åñëè ó âàñ åñòü ïðèëîæåíèå, èñïîëüçóþùåå FLAC, è âû õîòèòå, ÷òîáû îíî ðàáîòàëî ñ äîáàâëÿåìûìè â ôàéë ìåòàäàííûìè, çàéäèòå íà <A HREF="id.html">ñòðàíèöó</A> ðåãèñòðàöèè è çàðåçåðâèðóéòå äëÿ íåãî èäåíòèôèêàòîð.</P>
-<P> Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson</P>
+<P> Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson</P>
</BODY>
</HTML>
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/links.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/links.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/links.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//RU">
-<!-- Copyright (c) 2001,2002,2003,2004 Josh Coalson -->
+<!-- Copyright (c) 2001,2002,2003,2004,2005 Josh Coalson -->
<!-- Permission is granted to copy, distribute and/or modify this document -->
<!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
<!-- or any later version published by the Free Software Foundation; -->
@@ -118,7 +118,7 @@
</UL></BLOCKQUOTE></P>
-<P> Copyright (c) 2001,2002,2003,2004 Josh Coalson</P>
+<P> Copyright (c) 2001,2002,2003,2004,2005 Josh Coalson</P>
</BODY>
</HTML>
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/news.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/news.html 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/doc/html/ru/news.html 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//RU">
-<!-- Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson -->
+<!-- Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson -->
<!-- Permission is granted to copy, distribute and/or modify this document -->
<!-- under the terms of the GNU Free Documentation License, Version 1.1 -->
<!-- or any later version published by the Free Software Foundation; -->
@@ -298,7 +298,7 @@
<P><LI><B>10.12.2000</B></LI><BR>
FLAC âûëîæåí íà SourceForge. Ïîñåòèòå <A HREF="http://www.sourceforge.net/projects/flac/">ñòðàíèöó</A> ïðîåêòà, ÷òîáû ïîäïèñàòüñÿ íà ñïèñîê ðàñûëêè èëè ñòàòü ðàçðàáîò÷èêîì.</P>
-<P> Copyright (c) 2000,2001,2002,2003,2004 Josh Coalson</P>
+<P> Copyright (c) 2000,2001,2002,2003,2004,2005 Josh Coalson</P>
</BODY>
</HTML>
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/flac.pbproj/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/flac.pbproj/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/flac.pbproj/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/flac.pbproj/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/flac.pbproj/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/flac.pbproj/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
@@ -67,6 +67,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -102,10 +103,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -118,12 +127,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/flac.pbproj/project.pbxproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/flac.pbproj/project.pbxproj 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/flac.pbproj/project.pbxproj 2005-10-20 12:55:24 UTC (rev 10204)
@@ -2798,7 +2798,7 @@
HEADER_SEARCH_PATHS = "src/libFLAC/include include";
LIBRARY_STYLE = STATIC;
OPTIMIZATION_CFLAGS = "-O3";
- OTHER_CFLAGS = "-DVERSION=\\\\\\\"1.1.1\\\\\\\" -DHAVE_INTTYPES_H -DFLAC__CPU_PPC -DFLAC__USE_ALTIVEC -DFLAC__ALIGN_MALLOC_DATA";
+ OTHER_CFLAGS = "-DVERSION=\\\\\\\"1.1.2\\\\\\\" -DHAVE_INTTYPES_H -DFLAC__CPU_PPC -DFLAC__USE_ALTIVEC -DFLAC__ALIGN_MALLOC_DATA";
OTHER_LDFLAGS = "";
OTHER_LIBTOOL_FLAGS = "";
OTHER_REZFLAGS = "";
@@ -3108,7 +3108,7 @@
HEADER_SEARCH_PATHS = "/sw/include include";
LIBRARY_SEARCH_PATHS = /sw/lib;
OPTIMIZATION_CFLAGS = "-O3";
- OTHER_CFLAGS = "-DVERSION=\\\\\\\"1.1.1\\\\\\\" -DHAVE_INTTYPES_H -DFLAC__HAS_OGG";
+ OTHER_CFLAGS = "-DVERSION=\\\\\\\"1.1.2\\\\\\\" -DHAVE_INTTYPES_H -DFLAC__HAS_OGG";
OTHER_LDFLAGS = "-logg";
OTHER_REZFLAGS = "";
PRODUCT_NAME = flac;
@@ -4124,7 +4124,7 @@
HEADER_SEARCH_PATHS = "/sw/include include";
LIBRARY_SEARCH_PATHS = /sw/lib;
OPTIMIZATION_CFLAGS = "-O3";
- OTHER_CFLAGS = "-DVERSION=\\\\\\\"1.1.1\\\\\\\" -DHAVE_INTTYPES_H -DFLAC__HAS_OGG";
+ OTHER_CFLAGS = "-DVERSION=\\\\\\\"1.1.2\\\\\\\" -DHAVE_INTTYPES_H -DFLAC__HAS_OGG";
OTHER_REZFLAGS = "";
PRODUCT_NAME = metaflac;
REZ_EXECUTABLE = YES;
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# libFLAC - Free Lossless Audio Codec library
-# Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# libFLAC - Free Lossless Audio Codec library
-# Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -87,6 +87,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -122,10 +123,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -138,12 +147,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/all.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/all.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/all.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/assert.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/assert.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/assert.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/callback.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/callback.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/callback.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2004 Josh Coalson
+ * Copyright (C) 2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/export.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/export.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/export.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/file_decoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/file_decoder.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/file_decoder.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/file_encoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/file_encoder.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/file_encoder.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/format.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/format.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/format.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -583,6 +583,10 @@
/** Vorbis comment entry structure used in VORBIS_COMMENT blocks. (c.f. <A HREF="../format.html#metadata_block_vorbis_comment">format specification</A>)
+ *
+ * For convenience, the APIs maintain a trailing NUL character at the end of
+ * \a entry which is not counted toward \a length, i.e.
+ * \code strlen(entry) == length \endcode
*/
typedef struct {
FLAC__uint32 length;
@@ -743,7 +747,6 @@
*
*****************************************************************************/
-/* @@@@ add to unit tests; it is already indirectly tested by the metadata_object tests */
/** Tests that a sample rate is valid for FLAC. Since the rules for valid
* sample rates are slightly complex, they are encapsulated in this function.
*
@@ -754,6 +757,52 @@
*/
FLAC_API FLAC__bool FLAC__format_sample_rate_is_valid(unsigned sample_rate);
+/** Check a Vorbis comment entry name to see if it conforms to the Vorbis
+ * comment specification.
+ *
+ * Vorbis comment names must be composed only of characters from
+ * [0x20-0x3C,0x3E-0x7D].
+ *
+ * \param name A NUL-terminated string to be checked.
+ * \assert
+ * \code name != NULL \endcode
+ * \retval FLAC__bool
+ * \c false if entry name is illegal, else \c true.
+ */
+FLAC_API FLAC__bool FLAC__format_vorbiscomment_entry_name_is_legal(const char *name);
+
+/** Check a Vorbis comment entry value to see if it conforms to the Vorbis
+ * comment specification.
+ *
+ * Vorbis comment values must be valid UTF-8 sequences.
+ *
+ * \param value A string to be checked.
+ * \param length A the length of \a value in bytes. May be
+ * \c (unsigned)(-1) to indicate that \a value is a plain
+ * UTF-8 NUL-terminated string.
+ * \assert
+ * \code value != NULL \endcode
+ * \retval FLAC__bool
+ * \c false if entry name is illegal, else \c true.
+ */
+FLAC_API FLAC__bool FLAC__format_vorbiscomment_entry_value_is_legal(const FLAC__byte *value, unsigned length);
+
+/** Check a Vorbis comment entry to see if it conforms to the Vorbis
+ * comment specification.
+ *
+ * Vorbis comment entries must be of the form 'name=value', and 'name' and
+ * 'value' must be legal according to
+ * FLAC__format_vorbiscomment_entry_name_is_legal() and
+ * FLAC__format_vorbiscomment_entry_value_is_legal() respectively.
+ *
+ * \param value A string to be checked.
+ * \assert
+ * \code value != NULL \endcode
+ * \retval FLAC__bool
+ * \c false if entry name is illegal, else \c true.
+ */
+FLAC_API FLAC__bool FLAC__format_vorbiscomment_entry_is_legal(const FLAC__byte *entry, unsigned length);
+
/* @@@@ add to unit tests; it is already indirectly tested by the metadata_object tests */
/** Check a seek table to see if it conforms to the FLAC specification.
* See the format specification for limits on the contents of the
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/metadata.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/metadata.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/metadata.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -1087,6 +1087,17 @@
* FLAC__metadata_object_application_set_data(), you will get an assertion
* failure.
*
+ * For convenience the FLAC__metadata_object_vorbiscomment_*() functions
+ * maintain a trailing NUL on each Vorbis comment entry. This is not counted
+ * toward the length or stored in the stream, but it can make working with plain
+ * comments (those that don't contain embedded-NULs in the value) easier.
+ * Entries passed into these functions have trailing NULs added if missing, and
+ * returned entries are guaranteed to have a trailing NUL.
+ *
+ * The FLAC__metadata_object_vorbiscomment_*() functions that take a Vorbis
+ * comment entry/name/value will first validate that it complies with the Vorbis
+ * comment specification and return false if it does not.
+ *
* There is no need to recalculate the length field on metadata blocks you
* have modified. They will be calculated automatically before they are
* written back to a file.
@@ -1155,8 +1166,7 @@
/** Sets the application data of an APPLICATION block.
*
* If \a copy is \c true, a copy of the data is stored; otherwise, the object
- * takes ownership of the pointer. Returns \c false if \a copy == \c true
- * and malloc fails.
+ * takes ownership of the pointer.
*
* \param object A pointer to an existing APPLICATION object.
* \param data A pointer to the data to set.
@@ -1168,7 +1178,7 @@
* \code (data != NULL && length > 0) ||
* (data == NULL && length == 0 && copy == false) \endcode
* \retval FLAC__bool
- * \c false if \a copy is \c true and malloc fails, else \c true.
+ * \c false if \a copy is \c true and malloc() fails, else \c true.
*/
FLAC_API FLAC__bool FLAC__metadata_object_application_set_data(FLAC__StreamMetadata *object, FLAC__byte *data, unsigned length, FLAC__bool copy);
@@ -1327,26 +1337,32 @@
* \code object != NULL \endcode
* \code object->type == FLAC__METADATA_TYPE_SEEKTABLE \endcode
* \retval FLAC__bool
- * \c false if realloc fails, else \c true.
+ * \c false if realloc() fails, else \c true.
*/
FLAC_API FLAC__bool FLAC__metadata_object_seektable_template_sort(FLAC__StreamMetadata *object, FLAC__bool compact);
/** Sets the vendor string in a VORBIS_COMMENT block.
*
+ * For convenience, a trailing NUL is added to the entry if it doesn't have
+ * one already.
+ *
* If \a copy is \c true, a copy of the entry is stored; otherwise, the object
- * takes ownership of the \c entry->entry pointer. Returns \c false if
- * \a copy == \c true and malloc fails.
+ * takes ownership of the \c entry.entry pointer.
*
+ * \note If this function returns \c false, the caller still owns the
+ * pointer.
+ *
* \param object A pointer to an existing VORBIS_COMMENT object.
* \param entry The entry to set the vendor string to.
* \param copy See above.
* \assert
* \code object != NULL \endcode
* \code object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT \endcode
- * \code (entry->entry != NULL && entry->length > 0) ||
- * (entry->entry == NULL && entry->length == 0) \endcode
+ * \code (entry.entry != NULL && entry.length > 0) ||
+ * (entry.entry == NULL && entry.length == 0) \endcode
* \retval FLAC__bool
- * \c false if \a copy is \c true and malloc fails, else \c true.
+ * \c false if memory allocation fails or \a entry does not comply with the
+ * Vorbis comment specification, else \c true.
*/
FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_set_vendor_string(FLAC__StreamMetadata *object, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy);
@@ -1363,16 +1379,21 @@
* \code (object->data.vorbis_comment.comments == NULL && object->data.vorbis_comment.num_comments == 0) ||
* (object->data.vorbis_comment.comments != NULL && object->data.vorbis_comment.num_comments > 0) \endcode
* \retval FLAC__bool
- * \c false if memory allocation error, else \c true.
+ * \c false if memory allocation fails, else \c true.
*/
FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_resize_comments(FLAC__StreamMetadata *object, unsigned new_num_comments);
/** Sets a comment in a VORBIS_COMMENT block.
*
+ * For convenience, a trailing NUL is added to the entry if it doesn't have
+ * one already.
+ *
* If \a copy is \c true, a copy of the entry is stored; otherwise, the object
- * takes ownership of the \c entry->entry pointer. Returns \c false if
- * \a copy == \c true and malloc fails.
+ * takes ownership of the \c entry.entry pointer.
*
+ * \note If this function returns \c false, the caller still owns the
+ * pointer.
+ *
* \param object A pointer to an existing VORBIS_COMMENT object.
* \param comment_num Index into comment array to set.
* \param entry The entry to set the comment to.
@@ -1381,19 +1402,25 @@
* \code object != NULL \endcode
* \code object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT \endcode
* \code comment_num < object->data.vorbis_comment.num_comments \endcode
- * \code (entry->entry != NULL && entry->length > 0) ||
- * (entry->entry == NULL && entry->length == 0) \endcode
+ * \code (entry.entry != NULL && entry.length > 0) ||
+ * (entry.entry == NULL && entry.length == 0) \endcode
* \retval FLAC__bool
- * \c false if \a copy is \c true and malloc fails, else \c true.
+ * \c false if memory allocation fails or \a entry does not comply with the
+ * Vorbis comment specification, else \c true.
*/
FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_set_comment(FLAC__StreamMetadata *object, unsigned comment_num, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy);
/** Insert a comment in a VORBIS_COMMENT block at the given index.
*
+ * For convenience, a trailing NUL is added to the entry if it doesn't have
+ * one already.
+ *
* If \a copy is \c true, a copy of the entry is stored; otherwise, the object
- * takes ownership of the \c entry->entry pointer. Returns \c false if
- * \a copy == \c true and malloc fails.
+ * takes ownership of the \c entry.entry pointer.
*
+ * \note If this function returns \c false, the caller still owns the
+ * pointer.
+ *
* \param object A pointer to an existing VORBIS_COMMENT object.
* \param comment_num The index at which to insert the comment. The comments
* at and after \a comment_num move right one position.
@@ -1405,13 +1432,74 @@
* \code object != NULL \endcode
* \code object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT \endcode
* \code object->data.vorbis_comment.num_comments >= comment_num \endcode
- * \code (entry->entry != NULL && entry->length > 0) ||
- * (entry->entry == NULL && entry->length == 0 && copy == false) \endcode
+ * \code (entry.entry != NULL && entry.length > 0) ||
+ * (entry.entry == NULL && entry.length == 0 && copy == false) \endcode
* \retval FLAC__bool
- * \c false if \a copy is \c true and malloc fails, else \c true.
+ * \c false if memory allocation fails or \a entry does not comply with the
+ * Vorbis comment specification, else \c true.
*/
FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_insert_comment(FLAC__StreamMetadata *object, unsigned comment_num, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy);
+/** Appends a comment to a VORBIS_COMMENT block.
+ *
+ * For convenience, a trailing NUL is added to the entry if it doesn't have
+ * one already.
+ *
+ * If \a copy is \c true, a copy of the entry is stored; otherwise, the object
+ * takes ownership of the \c entry.entry pointer.
+ *
+ * \note If this function returns \c false, the caller still owns the
+ * pointer.
+ *
+ * \param object A pointer to an existing VORBIS_COMMENT object.
+ * \param entry The comment to insert.
+ * \param copy See above.
+ * \assert
+ * \code object != NULL \endcode
+ * \code object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT \endcode
+ * \code (entry.entry != NULL && entry.length > 0) ||
+ * (entry.entry == NULL && entry.length == 0 && copy == false) \endcode
+ * \retval FLAC__bool
+ * \c false if memory allocation fails or \a entry does not comply with the
+ * Vorbis comment specification, else \c true.
+ */
+FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_append_comment(FLAC__StreamMetadata *object, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy);
+
+/** Replaces comments in a VORBIS_COMMENT block with a new one.
+ *
+ * For convenience, a trailing NUL is added to the entry if it doesn't have
+ * one already.
+ *
+ * Depending on the the value of \a all, either all or just the first comment
+ * whose field name(s) match the given entry's name will be replaced by the
+ * given entry. If no comments match, \a entry will simply be appended.
+ *
+ * If \a copy is \c true, a copy of the entry is stored; otherwise, the object
+ * takes ownership of the \c entry.entry pointer.
+ *
+ * \note If this function returns \c false, the caller still owns the
+ * pointer.
+ *
+ * \param object A pointer to an existing VORBIS_COMMENT object.
+ * \param entry The comment to insert.
+ * \param all If \c true, all comments whose field name matches
+ * \a entry's field name will be removed, and \a entry will
+ * be inserted at the position of the first matching
+ * comment. If \c false, only the first comment whose
+ * field name matches \a entry's field name will be
+ * replaced with \a entry.
+ * \param copy See above.
+ * \assert
+ * \code object != NULL \endcode
+ * \code object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT \endcode
+ * \code (entry.entry != NULL && entry.length > 0) ||
+ * (entry.entry == NULL && entry.length == 0 && copy == false) \endcode
+ * \retval FLAC__bool
+ * \c false if memory allocation fails or \a entry does not comply with the
+ * Vorbis comment specification, else \c true.
+ */
+FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_replace_comment(FLAC__StreamMetadata *object, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool all, FLAC__bool copy);
+
/** Delete a comment in a VORBIS_COMMENT block at the given index.
*
* \param object A pointer to an existing VORBIS_COMMENT object.
@@ -1420,30 +1508,67 @@
* \code object != NULL \endcode
* \code object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT \endcode
* \code object->data.vorbis_comment.num_comments > comment_num \endcode
- * \code (entry->entry != NULL && entry->length > 0) ||
- * (entry->entry == NULL && entry->length == 0 && copy == false) \endcode
* \retval FLAC__bool
- * \c false if realloc fails, else \c true.
+ * \c false if realloc() fails, else \c true.
*/
FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_delete_comment(FLAC__StreamMetadata *object, unsigned comment_num);
-/*@@@@ add to unit tests */
+/** Creates a Vorbis comment entry from NUL-terminated name and value strings.
+ *
+ * On return, the filled-in \a entry->entry pointer will point to malloc()ed
+ * memory and shall be owned by the caller. For convenience the entry will
+ * have a terminating NUL.
+ *
+ * \param entry A pointer to a Vorbis comment entry. The entry's
+ * \c entry pointer should not point to allocated
+ * memory as it will be overwritten.
+ * \param field_name The field name in ASCII, \c NUL terminated.
+ * \param field_value The field value in UTF-8, \c NUL terminated.
+ * \assert
+ * \code entry != NULL \endcode
+ * \code field_name != NULL \endcode
+ * \code field_value != NULL \endcode
+ * \retval FLAC__bool
+ * \c false if malloc() fails, or if \a field_name or \a field_value does
+ * not comply with the Vorbis comment specification, else \c true.
+ */
+FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair(FLAC__StreamMetadata_VorbisComment_Entry *entry, const char *field_name, const char *field_value);
+
+/** Splits a Vorbis comment entry into NUL-terminated name and value strings.
+ *
+ * The returned pointers to name and value will be allocated by malloc()
+ * and shall be owned by the caller.
+ *
+ * \param entry An existing Vorbis comment entry.
+ * \param field_name The address of where the returned pointer to the
+ * field name will be stored.
+ * \param field_value The address of where the returned pointer to the
+ * field value will be stored.
+ * \assert
+ * \code (entry.entry != NULL && entry.length > 0) \endcode
+ * \code memchr(entry.entry, '=', entry.length) != NULL \endcode
+ * \code field_name != NULL \endcode
+ * \code field_value != NULL \endcode
+ * \retval FLAC__bool
+ * \c false if memory allocation fails or \a entry does not comply with the
+ * Vorbis comment specification, else \c true.
+ */
+FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_entry_to_name_value_pair(const FLAC__StreamMetadata_VorbisComment_Entry entry, char **field_name, char **field_value);
+
/** Check if the given Vorbis comment entry's field name matches the given
* field name.
*
- * \param entry A pointer to an existing Vorbis comment entry.
+ * \param entry An existing Vorbis comment entry.
* \param field_name The field name to check.
* \param field_name_length The length of \a field_name, not including the
- * terminating \c NULL.
+ * terminating \c NUL.
* \assert
- * \code entry != NULL \endcode
- * \code (entry->entry != NULL && entry->length > 0) \endcode
+ * \code (entry.entry != NULL && entry.length > 0) \endcode
* \retval FLAC__bool
* \c true if the field names match, else \c false
*/
-FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_entry_matches(const FLAC__StreamMetadata_VorbisComment_Entry *entry, const char *field_name, unsigned field_name_length);
+FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_entry_matches(const FLAC__StreamMetadata_VorbisComment_Entry entry, const char *field_name, unsigned field_name_length);
-/*@@@@ add to unit tests */
/** Find a Vorbis comment with the given field name.
*
* The search begins at entry number \a offset; use an offset of 0 to
@@ -1456,13 +1581,13 @@
* \assert
* \code object != NULL \endcode
* \code object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT \endcode
+ * \code field_name != NULL \endcode
* \retval int
* The offset in the comment array of the first comment whose field
* name matches \a field_name, or \c -1 if no match was found.
*/
FLAC_API int FLAC__metadata_object_vorbiscomment_find_entry_from(const FLAC__StreamMetadata *object, unsigned offset, const char *field_name);
-/*@@@@ add to unit tests */
/** Remove first Vorbis comment matching the given field name.
*
* \param object A pointer to an existing VORBIS_COMMENT object.
@@ -1476,7 +1601,6 @@
*/
FLAC_API int FLAC__metadata_object_vorbiscomment_remove_entry_matching(FLAC__StreamMetadata *object, const char *field_name);
-/*@@@@ add to unit tests */
/** Remove all Vorbis comments matching the given field name.
*
* \param object A pointer to an existing VORBIS_COMMENT object.
@@ -1561,7 +1685,7 @@
* \code object->data.cue_sheet.num_tracks > track_num \endcode
* \code object->data.cue_sheet.tracks[track_num].num_indices >= index_num \endcode
* \retval FLAC__bool
- * \c false if realloc fails, else \c true.
+ * \c false if realloc() fails, else \c true.
*/
FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_track_insert_index(FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num, FLAC__StreamMetadata_CueSheet_Index index);
@@ -1585,7 +1709,7 @@
* \code object->data.cue_sheet.num_tracks > track_num \endcode
* \code object->data.cue_sheet.tracks[track_num].num_indices >= index_num \endcode
* \retval FLAC__bool
- * \c false if realloc fails, else \c true.
+ * \c false if realloc() fails, else \c true.
*/
FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_track_insert_blank_index(FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num);
@@ -1604,7 +1728,7 @@
* \code object->data.cue_sheet.num_tracks > track_num \endcode
* \code object->data.cue_sheet.tracks[track_num].num_indices > index_num \endcode
* \retval FLAC__bool
- * \c false if realloc fails, else \c true.
+ * \c false if realloc() fails, else \c true.
*/
FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_track_delete_index(FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num);
@@ -1628,8 +1752,7 @@
/** Sets a track in a CUESHEET block.
*
* If \a copy is \c true, a copy of the track is stored; otherwise, the object
- * takes ownership of the \a track pointer. Returns \c false if
- * \a copy == \c true and malloc fails.
+ * takes ownership of the \a track pointer.
*
* \param object A pointer to an existing CUESHEET object.
* \param track_num Index into track array to set. NOTE: this is not
@@ -1644,15 +1767,14 @@
* \code (track->indices != NULL && track->num_indices > 0) ||
* (track->indices == NULL && track->num_indices == 0)
* \retval FLAC__bool
- * \c false if \a copy is \c true and malloc fails, else \c true.
+ * \c false if \a copy is \c true and malloc() fails, else \c true.
*/
FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_set_track(FLAC__StreamMetadata *object, unsigned track_num, FLAC__StreamMetadata_CueSheet_Track *track, FLAC__bool copy);
/** Insert a track in a CUESHEET block at the given index.
*
* If \a copy is \c true, a copy of the track is stored; otherwise, the object
- * takes ownership of the \a track pointer. Returns \c false if
- * \a copy == \c true and malloc fails.
+ * takes ownership of the \a track pointer.
*
* \param object A pointer to an existing CUESHEET object.
* \param track_num The index at which to insert the track. NOTE: this
@@ -1668,7 +1790,7 @@
* \code object->type == FLAC__METADATA_TYPE_CUESHEET \endcode
* \code object->data.cue_sheet.num_tracks >= track_num \endcode
* \retval FLAC__bool
- * \c false if \a copy is \c true and malloc fails, else \c true.
+ * \c false if \a copy is \c true and malloc() fails, else \c true.
*/
FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_insert_track(FLAC__StreamMetadata *object, unsigned track_num, FLAC__StreamMetadata_CueSheet_Track *track, FLAC__bool copy);
@@ -1687,7 +1809,7 @@
* \code object->type == FLAC__METADATA_TYPE_CUESHEET \endcode
* \code object->data.cue_sheet.num_tracks >= track_num \endcode
* \retval FLAC__bool
- * \c false if \a copy is \c true and malloc fails, else \c true.
+ * \c false if \a copy is \c true and malloc() fails, else \c true.
*/
FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_insert_blank_track(FLAC__StreamMetadata *object, unsigned track_num);
@@ -1702,7 +1824,7 @@
* \code object->type == FLAC__METADATA_TYPE_CUESHEET \endcode
* \code object->data.cue_sheet.num_tracks > track_num \endcode
* \retval FLAC__bool
- * \c false if realloc fails, else \c true.
+ * \c false if realloc() fails, else \c true.
*/
FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_delete_track(FLAC__StreamMetadata *object, unsigned track_num);
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/seekable_stream_decoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/seekable_stream_decoder.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/seekable_stream_decoder.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/seekable_stream_encoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/seekable_stream_encoder.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/seekable_stream_encoder.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/stream_decoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/stream_decoder.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/stream_decoder.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -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
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/stream_encoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/stream_encoder.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC/stream_encoder.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC++/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC++/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC++/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# libFLAC++ - Free Lossless Audio Codec library
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC++/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC++/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC++/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# libFLAC++ - Free Lossless Audio Codec library
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -87,6 +87,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -122,10 +123,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -138,12 +147,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC++/all.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC++/all.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC++/all.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC++ - Free Lossless Audio Codec library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC++/decoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC++/decoder.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC++/decoder.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC++ - Free Lossless Audio Codec library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -141,7 +141,7 @@
virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0;
-#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
+#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)
// lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring()
friend State;
#endif
@@ -236,7 +236,7 @@
virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0;
-#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
+#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)
// lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring()
friend State;
#endif
@@ -329,7 +329,7 @@
virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0;
-#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
+#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)
// lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring()
friend State;
#endif
@@ -346,7 +346,7 @@
/* \} */
- };
-};
+ }
+}
#endif
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC++/encoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC++/encoder.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC++/encoder.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC++ - Free Lossless Audio Codec library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -159,7 +159,7 @@
virtual ::FLAC__StreamEncoderWriteStatus write_callback(const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame) = 0;
virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
-#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
+#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)
// lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring()
friend State;
#endif
@@ -259,7 +259,7 @@
virtual ::FLAC__SeekableStreamEncoderTellStatus tell_callback(FLAC__uint64 *absolute_byte_offset) = 0;
virtual ::FLAC__StreamEncoderWriteStatus write_callback(const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame) = 0;
-#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
+#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)
// lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring()
friend State;
#endif
@@ -360,7 +360,7 @@
protected:
virtual void progress_callback(FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate);
-#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
+#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)
// lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring()
friend State;
#endif
@@ -375,7 +375,7 @@
/* \} */
- };
-};
+ }
+}
#endif
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC++/export.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC++/export.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC++/export.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC++ - Free Lossless Audio Codec library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC++/metadata.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC++/metadata.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/FLAC++/metadata.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC++ - Free Lossless Audio Codec library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -126,11 +126,16 @@
//@{
/** Assign from another object. Always performs a deep copy. */
- void operator=(const Prototype &);
- void operator=(const ::FLAC__StreamMetadata &);
- void operator=(const ::FLAC__StreamMetadata *);
+ Prototype &operator=(const Prototype &);
+ Prototype &operator=(const ::FLAC__StreamMetadata &);
+ Prototype &operator=(const ::FLAC__StreamMetadata *);
//@}
+ /** Assigns an object with copy control. See
+ * Prototype(::FLAC__StreamMetadata *object, bool copy).
+ */
+ Prototype &assign_object(::FLAC__StreamMetadata *object, bool copy);
+
/** Deletes the underlying ::FLAC__StreamMetadata object.
*/
virtual void clear();
@@ -278,11 +283,16 @@
//@{
/** Assign from another object. Always performs a deep copy. */
- inline void operator=(const StreamInfo &object) { Prototype::operator=(object); }
- inline void operator=(const ::FLAC__StreamMetadata &object) { Prototype::operator=(object); }
- inline void operator=(const ::FLAC__StreamMetadata *object) { Prototype::operator=(object); }
+ inline StreamInfo &operator=(const StreamInfo &object) { Prototype::operator=(object); return *this; }
+ inline StreamInfo &operator=(const ::FLAC__StreamMetadata &object) { Prototype::operator=(object); return *this; }
+ inline StreamInfo &operator=(const ::FLAC__StreamMetadata *object) { Prototype::operator=(object); return *this; }
//@}
+ /** Assigns an object with copy control. See
+ * Prototype::assign_object(::FLAC__StreamMetadata *object, bool copy).
+ */
+ inline StreamInfo &assign(::FLAC__StreamMetadata *object, bool copy) { Prototype::assign_object(object, copy); return *this; }
+
//@{
/** Check for equality, performing a deep compare by following pointers. */
inline bool operator==(const StreamInfo &object) const { return Prototype::operator==(object); }
@@ -346,11 +356,16 @@
//@{
/** Assign from another object. Always performs a deep copy. */
- inline void operator=(const Padding &object) { Prototype::operator=(object); }
- inline void operator=(const ::FLAC__StreamMetadata &object) { Prototype::operator=(object); }
- inline void operator=(const ::FLAC__StreamMetadata *object) { Prototype::operator=(object); }
+ inline Padding &operator=(const Padding &object) { Prototype::operator=(object); return *this; }
+ inline Padding &operator=(const ::FLAC__StreamMetadata &object) { Prototype::operator=(object); return *this; }
+ inline Padding &operator=(const ::FLAC__StreamMetadata *object) { Prototype::operator=(object); return *this; }
//@}
+ /** Assigns an object with copy control. See
+ * Prototype::assign_object(::FLAC__StreamMetadata *object, bool copy).
+ */
+ inline Padding &assign(::FLAC__StreamMetadata *object, bool copy) { Prototype::assign_object(object, copy); return *this; }
+
//@{
/** Check for equality, performing a deep compare by following pointers. */
inline bool operator==(const Padding &object) const { return Prototype::operator==(object); }
@@ -393,11 +408,16 @@
//@{
/** Assign from another object. Always performs a deep copy. */
- inline void operator=(const Application &object) { Prototype::operator=(object); }
- inline void operator=(const ::FLAC__StreamMetadata &object) { Prototype::operator=(object); }
- inline void operator=(const ::FLAC__StreamMetadata *object) { Prototype::operator=(object); }
+ inline Application &operator=(const Application &object) { Prototype::operator=(object); return *this; }
+ inline Application &operator=(const ::FLAC__StreamMetadata &object) { Prototype::operator=(object); return *this; }
+ inline Application &operator=(const ::FLAC__StreamMetadata *object) { Prototype::operator=(object); return *this; }
//@}
+ /** Assigns an object with copy control. See
+ * Prototype::assign_object(::FLAC__StreamMetadata *object, bool copy).
+ */
+ inline Application &assign(::FLAC__StreamMetadata *object, bool copy) { Prototype::assign_object(object, copy); return *this; }
+
//@{
/** Check for equality, performing a deep compare by following pointers. */
inline bool operator==(const Application &object) const { return Prototype::operator==(object); }
@@ -446,11 +466,16 @@
//@{
/** Assign from another object. Always performs a deep copy. */
- inline void operator=(const SeekTable &object) { Prototype::operator=(object); }
- inline void operator=(const ::FLAC__StreamMetadata &object) { Prototype::operator=(object); }
- inline void operator=(const ::FLAC__StreamMetadata *object) { Prototype::operator=(object); }
+ inline SeekTable &operator=(const SeekTable &object) { Prototype::operator=(object); return *this; }
+ inline SeekTable &operator=(const ::FLAC__StreamMetadata &object) { Prototype::operator=(object); return *this; }
+ inline SeekTable &operator=(const ::FLAC__StreamMetadata *object) { Prototype::operator=(object); return *this; }
//@}
+ /** Assigns an object with copy control. See
+ * Prototype::assign_object(::FLAC__StreamMetadata *object, bool copy).
+ */
+ inline SeekTable &assign(::FLAC__StreamMetadata *object, bool copy) { Prototype::assign_object(object, copy); return *this; }
+
//@{
/** Check for equality, performing a deep compare by following pointers. */
inline bool operator==(const SeekTable &object) const { return Prototype::operator==(object); }
@@ -492,32 +517,43 @@
* name is undefined; only the field value is relevant.
*
* A \a field as used in the methods refers to an
- * entire 'NAME=VALUE' string; the string is not null-
- * terminated and a length field is required since the
- * string may contain embedded nulls.
+ * entire 'NAME=VALUE' string; for convenience the
+ * string is NUL-terminated. A length field is
+ * required in the unlikely event that the value
+ * contains contain embedded NULs.
*
* A \a field_name is what is on the left side of the
* first '=' in the \a field. By definition it is ASCII
- * and so is null-terminated and does not require a
+ * and so is NUL-terminated and does not require a
* length to describe it. \a field_name is undefined
* for a vendor string entry.
*
* A \a field_value is what is on the right side of the
* first '=' in the \a field. By definition, this may
- * contain embedded nulls and so a \a field_value_length
- * is requires to describe it.
+ * contain embedded NULs and so a \a field_value_length
+ * is required to describe it. However in practice,
+ * embedded NULs are not known to be used, so it is
+ * generally safe to treat field values as NUL-
+ * terminated UTF-8 strings.
*
* Always check is_valid() after the constructor or operator=
- * to make sure memory was properly allocated.
+ * to make sure memory was properly allocated and that the
+ * Entry conforms to the Vorbis comment specification.
*/
class FLACPP_API Entry {
public:
Entry();
+
Entry(const char *field, unsigned field_length);
+ Entry(const char *field); // assumes \a field is NUL-terminated
+
Entry(const char *field_name, const char *field_value, unsigned field_value_length);
+ Entry(const char *field_name, const char *field_value); // assumes \a field_value is NUL-terminated
+
Entry(const Entry &entry);
- void operator=(const Entry &entry);
+ Entry &operator=(const Entry &entry);
+
virtual ~Entry();
virtual bool is_valid() const;
@@ -532,8 +568,10 @@
const char *get_field_value() const;
bool set_field(const char *field, unsigned field_length);
+ bool set_field(const char *field); // assumes \a field is NUL-terminated
bool set_field_name(const char *field_name);
bool set_field_value(const char *field_value, unsigned field_value_length);
+ bool set_field_value(const char *field_value); // assumes \a field_value is NUL-terminated
protected:
bool is_valid_;
::FLAC__StreamMetadata_VorbisComment_Entry entry_;
@@ -548,7 +586,9 @@
void clear_field_name();
void clear_field_value();
void construct(const char *field, unsigned field_length);
+ void construct(const char *field); // assumes \a field is NUL-terminated
void construct(const char *field_name, const char *field_value, unsigned field_value_length);
+ void construct(const char *field_name, const char *field_value); // assumes \a field_value is NUL-terminated
void compose_field();
void parse_field();
};
@@ -573,11 +613,16 @@
//@{
/** Assign from another object. Always performs a deep copy. */
- inline void operator=(const VorbisComment &object) { Prototype::operator=(object); }
- inline void operator=(const ::FLAC__StreamMetadata &object) { Prototype::operator=(object); }
- inline void operator=(const ::FLAC__StreamMetadata *object) { Prototype::operator=(object); }
+ inline VorbisComment &operator=(const VorbisComment &object) { Prototype::operator=(object); return *this; }
+ inline VorbisComment &operator=(const ::FLAC__StreamMetadata &object) { Prototype::operator=(object); return *this; }
+ inline VorbisComment &operator=(const ::FLAC__StreamMetadata *object) { Prototype::operator=(object); return *this; }
//@}
+ /** Assigns an object with copy control. See
+ * Prototype::assign_object(::FLAC__StreamMetadata *object, bool copy).
+ */
+ inline VorbisComment &assign(::FLAC__StreamMetadata *object, bool copy) { Prototype::assign_object(object, copy); return *this; }
+
//@{
/** Check for equality, performing a deep compare by following pointers. */
inline bool operator==(const VorbisComment &object) const { return Prototype::operator==(object); }
@@ -593,12 +638,11 @@
//@}
unsigned get_num_comments() const;
- Entry get_vendor_string() const; // only the Entry's field name should be used
+ const FLAC__byte *get_vendor_string() const; // NUL-terminated UTF-8 string
Entry get_comment(unsigned index) const;
//! See FLAC__metadata_object_vorbiscomment_set_vendor_string()
- //! \note Only the Entry's field name will be used.
- bool set_vendor_string(const Entry &entry);
+ bool set_vendor_string(const FLAC__byte *string); // NUL-terminated UTF-8 string
//! See FLAC__metadata_object_vorbiscomment_set_comment()
bool set_comment(unsigned index, const Entry &entry);
@@ -606,6 +650,9 @@
//! See FLAC__metadata_object_vorbiscomment_insert_comment()
bool insert_comment(unsigned index, const Entry &entry);
+ //! See FLAC__metadata_object_vorbiscomment_append_comment()
+ bool append_comment(const Entry &entry);
+
//! See FLAC__metadata_object_vorbiscomment_delete_comment()
bool delete_comment(unsigned index);
};
@@ -628,7 +675,7 @@
Track();
Track(const ::FLAC__StreamMetadata_CueSheet_Track *track);
Track(const Track &track);
- void operator=(const Track &track);
+ Track &operator=(const Track &track);
virtual ~Track();
@@ -676,11 +723,16 @@
//@{
/** Assign from another object. Always performs a deep copy. */
- inline void operator=(const CueSheet &object) { Prototype::operator=(object); }
- inline void operator=(const ::FLAC__StreamMetadata &object) { Prototype::operator=(object); }
- inline void operator=(const ::FLAC__StreamMetadata *object) { Prototype::operator=(object); }
+ inline CueSheet &operator=(const CueSheet &object) { Prototype::operator=(object); return *this; }
+ inline CueSheet &operator=(const ::FLAC__StreamMetadata &object) { Prototype::operator=(object); return *this; }
+ inline CueSheet &operator=(const ::FLAC__StreamMetadata *object) { Prototype::operator=(object); return *this; }
//@}
+ /** Assigns an object with copy control. See
+ * Prototype::assign_object(::FLAC__StreamMetadata *object, bool copy).
+ */
+ inline CueSheet &assign(::FLAC__StreamMetadata *object, bool copy) { Prototype::assign_object(object, copy); return *this; }
+
//@{
/** Check for equality, performing a deep compare by following pointers. */
inline bool operator==(const CueSheet &object) const { return Prototype::operator==(object); }
@@ -754,11 +806,16 @@
//@{
/** Assign from another object. Always performs a deep copy. */
- inline void operator=(const Unknown &object) { Prototype::operator=(object); }
- inline void operator=(const ::FLAC__StreamMetadata &object) { Prototype::operator=(object); }
- inline void operator=(const ::FLAC__StreamMetadata *object) { Prototype::operator=(object); }
+ inline Unknown &operator=(const Unknown &object) { Prototype::operator=(object); return *this; }
+ inline Unknown &operator=(const ::FLAC__StreamMetadata &object) { Prototype::operator=(object); return *this; }
+ inline Unknown &operator=(const ::FLAC__StreamMetadata *object) { Prototype::operator=(object); return *this; }
//@}
+ /** Assigns an object with copy control. See
+ * Prototype::assign_object(::FLAC__StreamMetadata *object, bool copy).
+ */
+ inline Unknown &assign(::FLAC__StreamMetadata *object, bool copy) { Prototype::assign_object(object, copy); return *this; }
+
//@{
/** Check for equality, performing a deep compare by following pointers. */
inline bool operator==(const Unknown &object) const { return Prototype::operator==(object); }
@@ -797,9 +854,10 @@
//! See FLAC__metadata_get_streaminfo().
FLACPP_API bool get_streaminfo(const char *filename, StreamInfo &streaminfo);
- //
+
//! See FLAC__metadata_get_tags().
FLACPP_API bool get_tags(const char *filename, VorbisComment *&tags);
+ FLACPP_API bool get_tags(const char *filename, VorbisComment &tags);
/* \} */
@@ -978,7 +1036,7 @@
/* \} */
- };
-};
+ }
+}
#endif
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
@@ -76,6 +76,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -111,10 +112,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -127,12 +136,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# libOggFLAC - Free Lossless Audio Codec + Ogg library
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# libOggFLAC - Free Lossless Audio Codec + Ogg library
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -87,6 +87,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -122,10 +123,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -138,12 +147,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/all.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/all.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/all.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/export.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/export.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/export.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/file_decoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/file_decoder.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/file_decoder.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/file_encoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/file_encoder.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/file_encoder.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/seekable_stream_decoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/seekable_stream_decoder.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/seekable_stream_decoder.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/seekable_stream_encoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/seekable_stream_encoder.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/seekable_stream_encoder.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/stream_decoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/stream_decoder.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/stream_decoder.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/stream_encoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/stream_encoder.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC/stream_encoder.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC++/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC++/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC++/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# libOggFLAC++ - Free Lossless Audio Codec + Ogg library
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC++/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC++/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC++/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# libOggFLAC++ - Free Lossless Audio Codec + Ogg library
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -87,6 +87,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -122,10 +123,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -138,12 +147,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC++/all.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC++/all.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC++/all.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC++ - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC++/decoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC++/decoder.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC++/decoder.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC++ - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -144,7 +144,7 @@
virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0;
-#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
+#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)
// lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring()
friend State;
#endif
@@ -240,7 +240,7 @@
virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0;
-#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
+#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)
// lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring()
friend State;
#endif
@@ -334,7 +334,7 @@
virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0;
-#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
+#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)
// lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring()
friend State;
#endif
@@ -351,7 +351,7 @@
/* \} */
- };
-};
+ }
+}
#endif
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC++/encoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC++/encoder.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC++/encoder.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC++ - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -162,7 +162,7 @@
virtual ::FLAC__StreamEncoderWriteStatus write_callback(const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame) = 0;
virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
-#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
+#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)
// lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring()
friend State;
#endif
@@ -263,7 +263,7 @@
virtual ::FLAC__SeekableStreamEncoderTellStatus tell_callback(FLAC__uint64 *absolute_byte_offset) = 0;
virtual ::FLAC__StreamEncoderWriteStatus write_callback(const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame) = 0;
-#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
+#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)
// lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring()
friend State;
#endif
@@ -365,7 +365,7 @@
protected:
virtual void progress_callback(FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate);
-#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
+#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)
// lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring()
friend State;
#endif
@@ -380,7 +380,7 @@
/* \} */
- };
-};
+ }
+}
#endif
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC++/export.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC++/export.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/OggFLAC++/export.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC++ - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/share/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/share/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/share/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -59,6 +59,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -94,10 +95,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -110,12 +119,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/share/grabbag/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/share/grabbag/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/share/grabbag/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -50,6 +50,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -85,10 +86,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -101,12 +110,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/share/grabbag/cuesheet.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/share/grabbag/cuesheet.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/share/grabbag/cuesheet.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* grabbag - Convenience lib for various routines common to several tools
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/share/grabbag/file.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/share/grabbag/file.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/share/grabbag/file.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* grabbag - Convenience lib for various routines common to several tools
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/share/grabbag/replaygain.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/share/grabbag/replaygain.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/share/grabbag/replaygain.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* grabbag - Convenience lib for various routines common to several tools
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/share/grabbag/seektable.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/share/grabbag/seektable.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/share/grabbag/seektable.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* grabbag - Convenience lib for various routines common to several tools
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/share/grabbag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/share/grabbag.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/share/grabbag.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* grabbag - Convenience lib for various routines common to several tools
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/share/replaygain_synthesis.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/share/replaygain_synthesis.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/include/share/replaygain_synthesis.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* replaygain_synthesis - Routines for applying ReplayGain to a signal
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/ltmain.sh
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/ltmain.sh 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/ltmain.sh 2005-10-20 12:55:24 UTC (rev 10204)
@@ -35,7 +35,7 @@
#@@@[JEC] There is a bug somewhere in libtool/autoconf where the libtool
#@@@[JEC] generated after `configure' does not set $SED, so to catch that
-#@@@[JEC] case, we pick let `sed' come from the path:
+#@@@[JEC] case, we let `sed' come from the path:
if [ "x$SED" = x ] ; then
SED=sed
fi
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/man/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/man/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/man/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# flac - Command-line FLAC encoder/decoder
-# Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/man/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/man/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/man/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# flac - Command-line FLAC encoder/decoder
-# Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -71,6 +71,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -106,10 +107,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -122,12 +131,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/man/flac.1
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/man/flac.1 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/man/flac.1 2005-10-20 12:55:24 UTC (rev 10204)
@@ -3,7 +3,7 @@
.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng <steve at ggi-project.org>.
-.TH "FLAC" "1" "09 September 2004" "" ""
+.TH "FLAC" "1" "02 February 2005" "" ""
.SH NAME
flac \- Free Lossless Audio Codec
.SH SYNOPSIS
@@ -141,7 +141,7 @@
which decoding will start; the default is the beginning
of the stream. The optional second #.# is the track
and index point at which decoding will end; the default
-is the end of the stream. If the seekpoint does not
+is the end of the stream. If the cuepoint does not
exist, the closest one before it (for the start point)
or after it (for the end point) will be used. If those
don't exist, the start of the stream (for the start
@@ -166,7 +166,12 @@
.TP
\fB--lax\fR
Allow encoder to generate non-Subset
-files.
+files. The resulting FLAC file may not be
+streamable or might have trouble being played
+in all players (especially hardware devices),
+so you should only use this option in
+combination with custom encoding options meant
+for archival.
.TP
\fB--replay-gain\fR
Calculate ReplayGain values and store in
@@ -333,6 +338,16 @@
\fB--sign={\fIsigned\fB|\fIunsigned\fB}\fR
Set the sign of samples (the default is signed).
.TP
+\fB--input-size=\fI#\fB\fR
+Specify the size of the raw input in bytes. If you are
+encoding raw samples from stdin, you must set this option
+in order to be able to use --skip, --until, --cue-sheet, or
+other options that need to know the size of the input
+beforehand. If the size given is greater than what is
+found in the input stream, the encoder will complain about
+an unexpected end-of-file. If the size given is less,
+samples will be truncated.
+.TP
\fB--force-aiff-format\fR
Force the decoder to output AIFF format. This option
is not needed if the output filename (as set by -o) ends
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/man/flac.sgml
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/man/flac.sgml 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/man/flac.sgml 2005-10-20 12:55:24 UTC (rev 10204)
@@ -4,7 +4,7 @@
<!ENTITY dhfirstname "<firstname>Matt</firstname>">
<!ENTITY dhsurname "<surname>Zimmerman</surname>">
<!-- Please adjust the date whenever revising the manpage. -->
- <!ENTITY dhdate "<date>July 29, 2004</date>">
+ <!ENTITY dhdate "<date>Feb 2, 2005</date>">
<!-- SECTION should be 1-8, maybe w/ subsection other parameters are
allowed: see man(7), man(1). -->
<!ENTITY dhsection "<manvolnum>1</manvolnum>">
@@ -27,8 +27,8 @@
&dhsurname;
</author>
<copyright>
- <year>2002,2003,2004</year>
- <holder>&dhusername;</holder>
+ <year>2002,2003,2004,2005</year>
+ <holder>&dhusername;</holder>
</copyright>
&dhdate;
</docinfo>
@@ -304,7 +304,7 @@
which decoding will start; the default is the beginning
of the stream. The optional second #.# is the track
and index point at which decoding will end; the default
- is the end of the stream. If the seekpoint does not
+ is the end of the stream. If the cuepoint does not
exist, the closest one before it (for the start point)
or after it (for the end point) will be used. If those
don't exist, the start of the stream (for the start
@@ -350,7 +350,12 @@
<listitem>
<para>Allow encoder to generate non-Subset
- files.</para>
+ files. The resulting FLAC file may not be
+ streamable or might have trouble being played
+ in all players (especially hardware devices),
+ so you should only use this option in
+ combination with custom encoding options meant
+ for archival.</para>
</listitem>
</varlistentry>
@@ -695,6 +700,21 @@
</varlistentry>
<varlistentry>
+ <term><option>--input-size</option>=<replaceable>#</replaceable></term>
+
+ <listitem>
+ <para>Specify the size of the raw input in bytes. If you are
+ encoding raw samples from stdin, you must set this option
+ in order to be able to use --skip, --until, --cue-sheet, or
+ other options that need to know the size of the input
+ beforehand. If the size given is greater than what is
+ found in the input stream, the encoder will complain about
+ an unexpected end-of-file. If the size given is less,
+ samples will be truncated.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><option>--force-aiff-format</option></term>
<listitem>
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/man/metaflac.1
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/man/metaflac.1 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/man/metaflac.1 2005-10-20 12:55:24 UTC (rev 10204)
@@ -3,7 +3,7 @@
.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/>
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng <steve at ggi-project.org>.
-.TH "METAFLAC" "1" "14 September 2004" "" ""
+.TH "METAFLAC" "1" "02 February 2005" "" ""
.SH NAME
metaflac \- program to list, add, remove, or edit metadata in one or more FLAC files.
.SH SYNOPSIS
@@ -93,14 +93,14 @@
--no-utf8-convert if necessary.
.TP
\fB--import-cuesheet-from=file\fR
-Import a cuesheet from a file. Only one FLAC file may be
-specified. A seekpoint will be added for each index point in
-the cuesheet to the SEEKTABLE unless --no-cued-seekpoints is
-specified.
+Import a cuesheet from a file. Use '-' for stdin. Only one
+FLAC file may be specified. A seekpoint will be added for each
+index point in the cuesheet to the SEEKTABLE unless
+--no-cued-seekpoints is specified.
.TP
\fB--export-cuesheet-to=file\fR
Export CUESHEET block to a cuesheet file, suitable for use by
-CD authoring software. Use '-' for stdin. Only one FLAC file
+CD authoring software. Use '-' for stdout. Only one FLAC file
may be specified on the command line.
.TP
\fB--add-replay-gain\fR
@@ -150,7 +150,7 @@
\fB--block-type=type[,type[...]]\fR
.TP
\fB--except-block-type=type[,type[...]]\fR
-An optional comma-separated list of block types to included
+An optional comma-separated list of block types to be included
or ignored with this option. Use only one of --block-type or
--except-block-type. The valid block types are: STREAMINFO,
PADDING, APPLICATION, SEEKTABLE, VORBIS_COMMENT. You may
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/man/metaflac.sgml
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/man/metaflac.sgml 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/man/metaflac.sgml 2005-10-20 12:55:24 UTC (rev 10204)
@@ -20,7 +20,7 @@
<!ENTITY manfirstname "<firstname>dann</firstname>">
<!ENTITY mansurname "<surname>frazier</surname>">
<!-- Please adjust the date whenever revising the manpage. -->
- <!ENTITY mandate "<date>2004-09-14</date>">
+ <!ENTITY mandate "<date>2005-02-02</date>">
<!-- SECTION should be 1-8, maybe with subsection. Other parameters are
allowed: see man(7), man(1). -->
<!ENTITY mansection "<manvolnum>1</manvolnum>">
@@ -40,7 +40,7 @@
&mansurname;
</author>
<copyright>
- <year>2002,2003,2004</year>
+ <year>2002,2003,2004,2005</year>
<holder>&manusername;</holder>
</copyright>
&mandate;
@@ -268,10 +268,10 @@
<term><option>--import-cuesheet-from=file</option></term>
<listitem>
<para>
- Import a cuesheet from a file. Only one FLAC file may be
- specified. A seekpoint will be added for each index point in
- the cuesheet to the SEEKTABLE unless --no-cued-seekpoints is
- specified.
+ Import a cuesheet from a file. Use '-' for stdin. Only one
+ FLAC file may be specified. A seekpoint will be added for each
+ index point in the cuesheet to the SEEKTABLE unless
+ --no-cued-seekpoints is specified.
</para>
</listitem>
</varlistentry>
@@ -280,7 +280,7 @@
<listitem>
<para>
Export CUESHEET block to a cuesheet file, suitable for use by
- CD authoring software. Use '-' for stdin. Only one FLAC file
+ CD authoring software. Use '-' for stdout. Only one FLAC file
may be specified on the command line.
</para>
</listitem>
@@ -365,7 +365,7 @@
<term><option>--except-block-type=type[,type[...]]</option></term>
<listitem>
<para>
- An optional comma-separated list of block types to included
+ An optional comma-separated list of block types to be included
or ignored with this option. Use only one of --block-type or
--except-block-type. The valid block types are: STREAMINFO,
PADDING, APPLICATION, SEEKTABLE, VORBIS_COMMENT. You may
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/obj/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/obj/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/obj/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/obj/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/obj/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/obj/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
@@ -76,6 +76,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -111,10 +112,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -127,12 +136,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
@@ -79,6 +79,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -114,10 +115,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -130,12 +139,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/Makefile.lite
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/Makefile.lite 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/Makefile.lite 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# flac - Command-line FLAC encoder/decoder
-# Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -16,8 +16,9 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
bin_PROGRAMS = flac
-CFLAGS = @CFLAGS@ @OGG_CFLAGS@
+AM_CFLAGS = @OGG_CFLAGS@
+
if FLaC__HAS_OGG
NEED_OGGFLAC_LIB = $(top_builddir)/src/libOggFLAC/libOggFLAC.la
endif
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# flac - Command-line FLAC encoder/decoder
-# Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -104,6 +104,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -112,7 +113,7 @@
CCAS = @CCAS@
CCASFLAGS = @CCASFLAGS@
CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@ @OGG_CFLAGS@
+CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
@@ -139,10 +140,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -155,12 +164,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -244,6 +258,7 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+AM_CFLAGS = @OGG_CFLAGS@
@FLaC__HAS_OGG_TRUE at NEED_OGGFLAC_LIB = $(top_builddir)/src/libOggFLAC/libOggFLAC.la
EXTRA_DIST = \
Makefile.lite \
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/Makefile.lite
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/Makefile.lite 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/Makefile.lite 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# flac - Command-line FLAC encoder/decoder
-# Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -20,22 +20,17 @@
#
topdir = ../..
+libdir = $(topdir)/obj/$(BUILD)/lib
PROGRAM_NAME = flac
+
+INCLUDES = -I./include -I$(topdir)/include -I$(OGG_INCLUDE_DIR)
+
ifeq ($(DARWIN_BUILD),yes)
-INCLUDES = -I./include -I$(topdir)/include
-LIBS = -lgrabbag -lFLAC -lreplaygain_analysis -lreplaygain_synthesis -lgetopt -lutf8 -lc -lm
+EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libOggFLAC.a $(libdir)/libFLAC.a $(libdir)/libreplaygain_analysis.a $(libdir)/libreplaygain_synthesis.a $(libdir)/libgetopt.a $(libdir)/libutf8.a $(OGG_LIB_DIR)/libogg.a -L$(ICONV_LIB_DIR) -liconv -lm
else
-#@@@ TODO: conditionalize ogg includes, defines, and -logg
-ifeq ($(SOLARIS_BUILD),yes)
-INCLUDES = -I./include -I$(topdir)/include -I$(HOME)/local/include -DFLAC__HAS_OGG
-LIBS = -lgrabbag -lOggFLAC -lFLAC -lreplaygain_analysis -lreplaygain_synthesis -lgetopt -lutf8 -lm -L$(HOME)/local/lib -logg
-else
-#@@@ TODO: conditionalize ogg includes, defines, and -logg
-INCLUDES = -I./include -I$(topdir)/include -I$(HOME)/local/include -DFLAC__HAS_OGG
-LIBS = -lgrabbag -lOggFLAC -lFLAC -lreplaygain_analysis -lreplaygain_synthesis -lgetopt -lutf8 -lm -L$(HOME)/local/lib -logg
+LIBS = -lgrabbag -lOggFLAC -lFLAC -lreplaygain_analysis -lreplaygain_synthesis -lgetopt -lutf8 -L$(OGG_LIB_DIR) -logg -L$(ICONV_LIB_DIR) -liconv -lm
endif
-endif
SRCS_C = \
analyze.c \
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/analyze.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/analyze.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/analyze.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* flac - Command-line FLAC encoder/decoder
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/analyze.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/analyze.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/analyze.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* flac - Command-line FLAC encoder/decoder
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/decode.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/decode.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/decode.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* flac - Command-line FLAC encoder/decoder
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -1155,10 +1155,11 @@
flac__utils_printf(stderr, 1,
"\n"
"The FLAC stream may have been created by a more advanced encoder. Try\n"
- " metaflac --show-vc-vendor %s\n"
+ " metaflac --show-vendor-tag %s\n"
"If the version number is greater than %s, this decoder is probably\n"
- "not able to decode the file. If the version number is not, you may\n"
- "have found a bug. In this case please submit a bug report to\n"
+ "not able to decode the file. If the version number is not, the file\n"
+ "may be corrupted, or you may have found a bug. In this case please\n"
+ "submit a bug report to\n"
" http://sourceforge.net/bugs/?func=addbug&group_id=13478\n"
"Make sure to include an email contact in the comment and/or use the\n"
"\"Monitor\" feature to monitor the bug status.\n",
@@ -1183,7 +1184,7 @@
{
if(flac__utils_verbosity_ >= 2) {
#if defined _MSC_VER || defined __MINGW32__
- /* with VC++ you have to spoon feed it the casting */
+ /* with MSVC you have to spoon feed it the casting */
const double progress = (double)(FLAC__int64)decoder_session->samples_processed / (double)(FLAC__int64)decoder_session->total_samples * 100.0;
#else
const double progress = (double)decoder_session->samples_processed / (double)decoder_session->total_samples * 100.0;
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/decode.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/decode.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/decode.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* flac - Command-line FLAC encoder/decoder
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/encode.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/encode.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/encode.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* flac - Command-line FLAC encoder/decoder
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -1866,7 +1866,7 @@
{
const FLAC__uint64 samples_written = min(encoder_session->total_samples_to_encode, encoder_session->samples_written);
#if defined _MSC_VER || defined __MINGW32__
- /* with VC++ you have to spoon feed it the casting */
+ /* with MSVC you have to spoon feed it the casting */
const double progress = (double)(FLAC__int64)samples_written / (double)(FLAC__int64)encoder_session->total_samples_to_encode;
const double ratio = (double)(FLAC__int64)encoder_session->bytes_written / ((double)(FLAC__int64)encoder_session->unencoded_size * min(1.0, progress));
#else
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/encode.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/encode.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/encode.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* flac - Command-line FLAC encoder/decoder
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/local_string_utils.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/local_string_utils.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/local_string_utils.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* flac - Command-line FLAC encoder/decoder
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/main.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/main.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/main.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* flac - Command-line FLAC encoder/decoder
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -153,6 +153,7 @@
{ "bps" , share__required_argument, 0, 0 },
{ "sample-rate" , share__required_argument, 0, 0 },
{ "sign" , share__required_argument, 0, 0 },
+ { "input-size" , share__required_argument, 0, 0 },
/*
* analysis options
@@ -237,6 +238,7 @@
int format_channels;
int format_bps;
int format_sample_rate;
+ long format_input_size;
int blocksize;
int min_residual_partition_order;
int max_residual_partition_order;
@@ -438,7 +440,7 @@
}
flac__utils_printf(stderr, 2, "\n");
- flac__utils_printf(stderr, 2, "flac %s, Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson\n", FLAC__VERSION_STRING);
+ flac__utils_printf(stderr, 2, "flac %s, Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson\n", FLAC__VERSION_STRING);
flac__utils_printf(stderr, 2, "flac comes with ABSOLUTELY NO WARRANTY. This is free software, and you are\n");
flac__utils_printf(stderr, 2, "welcome to redistribute it under certain conditions. Type `flac' for details.\n\n");
@@ -574,6 +576,7 @@
option_values.format_channels = -1;
option_values.format_bps = -1;
option_values.format_sample_rate = -1;
+ option_values.format_input_size = -1;
option_values.blocksize = -1;
option_values.min_residual_partition_order = -1;
option_values.max_residual_partition_order = -1;
@@ -628,7 +631,7 @@
if(option_values.num_files > 0) {
unsigned i = 0;
- if(0 == (option_values.filenames = malloc(sizeof(char *) * option_values.num_files)))
+ if(0 == (option_values.filenames = (char**)malloc(sizeof(char*) * option_values.num_files)))
die("out of memory allocating space for file names list");
while(share__optind < argc)
option_values.filenames[i++] = local_strdup(argv[share__optind++]);
@@ -661,6 +664,10 @@
FLAC__ASSERT(0 != option_argument);
option_values.until_specification = option_argument;
}
+ else if(0 == strcmp(long_option, "input-size")) {
+ FLAC__ASSERT(0 != option_argument);
+ option_values.format_input_size = atol(option_argument);
+ }
else if(0 == strcmp(long_option, "cue")) {
FLAC__ASSERT(0 != option_argument);
option_values.cue_specification = option_argument;
@@ -1092,7 +1099,7 @@
{
printf("===============================================================================\n");
printf("flac - Command-line FLAC encoder/decoder version %s\n", FLAC__VERSION_STRING);
- printf("Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson\n");
+ printf("Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson\n");
printf("\n");
printf("This program is free software; you can redistribute it and/or\n");
printf("modify it under the terms of the GNU General Public License\n");
@@ -1202,6 +1209,7 @@
printf(" --bps=# Number of bits per sample\n");
printf(" --sample-rate=# Sample rate in Hz\n");
printf(" --sign={signed|unsigned} Sign of samples\n");
+ printf(" --input-size=# Size of the raw input in bytes\n");
printf(" --force-aiff-format Force decoding to AIFF format\n");
printf(" --force-raw-format Treat input or output as raw samples\n");
printf("negative options:\n");
@@ -1324,7 +1332,7 @@
printf(" default is the beginning of the stream. The\n");
printf(" optional second #.# is the track and index point\n");
printf(" at which decoding will end; the default is the\n");
- printf(" end of the stream. If the seekpoint does not\n");
+ printf(" end of the stream. If the cuepoint does not\n");
printf(" exist, the closest one before it (for the start\n");
printf(" point) or after it (for the end point) will be\n");
printf(" used. The cuepoints are merely translated into\n");
@@ -1420,6 +1428,15 @@
printf(" --bps=# Number of bits per sample\n");
printf(" --sample-rate=# Sample rate in Hz\n");
printf(" --sign={signed|unsigned} Sign of samples (the default is signed)\n");
+ printf(" --input-size=# Size of the raw input in bytes. If you are\n");
+ printf(" encoding raw samples from stdin, you must set\n");
+ printf(" this option in order to be able to use --skip,\n");
+ printf(" --until, --cue-sheet, or other options that need\n");
+ printf(" to know the size of the input beforehand. If\n");
+ printf(" the size given is greater than what is found in\n");
+ printf(" the input stream, the encoder will complain\n");
+ printf(" about an unexpected end-of-file. If the size\n");
+ printf(" given is less, samples will be truncated.\n");
printf(" --force-aiff-format Force the decoder to output AIFF format. This\n");
printf(" option is not needed if the output filename (as\n");
printf(" set by -o) ends with .aif or .aiff; this option\n");
@@ -1518,6 +1535,16 @@
}
}
+ if(option_values.format_input_size >= 0) {
+ if (fmt != RAW || infilesize >= 0) {
+ flac__utils_printf(stderr, 1, "ERROR: can only use --input-size when encoding raw samples from stdin\n");
+ return 1;
+ }
+ else {
+ infilesize = option_values.format_input_size;
+ }
+ }
+
if(option_values.sector_align && fmt == RAW && infilesize < 0) {
flac__utils_printf(stderr, 1, "ERROR: can't --sector-align when the input size is unknown\n");
return 1;
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/utils.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/utils.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/utils.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* flac - Command-line FLAC encoder/decoder
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/utils.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/utils.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/utils.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* flac - Command-line FLAC encoder/decoder
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/vorbiscomment.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/vorbiscomment.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/vorbiscomment.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* flac - Command-line FLAC encoder/decoder
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -122,7 +122,7 @@
entry.length = strlen((const char *)entry.entry);
- if(!FLAC__metadata_object_vorbiscomment_insert_comment(block, block->data.vorbis_comment.num_comments, entry, /*copy=*/true)) {
+ if(!FLAC__metadata_object_vorbiscomment_append_comment(block, entry, /*copy=*/true)) {
if(needs_free)
free(converted);
*violation = "memory allocation failure";
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/vorbiscomment.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/vorbiscomment.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/flac/vorbiscomment.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* flac - Command-line FLAC encoder/decoder
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# libFLAC - Free Lossless Audio Codec library
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -32,8 +32,21 @@
if DEBUG
DEBUGCFLAGS = -DFLAC__OVERFLOW_DETECT
endif
-CFLAGS = @CFLAGS@ $(DEBUGCFLAGS)
+if FLaC__CPU_PPC
+# The -force_cpusubtype_ALL is needed to insert a ppc64 instruction
+# into cpu.c with an asm().
+if FLaC__SYS_DARWIN
+#@@@@@@ PPC optimizations temporarily disabled
+CPUCFLAGS = -faltivec -force_cpusubtype_ALL -DFLAC__NO_ASM
+else
+# Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific
+#@@@@@@ PPC optimizations temporarily disabled
+CPUCFLAGS = -maltivec -mabi=altivec -DFLAC__NO_ASM
+endif
+endif
+AM_CFLAGS = $(DEBUGCFLAGS) $(CPUCFLAGS)
+
if FLaC__NO_ASM
else
if FLaC__CPU_IA32
@@ -44,7 +57,13 @@
endif
if FLaC__CPU_PPC
ARCH_SUBDIRS = ppc
-libFLAC_la_LIBADD = ppc/libFLAC-asm.la
+if FLaC__HAS_AS__TEMPORARILY_DISABLED
+libFLAC_la_LIBADD = ppc/as/libFLAC-asm.la
+else
+if FLaC__HAS_GAS__TEMPORARILY_DISABLED
+libFLAC_la_LIBADD = ppc/gas/libFLAC-asm.la
+endif
+endif
LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning"
endif
endif
@@ -61,7 +80,7 @@
libFLAC.m4
# see 'http://www.gnu.org/software/libtool/manual.html#SEC35' for numbering convention
-libFLAC_la_LDFLAGS = -version-info 6:1:0 -lm $(LOCAL_EXTRA_LDFLAGS)
+libFLAC_la_LDFLAGS = -version-info 7:0:0 -lm $(LOCAL_EXTRA_LDFLAGS)
libFLAC_la_SOURCES = \
bitbuffer.c \
bitmath.c \
@@ -70,6 +89,7 @@
file_decoder.c \
file_encoder.c \
fixed.c \
+ float.c \
format.c \
lpc.c \
md5.c \
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# libFLAC - Free Lossless Audio Codec library
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -80,14 +80,17 @@
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(m4datadir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
- at FLaC__CPU_IA32_FALSE@@FLaC__CPU_PPC_TRUE@@FLaC__NO_ASM_FALSE at libFLAC_la_DEPENDENCIES = ppc/libFLAC-asm.la
+ at FLaC__CPU_IA32_FALSE@@FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@@FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@@FLaC__NO_ASM_FALSE at libFLAC_la_DEPENDENCIES = ppc/gas/libFLAC-asm.la
+ at FLaC__CPU_IA32_FALSE@@FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@@FLaC__NO_ASM_FALSE at libFLAC_la_DEPENDENCIES = ppc/as/libFLAC-asm.la
@FLaC__CPU_IA32_TRUE@@FLaC__HAS_NASM_TRUE@@FLaC__NO_ASM_FALSE at libFLAC_la_DEPENDENCIES = ia32/libFLAC-asm.la
- at FLaC__CPU_PPC_TRUE@@FLaC__HAS_NASM_FALSE@@FLaC__NO_ASM_FALSE at libFLAC_la_DEPENDENCIES = ppc/libFLAC-asm.la
+ at FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@@FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@@FLaC__HAS_NASM_FALSE@@FLaC__NO_ASM_FALSE at libFLAC_la_DEPENDENCIES = ppc/gas/libFLAC-asm.la
+ at FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@@FLaC__HAS_NASM_FALSE@@FLaC__NO_ASM_FALSE at libFLAC_la_DEPENDENCIES = ppc/as/libFLAC-asm.la
am_libFLAC_la_OBJECTS = bitbuffer.lo bitmath.lo cpu.lo crc.lo \
- file_decoder.lo file_encoder.lo fixed.lo format.lo lpc.lo \
- md5.lo memory.lo metadata_iterators.lo metadata_object.lo \
- seekable_stream_decoder.lo seekable_stream_encoder.lo \
- stream_decoder.lo stream_encoder.lo stream_encoder_framing.lo
+ file_decoder.lo file_encoder.lo fixed.lo float.lo format.lo \
+ lpc.lo md5.lo memory.lo metadata_iterators.lo \
+ metadata_object.lo seekable_stream_decoder.lo \
+ seekable_stream_encoder.lo stream_decoder.lo stream_encoder.lo \
+ stream_encoder_framing.lo
libFLAC_la_OBJECTS = $(am_libFLAC_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -96,8 +99,9 @@
@AMDEP_TRUE@ ./$(DEPDIR)/bitmath.Plo ./$(DEPDIR)/cpu.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/crc.Plo ./$(DEPDIR)/file_decoder.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/file_encoder.Plo ./$(DEPDIR)/fixed.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/format.Plo ./$(DEPDIR)/lpc.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/md5.Plo ./$(DEPDIR)/memory.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/float.Plo ./$(DEPDIR)/format.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/lpc.Plo ./$(DEPDIR)/md5.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/memory.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/metadata_iterators.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/metadata_object.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/seekable_stream_decoder.Plo \
@@ -131,6 +135,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -139,7 +144,7 @@
CCAS = @CCAS@
CCASFLAGS = @CCASFLAGS@
CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@ $(DEBUGCFLAGS)
+CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
@@ -166,10 +171,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -182,12 +195,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -273,10 +291,19 @@
target_alias = @target_alias@
lib_LTLIBRARIES = libFLAC.la
@DEBUG_TRUE at DEBUGCFLAGS = -DFLAC__OVERFLOW_DETECT
+# Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific
+#@@@@@@ PPC optimizations temporarily disabled
+ at FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_FALSE at CPUCFLAGS = -maltivec -mabi=altivec -DFLAC__NO_ASM
+# The -force_cpusubtype_ALL is needed to insert a ppc64 instruction
+# into cpu.c with an asm().
+#@@@@@@ PPC optimizations temporarily disabled
+ at FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_TRUE at CPUCFLAGS = -faltivec -force_cpusubtype_ALL -DFLAC__NO_ASM
+AM_CFLAGS = $(DEBUGCFLAGS) $(CPUCFLAGS)
@FLaC__CPU_IA32_TRUE@@FLaC__HAS_NASM_TRUE@@FLaC__NO_ASM_FALSE at ARCH_SUBDIRS = ia32
@FLaC__CPU_PPC_TRUE@@FLaC__NO_ASM_FALSE at ARCH_SUBDIRS = ppc
@FLaC__CPU_IA32_TRUE@@FLaC__HAS_NASM_TRUE@@FLaC__NO_ASM_FALSE at libFLAC_la_LIBADD = ia32/libFLAC-asm.la
- at FLaC__CPU_PPC_TRUE@@FLaC__NO_ASM_FALSE at libFLAC_la_LIBADD = ppc/libFLAC-asm.la
+ at FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@@FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@@FLaC__NO_ASM_FALSE at libFLAC_la_LIBADD = ppc/gas/libFLAC-asm.la
+ at FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@@FLaC__NO_ASM_FALSE at libFLAC_la_LIBADD = ppc/as/libFLAC-asm.la
@FLaC__CPU_PPC_TRUE@@FLaC__NO_ASM_FALSE at LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning"
SUBDIRS = $(ARCH_SUBDIRS) include .
m4datadir = $(datadir)/aclocal
@@ -289,7 +316,7 @@
# see 'http://www.gnu.org/software/libtool/manual.html#SEC35' for numbering convention
-libFLAC_la_LDFLAGS = -version-info 6:1:0 -lm $(LOCAL_EXTRA_LDFLAGS)
+libFLAC_la_LDFLAGS = -version-info 7:0:0 -lm $(LOCAL_EXTRA_LDFLAGS)
libFLAC_la_SOURCES = \
bitbuffer.c \
bitmath.c \
@@ -298,6 +325,7 @@
file_decoder.c \
file_encoder.c \
fixed.c \
+ float.c \
format.c \
lpc.c \
md5.c \
@@ -386,6 +414,7 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/file_decoder.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/file_encoder.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fixed.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/float.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/format.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/lpc.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/md5.Plo at am__quote@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/Makefile.lite
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/Makefile.lite 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/Makefile.lite 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# libFLAC - Free Lossless Audio Codec library
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -36,10 +36,10 @@
LIB_NAME = libFLAC
ifeq ($(DARWIN_BUILD),yes)
-DEFINES = -DFLAC__NO_NASM -DFLAC__ALIGN_MALLOC_DATA
+DEFINES = -DFLAC__CPU_PPC -DFLAC__USE_ALTIVEC -DFLAC__ALIGN_MALLOC_DATA
else
ifeq ($(SOLARIS_BUILD),yes)
-DEFINES = -DFLAC__NO_NASM -DFLAC__ALIGN_MALLOC_DATA
+DEFINES = -DFLAC__NO_ASM -DFLAC__ALIGN_MALLOC_DATA
else
DEFINES = -DFLAC__CPU_IA32 -DFLAC__USE_3DNOW -DFLAC__HAS_NASM -DFLAC__ALIGN_MALLOC_DATA
endif
@@ -48,6 +48,8 @@
DEBUG_CFLAGS = -DFLAC__OVERFLOW_DETECT
ifeq ($(DARWIN_BUILD),yes)
+SRCS_S = \
+ ppc/as/lpc_asm.s
else
ifeq ($(SOLARIS_BUILD),yes)
else
@@ -66,6 +68,7 @@
file_decoder.c \
file_encoder.c \
fixed.c \
+ float.c \
format.c \
lpc.c \
md5.c \
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/bitbuffer.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/bitbuffer.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/bitbuffer.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -45,6 +45,13 @@
*/
/*
+ * Some optimization strategies are slower with older versions of MSVC
+ */
+#if defined _MSC_VER && _MSC_VER <= 1200
+#define FLAC__OLD_MSVC_FLAVOR
+#endif
+
+/*
* This should be at least twice as large as the largest number of blurbs
* required to represent any 'number' (in any encoding) you are going to
* read. With FLAC this is on the order of maybe a few hundred bits.
@@ -63,6 +70,27 @@
*/
static const unsigned FLAC__BITBUFFER_DEFAULT_CAPACITY = ((65536 - 64) * 8) / FLAC__BITS_PER_BLURB; /* blurbs */
+#ifndef FLAC__OLD_MSVC_FLAVOR
+static const unsigned char byte_to_unary_table[] = {
+ 8, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4,
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+#endif
+
#if FLAC__BITS_PER_BLURB == 8
#define FLAC__BITS_PER_BLURB_LOG2 3
#define FLAC__BYTES_PER_BLURB 1
@@ -70,6 +98,9 @@
#define FLAC__BLURB_TOP_BIT_ONE ((FLAC__byte)0x80)
#define BLURB_BIT_TO_MASK(b) (((FLAC__blurb)'\x80') >> (b))
#define CRC16_UPDATE_BLURB(bb, blurb, crc) FLAC__CRC16_UPDATE((blurb), (crc));
+#ifndef FLAC__OLD_MSVC_FLAVOR
+#define FLAC__ALIGNED_BLURB_UNARY(blurb) (byte_to_unary_table[blurb])
+#endif
#elif FLAC__BITS_PER_BLURB == 32
#define FLAC__BITS_PER_BLURB_LOG2 5
#define FLAC__BYTES_PER_BLURB 4
@@ -77,6 +108,9 @@
#define FLAC__BLURB_TOP_BIT_ONE ((FLAC__uint32)0x80000000)
#define BLURB_BIT_TO_MASK(b) (((FLAC__blurb)0x80000000) >> (b))
#define CRC16_UPDATE_BLURB(bb, blurb, crc) crc16_update_blurb((bb), (blurb));
+#ifndef FLAC__OLD_MSVC_FLAVOR
+#define FLAC__ALIGNED_BLURB_UNARY(blurb) ((blurb) <= 0xff ? byte_to_unary_table[blurb] + 24 : ((blurb) <= 0xffff ? byte_to_unary_table[(blurb) >> 8] + 16 : ((blurb) <= 0xffffff ? byte_to_unary_table[(blurb) >> 16] + 8 : byte_to_unary_table[(blurb) >> 24])))
+#endif
#else
/* ERROR, only sizes of 8 and 32 are supported */
#endif
@@ -207,11 +241,27 @@
/* first shift the unconsumed buffer data toward the front as much as possible */
if(bb->total_consumed_bits >= FLAC__BITS_PER_BLURB) {
- unsigned l = 0, r = bb->consumed_blurbs, r_end = bb->blurbs + (bb->bits? 1:0);
+#if FLAC__BITS_PER_BLURB == 8
+ /*
+ * memset and memcpy are usually implemented in assembly language
+ * by the system libc, and they can be much faster
+ */
+ const unsigned r_end = bb->blurbs + (bb->bits? 1:0);
+ const unsigned r = bb->consumed_blurbs, l = r_end - r;
+ memmove(&bb->buffer[0], &bb->buffer[r], l);
+ memset(&bb->buffer[l], 0, r);
+#elif FLAC__BITS_PER_BLURB == 32
+ /* still needs optimization */
+ const unsigned r_end = bb->blurbs + (bb->bits? 1:0);
+ unsigned l = 0, r = bb->consumed_blurbs;
for( ; r < r_end; l++, r++)
bb->buffer[l] = bb->buffer[r];
for( ; l < r_end; l++)
bb->buffer[l] = 0;
+#else
+ FLAC__ASSERT(false); /* ERROR, only sizes of 8 and 32 are supported */
+#endif /* FLAC__BITS_PER_BLURB == 32 or 8 */
+
bb->blurbs -= bb->consumed_blurbs;
bb->total_bits -= FLAC__BLURBS_TO_BITS(bb->consumed_blurbs);
bb->consumed_blurbs = 0;
@@ -2094,6 +2144,7 @@
}
FLAC__bool FLAC__bitbuffer_read_rice_signed_block(FLAC__BitBuffer *bb, int vals[], unsigned nvals, unsigned parameter, FLAC__bool (*read_callback)(FLAC__byte buffer[], unsigned *bytes, void *client_data), void *client_data)
+#ifdef FLAC__OLD_MSVC_FLAVOR
{
const FLAC__blurb *buffer = bb->buffer;
@@ -2300,7 +2351,116 @@
return true;
}
+#else
+{
+ const FLAC__blurb *buffer = bb->buffer;
+ unsigned i, j, val_i = nvals;
+ unsigned cbits = 0, uval = 0, msbs = 0, lsbs_left = 0;
+ FLAC__blurb blurb, save_blurb;
+ unsigned state = 0; /* 0 = getting unary MSBs, 1 = getting binary LSBs */
+
+ FLAC__ASSERT(0 != bb);
+ FLAC__ASSERT(0 != bb->buffer);
+ FLAC__ASSERT(parameter <= 31);
+
+ if(nvals == 0)
+ return true;
+
+ cbits = bb->consumed_bits;
+ i = bb->consumed_blurbs;
+ while(val_i != 0) {
+ for( ; i < bb->blurbs; i++) {
+ blurb = (save_blurb = buffer[i]) << cbits;
+ while(1) {
+ if(state == 0) {
+ if(blurb) {
+ j = FLAC__ALIGNED_BLURB_UNARY(blurb);
+ msbs += j;
+ j++;
+ cbits += j;
+
+ uval = 0;
+ lsbs_left = parameter;
+ state++;
+ if(cbits == FLAC__BITS_PER_BLURB) {
+ cbits = 0;
+ CRC16_UPDATE_BLURB(bb, save_blurb, bb->read_crc16);
+ break;
+ }
+ blurb <<= j;
+ }
+ else {
+ msbs += FLAC__BITS_PER_BLURB - cbits;
+ cbits = 0;
+ CRC16_UPDATE_BLURB(bb, save_blurb, bb->read_crc16);
+ break;
+ }
+ }
+ else {
+ const unsigned available_bits = FLAC__BITS_PER_BLURB - cbits;
+ if(lsbs_left >= available_bits) {
+ uval <<= available_bits;
+ uval |= (blurb >> cbits);
+ cbits = 0;
+ CRC16_UPDATE_BLURB(bb, save_blurb, bb->read_crc16);
+
+ if(lsbs_left == available_bits) {
+ /* compose the value */
+ uval |= (msbs << parameter);
+ *vals = (int)(uval >> 1 ^ -(int)(uval & 1));
+ --val_i;
+ if(val_i == 0) {
+ i++;
+ goto break2;
+ }
+ ++vals;
+
+ msbs = 0;
+ state = 0;
+ }
+
+ lsbs_left -= available_bits;
+ break;
+ }
+ else {
+ cbits += lsbs_left;
+ uval <<= lsbs_left;
+ uval |= (blurb >> (FLAC__BITS_PER_BLURB - lsbs_left));
+ blurb <<= lsbs_left;
+
+ /* compose the value */
+ uval |= (msbs << parameter);
+ *vals = (int)(uval >> 1 ^ -(int)(uval & 1));
+ --val_i;
+ if(val_i == 0)
+ goto break2;
+ ++vals;
+
+ msbs = 0;
+ state = 0;
+ }
+ }
+ }
+ }
+break2:
+ bb->consumed_blurbs = i;
+ bb->consumed_bits = cbits;
+ bb->total_consumed_bits = (i << FLAC__BITS_PER_BLURB_LOG2) | cbits;
+ if(val_i != 0) {
+ if(!bitbuffer_read_from_client_(bb, read_callback, client_data))
+ return false;
+ /* these must be zero because we can only get here if we got to the end of the buffer */
+ FLAC__ASSERT(bb->consumed_blurbs == 0);
+ FLAC__ASSERT(bb->consumed_bits == 0);
+ i = 0;
+ }
+ }
+
+ return true;
+}
+#endif
+
#if 0 /* UNUSED */
FLAC__bool FLAC__bitbuffer_read_golomb_signed(FLAC__BitBuffer *bb, int *val, unsigned parameter, FLAC__bool (*read_callback)(FLAC__byte buffer[], unsigned *bytes, void *client_data), void *client_data)
{
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/bitmath.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/bitmath.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/bitmath.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -54,7 +54,7 @@
* ilog2(17) = 4
* ilog2(18) = 4
*/
-unsigned FLAC__bitmath_ilog2(unsigned v)
+unsigned FLAC__bitmath_ilog2(FLAC__uint32 v)
{
unsigned l = 0;
FLAC__ASSERT(v > 0);
@@ -63,6 +63,15 @@
return l;
}
+unsigned FLAC__bitmath_ilog2_wide(FLAC__uint64 v)
+{
+ unsigned l = 0;
+ FLAC__ASSERT(v > 0);
+ while(v >>= 1)
+ l++;
+ return l;
+}
+
/* An example of what FLAC__bitmath_silog2() computes:
*
* silog2(-10) = 5
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/cpu.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/cpu.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/cpu.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -30,8 +30,8 @@
*/
#include "private/cpu.h"
-#include<stdlib.h>
-#include<stdio.h>
+#include <stdlib.h>
+#include <stdio.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -39,9 +39,32 @@
#if defined FLAC__CPU_PPC
#if !defined FLAC__NO_ASM
-#if defined __APPLE__ && defined __MACH__
+#if defined FLAC__SYS_DARWIN
#include <sys/sysctl.h>
-#endif /* __APPLE__ && __MACH__ */
+#include <mach/mach.h>
+#include <mach/mach_host.h>
+#include <mach/host_info.h>
+#include <mach/machine.h>
+#ifndef CPU_SUBTYPE_POWERPC_970
+#define CPU_SUBTYPE_POWERPC_970 ((cpu_subtype_t) 100)
+#endif
+#else /* FLAC__SYS_DARWIN */
+#include <signal.h>
+#include <setjmp.h>
+
+static sigjmp_buf jmpbuf;
+static volatile sig_atomic_t canjump = 0;
+
+static void sigill_handler (int sig)
+{
+ if (!canjump) {
+ signal (sig, SIG_DFL);
+ raise (sig);
+ }
+ canjump = 0;
+ siglongjmp (jmpbuf, 1);
+}
+#endif /* FLAC__SYS_DARWIN */
#endif /* FLAC__NO_ASM */
#endif /* FLAC__CPU_PPC */
@@ -91,7 +114,7 @@
#if !defined FLAC__NO_ASM
info->use_asm = true;
#ifdef FLAC__USE_ALTIVEC
-#if defined __APPLE__ && defined __MACH__
+#if defined FLAC__SYS_DARWIN
{
int selectors[2] = { CTL_HW, HW_VECTORUNIT };
int result = 0;
@@ -100,12 +123,51 @@
info->data.ppc.altivec = error==0 ? result!=0 : 0;
}
-#else /* __APPLE__ && __MACH__ */
- /* don't know of any other thread-safe way to check */
- info->data.ppc.altivec = 0;
-#endif /* __APPLE__ && __MACH__ */
+ {
+ host_basic_info_data_t hostInfo;
+ mach_msg_type_number_t infoCount;
+
+ infoCount = HOST_BASIC_INFO_COUNT;
+ host_info(mach_host_self(), HOST_BASIC_INFO, (host_info_t)&hostInfo, &infoCount);
+
+ info->data.ppc.ppc64 = (hostInfo.cpu_type == CPU_TYPE_POWERPC) && (hostInfo.cpu_subtype == CPU_SUBTYPE_POWERPC_970);
+ }
+#else /* FLAC__SYS_DARWIN */
+ {
+ /* no Darwin, do it the brute-force way */
+ /* this is borrowed from MPlayer from the libmpeg2 library */
+ info->data.ppc.altivec = 0;
+ info->data.ppc.ppc64 = 0;
+
+ signal (SIGILL, sigill_handler);
+ if (!sigsetjmp (jmpbuf, 1)) {
+ canjump = 1;
+
+ asm volatile (
+ "mtspr 256, %0\n\t"
+ "vand %%v0, %%v0, %%v0"
+ :
+ : "r" (-1)
+ );
+
+ info->data.ppc.altivec = 1;
+ }
+ canjump = 0;
+ if (!sigsetjmp (jmpbuf, 1)) {
+ int x = 0;
+ canjump = 1;
+
+ /* PPC64 hardware implements the cntlzd instruction */
+ asm volatile ("cntlzd %0, %1" : "=r" (x) : "r" (x) );
+
+ info->data.ppc.ppc64 = 1;
+ }
+ signal (SIGILL, SIG_DFL);
+ }
+#endif /* FLAC__SYS_DARWIN */
#else /* FLAC__USE_ALTIVEC */
info->data.ppc.altivec = 0;
+ info->data.ppc.ppc64 = 0;
#endif /* FLAC__USE_ALTIVEC */
#else /* FLAC__NO_ASM */
info->use_asm = false;
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/crc.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/crc.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/crc.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/file_decoder.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/file_decoder.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/file_decoder.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/file_encoder.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/file_encoder.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/file_encoder.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/fixed.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/fixed.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/fixed.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -30,6 +30,7 @@
*/
#include <math.h>
+#include "private/bitmath.h"
#include "private/fixed.h"
#include "FLAC/assert.h"
@@ -48,8 +49,178 @@
#endif
#define local_abs(x) ((unsigned)((x)<0? -(x) : (x)))
-unsigned FLAC__fixed_compute_best_predictor(const FLAC__int32 data[], unsigned data_len, FLAC__real residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1])
+#ifdef FLAC__INTEGER_ONLY_LIBRARY
+/* rbps stands for residual bits per sample
+ *
+ * (ln(2) * err)
+ * rbps = log (-----------)
+ * 2 ( n )
+ */
+static FLAC__fixedpoint local__compute_rbps_integerized(FLAC__uint32 err, FLAC__uint32 n)
{
+ FLAC__uint32 rbps;
+ unsigned bits; /* the number of bits required to represent a number */
+ int fracbits; /* the number of bits of rbps that comprise the fractional part */
+
+ FLAC__ASSERT(sizeof(rbps) == sizeof(FLAC__fixedpoint));
+ FLAC__ASSERT(err > 0);
+ FLAC__ASSERT(n > 0);
+
+ FLAC__ASSERT(n <= FLAC__MAX_BLOCK_SIZE);
+ if(err <= n)
+ return 0;
+ /*
+ * The above two things tell us 1) n fits in 16 bits; 2) err/n > 1.
+ * These allow us later to know we won't lose too much precision in the
+ * fixed-point division (err<<fracbits)/n.
+ */
+
+ fracbits = (8*sizeof(err)) - (FLAC__bitmath_ilog2(err)+1);
+
+ err <<= fracbits;
+ err /= n;
+ /* err now holds err/n with fracbits fractional bits */
+
+ /*
+ * Whittle err down to 16 bits max. 16 significant bits is enough for
+ * our purposes.
+ */
+ FLAC__ASSERT(err > 0);
+ bits = FLAC__bitmath_ilog2(err)+1;
+ if(bits > 16) {
+ err >>= (bits-16);
+ fracbits -= (bits-16);
+ }
+ rbps = (FLAC__uint32)err;
+
+ /* Multiply by fixed-point version of ln(2), with 16 fractional bits */
+ rbps *= FLAC__FP_LN2;
+ fracbits += 16;
+ FLAC__ASSERT(fracbits >= 0);
+
+ /* FLAC__fixedpoint_log2 requires fracbits%4 to be 0 */
+ {
+ const int f = fracbits & 3;
+ if(f) {
+ rbps >>= f;
+ fracbits -= f;
+ }
+ }
+
+ rbps = FLAC__fixedpoint_log2(rbps, fracbits, (unsigned)(-1));
+
+ if(rbps == 0)
+ return 0;
+
+ /*
+ * The return value must have 16 fractional bits. Since the whole part
+ * of the base-2 log of a 32 bit number must fit in 5 bits, and fracbits
+ * must be >= -3, these assertion allows us to be able to shift rbps
+ * left if necessary to get 16 fracbits without losing any bits of the
+ * whole part of rbps.
+ *
+ * There is a slight chance due to accumulated error that the whole part
+ * will require 6 bits, so we use 6 in the assertion. Really though as
+ * long as it fits in 13 bits (32 - (16 - (-3))) we are fine.
+ */
+ FLAC__ASSERT((int)FLAC__bitmath_ilog2(rbps)+1 <= fracbits + 6);
+ FLAC__ASSERT(fracbits >= -3);
+
+ /* now shift the decimal point into place */
+ if(fracbits < 16)
+ return rbps << (16-fracbits);
+ else if(fracbits > 16)
+ return rbps >> (fracbits-16);
+ else
+ return rbps;
+}
+
+static FLAC__fixedpoint local__compute_rbps_wide_integerized(FLAC__uint64 err, FLAC__uint32 n)
+{
+ FLAC__uint32 rbps;
+ unsigned bits; /* the number of bits required to represent a number */
+ int fracbits; /* the number of bits of rbps that comprise the fractional part */
+
+ FLAC__ASSERT(sizeof(rbps) == sizeof(FLAC__fixedpoint));
+ FLAC__ASSERT(err > 0);
+ FLAC__ASSERT(n > 0);
+
+ FLAC__ASSERT(n <= FLAC__MAX_BLOCK_SIZE);
+ if(err <= n)
+ return 0;
+ /*
+ * The above two things tell us 1) n fits in 16 bits; 2) err/n > 1.
+ * These allow us later to know we won't lose too much precision in the
+ * fixed-point division (err<<fracbits)/n.
+ */
+
+ fracbits = (8*sizeof(err)) - (FLAC__bitmath_ilog2_wide(err)+1);
+
+ err <<= fracbits;
+ err /= n;
+ /* err now holds err/n with fracbits fractional bits */
+
+ /*
+ * Whittle err down to 16 bits max. 16 significant bits is enough for
+ * our purposes.
+ */
+ FLAC__ASSERT(err > 0);
+ bits = FLAC__bitmath_ilog2_wide(err)+1;
+ if(bits > 16) {
+ err >>= (bits-16);
+ fracbits -= (bits-16);
+ }
+ rbps = (FLAC__uint32)err;
+
+ /* Multiply by fixed-point version of ln(2), with 16 fractional bits */
+ rbps *= FLAC__FP_LN2;
+ fracbits += 16;
+ FLAC__ASSERT(fracbits >= 0);
+
+ /* FLAC__fixedpoint_log2 requires fracbits%4 to be 0 */
+ {
+ const int f = fracbits & 3;
+ if(f) {
+ rbps >>= f;
+ fracbits -= f;
+ }
+ }
+
+ rbps = FLAC__fixedpoint_log2(rbps, fracbits, (unsigned)(-1));
+
+ if(rbps == 0)
+ return 0;
+
+ /*
+ * The return value must have 16 fractional bits. Since the whole part
+ * of the base-2 log of a 32 bit number must fit in 5 bits, and fracbits
+ * must be >= -3, these assertion allows us to be able to shift rbps
+ * left if necessary to get 16 fracbits without losing any bits of the
+ * whole part of rbps.
+ *
+ * There is a slight chance due to accumulated error that the whole part
+ * will require 6 bits, so we use 6 in the assertion. Really though as
+ * long as it fits in 13 bits (32 - (16 - (-3))) we are fine.
+ */
+ FLAC__ASSERT((int)FLAC__bitmath_ilog2(rbps)+1 <= fracbits + 6);
+ FLAC__ASSERT(fracbits >= -3);
+
+ /* now shift the decimal point into place */
+ if(fracbits < 16)
+ return rbps << (16-fracbits);
+ else if(fracbits > 16)
+ return rbps >> (fracbits-16);
+ else
+ return rbps;
+}
+#endif
+
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
+unsigned FLAC__fixed_compute_best_predictor(const FLAC__int32 data[], unsigned data_len, FLAC__float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1])
+#else
+unsigned FLAC__fixed_compute_best_predictor(const FLAC__int32 data[], unsigned data_len, FLAC__fixedpoint residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1])
+#endif
+{
FLAC__int32 last_error_0 = data[-1];
FLAC__int32 last_error_1 = data[-1] - data[-2];
FLAC__int32 last_error_2 = last_error_1 - (data[-2] - data[-3]);
@@ -85,16 +256,28 @@
FLAC__ASSERT(data_len > 0 || total_error_2 == 0);
FLAC__ASSERT(data_len > 0 || total_error_3 == 0);
FLAC__ASSERT(data_len > 0 || total_error_4 == 0);
- residual_bits_per_sample[0] = (FLAC__real)((total_error_0 > 0) ? log(M_LN2 * (double)total_error_0 / (double)data_len) / M_LN2 : 0.0);
- residual_bits_per_sample[1] = (FLAC__real)((total_error_1 > 0) ? log(M_LN2 * (double)total_error_1 / (double)data_len) / M_LN2 : 0.0);
- residual_bits_per_sample[2] = (FLAC__real)((total_error_2 > 0) ? log(M_LN2 * (double)total_error_2 / (double)data_len) / M_LN2 : 0.0);
- residual_bits_per_sample[3] = (FLAC__real)((total_error_3 > 0) ? log(M_LN2 * (double)total_error_3 / (double)data_len) / M_LN2 : 0.0);
- residual_bits_per_sample[4] = (FLAC__real)((total_error_4 > 0) ? log(M_LN2 * (double)total_error_4 / (double)data_len) / M_LN2 : 0.0);
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
+ residual_bits_per_sample[0] = (FLAC__float)((total_error_0 > 0) ? log(M_LN2 * (FLAC__double)total_error_0 / (FLAC__double)data_len) / M_LN2 : 0.0);
+ residual_bits_per_sample[1] = (FLAC__float)((total_error_1 > 0) ? log(M_LN2 * (FLAC__double)total_error_1 / (FLAC__double)data_len) / M_LN2 : 0.0);
+ residual_bits_per_sample[2] = (FLAC__float)((total_error_2 > 0) ? log(M_LN2 * (FLAC__double)total_error_2 / (FLAC__double)data_len) / M_LN2 : 0.0);
+ residual_bits_per_sample[3] = (FLAC__float)((total_error_3 > 0) ? log(M_LN2 * (FLAC__double)total_error_3 / (FLAC__double)data_len) / M_LN2 : 0.0);
+ residual_bits_per_sample[4] = (FLAC__float)((total_error_4 > 0) ? log(M_LN2 * (FLAC__double)total_error_4 / (FLAC__double)data_len) / M_LN2 : 0.0);
+#else
+ residual_bits_per_sample[0] = (total_error_0 > 0) ? local__compute_rbps_integerized(total_error_0, data_len) : 0;
+ residual_bits_per_sample[1] = (total_error_1 > 0) ? local__compute_rbps_integerized(total_error_1, data_len) : 0;
+ residual_bits_per_sample[2] = (total_error_2 > 0) ? local__compute_rbps_integerized(total_error_2, data_len) : 0;
+ residual_bits_per_sample[3] = (total_error_3 > 0) ? local__compute_rbps_integerized(total_error_3, data_len) : 0;
+ residual_bits_per_sample[4] = (total_error_4 > 0) ? local__compute_rbps_integerized(total_error_4, data_len) : 0;
+#endif
return order;
}
-unsigned FLAC__fixed_compute_best_predictor_wide(const FLAC__int32 data[], unsigned data_len, FLAC__real residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1])
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
+unsigned FLAC__fixed_compute_best_predictor_wide(const FLAC__int32 data[], unsigned data_len, FLAC__float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1])
+#else
+unsigned FLAC__fixed_compute_best_predictor_wide(const FLAC__int32 data[], unsigned data_len, FLAC__fixedpoint residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1])
+#endif
{
FLAC__int32 last_error_0 = data[-1];
FLAC__int32 last_error_1 = data[-1] - data[-2];
@@ -135,20 +318,28 @@
FLAC__ASSERT(data_len > 0 || total_error_2 == 0);
FLAC__ASSERT(data_len > 0 || total_error_3 == 0);
FLAC__ASSERT(data_len > 0 || total_error_4 == 0);
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
#if defined _MSC_VER || defined __MINGW32__
- /* with VC++ you have to spoon feed it the casting */
- residual_bits_per_sample[0] = (FLAC__real)((total_error_0 > 0) ? log(M_LN2 * (double)(FLAC__int64)total_error_0 / (double)data_len) / M_LN2 : 0.0);
- residual_bits_per_sample[1] = (FLAC__real)((total_error_1 > 0) ? log(M_LN2 * (double)(FLAC__int64)total_error_1 / (double)data_len) / M_LN2 : 0.0);
- residual_bits_per_sample[2] = (FLAC__real)((total_error_2 > 0) ? log(M_LN2 * (double)(FLAC__int64)total_error_2 / (double)data_len) / M_LN2 : 0.0);
- residual_bits_per_sample[3] = (FLAC__real)((total_error_3 > 0) ? log(M_LN2 * (double)(FLAC__int64)total_error_3 / (double)data_len) / M_LN2 : 0.0);
- residual_bits_per_sample[4] = (FLAC__real)((total_error_4 > 0) ? log(M_LN2 * (double)(FLAC__int64)total_error_4 / (double)data_len) / M_LN2 : 0.0);
+ /* with MSVC you have to spoon feed it the casting */
+ residual_bits_per_sample[0] = (FLAC__float)((total_error_0 > 0) ? log(M_LN2 * (FLAC__double)(FLAC__int64)total_error_0 / (FLAC__double)data_len) / M_LN2 : 0.0);
+ residual_bits_per_sample[1] = (FLAC__float)((total_error_1 > 0) ? log(M_LN2 * (FLAC__double)(FLAC__int64)total_error_1 / (FLAC__double)data_len) / M_LN2 : 0.0);
+ residual_bits_per_sample[2] = (FLAC__float)((total_error_2 > 0) ? log(M_LN2 * (FLAC__double)(FLAC__int64)total_error_2 / (FLAC__double)data_len) / M_LN2 : 0.0);
+ residual_bits_per_sample[3] = (FLAC__float)((total_error_3 > 0) ? log(M_LN2 * (FLAC__double)(FLAC__int64)total_error_3 / (FLAC__double)data_len) / M_LN2 : 0.0);
+ residual_bits_per_sample[4] = (FLAC__float)((total_error_4 > 0) ? log(M_LN2 * (FLAC__double)(FLAC__int64)total_error_4 / (FLAC__double)data_len) / M_LN2 : 0.0);
#else
- residual_bits_per_sample[0] = (FLAC__real)((total_error_0 > 0) ? log(M_LN2 * (double)total_error_0 / (double)data_len) / M_LN2 : 0.0);
- residual_bits_per_sample[1] = (FLAC__real)((total_error_1 > 0) ? log(M_LN2 * (double)total_error_1 / (double)data_len) / M_LN2 : 0.0);
- residual_bits_per_sample[2] = (FLAC__real)((total_error_2 > 0) ? log(M_LN2 * (double)total_error_2 / (double)data_len) / M_LN2 : 0.0);
- residual_bits_per_sample[3] = (FLAC__real)((total_error_3 > 0) ? log(M_LN2 * (double)total_error_3 / (double)data_len) / M_LN2 : 0.0);
- residual_bits_per_sample[4] = (FLAC__real)((total_error_4 > 0) ? log(M_LN2 * (double)total_error_4 / (double)data_len) / M_LN2 : 0.0);
+ residual_bits_per_sample[0] = (FLAC__float)((total_error_0 > 0) ? log(M_LN2 * (FLAC__double)total_error_0 / (FLAC__double)data_len) / M_LN2 : 0.0);
+ residual_bits_per_sample[1] = (FLAC__float)((total_error_1 > 0) ? log(M_LN2 * (FLAC__double)total_error_1 / (FLAC__double)data_len) / M_LN2 : 0.0);
+ residual_bits_per_sample[2] = (FLAC__float)((total_error_2 > 0) ? log(M_LN2 * (FLAC__double)total_error_2 / (FLAC__double)data_len) / M_LN2 : 0.0);
+ residual_bits_per_sample[3] = (FLAC__float)((total_error_3 > 0) ? log(M_LN2 * (FLAC__double)total_error_3 / (FLAC__double)data_len) / M_LN2 : 0.0);
+ residual_bits_per_sample[4] = (FLAC__float)((total_error_4 > 0) ? log(M_LN2 * (FLAC__double)total_error_4 / (FLAC__double)data_len) / M_LN2 : 0.0);
#endif
+#else
+ residual_bits_per_sample[0] = (total_error_0 > 0) ? local__compute_rbps_wide_integerized(total_error_0, data_len) : 0;
+ residual_bits_per_sample[1] = (total_error_1 > 0) ? local__compute_rbps_wide_integerized(total_error_1, data_len) : 0;
+ residual_bits_per_sample[2] = (total_error_2 > 0) ? local__compute_rbps_wide_integerized(total_error_2, data_len) : 0;
+ residual_bits_per_sample[3] = (total_error_3 > 0) ? local__compute_rbps_wide_integerized(total_error_3, data_len) : 0;
+ residual_bits_per_sample[4] = (total_error_4 > 0) ? local__compute_rbps_wide_integerized(total_error_4, data_len) : 0;
+#endif
return order;
}
Added: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/float.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/float.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/float.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -0,0 +1,304 @@
+/* libFLAC - Free Lossless Audio Codec library
+ * Copyright (C) 2004,2005 Josh Coalson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of the Xiph.org Foundation nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "FLAC/assert.h"
+
+#include "private/float.h"
+
+#ifdef FLAC__INTEGER_ONLY_LIBRARY
+
+/* adjust for compilers that can't understand using LLU suffix for uint64_t literals */
+#ifdef _MSC_VER
+#define FLAC__U64L(x) x
+#else
+#define FLAC__U64L(x) x##LLU
+#endif
+
+const FLAC__fixedpoint FLAC__FP_ZERO = 0;
+const FLAC__fixedpoint FLAC__FP_ONE_HALF = 0x00008000;
+const FLAC__fixedpoint FLAC__FP_ONE = 0x00010000;
+const FLAC__fixedpoint FLAC__FP_LN2 = 45426;
+const FLAC__fixedpoint FLAC__FP_E = 178145;
+
+/* Lookup tables for Knuth's logarithm algorithm */
+#define LOG2_LOOKUP_PRECISION 16
+static const FLAC__uint32 log2_lookup[][LOG2_LOOKUP_PRECISION] = {
+ {
+ /*
+ * 0 fraction bits
+ */
+ /* undefined */ 0x00000000,
+ /* lg(2/1) = */ 0x00000001,
+ /* lg(4/3) = */ 0x00000000,
+ /* lg(8/7) = */ 0x00000000,
+ /* lg(16/15) = */ 0x00000000,
+ /* lg(32/31) = */ 0x00000000,
+ /* lg(64/63) = */ 0x00000000,
+ /* lg(128/127) = */ 0x00000000,
+ /* lg(256/255) = */ 0x00000000,
+ /* lg(512/511) = */ 0x00000000,
+ /* lg(1024/1023) = */ 0x00000000,
+ /* lg(2048/2047) = */ 0x00000000,
+ /* lg(4096/4095) = */ 0x00000000,
+ /* lg(8192/8191) = */ 0x00000000,
+ /* lg(16384/16383) = */ 0x00000000,
+ /* lg(32768/32767) = */ 0x00000000
+ },
+ {
+ /*
+ * 4 fraction bits
+ */
+ /* undefined */ 0x00000000,
+ /* lg(2/1) = */ 0x00000010,
+ /* lg(4/3) = */ 0x00000007,
+ /* lg(8/7) = */ 0x00000003,
+ /* lg(16/15) = */ 0x00000001,
+ /* lg(32/31) = */ 0x00000001,
+ /* lg(64/63) = */ 0x00000000,
+ /* lg(128/127) = */ 0x00000000,
+ /* lg(256/255) = */ 0x00000000,
+ /* lg(512/511) = */ 0x00000000,
+ /* lg(1024/1023) = */ 0x00000000,
+ /* lg(2048/2047) = */ 0x00000000,
+ /* lg(4096/4095) = */ 0x00000000,
+ /* lg(8192/8191) = */ 0x00000000,
+ /* lg(16384/16383) = */ 0x00000000,
+ /* lg(32768/32767) = */ 0x00000000
+ },
+ {
+ /*
+ * 8 fraction bits
+ */
+ /* undefined */ 0x00000000,
+ /* lg(2/1) = */ 0x00000100,
+ /* lg(4/3) = */ 0x0000006a,
+ /* lg(8/7) = */ 0x00000031,
+ /* lg(16/15) = */ 0x00000018,
+ /* lg(32/31) = */ 0x0000000c,
+ /* lg(64/63) = */ 0x00000006,
+ /* lg(128/127) = */ 0x00000003,
+ /* lg(256/255) = */ 0x00000001,
+ /* lg(512/511) = */ 0x00000001,
+ /* lg(1024/1023) = */ 0x00000000,
+ /* lg(2048/2047) = */ 0x00000000,
+ /* lg(4096/4095) = */ 0x00000000,
+ /* lg(8192/8191) = */ 0x00000000,
+ /* lg(16384/16383) = */ 0x00000000,
+ /* lg(32768/32767) = */ 0x00000000
+ },
+ {
+ /*
+ * 12 fraction bits
+ */
+ /* undefined */ 0x00000000,
+ /* lg(2/1) = */ 0x00001000,
+ /* lg(4/3) = */ 0x000006a4,
+ /* lg(8/7) = */ 0x00000315,
+ /* lg(16/15) = */ 0x0000017d,
+ /* lg(32/31) = */ 0x000000bc,
+ /* lg(64/63) = */ 0x0000005d,
+ /* lg(128/127) = */ 0x0000002e,
+ /* lg(256/255) = */ 0x00000017,
+ /* lg(512/511) = */ 0x0000000c,
+ /* lg(1024/1023) = */ 0x00000006,
+ /* lg(2048/2047) = */ 0x00000003,
+ /* lg(4096/4095) = */ 0x00000001,
+ /* lg(8192/8191) = */ 0x00000001,
+ /* lg(16384/16383) = */ 0x00000000,
+ /* lg(32768/32767) = */ 0x00000000
+ },
+ {
+ /*
+ * 16 fraction bits
+ */
+ /* undefined */ 0x00000000,
+ /* lg(2/1) = */ 0x00010000,
+ /* lg(4/3) = */ 0x00006a40,
+ /* lg(8/7) = */ 0x00003151,
+ /* lg(16/15) = */ 0x000017d6,
+ /* lg(32/31) = */ 0x00000bba,
+ /* lg(64/63) = */ 0x000005d1,
+ /* lg(128/127) = */ 0x000002e6,
+ /* lg(256/255) = */ 0x00000172,
+ /* lg(512/511) = */ 0x000000b9,
+ /* lg(1024/1023) = */ 0x0000005c,
+ /* lg(2048/2047) = */ 0x0000002e,
+ /* lg(4096/4095) = */ 0x00000017,
+ /* lg(8192/8191) = */ 0x0000000c,
+ /* lg(16384/16383) = */ 0x00000006,
+ /* lg(32768/32767) = */ 0x00000003
+ },
+ {
+ /*
+ * 20 fraction bits
+ */
+ /* undefined */ 0x00000000,
+ /* lg(2/1) = */ 0x00100000,
+ /* lg(4/3) = */ 0x0006a3fe,
+ /* lg(8/7) = */ 0x00031513,
+ /* lg(16/15) = */ 0x00017d60,
+ /* lg(32/31) = */ 0x0000bb9d,
+ /* lg(64/63) = */ 0x00005d10,
+ /* lg(128/127) = */ 0x00002e59,
+ /* lg(256/255) = */ 0x00001721,
+ /* lg(512/511) = */ 0x00000b8e,
+ /* lg(1024/1023) = */ 0x000005c6,
+ /* lg(2048/2047) = */ 0x000002e3,
+ /* lg(4096/4095) = */ 0x00000171,
+ /* lg(8192/8191) = */ 0x000000b9,
+ /* lg(16384/16383) = */ 0x0000005c,
+ /* lg(32768/32767) = */ 0x0000002e
+ },
+ {
+ /*
+ * 24 fraction bits
+ */
+ /* undefined */ 0x00000000,
+ /* lg(2/1) = */ 0x01000000,
+ /* lg(4/3) = */ 0x006a3fe6,
+ /* lg(8/7) = */ 0x00315130,
+ /* lg(16/15) = */ 0x0017d605,
+ /* lg(32/31) = */ 0x000bb9ca,
+ /* lg(64/63) = */ 0x0005d0fc,
+ /* lg(128/127) = */ 0x0002e58f,
+ /* lg(256/255) = */ 0x0001720e,
+ /* lg(512/511) = */ 0x0000b8d8,
+ /* lg(1024/1023) = */ 0x00005c61,
+ /* lg(2048/2047) = */ 0x00002e2d,
+ /* lg(4096/4095) = */ 0x00001716,
+ /* lg(8192/8191) = */ 0x00000b8b,
+ /* lg(16384/16383) = */ 0x000005c5,
+ /* lg(32768/32767) = */ 0x000002e3
+ },
+ {
+ /*
+ * 28 fraction bits
+ */
+ /* undefined */ 0x00000000,
+ /* lg(2/1) = */ 0x10000000,
+ /* lg(4/3) = */ 0x06a3fe5c,
+ /* lg(8/7) = */ 0x03151301,
+ /* lg(16/15) = */ 0x017d6049,
+ /* lg(32/31) = */ 0x00bb9ca6,
+ /* lg(64/63) = */ 0x005d0fba,
+ /* lg(128/127) = */ 0x002e58f7,
+ /* lg(256/255) = */ 0x001720da,
+ /* lg(512/511) = */ 0x000b8d87,
+ /* lg(1024/1023) = */ 0x0005c60b,
+ /* lg(2048/2047) = */ 0x0002e2d7,
+ /* lg(4096/4095) = */ 0x00017160,
+ /* lg(8192/8191) = */ 0x0000b8ad,
+ /* lg(16384/16383) = */ 0x00005c56,
+ /* lg(32768/32767) = */ 0x00002e2b
+ }
+};
+
+#if 0
+static const FLAC__uint64 log2_lookup_wide[] = {
+ {
+ /*
+ * 32 fraction bits
+ */
+ /* undefined */ 0x00000000,
+ /* lg(2/1) = */ FLAC__U64L(0x100000000),
+ /* lg(4/3) = */ FLAC__U64L(0x6a3fe5c6),
+ /* lg(8/7) = */ FLAC__U64L(0x31513015),
+ /* lg(16/15) = */ FLAC__U64L(0x17d60497),
+ /* lg(32/31) = */ FLAC__U64L(0x0bb9ca65),
+ /* lg(64/63) = */ FLAC__U64L(0x05d0fba2),
+ /* lg(128/127) = */ FLAC__U64L(0x02e58f74),
+ /* lg(256/255) = */ FLAC__U64L(0x01720d9c),
+ /* lg(512/511) = */ FLAC__U64L(0x00b8d875),
+ /* lg(1024/1023) = */ FLAC__U64L(0x005c60aa),
+ /* lg(2048/2047) = */ FLAC__U64L(0x002e2d72),
+ /* lg(4096/4095) = */ FLAC__U64L(0x00171600),
+ /* lg(8192/8191) = */ FLAC__U64L(0x000b8ad2),
+ /* lg(16384/16383) = */ FLAC__U64L(0x0005c55d),
+ /* lg(32768/32767) = */ FLAC__U64L(0x0002e2ac)
+ },
+ {
+ /*
+ * 48 fraction bits
+ */
+ /* undefined */ 0x00000000,
+ /* lg(2/1) = */ FLAC__U64L(0x1000000000000),
+ /* lg(4/3) = */ FLAC__U64L(0x6a3fe5c60429),
+ /* lg(8/7) = */ FLAC__U64L(0x315130157f7a),
+ /* lg(16/15) = */ FLAC__U64L(0x17d60496cfbb),
+ /* lg(32/31) = */ FLAC__U64L(0xbb9ca64ecac),
+ /* lg(64/63) = */ FLAC__U64L(0x5d0fba187cd),
+ /* lg(128/127) = */ FLAC__U64L(0x2e58f7441ee),
+ /* lg(256/255) = */ FLAC__U64L(0x1720d9c06a8),
+ /* lg(512/511) = */ FLAC__U64L(0xb8d8752173),
+ /* lg(1024/1023) = */ FLAC__U64L(0x5c60aa252e),
+ /* lg(2048/2047) = */ FLAC__U64L(0x2e2d71b0d8),
+ /* lg(4096/4095) = */ FLAC__U64L(0x1716001719),
+ /* lg(8192/8191) = */ FLAC__U64L(0xb8ad1de1b),
+ /* lg(16384/16383) = */ FLAC__U64L(0x5c55d640d),
+ /* lg(32768/32767) = */ FLAC__U64L(0x2e2abcf52)
+ }
+};
+#endif
+
+FLAC__uint32 FLAC__fixedpoint_log2(FLAC__uint32 x, unsigned fracbits, unsigned precision)
+{
+ const FLAC__uint32 ONE = (1u << fracbits);
+ const FLAC__uint32 *table = log2_lookup[fracbits >> 2];
+
+ FLAC__ASSERT(fracbits < 32);
+ FLAC__ASSERT((fracbits & 0x3) == 0);
+
+ if(x < ONE)
+ return 0;
+
+ if(precision > LOG2_LOOKUP_PRECISION)
+ precision = LOG2_LOOKUP_PRECISION;
+
+ /* Knuth's algorithm for computing logarithms, optimized for base-2 with lookup tables */
+ {
+ FLAC__uint32 y = 0;
+ FLAC__uint32 z = x >> 1, k = 1;
+ while (x > ONE && k < precision) {
+ if (x - z >= ONE) {
+ x -= z;
+ z = x >> k;
+ y += table[k];
+ }
+ else {
+ z >>= 1;
+ k++;
+ }
+ }
+ return y;
+ }
+}
+
+#endif /* defined FLAC__INTEGER_ONLY_LIBRARY */
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/format.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/format.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/format.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -56,9 +56,9 @@
#if defined _MSC_VER || defined __MINW32__
/* yet one more hack because of MSVC6: */
-FLAC_API const char *FLAC__VENDOR_STRING = "reference libFLAC 1.1.1 20041001";
+FLAC_API const char *FLAC__VENDOR_STRING = "reference libFLAC 1.1.2 20050205";
#else
-FLAC_API const char *FLAC__VENDOR_STRING = "reference libFLAC " VERSION " 20041001";
+FLAC_API const char *FLAC__VENDOR_STRING = "reference libFLAC " VERSION " 20050205";
#endif
FLAC_API const FLAC__byte FLAC__STREAM_SYNC_STRING[4] = { 'f','L','a','C' };
@@ -254,6 +254,77 @@
return j;
}
+static __inline unsigned utf8len_(const FLAC__byte *utf8)
+{
+ FLAC__ASSERT(0 != utf8);
+ if ((utf8[0] & 0x80) == 0)
+ return 1;
+ else if ((utf8[0] & 0xE0) == 0xC0 && (utf8[1] & 0xC0) == 0x80)
+ return 2;
+ else if ((utf8[0] & 0xF0) == 0xE0 && (utf8[1] & 0xC0) == 0x80 && (utf8[2] & 0xC0) == 0x80)
+ return 3;
+ else
+ return 0;
+}
+
+FLAC_API FLAC__bool FLAC__format_vorbiscomment_entry_name_is_legal(const char *name)
+{
+ char c;
+ for(c = *name; c; c = *(++name))
+ if(c < 0x20 || c == 0x3d || c > 0x7d)
+ return false;
+ return true;
+}
+
+FLAC_API FLAC__bool FLAC__format_vorbiscomment_entry_value_is_legal(const FLAC__byte *value, unsigned length)
+{
+ if(length == (unsigned)(-1)) {
+ while(*value) {
+ unsigned n = utf8len_(value);
+ if(n == 0)
+ return false;
+ value += n;
+ }
+ }
+ else {
+ const FLAC__byte *end = value + length;
+ while(value < end) {
+ unsigned n = utf8len_(value);
+ if(n == 0)
+ return false;
+ value += n;
+ }
+ if(value != end)
+ return false;
+ }
+ return true;
+}
+
+FLAC_API FLAC__bool FLAC__format_vorbiscomment_entry_is_legal(const FLAC__byte *entry, unsigned length)
+{
+ const FLAC__byte *s, *end;
+
+ for(s = entry, end = s + length; s < end && *s != '='; s++) {
+ if(*s < 0x20 || *s > 0x7D)
+ return false;
+ }
+ if(s == end)
+ return false;
+
+ s++; /* skip '=' */
+
+ while(s < end) {
+ unsigned n = utf8len_(s);
+ if(n == 0)
+ return false;
+ s += n;
+ }
+ if(s != end)
+ return false;
+
+ return true;
+}
+
FLAC_API FLAC__bool FLAC__format_cuesheet_is_legal(const FLAC__StreamMetadata_CueSheet *cue_sheet, FLAC__bool check_cd_da_subset, const char **violation)
{
unsigned i, j;
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ia32/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ia32/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ia32/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# libFLAC - Free Lossless Audio Codec library
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ia32/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ia32/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ia32/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# libFLAC - Free Lossless Audio Codec library
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -98,6 +98,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -133,10 +134,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -149,12 +158,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ia32/cpu_asm.nasm
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ia32/cpu_asm.nasm 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ia32/cpu_asm.nasm 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
; libFLAC - Free Lossless Audio Codec library
-; Copyright (C) 2001,2002,2003,2004 Josh Coalson
+; Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
;
; Redistribution and use in source and binary forms, with or without
; modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ia32/fixed_asm.nasm
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ia32/fixed_asm.nasm 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ia32/fixed_asm.nasm 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
; libFLAC - Free Lossless Audio Codec library
-; Copyright (C) 2001,2002,2003,2004 Josh Coalson
+; Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
;
; Redistribution and use in source and binary forms, with or without
; modification, are permitted provided that the following conditions
@@ -38,7 +38,7 @@
; **********************************************************************
;
-; unsigned FLAC__fixed_compute_best_predictor(const FLAC__int32 data[], unsigned data_len, FLAC__real residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1])
+; unsigned FLAC__fixed_compute_best_predictor(const FLAC__int32 *data, unsigned data_len, FLAC__float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1])
; {
; FLAC__int32 last_error_0 = data[-1];
; FLAC__int32 last_error_1 = data[-1] - data[-2];
@@ -67,11 +67,11 @@
; else
; order = 4;
;
-; residual_bits_per_sample[0] = (FLAC__real)((data_len > 0 && total_error_0 > 0) ? log(M_LN2 * (double)total_error_0 / (double)data_len) / M_LN2 : 0.0);
-; residual_bits_per_sample[1] = (FLAC__real)((data_len > 0 && total_error_1 > 0) ? log(M_LN2 * (double)total_error_1 / (double)data_len) / M_LN2 : 0.0);
-; residual_bits_per_sample[2] = (FLAC__real)((data_len > 0 && total_error_2 > 0) ? log(M_LN2 * (double)total_error_2 / (double)data_len) / M_LN2 : 0.0);
-; residual_bits_per_sample[3] = (FLAC__real)((data_len > 0 && total_error_3 > 0) ? log(M_LN2 * (double)total_error_3 / (double)data_len) / M_LN2 : 0.0);
-; residual_bits_per_sample[4] = (FLAC__real)((data_len > 0 && total_error_4 > 0) ? log(M_LN2 * (double)total_error_4 / (double)data_len) / M_LN2 : 0.0);
+; residual_bits_per_sample[0] = (FLAC__float)((data_len > 0 && total_error_0 > 0) ? log(M_LN2 * (FLAC__double)total_error_0 / (FLAC__double)data_len) / M_LN2 : 0.0);
+; residual_bits_per_sample[1] = (FLAC__float)((data_len > 0 && total_error_1 > 0) ? log(M_LN2 * (FLAC__double)total_error_1 / (FLAC__double)data_len) / M_LN2 : 0.0);
+; residual_bits_per_sample[2] = (FLAC__float)((data_len > 0 && total_error_2 > 0) ? log(M_LN2 * (FLAC__double)total_error_2 / (FLAC__double)data_len) / M_LN2 : 0.0);
+; residual_bits_per_sample[3] = (FLAC__float)((data_len > 0 && total_error_3 > 0) ? log(M_LN2 * (FLAC__double)total_error_3 / (FLAC__double)data_len) / M_LN2 : 0.0);
+; residual_bits_per_sample[4] = (FLAC__float)((data_len > 0 && total_error_4 > 0) ? log(M_LN2 * (FLAC__double)total_error_4 / (FLAC__double)data_len) / M_LN2 : 0.0);
;
; return order;
; }
@@ -196,11 +196,11 @@
movd ebx, mm0 ; ebx = total_error_0
emms
- ; residual_bits_per_sample[0] = (FLAC__real)((data_len > 0 && total_error_0 > 0) ? log(M_LN2 * (double)total_error_0 / (double)data_len) / M_LN2 : 0.0);
- ; residual_bits_per_sample[1] = (FLAC__real)((data_len > 0 && total_error_1 > 0) ? log(M_LN2 * (double)total_error_1 / (double)data_len) / M_LN2 : 0.0);
- ; residual_bits_per_sample[2] = (FLAC__real)((data_len > 0 && total_error_2 > 0) ? log(M_LN2 * (double)total_error_2 / (double)data_len) / M_LN2 : 0.0);
- ; residual_bits_per_sample[3] = (FLAC__real)((data_len > 0 && total_error_3 > 0) ? log(M_LN2 * (double)total_error_3 / (double)data_len) / M_LN2 : 0.0);
- ; residual_bits_per_sample[4] = (FLAC__real)((data_len > 0 && total_error_4 > 0) ? log(M_LN2 * (double)total_error_4 / (double)data_len) / M_LN2 : 0.0);
+ ; residual_bits_per_sample[0] = (FLAC__float)((data_len > 0 && total_error_0 > 0) ? log(M_LN2 * (FLAC__double)total_error_0 / (FLAC__double)data_len) / M_LN2 : 0.0);
+ ; residual_bits_per_sample[1] = (FLAC__float)((data_len > 0 && total_error_1 > 0) ? log(M_LN2 * (FLAC__double)total_error_1 / (FLAC__double)data_len) / M_LN2 : 0.0);
+ ; residual_bits_per_sample[2] = (FLAC__float)((data_len > 0 && total_error_2 > 0) ? log(M_LN2 * (FLAC__double)total_error_2 / (FLAC__double)data_len) / M_LN2 : 0.0);
+ ; residual_bits_per_sample[3] = (FLAC__float)((data_len > 0 && total_error_3 > 0) ? log(M_LN2 * (FLAC__double)total_error_3 / (FLAC__double)data_len) / M_LN2 : 0.0);
+ ; residual_bits_per_sample[4] = (FLAC__float)((data_len > 0 && total_error_4 > 0) ? log(M_LN2 * (FLAC__double)total_error_4 / (FLAC__double)data_len) / M_LN2 : 0.0);
xor eax, eax
fild dword [esp + 40] ; ST = data_len (NOTE: assumes data_len is <2gigs)
.rbps_0:
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ia32/lpc_asm.nasm
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ia32/lpc_asm.nasm 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ia32/lpc_asm.nasm 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
; libFLAC - Free Lossless Audio Codec library
-; Copyright (C) 2001,2002,2003,2004 Josh Coalson
+; Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
;
; Redistribution and use in source and binary forms, with or without
; modification, are permitted provided that the following conditions
@@ -736,7 +736,7 @@
pop ebp
ret
-;void FLAC__lpc_compute_residual_from_qlp_coefficients(const FLAC__int32 data[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[])
+;void FLAC__lpc_compute_residual_from_qlp_coefficients(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[])
;
; for(i = 0; i < data_len; i++) {
; sum = 0;
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ia32/nasm.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ia32/nasm.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ia32/nasm.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
; libFLAC - Free Lossless Audio Codec library
-; Copyright (C) 2001,2002,2003,2004 Josh Coalson
+; Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
;
; Redistribution and use in source and binary forms, with or without
; modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# libFLAC - Free Lossless Audio Codec library
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# libFLAC - Free Lossless Audio Codec library
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -89,6 +89,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -124,10 +125,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -140,12 +149,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# libFLAC - Free Lossless Audio Codec library
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -35,6 +35,7 @@
cpu.h \
crc.h \
fixed.h \
+ float.h \
format.h \
lpc.h \
md5.h \
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# libFLAC - Free Lossless Audio Codec library
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -85,6 +85,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -120,10 +121,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -136,12 +145,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -232,6 +246,7 @@
cpu.h \
crc.h \
fixed.h \
+ float.h \
format.h \
lpc.h \
md5.h \
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/all.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/all.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/all.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -37,6 +37,7 @@
#include "cpu.h"
#include "crc.h"
#include "fixed.h"
+#include "float.h"
#include "format.h"
#include "lpc.h"
#include "md5.h"
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/bitbuffer.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/bitbuffer.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/bitbuffer.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/bitmath.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/bitmath.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/bitmath.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -34,7 +34,8 @@
#include "FLAC/ordinals.h"
-unsigned FLAC__bitmath_ilog2(unsigned v);
+unsigned FLAC__bitmath_ilog2(FLAC__uint32 v);
+unsigned FLAC__bitmath_ilog2_wide(FLAC__uint64 v);
unsigned FLAC__bitmath_silog2(int v);
unsigned FLAC__bitmath_silog2_wide(FLAC__int64 v);
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/cpu.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/cpu.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/cpu.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -57,6 +57,7 @@
typedef struct {
FLAC__bool altivec;
+ FLAC__bool ppc64;
} FLAC__CPUInfo_PPC;
extern const unsigned FLAC__CPUINFO_IA32_CPUID_CMOV;
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/crc.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/crc.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/crc.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/fixed.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/fixed.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/fixed.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,12 +32,13 @@
#ifndef FLAC__PRIVATE__FIXED_H
#define FLAC__PRIVATE__FIXED_H
-#include "FLAC/format.h"
-
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
+#include "private/float.h"
+#include "FLAC/format.h"
+
/*
* FLAC__fixed_compute_best_predictor()
* --------------------------------------------------------------------
@@ -50,15 +51,20 @@
* IN data_len
* OUT residual_bits_per_sample[0,FLAC__MAX_FIXED_ORDER]
*/
-unsigned FLAC__fixed_compute_best_predictor(const FLAC__int32 data[], unsigned data_len, FLAC__real residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]);
-#ifndef FLAC__NO_ASM
-#ifdef FLAC__CPU_IA32
-#ifdef FLAC__HAS_NASM
-unsigned FLAC__fixed_compute_best_predictor_asm_ia32_mmx_cmov(const FLAC__int32 data[], unsigned data_len, FLAC__real residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]);
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
+unsigned FLAC__fixed_compute_best_predictor(const FLAC__int32 data[], unsigned data_len, FLAC__float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]);
+# ifndef FLAC__NO_ASM
+# ifdef FLAC__CPU_IA32
+# ifdef FLAC__HAS_NASM
+unsigned FLAC__fixed_compute_best_predictor_asm_ia32_mmx_cmov(const FLAC__int32 data[], unsigned data_len, FLAC__float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]);
+# endif
+# endif
+# endif
+unsigned FLAC__fixed_compute_best_predictor_wide(const FLAC__int32 data[], unsigned data_len, FLAC__float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]);
+#else
+unsigned FLAC__fixed_compute_best_predictor(const FLAC__int32 data[], unsigned data_len, FLAC__fixedpoint residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]);
+unsigned FLAC__fixed_compute_best_predictor_wide(const FLAC__int32 data[], unsigned data_len, FLAC__fixedpoint residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]);
#endif
-#endif
-#endif
-unsigned FLAC__fixed_compute_best_predictor_wide(const FLAC__int32 data[], unsigned data_len, FLAC__real residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]);
/*
* FLAC__fixed_compute_residual()
Added: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/float.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/float.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/float.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -0,0 +1,97 @@
+/* libFLAC - Free Lossless Audio Codec library
+ * Copyright (C) 2004,2005 Josh Coalson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of the Xiph.org Foundation nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef FLAC__PRIVATE__FLOAT_H
+#define FLAC__PRIVATE__FLOAT_H
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "FLAC/ordinals.h"
+
+/*
+ * These typedefs make it easier to ensure that integer versions of
+ * the library really only contain integer operations. All the code
+ * in libFLAC should use FLAC__float and FLAC__double in place of
+ * float and double, and be protected by checks of the macro
+ * FLAC__INTEGER_ONLY_LIBRARY.
+ *
+ * FLAC__real is the basic floating point type used in LPC analysis.
+ */
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
+typedef double FLAC__double;
+typedef float FLAC__float;
+/*
+ * WATCHOUT: changing FLAC__real will change the signatures of many
+ * functions that have assembly language equivalents and break them.
+ */
+typedef float FLAC__real;
+#else
+/*
+ * The convention for FLAC__fixedpoint is to use the upper 16 bits
+ * for the integer part and lower 16 bits for the fractional part.
+ */
+typedef FLAC__int32 FLAC__fixedpoint;
+extern const FLAC__fixedpoint FLAC__FP_ZERO;
+extern const FLAC__fixedpoint FLAC__FP_ONE_HALF;
+extern const FLAC__fixedpoint FLAC__FP_ONE;
+extern const FLAC__fixedpoint FLAC__FP_LN2;
+extern const FLAC__fixedpoint FLAC__FP_E;
+
+#define FLAC__fixedpoint_trunc(x) ((x)>>16)
+
+#define FLAC__fixedpoint_mul(x, y) ( (FLAC__fixedpoint) ( ((FLAC__int64)(x)*(FLAC__int64)(y)) >> 16 ) )
+
+#define FLAC__fixedpoint_div(x, y) ( (FLAC__fixedpoint) ( ( ((FLAC__int64)(x)<<32) / (FLAC__int64)(y) ) >> 16 ) )
+
+/*
+ * FLAC__fixedpoint_log2()
+ * --------------------------------------------------------------------
+ * Returns the base-2 logarithm of the fixed-point number 'x' using an
+ * algorithm by Knuth for x >= 1.0
+ *
+ * 'fracbits' is the number of fractional bits of 'x'. 'fracbits' must
+ * be < 32 and evenly divisible by 4 (0 is OK but not very precise).
+ *
+ * 'precision' roughly limits the number of iterations that are done;
+ * use (unsigned)(-1) for maximum precision.
+ *
+ * If 'x' is less than one -- that is, x < (1<<fracbits) -- then this
+ * function will punt and return 0.
+ *
+ * The return value will also have 'fracbits' fractional bits.
+ */
+FLAC__uint32 FLAC__fixedpoint_log2(FLAC__uint32 x, unsigned fracbits, unsigned precision);
+
+#endif
+
+#endif
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/format.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/format.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/format.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/lpc.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/lpc.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/lpc.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,12 +32,15 @@
#ifndef FLAC__PRIVATE__LPC_H
#define FLAC__PRIVATE__LPC_H
-#include "FLAC/format.h"
-
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
+#include "private/float.h"
+#include "FLAC/format.h"
+
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
+
/*
* FLAC__lpc_compute_autocorrelation()
* --------------------------------------------------------------------
@@ -52,15 +55,16 @@
*/
void FLAC__lpc_compute_autocorrelation(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[]);
#ifndef FLAC__NO_ASM
-#ifdef FLAC__CPU_IA32
-#ifdef FLAC__HAS_NASM
+# ifdef FLAC__CPU_IA32
+# ifdef FLAC__HAS_NASM
void FLAC__lpc_compute_autocorrelation_asm_ia32(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[]);
void FLAC__lpc_compute_autocorrelation_asm_ia32_sse_lag_4(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[]);
void FLAC__lpc_compute_autocorrelation_asm_ia32_sse_lag_8(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[]);
void FLAC__lpc_compute_autocorrelation_asm_ia32_sse_lag_12(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[]);
void FLAC__lpc_compute_autocorrelation_asm_ia32_3dnow(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[]);
+# endif
+# endif
#endif
-#endif
/*
* FLAC__lpc_compute_lp_coefficients()
@@ -80,7 +84,7 @@
* in lp_coeff[8][0,8], the LP coefficients for order 8 will be
* in lp_coeff[7][0,7], etc.
*/
-void FLAC__lpc_compute_lp_coefficients(const FLAC__real autoc[], unsigned max_order, FLAC__real lp_coeff[][FLAC__MAX_LPC_ORDER], FLAC__real error[]);
+void FLAC__lpc_compute_lp_coefficients(const FLAC__real autoc[], unsigned max_order, FLAC__real lp_coeff[][FLAC__MAX_LPC_ORDER], FLAC__double error[]);
/*
* FLAC__lpc_quantize_coefficients()
@@ -117,17 +121,19 @@
* IN lp_quantization quantization of LP coefficients in bits
* OUT residual[0,data_len-1] residual signal
*/
-void FLAC__lpc_compute_residual_from_qlp_coefficients(const FLAC__int32 data[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]);
-void FLAC__lpc_compute_residual_from_qlp_coefficients_wide(const FLAC__int32 data[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]);
+void FLAC__lpc_compute_residual_from_qlp_coefficients(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]);
+void FLAC__lpc_compute_residual_from_qlp_coefficients_wide(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]);
#ifndef FLAC__NO_ASM
-#ifdef FLAC__CPU_IA32
-#ifdef FLAC__HAS_NASM
-void FLAC__lpc_compute_residual_from_qlp_coefficients_asm_ia32(const FLAC__int32 data[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]);
-void FLAC__lpc_compute_residual_from_qlp_coefficients_asm_ia32_mmx(const FLAC__int32 data[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]);
+# ifdef FLAC__CPU_IA32
+# ifdef FLAC__HAS_NASM
+void FLAC__lpc_compute_residual_from_qlp_coefficients_asm_ia32(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]);
+void FLAC__lpc_compute_residual_from_qlp_coefficients_asm_ia32_mmx(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]);
+# endif
+# endif
#endif
-#endif
-#endif
+#endif /* !defined FLAC__INTEGER_ONLY_LIBRARY */
+
/*
* FLAC__lpc_restore_signal()
* --------------------------------------------------------------------
@@ -146,18 +152,19 @@
void FLAC__lpc_restore_signal(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);
void FLAC__lpc_restore_signal_wide(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);
#ifndef FLAC__NO_ASM
-#ifdef FLAC__CPU_IA32
-#ifdef FLAC__HAS_NASM
+# ifdef FLAC__CPU_IA32
+# ifdef FLAC__HAS_NASM
void FLAC__lpc_restore_signal_asm_ia32(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);
void FLAC__lpc_restore_signal_asm_ia32_mmx(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);
-#endif
-#elif defined FLAC__CPU_PPC
+# endif /* FLAC__HAS_NASM */
+# elif defined FLAC__CPU_PPC
void FLAC__lpc_restore_signal_asm_ppc_altivec_16(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);
void FLAC__lpc_restore_signal_asm_ppc_altivec_16_order8(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);
-#endif
-#endif
-#endif
+# endif/* FLAC__CPU_IA32 || FLAC__CPU_PPC */
+#endif /* FLAC__NO_ASM */
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
+
/*
* FLAC__lpc_compute_expected_bits_per_residual_sample()
* --------------------------------------------------------------------
@@ -168,8 +175,8 @@
* IN total_samples > 0 # of samples in residual signal
* RETURN expected bits per sample
*/
-FLAC__real FLAC__lpc_compute_expected_bits_per_residual_sample(FLAC__real lpc_error, unsigned total_samples);
-FLAC__real FLAC__lpc_compute_expected_bits_per_residual_sample_with_error_scale(FLAC__real lpc_error, double error_scale);
+FLAC__double FLAC__lpc_compute_expected_bits_per_residual_sample(FLAC__double lpc_error, unsigned total_samples);
+FLAC__double FLAC__lpc_compute_expected_bits_per_residual_sample_with_error_scale(FLAC__double lpc_error, FLAC__double error_scale);
/*
* FLAC__lpc_compute_best_order()
@@ -183,6 +190,8 @@
* IN bits_per_signal_sample # of bits per sample in the original signal
* RETURN [1,max_order] best order
*/
-unsigned FLAC__lpc_compute_best_order(const FLAC__real lpc_error[], unsigned max_order, unsigned total_samples, unsigned bits_per_signal_sample);
+unsigned FLAC__lpc_compute_best_order(const FLAC__double lpc_error[], unsigned max_order, unsigned total_samples, unsigned bits_per_signal_sample);
+#endif /* !defined FLAC__INTEGER_ONLY_LIBRARY */
+
#endif
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/memory.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/memory.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/memory.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,8 +32,13 @@
#ifndef FLAC__PRIVATE__MEMORY_H
#define FLAC__PRIVATE__MEMORY_H
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdlib.h> /* for size_t */
+#include "private/float.h"
#include "FLAC/ordinals.h" /* for FLAC__bool */
/* Returns the unaligned address returned by malloc.
@@ -44,6 +49,8 @@
FLAC__bool FLAC__memory_alloc_aligned_uint32_array(unsigned elements, FLAC__uint32 **unaligned_pointer, FLAC__uint32 **aligned_pointer);
FLAC__bool FLAC__memory_alloc_aligned_uint64_array(unsigned elements, FLAC__uint64 **unaligned_pointer, FLAC__uint64 **aligned_pointer);
FLAC__bool FLAC__memory_alloc_aligned_unsigned_array(unsigned elements, unsigned **unaligned_pointer, unsigned **aligned_pointer);
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
FLAC__bool FLAC__memory_alloc_aligned_real_array(unsigned elements, FLAC__real **unaligned_pointer, FLAC__real **aligned_pointer);
+#endif
#endif
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/metadata.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/metadata.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/metadata.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/stream_encoder_framing.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/stream_encoder_framing.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/private/stream_encoder_framing.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# libFLAC - Free Lossless Audio Codec library
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# libFLAC - Free Lossless Audio Codec library
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -85,6 +85,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -120,10 +121,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -136,12 +145,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/all.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/all.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/all.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/file_decoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/file_decoder.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/file_decoder.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/file_encoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/file_encoder.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/file_encoder.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/seekable_stream_decoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/seekable_stream_decoder.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/seekable_stream_decoder.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/seekable_stream_encoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/seekable_stream_encoder.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/seekable_stream_encoder.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/stream_decoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/stream_decoder.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/stream_decoder.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/stream_encoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/stream_encoder.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/include/protected/stream_encoder.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/libFLAC_dynamic.dsp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/libFLAC_dynamic.dsp 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/libFLAC_dynamic.dsp 2005-10-20 12:55:24 UTC (rev 10204)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".\include" /I "..\..\include" /D "NDEBUG" /D "FLAC_API_EXPORTS" /D VERSION=\"1.1.1\" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".\include" /I "..\..\include" /D "NDEBUG" /D "FLAC_API_EXPORTS" /D VERSION=\"1.1.2\" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -69,7 +69,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".\include" /I "..\..\include" /D "_DEBUG" /D "FLAC_API_EXPORTS" /D VERSION=\"1.1.1\" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".\include" /I "..\..\include" /D "_DEBUG" /D "FLAC_API_EXPORTS" /D VERSION=\"1.1.2\" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D "_WINDOWS" /D "_WINDLL" /D "WIN32" /D "_USRDLL" /FR /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -215,6 +215,10 @@
# End Source File
# Begin Source File
+SOURCE=.\float.c
+# End Source File
+# Begin Source File
+
SOURCE=.\format.c
# End Source File
# Begin Source File
@@ -287,6 +291,10 @@
# End Source File
# Begin Source File
+SOURCE=.\include\private\float.h
+# End Source File
+# Begin Source File
+
SOURCE=.\include\private\format.h
# End Source File
# Begin Source File
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/libFLAC_static.dsp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/libFLAC_static.dsp 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/libFLAC_static.dsp 2005-10-20 12:55:24 UTC (rev 10204)
@@ -41,7 +41,7 @@
# PROP Intermediate_Dir "Release_static"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Op /I ".\include" /I "..\..\include" /D VERSION=\"1.1.1\" /D "FLAC__NO_DLL" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /Op /I ".\include" /I "..\..\include" /D VERSION=\"1.1.2\" /D "FLAC__NO_DLL" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -64,7 +64,7 @@
# PROP Intermediate_Dir "Debug_static"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".\include" /I "..\..\include" /D VERSION=\"1.1.1\" /D "FLAC__NO_DLL" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".\include" /I "..\..\include" /D VERSION=\"1.1.2\" /D "FLAC__NO_DLL" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -208,6 +208,10 @@
# End Source File
# Begin Source File
+SOURCE=.\float.c
+# End Source File
+# Begin Source File
+
SOURCE=.\format.c
# End Source File
# Begin Source File
@@ -280,6 +284,10 @@
# End Source File
# Begin Source File
+SOURCE=.\include\private\float.h
+# End Source File
+# Begin Source File
+
SOURCE=.\include\private\format.h
# End Source File
# Begin Source File
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/lpc.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/lpc.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/lpc.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -38,6 +38,8 @@
#include <stdio.h>
#endif
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
+
#ifndef M_LN2
/* math.h in VC++ doesn't seem to have this (how Microsoft is that?) */
#define M_LN2 0.69314718055994530942
@@ -85,10 +87,10 @@
}
}
-void FLAC__lpc_compute_lp_coefficients(const FLAC__real autoc[], unsigned max_order, FLAC__real lp_coeff[][FLAC__MAX_LPC_ORDER], FLAC__real error[])
+void FLAC__lpc_compute_lp_coefficients(const FLAC__real autoc[], unsigned max_order, FLAC__real lp_coeff[][FLAC__MAX_LPC_ORDER], FLAC__double error[])
{
unsigned i, j;
- double r, err, ref[FLAC__MAX_LPC_ORDER], lpc[FLAC__MAX_LPC_ORDER];
+ FLAC__double r, err, ref[FLAC__MAX_LPC_ORDER], lpc[FLAC__MAX_LPC_ORDER];
FLAC__ASSERT(0 < max_order);
FLAC__ASSERT(max_order <= FLAC__MAX_LPC_ORDER);
@@ -106,7 +108,7 @@
/* Update LPC coefficients and total error. */
lpc[i]=r;
for(j = 0; j < (i>>1); j++) {
- double tmp = lpc[j];
+ FLAC__double tmp = lpc[j];
lpc[j] += r * lpc[i-1-j];
lpc[i-1-j] += r * tmp;
}
@@ -118,14 +120,14 @@
/* save this order */
for(j = 0; j <= i; j++)
lp_coeff[i][j] = (FLAC__real)(-lpc[j]); /* negate FIR filter coeff to get predictor coeff */
- error[i] = (FLAC__real)err;
+ error[i] = err;
}
}
int FLAC__lpc_quantize_coefficients(const FLAC__real lp_coeff[], unsigned order, unsigned precision, FLAC__int32 qlp_coeff[], int *shift)
{
unsigned i;
- double d, cmax = -1e32;
+ FLAC__double d, cmax = -1e32;
FLAC__int32 qmax, qmin;
const int max_shiftlimit = (1 << (FLAC__SUBFRAME_LPC_QLP_SHIFT_LEN-1)) - 1;
const int min_shiftlimit = -max_shiftlimit - 1;
@@ -171,12 +173,12 @@
if(*shift >= 0) {
for(i = 0; i < order; i++) {
- qlp_coeff[i] = (FLAC__int32)floor((double)lp_coeff[i] * (double)(1 << *shift));
+ qlp_coeff[i] = (FLAC__int32)floor((FLAC__double)lp_coeff[i] * (FLAC__double)(1 << *shift));
/* double-check the result */
if(qlp_coeff[i] > qmax || qlp_coeff[i] < qmin) {
#ifdef FLAC__OVERFLOW_DETECT
- fprintf(stderr,"FLAC__lpc_quantize_coefficients: compensating for overflow, qlp_coeff[%u]=%d, lp_coeff[%u]=%f, cmax=%f, precision=%u, shift=%d, q=%f, f(q)=%f\n", i, qlp_coeff[i], i, lp_coeff[i], cmax, precision, *shift, (double)lp_coeff[i] * (double)(1 << *shift), floor((double)lp_coeff[i] * (double)(1 << *shift)));
+ fprintf(stderr,"FLAC__lpc_quantize_coefficients: compensating for overflow, qlp_coeff[%u]=%d, lp_coeff[%u]=%f, cmax=%f, precision=%u, shift=%d, q=%f, f(q)=%f\n", i, qlp_coeff[i], i, lp_coeff[i], cmax, precision, *shift, (FLAC__double)lp_coeff[i] * (FLAC__double)(1 << *shift), floor((FLAC__double)lp_coeff[i] * (FLAC__double)(1 << *shift)));
#endif
cmax *= 2.0;
goto redo_it;
@@ -189,12 +191,12 @@
fprintf(stderr,"FLAC__lpc_quantize_coefficients: negative shift = %d\n", *shift);
#endif
for(i = 0; i < order; i++) {
- qlp_coeff[i] = (FLAC__int32)floor((double)lp_coeff[i] / (double)(1 << nshift));
+ qlp_coeff[i] = (FLAC__int32)floor((FLAC__double)lp_coeff[i] / (FLAC__double)(1 << nshift));
/* double-check the result */
if(qlp_coeff[i] > qmax || qlp_coeff[i] < qmin) {
#ifdef FLAC__OVERFLOW_DETECT
- fprintf(stderr,"FLAC__lpc_quantize_coefficients: compensating for overflow, qlp_coeff[%u]=%d, lp_coeff[%u]=%f, cmax=%f, precision=%u, shift=%d, q=%f, f(q)=%f\n", i, qlp_coeff[i], i, lp_coeff[i], cmax, precision, *shift, (double)lp_coeff[i] / (double)(1 << nshift), floor((double)lp_coeff[i] / (double)(1 << nshift)));
+ fprintf(stderr,"FLAC__lpc_quantize_coefficients: compensating for overflow, qlp_coeff[%u]=%d, lp_coeff[%u]=%f, cmax=%f, precision=%u, shift=%d, q=%f, f(q)=%f\n", i, qlp_coeff[i], i, lp_coeff[i], cmax, precision, *shift, (FLAC__double)lp_coeff[i] / (FLAC__double)(1 << nshift), floor((FLAC__double)lp_coeff[i] / (FLAC__double)(1 << nshift)));
#endif
cmax *= 2.0;
goto redo_it;
@@ -205,7 +207,7 @@
return 0;
}
-void FLAC__lpc_compute_residual_from_qlp_coefficients(const FLAC__int32 data[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[])
+void FLAC__lpc_compute_residual_from_qlp_coefficients(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[])
{
#ifdef FLAC__OVERFLOW_DETECT
FLAC__int64 sumo;
@@ -254,7 +256,7 @@
*/
}
-void FLAC__lpc_compute_residual_from_qlp_coefficients_wide(const FLAC__int32 data[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[])
+void FLAC__lpc_compute_residual_from_qlp_coefficients_wide(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[])
{
unsigned i, j;
FLAC__int64 sum;
@@ -287,6 +289,8 @@
}
}
+#endif /* !defined FLAC__INTEGER_ONLY_LIBRARY */
+
void FLAC__lpc_restore_signal(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[])
{
#ifdef FLAC__OVERFLOW_DETECT
@@ -369,50 +373,51 @@
}
}
-FLAC__real FLAC__lpc_compute_expected_bits_per_residual_sample(FLAC__real lpc_error, unsigned total_samples)
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
+
+FLAC__double FLAC__lpc_compute_expected_bits_per_residual_sample(FLAC__double lpc_error, unsigned total_samples)
{
- double error_scale;
+ FLAC__double error_scale;
FLAC__ASSERT(total_samples > 0);
- error_scale = 0.5 * M_LN2 * M_LN2 / (FLAC__real)total_samples;
+ error_scale = 0.5 * M_LN2 * M_LN2 / (FLAC__double)total_samples;
return FLAC__lpc_compute_expected_bits_per_residual_sample_with_error_scale(lpc_error, error_scale);
}
-FLAC__real FLAC__lpc_compute_expected_bits_per_residual_sample_with_error_scale(FLAC__real lpc_error, double error_scale)
+FLAC__double FLAC__lpc_compute_expected_bits_per_residual_sample_with_error_scale(FLAC__double lpc_error, FLAC__double error_scale)
{
if(lpc_error > 0.0) {
- FLAC__real bps = (FLAC__real)((double)0.5 * log(error_scale * lpc_error) / M_LN2);
+ FLAC__double bps = (FLAC__double)0.5 * log(error_scale * lpc_error) / M_LN2;
if(bps >= 0.0)
return bps;
else
return 0.0;
}
- else if(lpc_error < 0.0) { /* error should not be negative but can happen due to inadequate float resolution */
- return (FLAC__real)1e32;
+ else if(lpc_error < 0.0) { /* error should not be negative but can happen due to inadequate floating-point resolution */
+ return 1e32;
}
else {
return 0.0;
}
}
-unsigned FLAC__lpc_compute_best_order(const FLAC__real lpc_error[], unsigned max_order, unsigned total_samples, unsigned bits_per_signal_sample)
+unsigned FLAC__lpc_compute_best_order(const FLAC__double lpc_error[], unsigned max_order, unsigned total_samples, unsigned bits_per_signal_sample)
{
unsigned order, best_order;
- FLAC__real best_bits, tmp_bits;
- double error_scale;
+ FLAC__double best_bits, tmp_bits, error_scale;
FLAC__ASSERT(max_order > 0);
FLAC__ASSERT(total_samples > 0);
- error_scale = 0.5 * M_LN2 * M_LN2 / (FLAC__real)total_samples;
+ error_scale = 0.5 * M_LN2 * M_LN2 / (FLAC__double)total_samples;
best_order = 0;
- best_bits = FLAC__lpc_compute_expected_bits_per_residual_sample_with_error_scale(lpc_error[0], error_scale) * (FLAC__real)total_samples;
+ best_bits = FLAC__lpc_compute_expected_bits_per_residual_sample_with_error_scale(lpc_error[0], error_scale) * (FLAC__double)total_samples;
for(order = 1; order < max_order; order++) {
- tmp_bits = FLAC__lpc_compute_expected_bits_per_residual_sample_with_error_scale(lpc_error[order], error_scale) * (FLAC__real)(total_samples - order) + (FLAC__real)(order * bits_per_signal_sample);
+ tmp_bits = FLAC__lpc_compute_expected_bits_per_residual_sample_with_error_scale(lpc_error[order], error_scale) * (FLAC__double)(total_samples - order) + (FLAC__double)(order * bits_per_signal_sample);
if(tmp_bits < best_bits) {
best_order = order;
best_bits = tmp_bits;
@@ -421,3 +426,5 @@
return best_order+1; /* +1 since index of lpc_error[] is order-1 */
}
+
+#endif /* !defined FLAC__INTEGER_ONLY_LIBRARY */
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/memory.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/memory.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/memory.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -55,14 +55,18 @@
FLAC__bool FLAC__memory_alloc_aligned_int32_array(unsigned elements, FLAC__int32 **unaligned_pointer, FLAC__int32 **aligned_pointer)
{
- FLAC__int32 *pa, *pu; /* aligned pointer, unaligned pointer */
+ FLAC__int32 *pu; /* unaligned pointer */
+ union { /* union needed to comply with C99 pointer aliasing rules */
+ FLAC__int32 *pa; /* aligned pointer */
+ void *pv; /* aligned pointer alias */
+ } u;
FLAC__ASSERT(elements > 0);
FLAC__ASSERT(0 != unaligned_pointer);
FLAC__ASSERT(0 != aligned_pointer);
FLAC__ASSERT(unaligned_pointer != aligned_pointer);
- pu = (FLAC__int32*)FLAC__memory_alloc_aligned(sizeof(FLAC__int32) * elements, (void**)&pa);
+ pu = (FLAC__int32*)FLAC__memory_alloc_aligned(sizeof(FLAC__int32) * elements, &u.pv);
if(0 == pu) {
return false;
}
@@ -70,21 +74,25 @@
if(*unaligned_pointer != 0)
free(*unaligned_pointer);
*unaligned_pointer = pu;
- *aligned_pointer = pa;
+ *aligned_pointer = u.pa;
return true;
}
}
FLAC__bool FLAC__memory_alloc_aligned_uint32_array(unsigned elements, FLAC__uint32 **unaligned_pointer, FLAC__uint32 **aligned_pointer)
{
- FLAC__uint32 *pa, *pu; /* aligned pointer, unaligned pointer */
+ FLAC__uint32 *pu; /* unaligned pointer */
+ union { /* union needed to comply with C99 pointer aliasing rules */
+ FLAC__uint32 *pa; /* aligned pointer */
+ void *pv; /* aligned pointer alias */
+ } u;
FLAC__ASSERT(elements > 0);
FLAC__ASSERT(0 != unaligned_pointer);
FLAC__ASSERT(0 != aligned_pointer);
FLAC__ASSERT(unaligned_pointer != aligned_pointer);
- pu = (FLAC__uint32*)FLAC__memory_alloc_aligned(sizeof(FLAC__uint32) * elements, (void**)&pa);
+ pu = (FLAC__uint32*)FLAC__memory_alloc_aligned(sizeof(FLAC__uint32) * elements, &u.pv);
if(0 == pu) {
return false;
}
@@ -92,21 +100,25 @@
if(*unaligned_pointer != 0)
free(*unaligned_pointer);
*unaligned_pointer = pu;
- *aligned_pointer = pa;
+ *aligned_pointer = u.pa;
return true;
}
}
FLAC__bool FLAC__memory_alloc_aligned_uint64_array(unsigned elements, FLAC__uint64 **unaligned_pointer, FLAC__uint64 **aligned_pointer)
{
- FLAC__uint64 *pa, *pu; /* aligned pointer, unaligned pointer */
+ FLAC__uint64 *pu; /* unaligned pointer */
+ union { /* union needed to comply with C99 pointer aliasing rules */
+ FLAC__uint64 *pa; /* aligned pointer */
+ void *pv; /* aligned pointer alias */
+ } u;
FLAC__ASSERT(elements > 0);
FLAC__ASSERT(0 != unaligned_pointer);
FLAC__ASSERT(0 != aligned_pointer);
FLAC__ASSERT(unaligned_pointer != aligned_pointer);
- pu = (FLAC__uint64*)FLAC__memory_alloc_aligned(sizeof(FLAC__uint64) * elements, (void**)&pa);
+ pu = (FLAC__uint64*)FLAC__memory_alloc_aligned(sizeof(FLAC__uint64) * elements, &u.pv);
if(0 == pu) {
return false;
}
@@ -114,21 +126,25 @@
if(*unaligned_pointer != 0)
free(*unaligned_pointer);
*unaligned_pointer = pu;
- *aligned_pointer = pa;
+ *aligned_pointer = u.pa;
return true;
}
}
FLAC__bool FLAC__memory_alloc_aligned_unsigned_array(unsigned elements, unsigned **unaligned_pointer, unsigned **aligned_pointer)
{
- unsigned *pa, *pu; /* aligned pointer, unaligned pointer */
+ unsigned *pu; /* unaligned pointer */
+ union { /* union needed to comply with C99 pointer aliasing rules */
+ unsigned *pa; /* aligned pointer */
+ void *pv; /* aligned pointer alias */
+ } u;
FLAC__ASSERT(elements > 0);
FLAC__ASSERT(0 != unaligned_pointer);
FLAC__ASSERT(0 != aligned_pointer);
FLAC__ASSERT(unaligned_pointer != aligned_pointer);
- pu = (unsigned*)FLAC__memory_alloc_aligned(sizeof(unsigned) * elements, (void**)&pa);
+ pu = (unsigned*)FLAC__memory_alloc_aligned(sizeof(unsigned) * elements, &u.pv);
if(0 == pu) {
return false;
}
@@ -136,21 +152,27 @@
if(*unaligned_pointer != 0)
free(*unaligned_pointer);
*unaligned_pointer = pu;
- *aligned_pointer = pa;
+ *aligned_pointer = u.pa;
return true;
}
}
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
+
FLAC__bool FLAC__memory_alloc_aligned_real_array(unsigned elements, FLAC__real **unaligned_pointer, FLAC__real **aligned_pointer)
{
- FLAC__real *pa, *pu; /* aligned pointer, unaligned pointer */
+ FLAC__real *pu; /* unaligned pointer */
+ union { /* union needed to comply with C99 pointer aliasing rules */
+ FLAC__real *pa; /* aligned pointer */
+ void *pv; /* aligned pointer alias */
+ } u;
FLAC__ASSERT(elements > 0);
FLAC__ASSERT(0 != unaligned_pointer);
FLAC__ASSERT(0 != aligned_pointer);
FLAC__ASSERT(unaligned_pointer != aligned_pointer);
- pu = (FLAC__real*)FLAC__memory_alloc_aligned(sizeof(FLAC__real) * elements, (void**)&pa);
+ pu = (FLAC__real*)FLAC__memory_alloc_aligned(sizeof(FLAC__real) * elements, &u.pv);
if(0 == pu) {
return false;
}
@@ -158,7 +180,9 @@
if(*unaligned_pointer != 0)
free(*unaligned_pointer);
*unaligned_pointer = pu;
- *aligned_pointer = pa;
+ *aligned_pointer = u.pa;
return true;
}
}
+
+#endif
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/metadata_iterators.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/metadata_iterators.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/metadata_iterators.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -1982,11 +1982,13 @@
entry->entry = 0;
}
else {
- if(0 == (entry->entry = (FLAC__byte*)malloc(entry->length)))
+ if(0 == (entry->entry = (FLAC__byte*)malloc(entry->length+1)))
return FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR;
if(read_cb(entry->entry, 1, entry->length, handle) != entry->length)
return FLAC__METADATA_SIMPLE_ITERATOR_STATUS_READ_ERROR;
+
+ entry->entry[entry->length] = '\0';
}
return FLAC__METADATA_SIMPLE_ITERATOR_STATUS_OK;
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/metadata_object.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/metadata_object.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/metadata_object.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -60,6 +60,18 @@
return true;
}
+static FLAC__bool ensure_null_terminated_(FLAC__byte **entry, unsigned length)
+{
+ FLAC__byte *x = (FLAC__byte*)realloc(*entry, length+1);
+ if(0 != x) {
+ x[length] = '\0';
+ *entry = x;
+ return true;
+ }
+ else
+ return false;
+}
+
static FLAC__bool copy_vcentry_(FLAC__StreamMetadata_VorbisComment_Entry *to, const FLAC__StreamMetadata_VorbisComment_Entry *from)
{
to->length = from->length;
@@ -70,9 +82,10 @@
else {
FLAC__byte *x;
FLAC__ASSERT(from->length > 0);
- if(0 == (x = (FLAC__byte*)malloc(from->length)))
+ if(0 == (x = (FLAC__byte*)malloc(from->length+1)))
return false;
memcpy(x, from->entry, from->length);
+ x[from->length] = '\0';
to->entry = x;
}
return true;
@@ -194,13 +207,30 @@
save = dest->entry;
- /* do the copy first so that if we fail we leave the object untouched */
- if(copy && (0 != src->entry && src->length > 0)) {
- if(!copy_vcentry_(dest, src))
- return false;
+ if(0 != src->entry && src->length > 0) {
+ if(copy) {
+ /* do the copy first so that if we fail we leave the dest object untouched */
+ if(!copy_vcentry_(dest, src))
+ return false;
+ }
+ else {
+ /* we have to make sure that the string we're taking over is null-terminated */
+
+ /*
+ * Stripping the const from src->entry is OK since we're taking
+ * ownership of the pointer. This is a hack around a deficiency
+ * in the API where the same function is used for 'copy' and
+ * 'own', but the source entry is a const pointer. If we were
+ * precise, the 'own' flavor would be a separate function with a
+ * non-const source pointer. But it's not, so we hack away.
+ */
+ if(!ensure_null_terminated_((FLAC__byte**)(&src->entry), src->length))
+ return false;
+ *dest = *src;
+ }
}
else {
- /* either we're not copying or the src is null */
+ /* the src is null */
*dest = *src;
}
@@ -211,6 +241,22 @@
return true;
}
+static int vorbiscomment_find_entry_from_(const FLAC__StreamMetadata *object, unsigned offset, const char *field_name, unsigned field_name_length)
+{
+ unsigned i;
+
+ FLAC__ASSERT(0 != object);
+ FLAC__ASSERT(object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT);
+ FLAC__ASSERT(0 != field_name);
+
+ for(i = offset; i < object->data.vorbis_comment.num_comments; i++) {
+ if(FLAC__metadata_object_vorbiscomment_entry_matches(object->data.vorbis_comment.comments[i], field_name, field_name_length))
+ return (int)i;
+ }
+
+ return -1;
+}
+
static void cuesheet_calculate_length_(FLAC__StreamMetadata *object)
{
unsigned i;
@@ -369,7 +415,7 @@
case FLAC__METADATA_TYPE_VORBIS_COMMENT:
{
object->data.vorbis_comment.vendor_string.length = (unsigned)strlen(FLAC__VENDOR_STRING);
- if(!copy_bytes_(&object->data.vorbis_comment.vendor_string.entry, (const FLAC__byte*)FLAC__VENDOR_STRING, object->data.vorbis_comment.vendor_string.length)) {
+ if(!copy_bytes_(&object->data.vorbis_comment.vendor_string.entry, (const FLAC__byte*)FLAC__VENDOR_STRING, object->data.vorbis_comment.vendor_string.length+1)) {
free(object);
return 0;
}
@@ -918,6 +964,8 @@
FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_set_vendor_string(FLAC__StreamMetadata *object, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy)
{
+ if(!FLAC__format_vorbiscomment_entry_value_is_legal(entry.entry, entry.length))
+ return false;
return vorbiscomment_set_entry_(object, &object->data.vorbis_comment.vendor_string, &entry, copy);
}
@@ -970,6 +1018,8 @@
FLAC__ASSERT(0 != object);
FLAC__ASSERT(comment_num < object->data.vorbis_comment.num_comments);
+ if(!FLAC__format_vorbiscomment_entry_is_legal(entry.entry, entry.length))
+ return false;
return vorbiscomment_set_entry_(object, &object->data.vorbis_comment.comments[comment_num], &entry, copy);
}
@@ -981,6 +1031,9 @@
FLAC__ASSERT(object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT);
FLAC__ASSERT(comment_num <= object->data.vorbis_comment.num_comments);
+ if(!FLAC__format_vorbiscomment_entry_is_legal(entry.entry, entry.length))
+ return false;
+
vc = &object->data.vorbis_comment;
if(!FLAC__metadata_object_vorbiscomment_resize_comments(object, vc->num_comments+1))
@@ -994,6 +1047,53 @@
return FLAC__metadata_object_vorbiscomment_set_comment(object, comment_num, entry, copy);
}
+FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_append_comment(FLAC__StreamMetadata *object, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy)
+{
+ FLAC__ASSERT(0 != object);
+ FLAC__ASSERT(object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT);
+ return FLAC__metadata_object_vorbiscomment_insert_comment(object, object->data.vorbis_comment.num_comments, entry, copy);
+}
+
+FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_replace_comment(FLAC__StreamMetadata *object, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool all, FLAC__bool copy)
+{
+ FLAC__ASSERT(0 != entry.entry && entry.length > 0);
+
+ if(!FLAC__format_vorbiscomment_entry_is_legal(entry.entry, entry.length))
+ return false;
+
+ {
+ int i;
+ unsigned field_name_length;
+ const FLAC__byte *eq = (FLAC__byte*)memchr(entry.entry, '=', entry.length);
+
+ FLAC__ASSERT(0 != eq);
+
+ if(0 == eq)
+ return false; /* double protection */
+
+ field_name_length = eq-entry.entry;
+
+ if((i = vorbiscomment_find_entry_from_(object, 0, entry.entry, field_name_length)) >= 0) {
+ unsigned index = (unsigned)i;
+ if(!FLAC__metadata_object_vorbiscomment_set_comment(object, index, entry, copy))
+ return false;
+ if(all && (index+1 < object->data.vorbis_comment.num_comments)) {
+ for(i = vorbiscomment_find_entry_from_(object, index+1, entry.entry, field_name_length); i >= 0; ) {
+ if(!FLAC__metadata_object_vorbiscomment_delete_comment(object, (unsigned)i))
+ return false;
+ if((unsigned)i < object->data.vorbis_comment.num_comments)
+ i = vorbiscomment_find_entry_from_(object, (unsigned)i, entry.entry, field_name_length);
+ else
+ i = -1;
+ }
+ }
+ return true;
+ }
+ else
+ return FLAC__metadata_object_vorbiscomment_append_comment(object, entry, copy);
+ }
+}
+
FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_delete_comment(FLAC__StreamMetadata *object, unsigned comment_num)
{
FLAC__StreamMetadata_VorbisComment *vc;
@@ -1016,32 +1116,83 @@
return FLAC__metadata_object_vorbiscomment_resize_comments(object, vc->num_comments-1);
}
-FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_entry_matches(const FLAC__StreamMetadata_VorbisComment_Entry *entry, const char *field_name, unsigned field_name_length)
+FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair(FLAC__StreamMetadata_VorbisComment_Entry *entry, const char *field_name, const char *field_value)
{
- const FLAC__byte *eq = (FLAC__byte*)memchr(entry->entry, '=', entry->length);
+ FLAC__ASSERT(0 != entry);
+ FLAC__ASSERT(0 != field_name);
+ FLAC__ASSERT(0 != field_value);
+
+ if(!FLAC__format_vorbiscomment_entry_name_is_legal(field_name))
+ return false;
+ if(!FLAC__format_vorbiscomment_entry_value_is_legal(field_value, (unsigned)(-1)))
+ return false;
+
+ {
+ const size_t nn = strlen(field_name);
+ const size_t nv = strlen(field_value);
+ entry->length = nn + 1 /*=*/ + nv;
+ if(0 == (entry->entry = (FLAC__byte*)malloc(entry->length+1)))
+ return false;
+ memcpy(entry->entry, field_name, nn);
+ entry->entry[nn] = '=';
+ memcpy(entry->entry+nn+1, field_value, nv);
+ entry->entry[entry->length] = '\0';
+ }
+
+ return true;
+}
+
+FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_entry_to_name_value_pair(const FLAC__StreamMetadata_VorbisComment_Entry entry, char **field_name, char **field_value)
+{
+ FLAC__ASSERT(0 != entry.entry && entry.length > 0);
+ FLAC__ASSERT(0 != field_name);
+ FLAC__ASSERT(0 != field_value);
+
+ if(!FLAC__format_vorbiscomment_entry_is_legal(entry.entry, entry.length))
+ return false;
+
+ {
+ const FLAC__byte *eq = (FLAC__byte*)memchr(entry.entry, '=', entry.length);
+ const size_t nn = eq-entry.entry;
+ const size_t nv = entry.length-nn-1; /* -1 for the '=' */
+ FLAC__ASSERT(0 != eq);
+ if(0 == eq)
+ return false; /* double protection */
+ if(0 == (*field_name = (char*)malloc(nn+1)))
+ return false;
+ if(0 == (*field_value = (char*)malloc(nv+1))) {
+ free(*field_name);
+ return false;
+ }
+ memcpy(*field_name, entry.entry, nn);
+ memcpy(*field_value, entry.entry+nn+1, nv);
+ (*field_name)[nn] = '\0';
+ (*field_value)[nv] = '\0';
+ }
+
+ return true;
+}
+
+FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_entry_matches(const FLAC__StreamMetadata_VorbisComment_Entry entry, const char *field_name, unsigned field_name_length)
+{
+ FLAC__ASSERT(0 != entry.entry && entry.length > 0);
+ {
+ const FLAC__byte *eq = (FLAC__byte*)memchr(entry.entry, '=', entry.length);
#if defined _MSC_VER || defined __MINGW32__
#define FLAC__STRNCASECMP strnicmp
#else
#define FLAC__STRNCASECMP strncasecmp
#endif
- return (0 != eq && (unsigned)(eq-entry->entry) == field_name_length && 0 == FLAC__STRNCASECMP(field_name, (const char *)entry->entry, field_name_length));
+ return (0 != eq && (unsigned)(eq-entry.entry) == field_name_length && 0 == FLAC__STRNCASECMP(field_name, (const char *)entry.entry, field_name_length));
#undef FLAC__STRNCASECMP
+ }
}
FLAC_API int FLAC__metadata_object_vorbiscomment_find_entry_from(const FLAC__StreamMetadata *object, unsigned offset, const char *field_name)
{
- const unsigned field_name_length = strlen(field_name);
- unsigned i;
+ FLAC__ASSERT(0 != field_name);
- FLAC__ASSERT(0 != object);
- FLAC__ASSERT(object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT);
-
- for(i = offset; i < object->data.vorbis_comment.num_comments; i++) {
- if(FLAC__metadata_object_vorbiscomment_entry_matches(object->data.vorbis_comment.comments + i, field_name, field_name_length))
- return (int)i;
- }
-
- return -1;
+ return vorbiscomment_find_entry_from_(object, offset, field_name, strlen(field_name));
}
FLAC_API int FLAC__metadata_object_vorbiscomment_remove_entry_matching(FLAC__StreamMetadata *object, const char *field_name)
@@ -1053,7 +1204,7 @@
FLAC__ASSERT(object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT);
for(i = 0; i < object->data.vorbis_comment.num_comments; i++) {
- if(FLAC__metadata_object_vorbiscomment_entry_matches(object->data.vorbis_comment.comments + i, field_name, field_name_length)) {
+ if(FLAC__metadata_object_vorbiscomment_entry_matches(object->data.vorbis_comment.comments[i], field_name, field_name_length)) {
if(!FLAC__metadata_object_vorbiscomment_delete_comment(object, i))
return -1;
else
@@ -1076,7 +1227,7 @@
/* must delete from end to start otherwise it will interfere with our iteration */
for(i = (int)object->data.vorbis_comment.num_comments - 1; ok && i >= 0; i--) {
- if(FLAC__metadata_object_vorbiscomment_entry_matches(object->data.vorbis_comment.comments + i, field_name, field_name_length)) {
+ if(FLAC__metadata_object_vorbiscomment_entry_matches(object->data.vorbis_comment.comments[i], field_name, field_name_length)) {
matching++;
ok &= FLAC__metadata_object_vorbiscomment_delete_comment(object, (unsigned)i);
}
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ppc/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ppc/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ppc/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# libFLAC - Free Lossless Audio Codec library
-# Copyright (C) 2004 Josh Coalson
+# Copyright (C) 2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -28,15 +28,4 @@
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-SUFFIXES = .s .lo
-
-STRIP_NON_ASM = sh $(top_srcdir)/strip_non_asm_libtool_args.sh
-
-# For some unknown reason libtool can't figure out the tag for 'as', so
-# we fake it with --tag=CC and strip out unwanted options.
-.s.lo:
- $(LIBTOOL) --tag=CC --mode=compile $(STRIP_NON_ASM) as -force_cpusubtype_ALL -o $@ $<
-
-noinst_LTLIBRARIES = libFLAC-asm.la
-libFLAC_asm_la_SOURCES = \
- lpc_asm.s
+SUBDIRS = as gas
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ppc/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ppc/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ppc/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# libFLAC - Free Lossless Audio Codec library
-# Copyright (C) 2004 Josh Coalson
+# Copyright (C) 2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -43,9 +43,6 @@
# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-SOURCES = $(libFLAC_asm_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -76,31 +73,23 @@
mkinstalldirs = $(mkdir_p)
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-libFLAC_asm_la_LIBADD =
-am_libFLAC_asm_la_OBJECTS = lpc_asm.lo
-libFLAC_asm_la_OBJECTS = $(am_libFLAC_asm_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
-LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \
- $(CCASFLAGS)
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libFLAC_asm_la_SOURCES)
-DIST_SOURCES = $(libFLAC_asm_la_SOURCES)
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-exec-recursive install-info-recursive \
+ install-recursive installcheck-recursive installdirs-recursive \
+ pdf-recursive ps-recursive uninstall-info-recursive \
+ uninstall-recursive
ETAGS = etags
CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -136,10 +125,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -152,12 +149,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -241,16 +243,10 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-SUFFIXES = .s .lo
-STRIP_NON_ASM = sh $(top_srcdir)/strip_non_asm_libtool_args.sh
-noinst_LTLIBRARIES = libFLAC-asm.la
-libFLAC_asm_la_SOURCES = \
- lpc_asm.s
+SUBDIRS = as gas
+all: all-recursive
-all: all-am
-
.SUFFIXES:
-.SUFFIXES: .s .lo .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -281,29 +277,6 @@
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-clean-noinstLTLIBRARIES:
- -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
- @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-libFLAC-asm.la: $(libFLAC_asm_la_OBJECTS) $(libFLAC_asm_la_DEPENDENCIES)
- $(LINK) $(libFLAC_asm_la_LDFLAGS) $(libFLAC_asm_la_OBJECTS) $(libFLAC_asm_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-
-distclean-compile:
- -rm -f *.tab.c
-
-.s.o:
- $(CCASCOMPILE) -c $<
-
-.s.obj:
- $(CCASCOMPILE) -c `$(CYGPATH_W) '$<'`
-
mostlyclean-libtool:
-rm -f *.lo
@@ -314,6 +287,65 @@
-rm -f libtool
uninstall-info-am:
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+# (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
+ done; \
+ rev="$$rev ."; \
+ target=`echo $@ | sed s/-recursive//`; \
+ for subdir in $$rev; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -324,10 +356,23 @@
mkid -fID $$unique
tags: TAGS
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
@@ -340,7 +385,7 @@
$$tags $$unique; \
fi
ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
@@ -389,19 +434,33 @@
|| exit 1; \
fi; \
done
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="../$(top_distdir)" \
+ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-installcheck: installcheck-am
+installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
@@ -417,23 +476,22 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
+clean: clean-recursive
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
- mostlyclean-am
+clean-am: clean-generic clean-libtool mostlyclean-am
-distclean: distclean-am
+distclean: distclean-recursive
-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
- distclean-libtool distclean-tags
+distclean-am: clean-am distclean-generic distclean-libtool \
+ distclean-tags
-dvi: dvi-am
+dvi: dvi-recursive
dvi-am:
-html: html-am
+html: html-recursive
-info: info-am
+info: info-recursive
info-am:
@@ -441,48 +499,45 @@
install-exec-am:
-install-info: install-info-am
+install-info: install-info-recursive
install-man:
installcheck-am:
-maintainer-clean: maintainer-clean-am
+maintainer-clean: maintainer-clean-recursive
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
-mostlyclean: mostlyclean-am
+mostlyclean: mostlyclean-recursive
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-pdf: pdf-am
+pdf: pdf-recursive
pdf-am:
-ps: ps-am
+ps: ps-recursive
ps-am:
uninstall-am: uninstall-info-am
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-noinstLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am \
- uninstall-info-am
+uninstall-info: uninstall-info-recursive
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+ distclean-recursive distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-exec install-exec-am install-info \
+ install-info-am install-man install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic maintainer-clean-recursive \
+ mostlyclean mostlyclean-generic mostlyclean-libtool \
+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+ uninstall uninstall-am uninstall-info-am
-# For some unknown reason libtool can't figure out the tag for 'as', so
-# we fake it with --tag=CC and strip out unwanted options.
-.s.lo:
- $(LIBTOOL) --tag=CC --mode=compile $(STRIP_NON_ASM) as -force_cpusubtype_ALL -o $@ $<
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Added: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ppc/as/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ppc/as/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ppc/as/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -0,0 +1,52 @@
+# libFLAC - Free Lossless Audio Codec library
+# Copyright (C) 2004,2005 Josh Coalson
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# - Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# - Neither the name of the Xiph.org Foundation nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#@@@@@@
+if FLaC__HAS_AS__TEMPORARILY_DISABLED
+
+SUFFIXES = .s .lo
+
+STRIP_NON_ASM = sh $(top_srcdir)/strip_non_asm_libtool_args.sh
+
+# For some unknown reason libtool can't figure out the tag for 'as', so
+# we fake it with --tag=CC and strip out unwanted options.
+.s.lo:
+ $(LIBTOOL) --tag=CC --mode=compile $(STRIP_NON_ASM) as -force_cpusubtype_ALL -o $@ $<
+
+noinst_LTLIBRARIES = libFLAC-asm.la
+libFLAC_asm_la_SOURCES = \
+ lpc_asm.s
+
+else
+
+EXTRA_DIST = \
+ lpc_asm.s
+
+endif
Added: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ppc/as/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ppc/as/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ppc/as/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -0,0 +1,512 @@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# libFLAC - Free Lossless Audio Codec library
+# Copyright (C) 2004,2005 Josh Coalson
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# - Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# - Neither the name of the Xiph.org Foundation nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+SOURCES = $(libFLAC_asm_la_SOURCES)
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+subdir = src/libFLAC/ppc/as
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(mkdir_p)
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libFLAC_asm_la_LIBADD =
+am__libFLAC_asm_la_SOURCES_DIST = lpc_asm.s
+ at FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@am_libFLAC_asm_la_OBJECTS = \
+ at FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@ lpc_asm.lo
+libFLAC_asm_la_OBJECTS = $(am_libFLAC_asm_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
+LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \
+ $(CCASFLAGS)
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libFLAC_asm_la_SOURCES)
+DIST_SOURCES = $(am__libFLAC_asm_la_SOURCES_DIST)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEBUG_FALSE = @DEBUG_FALSE@
+DEBUG_TRUE = @DEBUG_TRUE@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
+DOXYGEN = @DOXYGEN@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FLaC__CPU_IA32_FALSE = @FLaC__CPU_IA32_FALSE@
+FLaC__CPU_IA32_TRUE = @FLaC__CPU_IA32_TRUE@
+FLaC__CPU_PPC_FALSE = @FLaC__CPU_PPC_FALSE@
+FLaC__CPU_PPC_TRUE = @FLaC__CPU_PPC_TRUE@
+FLaC__CPU_SPARC_FALSE = @FLaC__CPU_SPARC_FALSE@
+FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
+FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
+FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
+FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
+FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
+FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
+FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
+FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
+FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
+FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
+FLaC__HAS_OGG_TRUE = @FLaC__HAS_OGG_TRUE@
+FLaC__HAS_XMMS_FALSE = @FLaC__HAS_XMMS_FALSE@
+FLaC__HAS_XMMS_TRUE = @FLaC__HAS_XMMS_TRUE@
+FLaC__INSTALL_XMMS_PLUGIN_LOCALLY_FALSE = @FLaC__INSTALL_XMMS_PLUGIN_LOCALLY_FALSE@
+FLaC__INSTALL_XMMS_PLUGIN_LOCALLY_TRUE = @FLaC__INSTALL_XMMS_PLUGIN_LOCALLY_TRUE@
+FLaC__NO_ASM_FALSE = @FLaC__NO_ASM_FALSE@
+FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
+FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
+FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
+FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
+FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
+FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
+FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
+FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
+FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+NASM = @NASM@
+OBJEXT = @OBJEXT@
+OBJ_FORMAT = @OBJ_FORMAT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+XMMS_CFLAGS = @XMMS_CFLAGS@
+XMMS_CONFIG = @XMMS_CONFIG@
+XMMS_DATA_DIR = @XMMS_DATA_DIR@
+XMMS_EFFECT_PLUGIN_DIR = @XMMS_EFFECT_PLUGIN_DIR@
+XMMS_GENERAL_PLUGIN_DIR = @XMMS_GENERAL_PLUGIN_DIR@
+XMMS_INPUT_PLUGIN_DIR = @XMMS_INPUT_PLUGIN_DIR@
+XMMS_LIBS = @XMMS_LIBS@
+XMMS_OUTPUT_PLUGIN_DIR = @XMMS_OUTPUT_PLUGIN_DIR@
+XMMS_PLUGIN_DIR = @XMMS_PLUGIN_DIR@
+XMMS_VERSION = @XMMS_VERSION@
+XMMS_VISUALIZATION_PLUGIN_DIR = @XMMS_VISUALIZATION_PLUGIN_DIR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+
+#@@@@@@
+ at FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@SUFFIXES = .s .lo
+ at FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@STRIP_NON_ASM = sh $(top_srcdir)/strip_non_asm_libtool_args.sh
+ at FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@noinst_LTLIBRARIES = libFLAC-asm.la
+ at FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@libFLAC_asm_la_SOURCES = \
+ at FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@ lpc_asm.s
+
+ at FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@EXTRA_DIST = \
+ at FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@ lpc_asm.s
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .s .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/libFLAC/ppc/as/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --foreign src/libFLAC/ppc/as/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ test "$$dir" != "$$p" || dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+libFLAC-asm.la: $(libFLAC_asm_la_OBJECTS) $(libFLAC_asm_la_DEPENDENCIES)
+ $(LINK) $(libFLAC_asm_la_LDFLAGS) $(libFLAC_asm_la_OBJECTS) $(libFLAC_asm_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+.s.o:
+ $(CCASCOMPILE) -c $<
+
+.s.obj:
+ $(CCASCOMPILE) -c `$(CYGPATH_W) '$<'`
+
+ at FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@.s.lo:
+ $(LTCCASCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+ if test -d $$d/$$file; then \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags uninstall uninstall-am \
+ uninstall-info-am
+
+
+# For some unknown reason libtool can't figure out the tag for 'as', so
+# we fake it with --tag=CC and strip out unwanted options.
+ at FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@.s.lo:
+ at FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@ $(LIBTOOL) --tag=CC --mode=compile $(STRIP_NON_ASM) as -force_cpusubtype_ALL -o $@ $<
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Added: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ppc/as/lpc_asm.s
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ppc/as/lpc_asm.s 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ppc/as/lpc_asm.s 2005-10-20 12:55:24 UTC (rev 10204)
@@ -0,0 +1,429 @@
+; libFLAC - Free Lossless Audio Codec library
+; Copyright (C) 2004,2005 Josh Coalson
+;
+; Redistribution and use in source and binary forms, with or without
+; modification, are permitted provided that the following conditions
+; are met:
+;
+; - Redistributions of source code must retain the above copyright
+; notice, this list of conditions and the following disclaimer.
+;
+; - Redistributions in binary form must reproduce the above copyright
+; notice, this list of conditions and the following disclaimer in the
+; documentation and/or other materials provided with the distribution.
+;
+; - Neither the name of the Xiph.org Foundation nor the names of its
+; contributors may be used to endorse or promote products derived from
+; this software without specific prior written permission.
+;
+; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+; ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+; LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+; A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+; CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+; EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+; PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+; LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+; NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+.text
+ .align 2
+.globl _FLAC__lpc_restore_signal_asm_ppc_altivec_16
+
+.globl _FLAC__lpc_restore_signal_asm_ppc_altivec_16_order8
+
+_FLAC__lpc_restore_signal_asm_ppc_altivec_16:
+; r3: residual[]
+; r4: data_len
+; r5: qlp_coeff[]
+; r6: order
+; r7: lp_quantization
+; r8: data[]
+
+; see src/libFLAC/lpc.c:FLAC__lpc_restore_signal()
+; these is a PowerPC/Altivec assembly version which requires bps<=16 (or actual
+; bps<=15 for mid-side coding, since that uses an extra bit)
+
+; these should be fast; the inner loop is unrolled (it takes no more than
+; 3*(order%4) instructions, all of which are arithmetic), and all of the
+; coefficients and all relevant history stay in registers, so the outer loop
+; has only one load from memory (the residual)
+
+; I have not yet run this through simg4, so there may be some avoidable stalls,
+; and there may be a somewhat more clever way to do the outer loop
+
+; the branch mechanism may prevent dynamic loading; I still need to examine
+; this issue, and there may be a more elegant method
+
+ stmw r31,-4(r1)
+
+ addi r9,r1,-28
+ li r31,0xf
+ andc r9,r9,r31 ; for quadword-aligned stack data
+
+ slwi r6,r6,2 ; adjust for word size
+ slwi r4,r4,2
+ add r4,r4,r8 ; r4 = data+data_len
+
+ mfspr r0,256 ; cache old vrsave
+ addis r31,0,hi16(0xfffffc00)
+ ori r31,r31,lo16(0xfffffc00)
+ mtspr 256,r31 ; declare VRs in vrsave
+
+ cmplw cr0,r8,r4 ; i<data_len
+ bc 4,0,L1400
+
+ ; load coefficients into v0-v7 and initial history into v8-v15
+ li r31,0xf
+ and r31,r8,r31 ; r31: data%4
+ li r11,16
+ subf r31,r31,r11 ; r31: 4-(data%4)
+ slwi r31,r31,3 ; convert to bits for vsro
+ li r10,-4
+ stw r31,-4(r9)
+ lvewx v0,r10,r9
+ vspltisb v18,-1
+ vsro v18,v18,v0 ; v18: mask vector
+
+ li r31,0x8
+ lvsl v0,0,r31
+ vsldoi v0,v0,v0,12
+ li r31,0xc
+ lvsl v1,0,r31
+ vspltisb v2,0
+ vspltisb v3,-1
+ vmrglw v2,v2,v3
+ vsel v0,v1,v0,v2 ; v0: reversal permutation vector
+
+ add r10,r5,r6
+ lvsl v17,0,r5 ; v17: coefficient alignment permutation vector
+ vperm v17,v17,v17,v0 ; v17: reversal coefficient alignment permutation vector
+
+ mr r11,r8
+ lvsl v16,0,r11 ; v16: history alignment permutation vector
+
+ lvx v0,0,r5
+ addi r5,r5,16
+ lvx v1,0,r5
+ vperm v0,v0,v1,v17
+ lvx v8,0,r11
+ addi r11,r11,-16
+ lvx v9,0,r11
+ vperm v8,v9,v8,v16
+ cmplw cr0,r5,r10
+ bc 12,0,L1101
+ vand v0,v0,v18
+ addis r31,0,hi16(L1307)
+ ori r31,r31,lo16(L1307)
+ b L1199
+
+L1101:
+ addi r5,r5,16
+ lvx v2,0,r5
+ vperm v1,v1,v2,v17
+ addi r11,r11,-16
+ lvx v10,0,r11
+ vperm v9,v10,v9,v16
+ cmplw cr0,r5,r10
+ bc 12,0,L1102
+ vand v1,v1,v18
+ addis r31,0,hi16(L1306)
+ ori r31,r31,lo16(L1306)
+ b L1199
+
+L1102:
+ addi r5,r5,16
+ lvx v3,0,r5
+ vperm v2,v2,v3,v17
+ addi r11,r11,-16
+ lvx v11,0,r11
+ vperm v10,v11,v10,v16
+ cmplw cr0,r5,r10
+ bc 12,0,L1103
+ vand v2,v2,v18
+ addis r31,0,hi16(L1305)
+ ori r31,r31,lo16(L1305)
+ b L1199
+
+L1103:
+ addi r5,r5,16
+ lvx v4,0,r5
+ vperm v3,v3,v4,v17
+ addi r11,r11,-16
+ lvx v12,0,r11
+ vperm v11,v12,v11,v16
+ cmplw cr0,r5,r10
+ bc 12,0,L1104
+ vand v3,v3,v18
+ addis r31,0,hi16(L1304)
+ ori r31,r31,lo16(L1304)
+ b L1199
+
+L1104:
+ addi r5,r5,16
+ lvx v5,0,r5
+ vperm v4,v4,v5,v17
+ addi r11,r11,-16
+ lvx v13,0,r11
+ vperm v12,v13,v12,v16
+ cmplw cr0,r5,r10
+ bc 12,0,L1105
+ vand v4,v4,v18
+ addis r31,0,hi16(L1303)
+ ori r31,r31,lo16(L1303)
+ b L1199
+
+L1105:
+ addi r5,r5,16
+ lvx v6,0,r5
+ vperm v5,v5,v6,v17
+ addi r11,r11,-16
+ lvx v14,0,r11
+ vperm v13,v14,v13,v16
+ cmplw cr0,r5,r10
+ bc 12,0,L1106
+ vand v5,v5,v18
+ addis r31,0,hi16(L1302)
+ ori r31,r31,lo16(L1302)
+ b L1199
+
+L1106:
+ addi r5,r5,16
+ lvx v7,0,r5
+ vperm v6,v6,v7,v17
+ addi r11,r11,-16
+ lvx v15,0,r11
+ vperm v14,v15,v14,v16
+ cmplw cr0,r5,r10
+ bc 12,0,L1107
+ vand v6,v6,v18
+ addis r31,0,hi16(L1301)
+ ori r31,r31,lo16(L1301)
+ b L1199
+
+L1107:
+ addi r5,r5,16
+ lvx v19,0,r5
+ vperm v7,v7,v19,v17
+ addi r11,r11,-16
+ lvx v19,0,r11
+ vperm v15,v19,v15,v16
+ vand v7,v7,v18
+ addis r31,0,hi16(L1300)
+ ori r31,r31,lo16(L1300)
+
+L1199:
+ mtctr r31
+
+ ; set up invariant vectors
+ vspltish v16,0 ; v16: zero vector
+
+ li r10,-12
+ lvsr v17,r10,r8 ; v17: result shift vector
+ lvsl v18,r10,r3 ; v18: residual shift back vector
+
+ li r10,-4
+ stw r7,-4(r9)
+ lvewx v19,r10,r9 ; v19: lp_quantization vector
+
+L1200:
+ vmulosh v20,v0,v8 ; v20: sum vector
+ bcctr 20,0
+
+L1300:
+ vmulosh v21,v7,v15
+ vsldoi v15,v15,v14,4 ; increment history
+ vaddsws v20,v20,v21
+
+L1301:
+ vmulosh v21,v6,v14
+ vsldoi v14,v14,v13,4
+ vaddsws v20,v20,v21
+
+L1302:
+ vmulosh v21,v5,v13
+ vsldoi v13,v13,v12,4
+ vaddsws v20,v20,v21
+
+L1303:
+ vmulosh v21,v4,v12
+ vsldoi v12,v12,v11,4
+ vaddsws v20,v20,v21
+
+L1304:
+ vmulosh v21,v3,v11
+ vsldoi v11,v11,v10,4
+ vaddsws v20,v20,v21
+
+L1305:
+ vmulosh v21,v2,v10
+ vsldoi v10,v10,v9,4
+ vaddsws v20,v20,v21
+
+L1306:
+ vmulosh v21,v1,v9
+ vsldoi v9,v9,v8,4
+ vaddsws v20,v20,v21
+
+L1307:
+ vsumsws v20,v20,v16 ; v20[3]: sum
+ vsraw v20,v20,v19 ; v20[3]: sum >> lp_quantization
+
+ lvewx v21,0,r3 ; v21[n]: *residual
+ vperm v21,v21,v21,v18 ; v21[3]: *residual
+ vaddsws v20,v21,v20 ; v20[3]: *residual + (sum >> lp_quantization)
+ vsldoi v18,v18,v18,4 ; increment shift vector
+
+ vperm v21,v20,v20,v17 ; v21[n]: shift for storage
+ vsldoi v17,v17,v17,12 ; increment shift vector
+ stvewx v21,0,r8
+
+ vsldoi v20,v20,v20,12
+ vsldoi v8,v8,v20,4 ; insert value onto history
+
+ addi r3,r3,4
+ addi r8,r8,4
+ cmplw cr0,r8,r4 ; i<data_len
+ bc 12,0,L1200
+
+L1400:
+ mtspr 256,r0 ; restore old vrsave
+ lmw r31,-4(r1)
+ blr
+
+_FLAC__lpc_restore_signal_asm_ppc_altivec_16_order8:
+; r3: residual[]
+; r4: data_len
+; r5: qlp_coeff[]
+; r6: order
+; r7: lp_quantization
+; r8: data[]
+
+; see _FLAC__lpc_restore_signal_asm_ppc_altivec_16() above
+; this version assumes order<=8; it uses fewer vector registers, which should
+; save time in context switches, and has less code, which may improve
+; instruction caching
+
+ stmw r31,-4(r1)
+
+ addi r9,r1,-28
+ li r31,0xf
+ andc r9,r9,r31 ; for quadword-aligned stack data
+
+ slwi r6,r6,2 ; adjust for word size
+ slwi r4,r4,2
+ add r4,r4,r8 ; r4 = data+data_len
+
+ mfspr r0,256 ; cache old vrsave
+ addis r31,0,hi16(0xffc00000)
+ ori r31,r31,lo16(0xffc00000)
+ mtspr 256,r31 ; declare VRs in vrsave
+
+ cmplw cr0,r8,r4 ; i<data_len
+ bc 4,0,L2400
+
+ ; load coefficients into v0-v1 and initial history into v2-v3
+ li r31,0xf
+ and r31,r8,r31 ; r31: data%4
+ li r11,16
+ subf r31,r31,r11 ; r31: 4-(data%4)
+ slwi r31,r31,3 ; convert to bits for vsro
+ li r10,-4
+ stw r31,-4(r9)
+ lvewx v0,r10,r9
+ vspltisb v6,-1
+ vsro v6,v6,v0 ; v6: mask vector
+
+ li r31,0x8
+ lvsl v0,0,r31
+ vsldoi v0,v0,v0,12
+ li r31,0xc
+ lvsl v1,0,r31
+ vspltisb v2,0
+ vspltisb v3,-1
+ vmrglw v2,v2,v3
+ vsel v0,v1,v0,v2 ; v0: reversal permutation vector
+
+ add r10,r5,r6
+ lvsl v5,0,r5 ; v5: coefficient alignment permutation vector
+ vperm v5,v5,v5,v0 ; v5: reversal coefficient alignment permutation vector
+
+ mr r11,r8
+ lvsl v4,0,r11 ; v4: history alignment permutation vector
+
+ lvx v0,0,r5
+ addi r5,r5,16
+ lvx v1,0,r5
+ vperm v0,v0,v1,v5
+ lvx v2,0,r11
+ addi r11,r11,-16
+ lvx v3,0,r11
+ vperm v2,v3,v2,v4
+ cmplw cr0,r5,r10
+ bc 12,0,L2101
+ vand v0,v0,v6
+ addis r31,0,hi16(L2301)
+ ori r31,r31,lo16(L2301)
+ b L2199
+
+L2101:
+ addi r5,r5,16
+ lvx v7,0,r5
+ vperm v1,v1,v7,v5
+ addi r11,r11,-16
+ lvx v7,0,r11
+ vperm v3,v7,v3,v4
+ vand v1,v1,v6
+ addis r31,0,hi16(L2300)
+ ori r31,r31,lo16(L2300)
+
+L2199:
+ mtctr r31
+
+ ; set up invariant vectors
+ vspltish v4,0 ; v4: zero vector
+
+ li r10,-12
+ lvsr v5,r10,r8 ; v5: result shift vector
+ lvsl v6,r10,r3 ; v6: residual shift back vector
+
+ li r10,-4
+ stw r7,-4(r9)
+ lvewx v7,r10,r9 ; v7: lp_quantization vector
+
+L2200:
+ vmulosh v8,v0,v2 ; v8: sum vector
+ bcctr 20,0
+
+L2300:
+ vmulosh v9,v1,v3
+ vsldoi v3,v3,v2,4
+ vaddsws v8,v8,v9
+
+L2301:
+ vsumsws v8,v8,v4 ; v8[3]: sum
+ vsraw v8,v8,v7 ; v8[3]: sum >> lp_quantization
+
+ lvewx v9,0,r3 ; v9[n]: *residual
+ vperm v9,v9,v9,v6 ; v9[3]: *residual
+ vaddsws v8,v9,v8 ; v8[3]: *residual + (sum >> lp_quantization)
+ vsldoi v6,v6,v6,4 ; increment shift vector
+
+ vperm v9,v8,v8,v5 ; v9[n]: shift for storage
+ vsldoi v5,v5,v5,12 ; increment shift vector
+ stvewx v9,0,r8
+
+ vsldoi v8,v8,v8,12
+ vsldoi v2,v2,v8,4 ; insert value onto history
+
+ addi r3,r3,4
+ addi r8,r8,4
+ cmplw cr0,r8,r4 ; i<data_len
+ bc 12,0,L2200
+
+L2400:
+ mtspr 256,r0 ; restore old vrsave
+ lmw r31,-4(r1)
+ blr
Added: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ppc/gas/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ppc/gas/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ppc/gas/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -0,0 +1,52 @@
+# libFLAC - Free Lossless Audio Codec library
+# Copyright (C) 2004,2005 Josh Coalson
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# - Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# - Neither the name of the Xiph.org Foundation nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#@@@@@@
+if FLaC__HAS_GAS__TEMPORARILY_DISABLED
+
+SUFFIXES = .s .lo
+
+STRIP_NON_ASM = sh $(top_srcdir)/strip_non_asm_libtool_args.sh
+
+# For some unknown reason libtool can't figure out the tag for 'gas', so
+# we fake it with --tag=CC and strip out unwanted options.
+.s.lo:
+ $(LIBTOOL) --tag=CC --mode=compile $(STRIP_NON_ASM) gas -force_cpusubtype_ALL -o $@ $<
+
+noinst_LTLIBRARIES = libFLAC-asm.la
+libFLAC_asm_la_SOURCES = \
+ lpc_asm.s
+
+else
+
+EXTRA_DIST = \
+ lpc_asm.s
+
+endif
Added: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ppc/gas/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ppc/gas/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ppc/gas/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -0,0 +1,512 @@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# libFLAC - Free Lossless Audio Codec library
+# Copyright (C) 2004,2005 Josh Coalson
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# - Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# - Neither the name of the Xiph.org Foundation nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+SOURCES = $(libFLAC_asm_la_SOURCES)
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+subdir = src/libFLAC/ppc/gas
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(mkdir_p)
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libFLAC_asm_la_LIBADD =
+am__libFLAC_asm_la_SOURCES_DIST = lpc_asm.s
+ at FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@am_libFLAC_asm_la_OBJECTS = \
+ at FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@ lpc_asm.lo
+libFLAC_asm_la_OBJECTS = $(am_libFLAC_asm_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
+LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \
+ $(CCASFLAGS)
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libFLAC_asm_la_SOURCES)
+DIST_SOURCES = $(am__libFLAC_asm_la_SOURCES_DIST)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEBUG_FALSE = @DEBUG_FALSE@
+DEBUG_TRUE = @DEBUG_TRUE@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
+DOXYGEN = @DOXYGEN@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FLaC__CPU_IA32_FALSE = @FLaC__CPU_IA32_FALSE@
+FLaC__CPU_IA32_TRUE = @FLaC__CPU_IA32_TRUE@
+FLaC__CPU_PPC_FALSE = @FLaC__CPU_PPC_FALSE@
+FLaC__CPU_PPC_TRUE = @FLaC__CPU_PPC_TRUE@
+FLaC__CPU_SPARC_FALSE = @FLaC__CPU_SPARC_FALSE@
+FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
+FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
+FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
+FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
+FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
+FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
+FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
+FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
+FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
+FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
+FLaC__HAS_OGG_TRUE = @FLaC__HAS_OGG_TRUE@
+FLaC__HAS_XMMS_FALSE = @FLaC__HAS_XMMS_FALSE@
+FLaC__HAS_XMMS_TRUE = @FLaC__HAS_XMMS_TRUE@
+FLaC__INSTALL_XMMS_PLUGIN_LOCALLY_FALSE = @FLaC__INSTALL_XMMS_PLUGIN_LOCALLY_FALSE@
+FLaC__INSTALL_XMMS_PLUGIN_LOCALLY_TRUE = @FLaC__INSTALL_XMMS_PLUGIN_LOCALLY_TRUE@
+FLaC__NO_ASM_FALSE = @FLaC__NO_ASM_FALSE@
+FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
+FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
+FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
+FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
+FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
+FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
+FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
+FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
+FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+NASM = @NASM@
+OBJEXT = @OBJEXT@
+OBJ_FORMAT = @OBJ_FORMAT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+XMMS_CFLAGS = @XMMS_CFLAGS@
+XMMS_CONFIG = @XMMS_CONFIG@
+XMMS_DATA_DIR = @XMMS_DATA_DIR@
+XMMS_EFFECT_PLUGIN_DIR = @XMMS_EFFECT_PLUGIN_DIR@
+XMMS_GENERAL_PLUGIN_DIR = @XMMS_GENERAL_PLUGIN_DIR@
+XMMS_INPUT_PLUGIN_DIR = @XMMS_INPUT_PLUGIN_DIR@
+XMMS_LIBS = @XMMS_LIBS@
+XMMS_OUTPUT_PLUGIN_DIR = @XMMS_OUTPUT_PLUGIN_DIR@
+XMMS_PLUGIN_DIR = @XMMS_PLUGIN_DIR@
+XMMS_VERSION = @XMMS_VERSION@
+XMMS_VISUALIZATION_PLUGIN_DIR = @XMMS_VISUALIZATION_PLUGIN_DIR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+
+#@@@@@@
+ at FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@SUFFIXES = .s .lo
+ at FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@STRIP_NON_ASM = sh $(top_srcdir)/strip_non_asm_libtool_args.sh
+ at FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@noinst_LTLIBRARIES = libFLAC-asm.la
+ at FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@libFLAC_asm_la_SOURCES = \
+ at FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@ lpc_asm.s
+
+ at FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@EXTRA_DIST = \
+ at FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@ lpc_asm.s
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .s .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/libFLAC/ppc/gas/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --foreign src/libFLAC/ppc/gas/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ test "$$dir" != "$$p" || dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+libFLAC-asm.la: $(libFLAC_asm_la_OBJECTS) $(libFLAC_asm_la_DEPENDENCIES)
+ $(LINK) $(libFLAC_asm_la_LDFLAGS) $(libFLAC_asm_la_OBJECTS) $(libFLAC_asm_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+.s.o:
+ $(CCASCOMPILE) -c $<
+
+.s.obj:
+ $(CCASCOMPILE) -c `$(CYGPATH_W) '$<'`
+
+ at FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@.s.lo:
+ $(LTCCASCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+ if test -d $$d/$$file; then \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags uninstall uninstall-am \
+ uninstall-info-am
+
+
+# For some unknown reason libtool can't figure out the tag for 'gas', so
+# we fake it with --tag=CC and strip out unwanted options.
+ at FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@.s.lo:
+ at FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@ $(LIBTOOL) --tag=CC --mode=compile $(STRIP_NON_ASM) gas -force_cpusubtype_ALL -o $@ $<
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Added: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ppc/gas/lpc_asm.s
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ppc/gas/lpc_asm.s 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/ppc/gas/lpc_asm.s 2005-10-20 12:55:24 UTC (rev 10204)
@@ -0,0 +1,431 @@
+# libFLAC - Free Lossless Audio Codec library
+# Copyright (C) 2004,2005 Josh Coalson
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# - Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# - Neither the name of the Xiph.org Foundation nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+.text
+ .align 2
+.globl _FLAC__lpc_restore_signal_asm_ppc_altivec_16
+.type _FLAC__lpc_restore_signal_asm_ppc_altivec_16, @function
+
+.globl _FLAC__lpc_restore_signal_asm_ppc_altivec_16_order8
+.type _FLAC__lpc_restore_signal_asm_ppc_altivec_16_order8, @function
+
+_FLAC__lpc_restore_signal_asm_ppc_altivec_16:
+# r3: residual[]
+# r4: data_len
+# r5: qlp_coeff[]
+# r6: order
+# r7: lp_quantization
+# r8: data[]
+
+# see src/libFLAC/lpc.c:FLAC__lpc_restore_signal()
+# these is a PowerPC/Altivec assembly version which requires bps<=16 (or actual
+# bps<=15 for mid-side coding, since that uses an extra bit)
+
+# these should be fast; the inner loop is unrolled (it takes no more than
+# 3*(order%4) instructions, all of which are arithmetic), and all of the
+# coefficients and all relevant history stay in registers, so the outer loop
+# has only one load from memory (the residual)
+
+# I have not yet run this through simg4, so there may be some avoidable stalls,
+# and there may be a somewhat more clever way to do the outer loop
+
+# the branch mechanism may prevent dynamic loading; I still need to examine
+# this issue, and there may be a more elegant method
+
+ stmw r31,-4(r1)
+
+ addi r9,r1,-28
+ li r31,0xf
+ andc r9,r9,r31 # for quadword-aligned stack data
+
+ slwi r6,r6,2 # adjust for word size
+ slwi r4,r4,2
+ add r4,r4,r8 # r4 = data+data_len
+
+ mfspr r0,256 # cache old vrsave
+ addis r31,0,0xffff
+ ori r31,r31,0xfc00
+ mtspr 256,r31 # declare VRs in vrsave
+
+ cmplw cr0,r8,r4 # i<data_len
+ bc 4,0,L1400
+
+ # load coefficients into v0-v7 and initial history into v8-v15
+ li r31,0xf
+ and r31,r8,r31 # r31: data%4
+ li r11,16
+ subf r31,r31,r11 # r31: 4-(data%4)
+ slwi r31,r31,3 # convert to bits for vsro
+ li r10,-4
+ stw r31,-4(r9)
+ lvewx v0,r10,r9
+ vspltisb v18,-1
+ vsro v18,v18,v0 # v18: mask vector
+
+ li r31,0x8
+ lvsl v0,0,r31
+ vsldoi v0,v0,v0,12
+ li r31,0xc
+ lvsl v1,0,r31
+ vspltisb v2,0
+ vspltisb v3,-1
+ vmrglw v2,v2,v3
+ vsel v0,v1,v0,v2 # v0: reversal permutation vector
+
+ add r10,r5,r6
+ lvsl v17,0,r5 # v17: coefficient alignment permutation vector
+ vperm v17,v17,v17,v0 # v17: reversal coefficient alignment permutation vector
+
+ mr r11,r8
+ lvsl v16,0,r11 # v16: history alignment permutation vector
+
+ lvx v0,0,r5
+ addi r5,r5,16
+ lvx v1,0,r5
+ vperm v0,v0,v1,v17
+ lvx v8,0,r11
+ addi r11,r11,-16
+ lvx v9,0,r11
+ vperm v8,v9,v8,v16
+ cmplw cr0,r5,r10
+ bc 12,0,L1101
+ vand v0,v0,v18
+ addis r31,0,L1307 at ha
+ ori r31,r31,L1307 at l
+ b L1199
+
+L1101:
+ addi r5,r5,16
+ lvx v2,0,r5
+ vperm v1,v1,v2,v17
+ addi r11,r11,-16
+ lvx v10,0,r11
+ vperm v9,v10,v9,v16
+ cmplw cr0,r5,r10
+ bc 12,0,L1102
+ vand v1,v1,v18
+ addis r31,0,L1306 at ha
+ ori r31,r31,L1306 at l
+ b L1199
+
+L1102:
+ addi r5,r5,16
+ lvx v3,0,r5
+ vperm v2,v2,v3,v17
+ addi r11,r11,-16
+ lvx v11,0,r11
+ vperm v10,v11,v10,v16
+ cmplw cr0,r5,r10
+ bc 12,0,L1103
+ vand v2,v2,v18
+ lis r31,L1305 at ha
+ la r31,L1305 at l(r31)
+ b L1199
+
+L1103:
+ addi r5,r5,16
+ lvx v4,0,r5
+ vperm v3,v3,v4,v17
+ addi r11,r11,-16
+ lvx v12,0,r11
+ vperm v11,v12,v11,v16
+ cmplw cr0,r5,r10
+ bc 12,0,L1104
+ vand v3,v3,v18
+ lis r31,L1304 at ha
+ la r31,L1304 at l(r31)
+ b L1199
+
+L1104:
+ addi r5,r5,16
+ lvx v5,0,r5
+ vperm v4,v4,v5,v17
+ addi r11,r11,-16
+ lvx v13,0,r11
+ vperm v12,v13,v12,v16
+ cmplw cr0,r5,r10
+ bc 12,0,L1105
+ vand v4,v4,v18
+ lis r31,L1303 at ha
+ la r31,L1303 at l(r31)
+ b L1199
+
+L1105:
+ addi r5,r5,16
+ lvx v6,0,r5
+ vperm v5,v5,v6,v17
+ addi r11,r11,-16
+ lvx v14,0,r11
+ vperm v13,v14,v13,v16
+ cmplw cr0,r5,r10
+ bc 12,0,L1106
+ vand v5,v5,v18
+ lis r31,L1302 at ha
+ la r31,L1302 at l(r31)
+ b L1199
+
+L1106:
+ addi r5,r5,16
+ lvx v7,0,r5
+ vperm v6,v6,v7,v17
+ addi r11,r11,-16
+ lvx v15,0,r11
+ vperm v14,v15,v14,v16
+ cmplw cr0,r5,r10
+ bc 12,0,L1107
+ vand v6,v6,v18
+ lis r31,L1301 at ha
+ la r31,L1301 at l(r31)
+ b L1199
+
+L1107:
+ addi r5,r5,16
+ lvx v19,0,r5
+ vperm v7,v7,v19,v17
+ addi r11,r11,-16
+ lvx v19,0,r11
+ vperm v15,v19,v15,v16
+ vand v7,v7,v18
+ lis r31,L1300 at ha
+ la r31,L1300 at l(r31)
+
+L1199:
+ mtctr r31
+
+ # set up invariant vectors
+ vspltish v16,0 # v16: zero vector
+
+ li r10,-12
+ lvsr v17,r10,r8 # v17: result shift vector
+ lvsl v18,r10,r3 # v18: residual shift back vector
+
+ li r10,-4
+ stw r7,-4(r9)
+ lvewx v19,r10,r9 # v19: lp_quantization vector
+
+L1200:
+ vmulosh v20,v0,v8 # v20: sum vector
+ bcctr 20,0
+
+L1300:
+ vmulosh v21,v7,v15
+ vsldoi v15,v15,v14,4 # increment history
+ vaddsws v20,v20,v21
+
+L1301:
+ vmulosh v21,v6,v14
+ vsldoi v14,v14,v13,4
+ vaddsws v20,v20,v21
+
+L1302:
+ vmulosh v21,v5,v13
+ vsldoi v13,v13,v12,4
+ vaddsws v20,v20,v21
+
+L1303:
+ vmulosh v21,v4,v12
+ vsldoi v12,v12,v11,4
+ vaddsws v20,v20,v21
+
+L1304:
+ vmulosh v21,v3,v11
+ vsldoi v11,v11,v10,4
+ vaddsws v20,v20,v21
+
+L1305:
+ vmulosh v21,v2,v10
+ vsldoi v10,v10,v9,4
+ vaddsws v20,v20,v21
+
+L1306:
+ vmulosh v21,v1,v9
+ vsldoi v9,v9,v8,4
+ vaddsws v20,v20,v21
+
+L1307:
+ vsumsws v20,v20,v16 # v20[3]: sum
+ vsraw v20,v20,v19 # v20[3]: sum >> lp_quantization
+
+ lvewx v21,0,r3 # v21[n]: *residual
+ vperm v21,v21,v21,v18 # v21[3]: *residual
+ vaddsws v20,v21,v20 # v20[3]: *residual + (sum >> lp_quantization)
+ vsldoi v18,v18,v18,4 # increment shift vector
+
+ vperm v21,v20,v20,v17 # v21[n]: shift for storage
+ vsldoi v17,v17,v17,12 # increment shift vector
+ stvewx v21,0,r8
+
+ vsldoi v20,v20,v20,12
+ vsldoi v8,v8,v20,4 # insert value onto history
+
+ addi r3,r3,4
+ addi r8,r8,4
+ cmplw cr0,r8,r4 # i<data_len
+ bc 12,0,L1200
+
+L1400:
+ mtspr 256,r0 # restore old vrsave
+ lmw r31,-4(r1)
+ blr
+
+_FLAC__lpc_restore_signal_asm_ppc_altivec_16_order8:
+# r3: residual[]
+# r4: data_len
+# r5: qlp_coeff[]
+# r6: order
+# r7: lp_quantization
+# r8: data[]
+
+# see _FLAC__lpc_restore_signal_asm_ppc_altivec_16() above
+# this version assumes order<=8; it uses fewer vector registers, which should
+# save time in context switches, and has less code, which may improve
+# instruction caching
+
+ stmw r31,-4(r1)
+
+ addi r9,r1,-28
+ li r31,0xf
+ andc r9,r9,r31 # for quadword-aligned stack data
+
+ slwi r6,r6,2 # adjust for word size
+ slwi r4,r4,2
+ add r4,r4,r8 # r4 = data+data_len
+
+ mfspr r0,256 # cache old vrsave
+ addis r31,0,0xffc0
+ ori r31,r31,0x0000
+ mtspr 256,r31 # declare VRs in vrsave
+
+ cmplw cr0,r8,r4 # i<data_len
+ bc 4,0,L2400
+
+ # load coefficients into v0-v1 and initial history into v2-v3
+ li r31,0xf
+ and r31,r8,r31 # r31: data%4
+ li r11,16
+ subf r31,r31,r11 # r31: 4-(data%4)
+ slwi r31,r31,3 # convert to bits for vsro
+ li r10,-4
+ stw r31,-4(r9)
+ lvewx v0,r10,r9
+ vspltisb v6,-1
+ vsro v6,v6,v0 # v6: mask vector
+
+ li r31,0x8
+ lvsl v0,0,r31
+ vsldoi v0,v0,v0,12
+ li r31,0xc
+ lvsl v1,0,r31
+ vspltisb v2,0
+ vspltisb v3,-1
+ vmrglw v2,v2,v3
+ vsel v0,v1,v0,v2 # v0: reversal permutation vector
+
+ add r10,r5,r6
+ lvsl v5,0,r5 # v5: coefficient alignment permutation vector
+ vperm v5,v5,v5,v0 # v5: reversal coefficient alignment permutation vector
+
+ mr r11,r8
+ lvsl v4,0,r11 # v4: history alignment permutation vector
+
+ lvx v0,0,r5
+ addi r5,r5,16
+ lvx v1,0,r5
+ vperm v0,v0,v1,v5
+ lvx v2,0,r11
+ addi r11,r11,-16
+ lvx v3,0,r11
+ vperm v2,v3,v2,v4
+ cmplw cr0,r5,r10
+ bc 12,0,L2101
+ vand v0,v0,v6
+ lis r31,L2301 at ha
+ la r31,L2301 at l(r31)
+ b L2199
+
+L2101:
+ addi r5,r5,16
+ lvx v7,0,r5
+ vperm v1,v1,v7,v5
+ addi r11,r11,-16
+ lvx v7,0,r11
+ vperm v3,v7,v3,v4
+ vand v1,v1,v6
+ lis r31,L2300 at ha
+ la r31,L2300 at l(r31)
+
+L2199:
+ mtctr r31
+
+ # set up invariant vectors
+ vspltish v4,0 # v4: zero vector
+
+ li r10,-12
+ lvsr v5,r10,r8 # v5: result shift vector
+ lvsl v6,r10,r3 # v6: residual shift back vector
+
+ li r10,-4
+ stw r7,-4(r9)
+ lvewx v7,r10,r9 # v7: lp_quantization vector
+
+L2200:
+ vmulosh v8,v0,v2 # v8: sum vector
+ bcctr 20,0
+
+L2300:
+ vmulosh v9,v1,v3
+ vsldoi v3,v3,v2,4
+ vaddsws v8,v8,v9
+
+L2301:
+ vsumsws v8,v8,v4 # v8[3]: sum
+ vsraw v8,v8,v7 # v8[3]: sum >> lp_quantization
+
+ lvewx v9,0,r3 # v9[n]: *residual
+ vperm v9,v9,v9,v6 # v9[3]: *residual
+ vaddsws v8,v9,v8 # v8[3]: *residual + (sum >> lp_quantization)
+ vsldoi v6,v6,v6,4 # increment shift vector
+
+ vperm v9,v8,v8,v5 # v9[n]: shift for storage
+ vsldoi v5,v5,v5,12 # increment shift vector
+ stvewx v9,0,r8
+
+ vsldoi v8,v8,v8,12
+ vsldoi v2,v2,v8,4 # insert value onto history
+
+ addi r3,r3,4
+ addi r8,r8,4
+ cmplw cr0,r8,r4 # i<data_len
+ bc 12,0,L2200
+
+L2400:
+ mtspr 256,r0 # restore old vrsave
+ lmw r31,-4(r1)
+ blr
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/seekable_stream_decoder.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/seekable_stream_decoder.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/seekable_stream_decoder.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -35,6 +35,7 @@
#include "FLAC/assert.h"
#include "protected/seekable_stream_decoder.h"
#include "protected/stream_decoder.h"
+#include "private/float.h" /* for FLAC__double */
#include "private/md5.h"
/* adjust for compilers that can't understand using LLU suffix for uint64_t literals */
@@ -743,7 +744,7 @@
if(seekable_stream_decoder->private_->eof_callback(seekable_stream_decoder, seekable_stream_decoder->private_->client_data)) {
*bytes = 0;
#if 0
-@@@@@@ verify that this is not needed
+ /*@@@@@@ verify that this is not needed */
seekable_stream_decoder->protected_->state = FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM;
#endif
return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
@@ -756,7 +757,7 @@
if(*bytes == 0) {
if(seekable_stream_decoder->private_->eof_callback(seekable_stream_decoder, seekable_stream_decoder->private_->client_data)) {
#if 0
-@@@@@@ verify that this is not needed
+ /*@@@@@@ verify that this is not needed */
seekable_stream_decoder->protected_->state = FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM;
#endif
return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
@@ -948,13 +949,21 @@
else if(upper_seek_point >= 0) {
const FLAC__uint64 target_offset = target_sample - decoder->private_->seek_table->points[lower_seek_point].sample_number;
const FLAC__uint64 range_samples = decoder->private_->seek_table->points[upper_seek_point].sample_number - decoder->private_->seek_table->points[lower_seek_point].sample_number;
- const FLAC__uint64 range_bytes = upper_bound - lower_bound;
+ const FLAC__uint64 range_bytes = (upper_bound>lower_bound? upper_bound - lower_bound - 1 : 0);
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
#if defined _MSC_VER || defined __MINGW32__
- /* with VC++ you have to spoon feed it the casting */
- pos = (FLAC__int64)lower_bound + (FLAC__int64)((double)(FLAC__int64)target_offset / (double)(FLAC__int64)range_samples * (double)(FLAC__int64)(range_bytes-1)) - approx_bytes_per_frame;
+ /* with MSVC you have to spoon feed it the casting */
+ pos = (FLAC__int64)lower_bound + (FLAC__int64)(((FLAC__double)(FLAC__int64)target_offset / (FLAC__double)(FLAC__int64)range_samples) * (FLAC__double)(FLAC__int64)(range_bytes-1)) - approx_bytes_per_frame;
#else
- pos = (FLAC__int64)lower_bound + (FLAC__int64)((double)target_offset / (double)range_samples * (double)(range_bytes-1)) - approx_bytes_per_frame;
+ pos = (FLAC__int64)lower_bound + (FLAC__int64)(((FLAC__double)target_offset / (FLAC__double)range_samples) * (FLAC__double)range_bytes) - approx_bytes_per_frame;
#endif
+#else
+ /* a little less accurate: */
+ if (range_bytes <= 0xffffffff)
+ pos = (FLAC__int64)lower_bound + (FLAC__int64)((target_offset * range_bytes) / range_samples) - approx_bytes_per_frame;
+ else /* @@@ WATCHOUT, ~2TB limit */
+ pos = (FLAC__int64)lower_bound + (FLAC__int64)(((target_offset>>8) * (range_bytes>>8)) / (range_samples>>16)) - approx_bytes_per_frame;
+#endif
}
}
@@ -964,12 +973,26 @@
* frame with the correct sample.
*/
if(pos < 0 && total_samples > 0) {
+ /*
+ * For max accuracy we should be using
+ * (stream_length-first_frame_offset-1) in the divisor, but the
+ * difference is trivial and (stream_length-first_frame_offset)
+ * has no chance of underflow.
+ */
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
#if defined _MSC_VER || defined __MINGW32__
/* with VC++ you have to spoon feed it the casting */
- pos = (FLAC__int64)first_frame_offset + (FLAC__int64)((double)(FLAC__int64)target_sample / (double)(FLAC__int64)total_samples * (double)(FLAC__int64)(stream_length-first_frame_offset-1)) - approx_bytes_per_frame;
+ pos = (FLAC__int64)first_frame_offset + (FLAC__int64)(((FLAC__double)(FLAC__int64)target_sample / (FLAC__double)(FLAC__int64)total_samples) * (FLAC__double)(FLAC__int64)(stream_length-first_frame_offset)) - approx_bytes_per_frame;
#else
- pos = (FLAC__int64)first_frame_offset + (FLAC__int64)((double)target_sample / (double)total_samples * (double)(stream_length-first_frame_offset-1)) - approx_bytes_per_frame;
+ pos = (FLAC__int64)first_frame_offset + (FLAC__int64)(((FLAC__double)target_sample / (FLAC__double)total_samples) * (FLAC__double)(stream_length-first_frame_offset)) - approx_bytes_per_frame;
#endif
+#else
+ /* a little less accurate: */
+ if (stream_length < 0xffffffff)
+ pos = (FLAC__int64)first_frame_offset + (FLAC__int64)((target_sample * (stream_length-first_frame_offset)) / total_samples) - approx_bytes_per_frame;
+ else /* @@@ WATCHOUT, ~2TB limit */
+ pos = (FLAC__int64)first_frame_offset + (FLAC__int64)(((target_sample>>8) * ((stream_length-first_frame_offset)>>8)) / (total_samples>>16)) - approx_bytes_per_frame;
+#endif
}
/*
@@ -1039,7 +1062,8 @@
}
}
/* our write callback will change the state when it gets to the target frame */
- if(decoder->protected_->state != FLAC__SEEKABLE_STREAM_DECODER_SEEKING) {
+ /* actually, we could have got_a_frame if our decoder is at FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM so we need to check for that also */
+ if(decoder->protected_->state != FLAC__SEEKABLE_STREAM_DECODER_SEEKING && decoder->protected_->state != FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM) {
break;
}
else { /* we need to narrow the search */
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/seekable_stream_encoder.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/seekable_stream_encoder.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/seekable_stream_encoder.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/stream_decoder.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/stream_decoder.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/stream_decoder.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -121,6 +121,7 @@
FLAC__EntropyCodingMethod_PartitionedRiceContents partitioned_rice_contents[FLAC__MAX_CHANNELS];
unsigned output_capacity, output_channels;
FLAC__uint32 last_frame_number;
+ FLAC__uint32 last_block_size;
FLAC__uint64 samples_decoded;
FLAC__bool has_stream_info, has_seek_table;
FLAC__StreamMetadata stream_info;
@@ -284,6 +285,7 @@
return decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
decoder->private_->last_frame_number = 0;
+ decoder->private_->last_block_size = 0;
decoder->private_->samples_decoded = 0;
decoder->private_->has_stream_info = false;
decoder->private_->cached = false;
@@ -590,6 +592,8 @@
decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
return false;
}
+ decoder->private_->last_frame_number = 0;
+ decoder->private_->last_block_size = 0;
decoder->protected_->state = FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC;
return true;
@@ -1167,12 +1171,13 @@
if(!FLAC__bitbuffer_read_raw_uint32_little_endian(decoder->private_->input, &obj->vendor_string.length, read_callback_, decoder))
return false; /* the read_callback_ sets the state for us */
if(obj->vendor_string.length > 0) {
- if(0 == (obj->vendor_string.entry = (FLAC__byte*)malloc(obj->vendor_string.length))) {
+ if(0 == (obj->vendor_string.entry = (FLAC__byte*)malloc(obj->vendor_string.length+1))) {
decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
return false;
}
if(!FLAC__bitbuffer_read_byte_block_aligned_no_crc(decoder->private_->input, obj->vendor_string.entry, obj->vendor_string.length, read_callback_, decoder))
return false; /* the read_callback_ sets the state for us */
+ obj->vendor_string.entry[obj->vendor_string.length] = '\0';
}
else
obj->vendor_string.entry = 0;
@@ -1193,12 +1198,13 @@
if(!FLAC__bitbuffer_read_raw_uint32_little_endian(decoder->private_->input, &obj->comments[i].length, read_callback_, decoder))
return false; /* the read_callback_ sets the state for us */
if(obj->comments[i].length > 0) {
- if(0 == (obj->comments[i].entry = (FLAC__byte*)malloc(obj->comments[i].length))) {
+ if(0 == (obj->comments[i].entry = (FLAC__byte*)malloc(obj->comments[i].length+1))) {
decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
return false;
}
if(!FLAC__bitbuffer_read_byte_block_aligned_no_crc(decoder->private_->input, obj->comments[i].entry, obj->comments[i].length, read_callback_, decoder))
return false; /* the read_callback_ sets the state for us */
+ obj->comments[i].entry[obj->comments[i].length] = '\0';
}
else
obj->comments[i].entry = 0;
@@ -1700,18 +1706,34 @@
return true;
}
- if(blocksize_hint && is_known_variable_blocksize_stream) {
- if(!FLAC__bitbuffer_read_utf8_uint64(decoder->private_->input, &xx, read_callback_, decoder, raw_header, &raw_header_len))
- return false; /* the read_callback_ sets the state for us */
- if(xx == FLAC__U64L(0xffffffffffffffff)) { /* i.e. non-UTF8 code... */
- decoder->private_->lookahead = raw_header[raw_header_len-1]; /* back up as much as we can */
- decoder->private_->cached = true;
- decoder->private_->error_callback(decoder, FLAC__STREAM_DECODER_ERROR_STATUS_BAD_HEADER, decoder->private_->client_data);
- decoder->protected_->state = FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC;
- return true;
+ /*
+ * Now we get to the regrettable consequences of not knowing for sure
+ * whether we got a frame number or a sample number. There are no
+ * encoders that do variable-blocksize encoding so unless we know from
+ * the STREAMINFO that it is variable-blocksize we will assume it is
+ * fixed-blocksize. The trouble comes when we have no STREAMINFO; again
+ * we will guess that is fixed-blocksize. Where this can go wrong: 1) a
+ * variable-blocksize stream with no STREAMINFO; 2) a fixed-blocksize
+ * stream that was edited such that one or more frames before or
+ * including this one do not have the same number of samples as the
+ * STREAMINFO's min and max blocksize.
+ */
+ if(is_known_variable_blocksize_stream) {
+ if(blocksize_hint) {
+ if(!FLAC__bitbuffer_read_utf8_uint64(decoder->private_->input, &xx, read_callback_, decoder, raw_header, &raw_header_len))
+ return false; /* the read_callback_ sets the state for us */
+ if(xx == FLAC__U64L(0xffffffffffffffff)) { /* i.e. non-UTF8 code... */
+ decoder->private_->lookahead = raw_header[raw_header_len-1]; /* back up as much as we can */
+ decoder->private_->cached = true;
+ decoder->private_->error_callback(decoder, FLAC__STREAM_DECODER_ERROR_STATUS_BAD_HEADER, decoder->private_->client_data);
+ decoder->protected_->state = FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC;
+ return true;
+ }
+ decoder->private_->frame.header.number_type = FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER;
+ decoder->private_->frame.header.number.sample_number = xx;
}
- decoder->private_->frame.header.number_type = FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER;
- decoder->private_->frame.header.number.sample_number = xx;
+ else
+ is_unparseable = true;
}
else {
if(!FLAC__bitbuffer_read_utf8_uint32(decoder->private_->input, &x, read_callback_, decoder, raw_header, &raw_header_len))
@@ -1725,14 +1747,21 @@
}
decoder->private_->last_frame_number = x;
decoder->private_->frame.header.number_type = FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER;
- if(blocksize_hint) {
- if(decoder->private_->has_stream_info)
- decoder->private_->frame.header.number.sample_number = (FLAC__int64)decoder->private_->stream_info.data.stream_info.min_blocksize * (FLAC__int64)x;
+ if(decoder->private_->has_stream_info) {
+ FLAC__ASSERT(decoder->private_->stream_info.data.stream_info.min_blocksize == decoder->private_->stream_info.data.stream_info.max_blocksize);
+ decoder->private_->frame.header.number.sample_number = (FLAC__uint64)decoder->private_->stream_info.data.stream_info.min_blocksize * (FLAC__uint64)x;
+ decoder->private_->last_block_size = decoder->private_->frame.header.blocksize;
+ }
+ else if(blocksize_hint) {
+ if(decoder->private_->last_block_size)
+ decoder->private_->frame.header.number.sample_number = (FLAC__uint64)decoder->private_->last_block_size * (FLAC__uint64)x;
else
is_unparseable = true;
}
- else
- decoder->private_->frame.header.number.sample_number = (FLAC__int64)decoder->private_->frame.header.blocksize * (FLAC__int64)x;
+ else {
+ decoder->private_->frame.header.number.sample_number = (FLAC__uint64)decoder->private_->frame.header.blocksize * (FLAC__uint64)x;
+ decoder->private_->last_block_size = decoder->private_->frame.header.blocksize;
+ }
}
if(blocksize_hint) {
@@ -2045,6 +2074,22 @@
const unsigned partitions = 1u << partition_order;
const unsigned partition_samples = partition_order > 0? decoder->private_->frame.header.blocksize >> partition_order : decoder->private_->frame.header.blocksize - predictor_order;
+ /* sanity checks */
+ if(partition_order == 0) {
+ if(decoder->private_->frame.header.blocksize < predictor_order) {
+ decoder->private_->error_callback(decoder, FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC, decoder->private_->client_data);
+ decoder->protected_->state = FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC;
+ return true;
+ }
+ }
+ else {
+ if(partition_samples < predictor_order) {
+ decoder->private_->error_callback(decoder, FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC, decoder->private_->client_data);
+ decoder->protected_->state = FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC;
+ return true;
+ }
+ }
+
if(!FLAC__format_entropy_coding_method_partitioned_rice_contents_ensure_size(partitioned_rice_contents, max(6, partition_order))) {
decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
return false;
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/stream_encoder.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/stream_encoder.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/stream_encoder.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -100,7 +100,9 @@
const FLAC__FrameHeader *frame_header,
unsigned subframe_bps,
const FLAC__int32 integer_signal[],
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
const FLAC__real real_signal[],
+#endif
FLAC__Subframe *subframe[2],
FLAC__EntropyCodingMethod_PartitionedRiceContents *partitioned_rice_contents[2],
FLAC__int32 *residual[2],
@@ -142,6 +144,7 @@
FLAC__EntropyCodingMethod_PartitionedRiceContents *partitioned_rice_contents
);
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
static unsigned evaluate_lpc_subframe_(
FLAC__StreamEncoder *encoder,
const FLAC__int32 signal[],
@@ -163,6 +166,7 @@
FLAC__Subframe *subframe,
FLAC__EntropyCodingMethod_PartitionedRiceContents *partitioned_rice_contents
);
+#endif
static unsigned evaluate_verbatim_subframe_(
const FLAC__int32 signal[],
@@ -315,8 +319,10 @@
unsigned input_capacity; /* current size (in samples) of the signal and residual buffers */
FLAC__int32 *integer_signal[FLAC__MAX_CHANNELS]; /* the integer version of the input signal */
FLAC__int32 *integer_signal_mid_side[2]; /* the integer version of the mid-side input signal (stereo only) */
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
FLAC__real *real_signal[FLAC__MAX_CHANNELS]; /* the floating-point version of the input signal */
FLAC__real *real_signal_mid_side[2]; /* the floating-point version of the mid-side input signal (stereo only) */
+#endif
unsigned subframe_bps[FLAC__MAX_CHANNELS]; /* the effective bits per sample of the input signal (stream bps - wasted bits) */
unsigned subframe_bps_mid_side[2]; /* the effective bits per sample of the mid-side input signal (stream bps - wasted bits + 0/1) */
FLAC__int32 *residual_workspace[FLAC__MAX_CHANNELS][2]; /* each channel has a candidate and best workspace where the subframe residual signals will be stored */
@@ -337,7 +343,6 @@
FLAC__uint64 *abs_residual_partition_sums; /* workspace where the sum of abs(candidate residual) for each partition is stored */
unsigned *raw_bits_per_partition; /* workspace where the sum of silog2(candidate residual) for each partition is stored */
FLAC__BitBuffer *frame; /* the current frame being worked on */
- double loose_mid_side_stereo_frames_exact; /* exact number of frames the encoder will use before trying both independent and mid/side frames again */
unsigned loose_mid_side_stereo_frames; /* rounded number of frames the encoder will use before trying both independent and mid/side frames again */
unsigned loose_mid_side_stereo_frame_count; /* number of frames using the current channel assignment */
FLAC__ChannelAssignment last_channel_assignment;
@@ -346,11 +351,17 @@
unsigned current_frame_number;
struct FLAC__MD5Context md5context;
FLAC__CPUInfo cpuinfo;
- unsigned (*local_fixed_compute_best_predictor)(const FLAC__int32 data[], unsigned data_len, FLAC__real residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]);
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
+ unsigned (*local_fixed_compute_best_predictor)(const FLAC__int32 data[], unsigned data_len, FLAC__float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]);
+#else
+ unsigned (*local_fixed_compute_best_predictor)(const FLAC__int32 data[], unsigned data_len, FLAC__fixedpoint residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]);
+#endif
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
void (*local_lpc_compute_autocorrelation)(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[]);
- void (*local_lpc_compute_residual_from_qlp_coefficients)(const FLAC__int32 data[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]);
- void (*local_lpc_compute_residual_from_qlp_coefficients_64bit)(const FLAC__int32 data[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]);
- void (*local_lpc_compute_residual_from_qlp_coefficients_16bit)(const FLAC__int32 data[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]);
+ void (*local_lpc_compute_residual_from_qlp_coefficients)(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]);
+ void (*local_lpc_compute_residual_from_qlp_coefficients_64bit)(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]);
+ void (*local_lpc_compute_residual_from_qlp_coefficients_16bit)(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]);
+#endif
FLAC__bool use_wide_by_block; /* use slow 64-bit versions of some functions because of the block size */
FLAC__bool use_wide_by_partition; /* use slow 64-bit versions of some functions because of the min partition order and blocksize */
FLAC__bool use_wide_by_order; /* use slow 64-bit versions of some functions because of the lpc order */
@@ -364,8 +375,10 @@
/* unaligned (original) pointers to allocated data */
FLAC__int32 *integer_signal_unaligned[FLAC__MAX_CHANNELS];
FLAC__int32 *integer_signal_mid_side_unaligned[2];
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
FLAC__real *real_signal_unaligned[FLAC__MAX_CHANNELS];
FLAC__real *real_signal_mid_side_unaligned[2];
+#endif
FLAC__int32 *residual_workspace_unaligned[FLAC__MAX_CHANNELS][2];
FLAC__int32 *residual_workspace_mid_side_unaligned[2][2];
FLAC__uint32 *abs_residual_unaligned;
@@ -375,7 +388,9 @@
* These fields have been moved here from private function local
* declarations merely to save stack space during encoding.
*/
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
FLAC__real lp_coeff[FLAC__MAX_LPC_ORDER][FLAC__MAX_LPC_ORDER]; /* from process_subframe_() */
+#endif
FLAC__EntropyCodingMethod_PartitionedRiceContents partitioned_rice_contents_extra[2]; /* from find_best_partition_order_() */
/*
* The data for the verify section
@@ -698,11 +713,15 @@
encoder->private_->input_capacity = 0;
for(i = 0; i < encoder->protected_->channels; i++) {
encoder->private_->integer_signal_unaligned[i] = encoder->private_->integer_signal[i] = 0;
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
encoder->private_->real_signal_unaligned[i] = encoder->private_->real_signal[i] = 0;
+#endif
}
for(i = 0; i < 2; i++) {
encoder->private_->integer_signal_mid_side_unaligned[i] = encoder->private_->integer_signal_mid_side[i] = 0;
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
encoder->private_->real_signal_mid_side_unaligned[i] = encoder->private_->real_signal_mid_side[i] = 0;
+#endif
}
for(i = 0; i < encoder->protected_->channels; i++) {
encoder->private_->residual_workspace_unaligned[i][0] = encoder->private_->residual_workspace[i][0] = 0;
@@ -717,8 +736,17 @@
encoder->private_->abs_residual_unaligned = encoder->private_->abs_residual = 0;
encoder->private_->abs_residual_partition_sums_unaligned = encoder->private_->abs_residual_partition_sums = 0;
encoder->private_->raw_bits_per_partition_unaligned = encoder->private_->raw_bits_per_partition = 0;
- encoder->private_->loose_mid_side_stereo_frames_exact = (double)encoder->protected_->sample_rate * 0.4 / (double)encoder->protected_->blocksize;
- encoder->private_->loose_mid_side_stereo_frames = (unsigned)(encoder->private_->loose_mid_side_stereo_frames_exact + 0.5);
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
+ encoder->private_->loose_mid_side_stereo_frames = (unsigned)((FLAC__double)encoder->protected_->sample_rate * 0.4 / (FLAC__double)encoder->protected_->blocksize + 0.5);
+#else
+ /* 26214 is the approximate fixed-point equivalent to 0.4 (0.4 * 2^16) */
+ /* sample rate can be up to 655350 Hz, and thus use 20 bits, so we do the multiply÷ by hand */
+ FLAC__ASSERT(FLAC__MAX_SAMPLE_RATE <= 655350);
+ FLAC__ASSERT(FLAC__MAX_BLOCK_SIZE <= 65535);
+ FLAC__ASSERT(encoder->protected_->sample_rate <= 655350);
+ FLAC__ASSERT(encoder->protected_->blocksize <= 65535);
+ encoder->private_->loose_mid_side_stereo_frames = (unsigned)FLAC__fixedpoint_trunc((((FLAC__uint64)(encoder->protected_->sample_rate) * (FLAC__uint64)(26214)) << 16) / (encoder->protected_->blocksize<<16) + FLAC__FP_ONE_HALF);
+#endif
if(encoder->private_->loose_mid_side_stereo_frames == 0)
encoder->private_->loose_mid_side_stereo_frames = 1;
encoder->private_->loose_mid_side_stereo_frame_count = 0;
@@ -734,18 +762,23 @@
*/
FLAC__cpu_info(&encoder->private_->cpuinfo);
/* first default to the non-asm routines */
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation;
+#endif
encoder->private_->local_fixed_compute_best_predictor = FLAC__fixed_compute_best_predictor;
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
encoder->private_->local_lpc_compute_residual_from_qlp_coefficients = FLAC__lpc_compute_residual_from_qlp_coefficients;
encoder->private_->local_lpc_compute_residual_from_qlp_coefficients_64bit = FLAC__lpc_compute_residual_from_qlp_coefficients_wide;
encoder->private_->local_lpc_compute_residual_from_qlp_coefficients_16bit = FLAC__lpc_compute_residual_from_qlp_coefficients;
+#endif
/* now override with asm where appropriate */
-#ifndef FLAC__NO_ASM
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
+# ifndef FLAC__NO_ASM
if(encoder->private_->cpuinfo.use_asm) {
-#ifdef FLAC__CPU_IA32
+# ifdef FLAC__CPU_IA32
FLAC__ASSERT(encoder->private_->cpuinfo.type == FLAC__CPUINFO_TYPE_IA32);
-#ifdef FLAC__HAS_NASM
-#ifdef FLAC__SSE_OS
+# ifdef FLAC__HAS_NASM
+# ifdef FLAC__SSE_OS
if(encoder->private_->cpuinfo.data.ia32.sse) {
if(encoder->protected_->max_lpc_order < 4)
encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_asm_ia32_sse_lag_4;
@@ -757,13 +790,11 @@
encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_asm_ia32;
}
else
-#endif
+# endif /* FLAC__SSE_OS */
if(encoder->private_->cpuinfo.data.ia32._3dnow)
encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_asm_ia32_3dnow;
else
encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_asm_ia32;
- if(encoder->private_->cpuinfo.data.ia32.mmx && encoder->private_->cpuinfo.data.ia32.cmov)
- encoder->private_->local_fixed_compute_best_predictor = FLAC__fixed_compute_best_predictor_asm_ia32_mmx_cmov;
if(encoder->private_->cpuinfo.data.ia32.mmx) {
encoder->private_->local_lpc_compute_residual_from_qlp_coefficients = FLAC__lpc_compute_residual_from_qlp_coefficients_asm_ia32;
encoder->private_->local_lpc_compute_residual_from_qlp_coefficients_16bit = FLAC__lpc_compute_residual_from_qlp_coefficients_asm_ia32_mmx;
@@ -772,10 +803,13 @@
encoder->private_->local_lpc_compute_residual_from_qlp_coefficients = FLAC__lpc_compute_residual_from_qlp_coefficients_asm_ia32;
encoder->private_->local_lpc_compute_residual_from_qlp_coefficients_16bit = FLAC__lpc_compute_residual_from_qlp_coefficients_asm_ia32;
}
-#endif
-#endif
+ if(encoder->private_->cpuinfo.data.ia32.mmx && encoder->private_->cpuinfo.data.ia32.cmov)
+ encoder->private_->local_fixed_compute_best_predictor = FLAC__fixed_compute_best_predictor_asm_ia32_mmx_cmov;
+# endif /* FLAC__HAS_NASM */
+# endif /* FLAC__CPU_IA32 */
}
-#endif
+# endif /* !FLAC__NO_ASM */
+#endif /* !FLAC__INTEGER_ONLY_LIBRARY */
/* finally override based on wide-ness if necessary */
if(encoder->private_->use_wide_by_block) {
encoder->private_->local_fixed_compute_best_predictor = FLAC__fixed_compute_best_predictor_wide;
@@ -883,7 +917,7 @@
*
* WATCHOUT: libOggFLAC depends on us to write this block after the
* STREAMINFO since that's what the mapping requires. (In the case
- * that metadata_has_vorbis_comment it true it will have already
+ * that metadata_has_vorbis_comment is true it will have already
* insured that the metadata list is properly ordered.)
*/
if(!metadata_has_vorbis_comment) {
@@ -960,7 +994,9 @@
FLAC__ASSERT(0 != encoder);
if(encoder->protected_->state != FLAC__STREAM_ENCODER_UNINITIALIZED)
return false;
+#ifndef FLAC__MANDATORY_VERIFY_WHILE_ENCODING
encoder->protected_->verify = value;
+#endif
return true;
}
@@ -1340,51 +1376,121 @@
FLAC__ASSERT(encoder->protected_->state == FLAC__STREAM_ENCODER_OK);
j = 0;
- if(encoder->protected_->do_mid_side_stereo && channels == 2) {
- do {
- if(encoder->protected_->verify)
- append_to_verify_fifo_(&encoder->private_->verify.input_fifo, buffer, j, channels, min(blocksize-encoder->private_->current_sample_number, samples-j));
+ /*
+ * we have several flavors of the same basic loop, optimized for
+ * different conditions:
+ */
+ if(encoder->protected_->max_lpc_order > 0) {
+ if(encoder->protected_->do_mid_side_stereo && channels == 2) {
+ /*
+ * stereo coding: unroll channel loop
+ * with LPC: calculate floating point version of signal
+ */
+ do {
+ if(encoder->protected_->verify)
+ append_to_verify_fifo_(&encoder->private_->verify.input_fifo, buffer, j, channels, min(blocksize-encoder->private_->current_sample_number, samples-j));
- for(i = encoder->private_->current_sample_number; i < blocksize && j < samples; i++, j++) {
- x = mid = side = buffer[0][j];
- encoder->private_->integer_signal[0][i] = x;
- encoder->private_->real_signal[0][i] = (FLAC__real)x;
- x = buffer[1][j];
- encoder->private_->integer_signal[1][i] = x;
- encoder->private_->real_signal[1][i] = (FLAC__real)x;
- mid += x;
- side -= x;
- mid >>= 1; /* NOTE: not the same as 'mid = (buffer[0][j] + buffer[1][j]) / 2' ! */
- encoder->private_->integer_signal_mid_side[1][i] = side;
- encoder->private_->integer_signal_mid_side[0][i] = mid;
- encoder->private_->real_signal_mid_side[1][i] = (FLAC__real)side;
- encoder->private_->real_signal_mid_side[0][i] = (FLAC__real)mid;
- encoder->private_->current_sample_number++;
- }
- if(i == blocksize) {
- if(!process_frame_(encoder, false)) /* false => not last frame */
- return false;
- }
- } while(j < samples);
+ for(i = encoder->private_->current_sample_number; i < blocksize && j < samples; i++, j++) {
+ x = mid = side = buffer[0][j];
+ encoder->private_->integer_signal[0][i] = x;
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
+ encoder->private_->real_signal[0][i] = (FLAC__real)x;
+#endif
+ x = buffer[1][j];
+ encoder->private_->integer_signal[1][i] = x;
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
+ encoder->private_->real_signal[1][i] = (FLAC__real)x;
+#endif
+ mid += x;
+ side -= x;
+ mid >>= 1; /* NOTE: not the same as 'mid = (buffer[0][j] + buffer[1][j]) / 2' ! */
+ encoder->private_->integer_signal_mid_side[1][i] = side;
+ encoder->private_->integer_signal_mid_side[0][i] = mid;
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
+ encoder->private_->real_signal_mid_side[1][i] = (FLAC__real)side;
+ encoder->private_->real_signal_mid_side[0][i] = (FLAC__real)mid;
+#endif
+ encoder->private_->current_sample_number++;
+ }
+ if(i == blocksize) {
+ if(!process_frame_(encoder, false)) /* false => not last frame */
+ return false;
+ }
+ } while(j < samples);
+ }
+ else {
+ /*
+ * independent channel coding: buffer each channel in inner loop
+ * with LPC: calculate floating point version of signal
+ */
+ do {
+ if(encoder->protected_->verify)
+ append_to_verify_fifo_(&encoder->private_->verify.input_fifo, buffer, j, channels, min(blocksize-encoder->private_->current_sample_number, samples-j));
+
+ for(i = encoder->private_->current_sample_number; i < blocksize && j < samples; i++, j++) {
+ for(channel = 0; channel < channels; channel++) {
+ x = buffer[channel][j];
+ encoder->private_->integer_signal[channel][i] = x;
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
+ encoder->private_->real_signal[channel][i] = (FLAC__real)x;
+#endif
+ }
+ encoder->private_->current_sample_number++;
+ }
+ if(i == blocksize) {
+ if(!process_frame_(encoder, false)) /* false => not last frame */
+ return false;
+ }
+ } while(j < samples);
+ }
}
else {
- do {
- if(encoder->protected_->verify)
- append_to_verify_fifo_(&encoder->private_->verify.input_fifo, buffer, j, channels, min(blocksize-encoder->private_->current_sample_number, samples-j));
+ if(encoder->protected_->do_mid_side_stereo && channels == 2) {
+ /*
+ * stereo coding: unroll channel loop
+ * without LPC: no need to calculate floating point version of signal
+ */
+ do {
+ if(encoder->protected_->verify)
+ append_to_verify_fifo_(&encoder->private_->verify.input_fifo, buffer, j, channels, min(blocksize-encoder->private_->current_sample_number, samples-j));
- for(i = encoder->private_->current_sample_number; i < blocksize && j < samples; i++, j++) {
- for(channel = 0; channel < channels; channel++) {
- x = buffer[channel][j];
- encoder->private_->integer_signal[channel][i] = x;
- encoder->private_->real_signal[channel][i] = (FLAC__real)x;
+ for(i = encoder->private_->current_sample_number; i < blocksize && j < samples; i++, j++) {
+ encoder->private_->integer_signal[0][i] = mid = side = buffer[0][j];
+ x = buffer[1][j];
+ encoder->private_->integer_signal[1][i] = x;
+ mid += x;
+ side -= x;
+ mid >>= 1; /* NOTE: not the same as 'mid = (buffer[0][j] + buffer[1][j]) / 2' ! */
+ encoder->private_->integer_signal_mid_side[1][i] = side;
+ encoder->private_->integer_signal_mid_side[0][i] = mid;
+ encoder->private_->current_sample_number++;
}
- encoder->private_->current_sample_number++;
- }
- if(i == blocksize) {
- if(!process_frame_(encoder, false)) /* false => not last frame */
- return false;
- }
- } while(j < samples);
+ if(i == blocksize) {
+ if(!process_frame_(encoder, false)) /* false => not last frame */
+ return false;
+ }
+ } while(j < samples);
+ }
+ else {
+ /*
+ * independent channel coding: buffer each channel in inner loop
+ * without LPC: no need to calculate floating point version of signal
+ */
+ do {
+ if(encoder->protected_->verify)
+ append_to_verify_fifo_(&encoder->private_->verify.input_fifo, buffer, j, channels, min(blocksize-encoder->private_->current_sample_number, samples-j));
+
+ for(i = encoder->private_->current_sample_number; i < blocksize && j < samples; i++, j++) {
+ for(channel = 0; channel < channels; channel++)
+ encoder->private_->integer_signal[channel][i] = buffer[channel][j];
+ encoder->private_->current_sample_number++;
+ }
+ if(i == blocksize) {
+ if(!process_frame_(encoder, false)) /* false => not last frame */
+ return false;
+ }
+ } while(j < samples);
+ }
}
return true;
@@ -1400,51 +1506,121 @@
FLAC__ASSERT(encoder->protected_->state == FLAC__STREAM_ENCODER_OK);
j = k = 0;
- if(encoder->protected_->do_mid_side_stereo && channels == 2) {
- do {
- if(encoder->protected_->verify)
- append_to_verify_fifo_interleaved_(&encoder->private_->verify.input_fifo, buffer, j, channels, min(blocksize-encoder->private_->current_sample_number, samples-j));
+ /*
+ * we have several flavors of the same basic loop, optimized for
+ * different conditions:
+ */
+ if(encoder->protected_->max_lpc_order > 0) {
+ if(encoder->protected_->do_mid_side_stereo && channels == 2) {
+ /*
+ * stereo coding: unroll channel loop
+ * with LPC: calculate floating point version of signal
+ */
+ do {
+ if(encoder->protected_->verify)
+ append_to_verify_fifo_interleaved_(&encoder->private_->verify.input_fifo, buffer, j, channels, min(blocksize-encoder->private_->current_sample_number, samples-j));
- for(i = encoder->private_->current_sample_number; i < blocksize && j < samples; i++, j++) {
- x = mid = side = buffer[k++];
- encoder->private_->integer_signal[0][i] = x;
- encoder->private_->real_signal[0][i] = (FLAC__real)x;
- x = buffer[k++];
- encoder->private_->integer_signal[1][i] = x;
- encoder->private_->real_signal[1][i] = (FLAC__real)x;
- mid += x;
- side -= x;
- mid >>= 1; /* NOTE: not the same as 'mid = (left + right) / 2' ! */
- encoder->private_->integer_signal_mid_side[1][i] = side;
- encoder->private_->integer_signal_mid_side[0][i] = mid;
- encoder->private_->real_signal_mid_side[1][i] = (FLAC__real)side;
- encoder->private_->real_signal_mid_side[0][i] = (FLAC__real)mid;
- encoder->private_->current_sample_number++;
- }
- if(i == blocksize) {
- if(!process_frame_(encoder, false)) /* false => not last frame */
- return false;
- }
- } while(j < samples);
+ for(i = encoder->private_->current_sample_number; i < blocksize && j < samples; i++, j++) {
+ x = mid = side = buffer[k++];
+ encoder->private_->integer_signal[0][i] = x;
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
+ encoder->private_->real_signal[0][i] = (FLAC__real)x;
+#endif
+ x = buffer[k++];
+ encoder->private_->integer_signal[1][i] = x;
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
+ encoder->private_->real_signal[1][i] = (FLAC__real)x;
+#endif
+ mid += x;
+ side -= x;
+ mid >>= 1; /* NOTE: not the same as 'mid = (left + right) / 2' ! */
+ encoder->private_->integer_signal_mid_side[1][i] = side;
+ encoder->private_->integer_signal_mid_side[0][i] = mid;
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
+ encoder->private_->real_signal_mid_side[1][i] = (FLAC__real)side;
+ encoder->private_->real_signal_mid_side[0][i] = (FLAC__real)mid;
+#endif
+ encoder->private_->current_sample_number++;
+ }
+ if(i == blocksize) {
+ if(!process_frame_(encoder, false)) /* false => not last frame */
+ return false;
+ }
+ } while(j < samples);
+ }
+ else {
+ /*
+ * independent channel coding: buffer each channel in inner loop
+ * with LPC: calculate floating point version of signal
+ */
+ do {
+ if(encoder->protected_->verify)
+ append_to_verify_fifo_interleaved_(&encoder->private_->verify.input_fifo, buffer, j, channels, min(blocksize-encoder->private_->current_sample_number, samples-j));
+
+ for(i = encoder->private_->current_sample_number; i < blocksize && j < samples; i++, j++) {
+ for(channel = 0; channel < channels; channel++) {
+ x = buffer[k++];
+ encoder->private_->integer_signal[channel][i] = x;
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
+ encoder->private_->real_signal[channel][i] = (FLAC__real)x;
+#endif
+ }
+ encoder->private_->current_sample_number++;
+ }
+ if(i == blocksize) {
+ if(!process_frame_(encoder, false)) /* false => not last frame */
+ return false;
+ }
+ } while(j < samples);
+ }
}
else {
- do {
- if(encoder->protected_->verify)
- append_to_verify_fifo_interleaved_(&encoder->private_->verify.input_fifo, buffer, j, channels, min(blocksize-encoder->private_->current_sample_number, samples-j));
+ if(encoder->protected_->do_mid_side_stereo && channels == 2) {
+ /*
+ * stereo coding: unroll channel loop
+ * without LPC: no need to calculate floating point version of signal
+ */
+ do {
+ if(encoder->protected_->verify)
+ append_to_verify_fifo_interleaved_(&encoder->private_->verify.input_fifo, buffer, j, channels, min(blocksize-encoder->private_->current_sample_number, samples-j));
- for(i = encoder->private_->current_sample_number; i < blocksize && j < samples; i++, j++) {
- for(channel = 0; channel < channels; channel++) {
+ for(i = encoder->private_->current_sample_number; i < blocksize && j < samples; i++, j++) {
+ encoder->private_->integer_signal[0][i] = mid = side = buffer[k++];
x = buffer[k++];
- encoder->private_->integer_signal[channel][i] = x;
- encoder->private_->real_signal[channel][i] = (FLAC__real)x;
+ encoder->private_->integer_signal[1][i] = x;
+ mid += x;
+ side -= x;
+ mid >>= 1; /* NOTE: not the same as 'mid = (left + right) / 2' ! */
+ encoder->private_->integer_signal_mid_side[1][i] = side;
+ encoder->private_->integer_signal_mid_side[0][i] = mid;
+ encoder->private_->current_sample_number++;
}
- encoder->private_->current_sample_number++;
- }
- if(i == blocksize) {
- if(!process_frame_(encoder, false)) /* false => not last frame */
- return false;
- }
- } while(j < samples);
+ if(i == blocksize) {
+ if(!process_frame_(encoder, false)) /* false => not last frame */
+ return false;
+ }
+ } while(j < samples);
+ }
+ else {
+ /*
+ * independent channel coding: buffer each channel in inner loop
+ * without LPC: no need to calculate floating point version of signal
+ */
+ do {
+ if(encoder->protected_->verify)
+ append_to_verify_fifo_interleaved_(&encoder->private_->verify.input_fifo, buffer, j, channels, min(blocksize-encoder->private_->current_sample_number, samples-j));
+
+ for(i = encoder->private_->current_sample_number; i < blocksize && j < samples; i++, j++) {
+ for(channel = 0; channel < channels; channel++)
+ encoder->private_->integer_signal[channel][i] = buffer[k++];
+ encoder->private_->current_sample_number++;
+ }
+ if(i == blocksize) {
+ if(!process_frame_(encoder, false)) /* false => not last frame */
+ return false;
+ }
+ } while(j < samples);
+ }
}
return true;
@@ -1460,7 +1636,11 @@
{
FLAC__ASSERT(0 != encoder);
+#ifdef FLAC__MANDATORY_VERIFY_WHILE_ENCODING
+ encoder->protected_->verify = true;
+#else
encoder->protected_->verify = false;
+#endif
encoder->protected_->streamable_subset = true;
encoder->protected_->do_mid_side_stereo = false;
encoder->protected_->loose_mid_side_stereo = false;
@@ -1498,20 +1678,24 @@
free(encoder->private_->integer_signal_unaligned[i]);
encoder->private_->integer_signal_unaligned[i] = 0;
}
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
if(0 != encoder->private_->real_signal_unaligned[i]) {
free(encoder->private_->real_signal_unaligned[i]);
encoder->private_->real_signal_unaligned[i] = 0;
}
+#endif
}
for(i = 0; i < 2; i++) {
if(0 != encoder->private_->integer_signal_mid_side_unaligned[i]) {
free(encoder->private_->integer_signal_mid_side_unaligned[i]);
encoder->private_->integer_signal_mid_side_unaligned[i] = 0;
}
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
if(0 != encoder->private_->real_signal_mid_side_unaligned[i]) {
free(encoder->private_->real_signal_mid_side_unaligned[i]);
encoder->private_->real_signal_mid_side_unaligned[i] = 0;
}
+#endif
}
for(channel = 0; channel < encoder->protected_->channels; channel++) {
for(i = 0; i < 2; i++) {
@@ -1575,13 +1759,19 @@
for(i = 0; ok && i < encoder->protected_->channels; i++) {
ok = ok && FLAC__memory_alloc_aligned_int32_array(new_size+4, &encoder->private_->integer_signal_unaligned[i], &encoder->private_->integer_signal[i]);
- ok = ok && FLAC__memory_alloc_aligned_real_array(new_size, &encoder->private_->real_signal_unaligned[i], &encoder->private_->real_signal[i]);
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
+ if(encoder->protected_->max_lpc_order > 0)
+ ok = ok && FLAC__memory_alloc_aligned_real_array(new_size, &encoder->private_->real_signal_unaligned[i], &encoder->private_->real_signal[i]);
+#endif
memset(encoder->private_->integer_signal[i], 0, sizeof(FLAC__int32)*4);
encoder->private_->integer_signal[i] += 4;
}
for(i = 0; ok && i < 2; i++) {
ok = ok && FLAC__memory_alloc_aligned_int32_array(new_size+4, &encoder->private_->integer_signal_mid_side_unaligned[i], &encoder->private_->integer_signal_mid_side[i]);
- ok = ok && FLAC__memory_alloc_aligned_real_array(new_size, &encoder->private_->real_signal_mid_side_unaligned[i], &encoder->private_->real_signal_mid_side[i]);
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
+ if(encoder->protected_->max_lpc_order > 0)
+ ok = ok && FLAC__memory_alloc_aligned_real_array(new_size, &encoder->private_->real_signal_mid_side_unaligned[i], &encoder->private_->real_signal_mid_side[i]);
+#endif
memset(encoder->private_->integer_signal_mid_side[i], 0, sizeof(FLAC__int32)*4);
encoder->private_->integer_signal_mid_side[i] += 4;
}
@@ -1796,7 +1986,9 @@
&frame_header,
encoder->private_->subframe_bps[channel],
encoder->private_->integer_signal[channel],
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
encoder->private_->real_signal[channel],
+#endif
encoder->private_->subframe_workspace_ptr[channel],
encoder->private_->partitioned_rice_contents_workspace_ptr[channel],
encoder->private_->residual_workspace[channel],
@@ -1824,7 +2016,9 @@
&frame_header,
encoder->private_->subframe_bps_mid_side[channel],
encoder->private_->integer_signal_mid_side[channel],
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
encoder->private_->real_signal_mid_side[channel],
+#endif
encoder->private_->subframe_workspace_ptr_mid_side[channel],
encoder->private_->partitioned_rice_contents_workspace_ptr_mid_side[channel],
encoder->private_->residual_workspace_mid_side[channel],
@@ -1958,7 +2152,9 @@
const FLAC__FrameHeader *frame_header,
unsigned subframe_bps,
const FLAC__int32 integer_signal[],
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
const FLAC__real real_signal[],
+#endif
FLAC__Subframe *subframe[2],
FLAC__EntropyCodingMethod_PartitionedRiceContents *partitioned_rice_contents[2],
FLAC__int32 *residual[2],
@@ -1966,13 +2162,19 @@
unsigned *best_bits
)
{
- FLAC__real fixed_residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1];
- FLAC__real lpc_residual_bits_per_sample;
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
+ FLAC__float fixed_residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1];
+#else
+ FLAC__fixedpoint fixed_residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1];
+#endif
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
+ FLAC__double lpc_residual_bits_per_sample;
FLAC__real autoc[FLAC__MAX_LPC_ORDER+1]; /* WATCHOUT: the size is important even though encoder->protected_->max_lpc_order might be less; some asm routines need all the space */
- FLAC__real lpc_error[FLAC__MAX_LPC_ORDER];
+ FLAC__double lpc_error[FLAC__MAX_LPC_ORDER];
unsigned min_lpc_order, max_lpc_order, lpc_order;
+ unsigned min_qlp_coeff_precision, max_qlp_coeff_precision, qlp_coeff_precision;
+#endif
unsigned min_fixed_order, max_fixed_order, guess_fixed_order, fixed_order;
- unsigned min_qlp_coeff_precision, max_qlp_coeff_precision, qlp_coeff_precision;
unsigned rice_parameter;
unsigned _candidate_bits, _best_bits;
unsigned _best_subframe;
@@ -1988,11 +2190,18 @@
unsigned signal_is_constant = false;
guess_fixed_order = encoder->private_->local_fixed_compute_best_predictor(integer_signal+FLAC__MAX_FIXED_ORDER, frame_header->blocksize-FLAC__MAX_FIXED_ORDER, fixed_residual_bits_per_sample);
/* check for constant subframe */
- if(!encoder->private_->disable_constant_subframes && fixed_residual_bits_per_sample[1] == 0.0) {
- /* the above means integer_signal+FLAC__MAX_FIXED_ORDER is constant, now we just have to check the warmup samples */
+ if(
+ !encoder->private_->disable_constant_subframes &&
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
+ fixed_residual_bits_per_sample[1] == 0.0
+#else
+ fixed_residual_bits_per_sample[1] == FLAC__FP_ZERO
+#endif
+ ) {
+ /* the above means it's possible all samples are the same value; now double-check it: */
unsigned i;
signal_is_constant = true;
- for(i = 1; i <= FLAC__MAX_FIXED_ORDER; i++) {
+ for(i = 1; i < frame_header->blocksize; i++) {
if(integer_signal[0] != integer_signal[i]) {
signal_is_constant = false;
break;
@@ -2017,9 +2226,15 @@
min_fixed_order = max_fixed_order = guess_fixed_order;
}
for(fixed_order = min_fixed_order; fixed_order <= max_fixed_order; fixed_order++) {
- if(fixed_residual_bits_per_sample[fixed_order] >= (FLAC__real)subframe_bps)
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
+ if(fixed_residual_bits_per_sample[fixed_order] >= (FLAC__float)subframe_bps)
continue; /* don't even try */
rice_parameter = (fixed_residual_bits_per_sample[fixed_order] > 0.0)? (unsigned)(fixed_residual_bits_per_sample[fixed_order]+0.5) : 0; /* 0.5 is for rounding */
+#else
+ if(FLAC__fixedpoint_trunc(fixed_residual_bits_per_sample[fixed_order]) >= (int)subframe_bps)
+ continue; /* don't even try */
+ rice_parameter = (fixed_residual_bits_per_sample[fixed_order] > FLAC__FP_ZERO)? (unsigned)FLAC__fixedpoint_trunc(fixed_residual_bits_per_sample[fixed_order]+FLAC__FP_ONE_HALF) : 0; /* 0.5 is for rounding */
+#endif
#ifndef FLAC__SYMMETRIC_RICE
rice_parameter++; /* to account for the signed->unsigned conversion during rice coding */
#endif
@@ -2056,6 +2271,7 @@
}
}
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
/* encode lpc */
if(encoder->protected_->max_lpc_order > 0) {
if(encoder->protected_->max_lpc_order >= frame_header->blocksize)
@@ -2076,7 +2292,7 @@
}
for(lpc_order = min_lpc_order; lpc_order <= max_lpc_order; lpc_order++) {
lpc_residual_bits_per_sample = FLAC__lpc_compute_expected_bits_per_residual_sample(lpc_error[lpc_order-1], frame_header->blocksize-lpc_order);
- if(lpc_residual_bits_per_sample >= (FLAC__real)subframe_bps)
+ if(lpc_residual_bits_per_sample >= (FLAC__double)subframe_bps)
continue; /* don't even try */
rice_parameter = (lpc_residual_bits_per_sample > 0.0)? (unsigned)(lpc_residual_bits_per_sample+0.5) : 0; /* 0.5 is for rounding */
#ifndef FLAC__SYMMETRIC_RICE
@@ -2133,6 +2349,7 @@
}
}
}
+#endif /* !defined FLAC__INTEGER_ONLY_LIBRARY */
}
}
@@ -2256,6 +2473,7 @@
return FLAC__SUBFRAME_ZERO_PAD_LEN + FLAC__SUBFRAME_TYPE_LEN + FLAC__SUBFRAME_WASTED_BITS_FLAG_LEN + (order * subframe_bps) + residual_bits;
}
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
unsigned evaluate_lpc_subframe_(
FLAC__StreamEncoder *encoder,
const FLAC__int32 signal[],
@@ -2335,6 +2553,7 @@
return FLAC__SUBFRAME_ZERO_PAD_LEN + FLAC__SUBFRAME_TYPE_LEN + FLAC__SUBFRAME_WASTED_BITS_FLAG_LEN + FLAC__SUBFRAME_LPC_QLP_COEFF_PRECISION_LEN + FLAC__SUBFRAME_LPC_QLP_SHIFT_LEN + (order * (qlp_coeff_precision + subframe_bps)) + residual_bits;
}
+#endif
unsigned evaluate_verbatim_subframe_(
const FLAC__int32 signal[],
@@ -2737,7 +2956,14 @@
mean >>= 1;
}
#else
- /* calc rice_parameter ala LOCO-I */
+ /* we are basically calculating the size in bits of the
+ * average residual magnitude in the partition:
+ * rice_parameter = floor(log2(mean/partition_samples))
+ * 'mean' is not a good name for the variable, it is
+ * actually the sum of magnitudes of all residual values
+ * in the partition, so the actual mean is
+ * mean/partition_samples
+ */
for(rice_parameter = 0, k = partition_samples; k < mean; rice_parameter++, k <<= 1)
;
#endif
@@ -2943,7 +3169,14 @@
mean >>= 1;
}
#else
- /* calc rice_parameter ala LOCO-I */
+ /* we are basically calculating the size in bits of the
+ * average residual magnitude in the partition:
+ * rice_parameter = floor(log2(mean/partition_samples))
+ * 'mean' is not a good name for the variable, it is
+ * actually the sum of magnitudes of all residual values
+ * in the partition, so the actual mean is
+ * mean/partition_samples
+ */
for(rice_parameter = 0, k = partition_samples; k < mean; rice_parameter++, k <<= 1)
;
#endif
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/stream_encoder_framing.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/stream_encoder_framing.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/stream_encoder_framing.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# libFLAC++ - Free Lossless Audio Codec library
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -29,7 +29,6 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
lib_LTLIBRARIES = libFLAC++.la
-CXXFLAGS = @CXXFLAGS@
m4datadir = $(datadir)/aclocal
m4data_DATA = libFLAC++.m4
@@ -41,7 +40,7 @@
libFLAC++.m4
# see 'http://www.gnu.org/software/libtool/manual.html#SEC35' for numbering convention
-libFLAC___la_LDFLAGS = -version-info 4:1:0
+libFLAC___la_LDFLAGS = -version-info 5:0:0
libFLAC___la_LIBADD = ../libFLAC/libFLAC.la
libFLAC___la_SOURCES = \
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# libFLAC++ - Free Lossless Audio Codec library
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -114,6 +114,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -149,10 +150,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -165,12 +174,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -265,7 +279,7 @@
# see 'http://www.gnu.org/software/libtool/manual.html#SEC35' for numbering convention
-libFLAC___la_LDFLAGS = -version-info 4:1:0
+libFLAC___la_LDFLAGS = -version-info 5:0:0
libFLAC___la_LIBADD = ../libFLAC/libFLAC.la
libFLAC___la_SOURCES = \
file_decoder.cpp \
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/Makefile.lite
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/Makefile.lite 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/Makefile.lite 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# libFLAC++ - Free Lossless Audio Codec library
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/file_decoder.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/file_decoder.cpp 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/file_decoder.cpp 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC++ - Free Lossless Audio Codec library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -232,5 +232,5 @@
instance->error_callback(status);
}
- };
-};
+ }
+}
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/file_encoder.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/file_encoder.cpp 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/file_encoder.cpp 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC++ - Free Lossless Audio Codec library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -168,7 +168,7 @@
bool File::set_metadata(FLAC::Metadata::Prototype **metadata, unsigned num_blocks)
{
FLAC__ASSERT(is_valid());
-#ifdef _MSC_VER
+#if (defined _MSC_VER) || (defined __SUNPRO_CC)
// MSVC++ can't handle:
// ::FLAC__StreamMetadata *m[num_blocks];
// so we do this ugly workaround
@@ -180,7 +180,7 @@
// we can get away with this since we know the encoder will only correct the is_last flags
m[i] = const_cast< ::FLAC__StreamMetadata*>((::FLAC__StreamMetadata*)metadata[i]);
}
-#ifdef _MSC_VER
+#if (defined _MSC_VER) || (defined __SUNPRO_CC)
// complete the hack
const bool ok = (bool)::FLAC__file_encoder_set_metadata(encoder_, m, num_blocks);
delete [] m;
@@ -368,5 +368,5 @@
instance->progress_callback(bytes_written, samples_written, frames_written, total_frames_estimate);
}
- };
-};
+ }
+}
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/metadata.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/metadata.cpp 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/metadata.cpp 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC++ - Free Lossless Audio Codec library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -75,7 +75,7 @@
return ret;
}
- };
+ }
FLACPP_API Prototype *clone(const Prototype *object)
{
@@ -152,29 +152,41 @@
object_ = 0;
}
- void Prototype::operator=(const Prototype &object)
+ Prototype &Prototype::operator=(const Prototype &object)
{
FLAC__ASSERT(object.is_valid());
clear();
is_reference_ = false;
object_ = ::FLAC__metadata_object_clone(object.object_);
+ return *this;
}
- void Prototype::operator=(const ::FLAC__StreamMetadata &object)
+ Prototype &Prototype::operator=(const ::FLAC__StreamMetadata &object)
{
clear();
is_reference_ = false;
object_ = ::FLAC__metadata_object_clone(&object);
+ return *this;
}
- void Prototype::operator=(const ::FLAC__StreamMetadata *object)
+ Prototype &Prototype::operator=(const ::FLAC__StreamMetadata *object)
{
FLAC__ASSERT(0 != object);
clear();
is_reference_ = false;
object_ = ::FLAC__metadata_object_clone(object);
+ return *this;
}
+ Prototype &Prototype::assign_object(::FLAC__StreamMetadata *object, bool copy)
+ {
+ FLAC__ASSERT(0 != object);
+ clear();
+ object_ = (copy? ::FLAC__metadata_object_clone(object) : object);
+ is_reference_ = false;
+ return *this;
+ }
+
bool Prototype::get_is_last() const
{
FLAC__ASSERT(is_valid());
@@ -461,12 +473,24 @@
construct(field, field_length);
}
+ VorbisComment::Entry::Entry(const char *field)
+ {
+ zero();
+ construct(field);
+ }
+
VorbisComment::Entry::Entry(const char *field_name, const char *field_value, unsigned field_value_length)
{
zero();
construct(field_name, field_value, field_value_length);
}
+ VorbisComment::Entry::Entry(const char *field_name, const char *field_value)
+ {
+ zero();
+ construct(field_name, field_value);
+ }
+
VorbisComment::Entry::Entry(const Entry &entry)
{
FLAC__ASSERT(entry.is_valid());
@@ -474,11 +498,12 @@
construct((const char *)entry.entry_.entry, entry.entry_.length);
}
- void VorbisComment::Entry::operator=(const Entry &entry)
+ VorbisComment::Entry &VorbisComment::Entry::operator=(const Entry &entry)
{
FLAC__ASSERT(entry.is_valid());
clear();
construct((const char *)entry.entry_.entry, entry.entry_.length);
+ return *this;
}
VorbisComment::Entry::~Entry()
@@ -538,25 +563,37 @@
FLAC__ASSERT(is_valid());
FLAC__ASSERT(0 != field);
+ if(!::FLAC__format_vorbiscomment_entry_is_legal((const ::FLAC__byte*)field, field_length))
+ return is_valid_ = false;
+
clear_entry();
- if(0 == (entry_.entry = (FLAC__byte*)malloc(field_length))) {
+ if(0 == (entry_.entry = (FLAC__byte*)malloc(field_length+1))) {
is_valid_ = false;
}
else {
entry_.length = field_length;
memcpy(entry_.entry, field, field_length);
+ entry_.entry[field_length] = '\0';
(void) parse_field();
}
return is_valid_;
}
+ bool VorbisComment::Entry::set_field(const char *field)
+ {
+ return set_field(field, strlen(field));
+ }
+
bool VorbisComment::Entry::set_field_name(const char *field_name)
{
FLAC__ASSERT(is_valid());
FLAC__ASSERT(0 != field_name);
+ if(!::FLAC__format_vorbiscomment_entry_name_is_legal(field_name))
+ return is_valid_ = false;
+
clear_field_name();
if(0 == (field_name_ = strdup(field_name))) {
@@ -575,20 +612,29 @@
FLAC__ASSERT(is_valid());
FLAC__ASSERT(0 != field_value);
+ if(!::FLAC__format_vorbiscomment_entry_value_is_legal((const FLAC__byte*)field_value, field_value_length))
+ return is_valid_ = false;
+
clear_field_value();
- if(0 == (field_value_ = (char *)malloc(field_value_length))) {
+ if(0 == (field_value_ = (char *)malloc(field_value_length+1))) {
is_valid_ = false;
}
else {
field_value_length_ = field_value_length;
memcpy(field_value_, field_value, field_value_length);
+ field_value_[field_value_length] = '\0';
compose_field();
}
return is_valid_;
}
+ bool VorbisComment::Entry::set_field_value(const char *field_value)
+ {
+ return set_field_value(field_value, strlen(field_value));
+ }
+
void VorbisComment::Entry::zero()
{
is_valid_ = true;
@@ -641,17 +687,27 @@
parse_field();
}
+ void VorbisComment::Entry::construct(const char *field)
+ {
+ construct(field, strlen(field));
+ }
+
void VorbisComment::Entry::construct(const char *field_name, const char *field_value, unsigned field_value_length)
{
if(set_field_name(field_name) && set_field_value(field_value, field_value_length))
compose_field();
}
+ void VorbisComment::Entry::construct(const char *field_name, const char *field_value)
+ {
+ construct(field_name, field_value, strlen(field_value));
+ }
+
void VorbisComment::Entry::compose_field()
{
clear_entry();
- if(0 == (entry_.entry = (FLAC__byte*)malloc(field_name_length_ + 1 + field_value_length_))) {
+ if(0 == (entry_.entry = (FLAC__byte*)malloc(field_name_length_ + 1 + field_value_length_ + 1))) {
is_valid_ = false;
}
else {
@@ -661,6 +717,7 @@
entry_.length += 1;
memcpy(entry_.entry + entry_.length, field_value_, field_value_length_);
entry_.length += field_value_length_;
+ entry_.entry[entry_.length] = '\0';
is_valid_ = true;
}
}
@@ -692,11 +749,12 @@
}
else {
field_value_length_ = entry_.length - field_name_length_ - 1;
- if(0 == (field_value_ = (char *)malloc(field_value_length_))) {
+ if(0 == (field_value_ = (char *)malloc(field_value_length_ + 1))) { // +1 for the trailing \0
is_valid_ = false;
return;
}
memcpy(field_value_, ++p, field_value_length_);
+ field_value_[field_value_length_] = '\0';
}
is_valid_ = true;
@@ -720,10 +778,10 @@
return object_->data.vorbis_comment.num_comments;
}
- VorbisComment::Entry VorbisComment::get_vendor_string() const
+ const FLAC__byte *VorbisComment::get_vendor_string() const
{
FLAC__ASSERT(is_valid());
- return Entry((const char *)object_->data.vorbis_comment.vendor_string.entry, object_->data.vorbis_comment.vendor_string.length);
+ return object_->data.vorbis_comment.vendor_string.entry;
}
VorbisComment::Entry VorbisComment::get_comment(unsigned index) const
@@ -733,13 +791,11 @@
return Entry((const char *)object_->data.vorbis_comment.comments[index].entry, object_->data.vorbis_comment.comments[index].length);
}
- bool VorbisComment::set_vendor_string(const VorbisComment::Entry &entry)
+ bool VorbisComment::set_vendor_string(const FLAC__byte *string)
{
FLAC__ASSERT(is_valid());
// vendor_string is a special kind of entry
- ::FLAC__StreamMetadata_VorbisComment_Entry vendor_string;
- vendor_string.length = entry.get_field_name_length();
- vendor_string.entry = (FLAC__byte*)entry.get_field_name(); // we can cheat on const-ness because we make a copy below:
+ const ::FLAC__StreamMetadata_VorbisComment_Entry vendor_string = { strlen((const char *)string), (FLAC__byte*)string }; // we can cheat on const-ness because we make a copy below:
return (bool)::FLAC__metadata_object_vorbiscomment_set_vendor_string(object_, vendor_string, /*copy=*/true);
}
@@ -757,6 +813,12 @@
return (bool)::FLAC__metadata_object_vorbiscomment_insert_comment(object_, index, entry.get_entry(), /*copy=*/true);
}
+ bool VorbisComment::append_comment(const VorbisComment::Entry &entry)
+ {
+ FLAC__ASSERT(is_valid());
+ return (bool)::FLAC__metadata_object_vorbiscomment_append_comment(object_, entry.get_entry(), /*copy=*/true);
+ }
+
bool VorbisComment::delete_comment(unsigned index)
{
FLAC__ASSERT(is_valid());
@@ -781,11 +843,12 @@
object_(::FLAC__metadata_object_cuesheet_track_clone(track.object_))
{ }
- void CueSheet::Track::operator=(const Track &track)
+ CueSheet::Track &CueSheet::Track::operator=(const Track &track)
{
if(0 != object_)
::FLAC__metadata_object_cuesheet_track_delete(object_);
object_ = ::FLAC__metadata_object_cuesheet_track_clone(track.object_);
+ return *this;
}
CueSheet::Track::~Track()
@@ -1011,7 +1074,21 @@
return false;
}
+ FLACPP_API bool get_tags(const char *filename, VorbisComment &tags)
+ {
+ FLAC__ASSERT(0 != filename);
+ ::FLAC__StreamMetadata *object;
+
+ if(::FLAC__metadata_get_tags(filename, &object)) {
+ tags.assign(object, /*copy=*/false);
+ return true;
+ }
+ else
+ return false;
+ }
+
+
// ============================================================
//
// Level 1
@@ -1283,5 +1360,5 @@
return ret;
}
- };
-};
+ }
+}
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/seekable_stream_decoder.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/seekable_stream_decoder.cpp 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/seekable_stream_decoder.cpp 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC++ - Free Lossless Audio Codec library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -282,5 +282,5 @@
instance->error_callback(status);
}
- };
-};
+ }
+}
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/seekable_stream_encoder.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/seekable_stream_encoder.cpp 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/seekable_stream_encoder.cpp 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC++ - Free Lossless Audio Codec library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -168,7 +168,7 @@
bool SeekableStream::set_metadata(FLAC::Metadata::Prototype **metadata, unsigned num_blocks)
{
FLAC__ASSERT(is_valid());
-#ifdef _MSC_VER
+#if (defined _MSC_VER) || (defined __SUNPRO_CC)
// MSVC++ can't handle:
// ::FLAC__StreamMetadata *m[num_blocks];
// so we do this ugly workaround
@@ -180,7 +180,7 @@
// we can get away with this since we know the encoder will only correct the is_last flags
m[i] = const_cast< ::FLAC__StreamMetadata*>((::FLAC__StreamMetadata*)metadata[i]);
}
-#ifdef _MSC_VER
+#if (defined _MSC_VER) || (defined __SUNPRO_CC)
// complete the hack
const bool ok = (bool)::FLAC__seekable_stream_encoder_set_metadata(encoder_, m, num_blocks);
delete [] m;
@@ -371,5 +371,5 @@
return instance->write_callback(buffer, bytes, samples, current_frame);
}
- };
-};
+ }
+}
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/stream_decoder.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/stream_decoder.cpp 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/stream_decoder.cpp 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC++ - Free Lossless Audio Codec library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -218,5 +218,5 @@
instance->error_callback(status);
}
- };
-};
+ }
+}
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/stream_encoder.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/stream_encoder.cpp 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/stream_encoder.cpp 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libFLAC++ - Free Lossless Audio Codec library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -169,7 +169,7 @@
bool Stream::set_metadata(FLAC::Metadata::Prototype **metadata, unsigned num_blocks)
{
FLAC__ASSERT(is_valid());
-#ifdef _MSC_VER
+#if (defined _MSC_VER) || (defined __SUNPRO_CC)
// MSVC++ can't handle:
// ::FLAC__StreamMetadata *m[num_blocks];
// so we do this ugly workaround
@@ -181,7 +181,7 @@
// we can get away with this since we know the encoder will only correct the is_last flags
m[i] = const_cast< ::FLAC__StreamMetadata*>((::FLAC__StreamMetadata*)metadata[i]);
}
-#ifdef _MSC_VER
+#if (defined _MSC_VER) || (defined __SUNPRO_CC)
// complete the hack
const bool ok = (bool)::FLAC__stream_encoder_set_metadata(encoder_, m, num_blocks);
delete [] m;
@@ -356,5 +356,5 @@
instance->metadata_callback(metadata);
}
- };
-};
+ }
+}
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# libOggFLAC - Free Lossless Audio Codec + Ogg library
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -32,8 +32,9 @@
if DEBUG
DEBUGCFLAGS =
endif
-CFLAGS = @CFLAGS@ @OGG_CFLAGS@ $(DEBUGCFLAGS)
+AM_CFLAGS = @OGG_CFLAGS@ $(DEBUGCFLAGS)
+
SUBDIRS = include .
m4datadir = $(datadir)/aclocal
@@ -47,7 +48,7 @@
libOggFLAC_la_LIBADD = @OGG_LIBS@ ../libFLAC/libFLAC.la
# see 'http://www.gnu.org/software/libtool/manual.html#SEC35' for numbering convention
-libOggFLAC_la_LDFLAGS = -version-info 2:1:1
+libOggFLAC_la_LDFLAGS = -version-info 3:0:0
libOggFLAC_la_SOURCES = \
file_decoder.c \
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# libOggFLAC - Free Lossless Audio Codec + Ogg library
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -125,6 +125,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -133,7 +134,7 @@
CCAS = @CCAS@
CCASFLAGS = @CCASFLAGS@
CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@ @OGG_CFLAGS@ $(DEBUGCFLAGS)
+CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
@@ -160,10 +161,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -176,12 +185,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -267,6 +281,7 @@
target_alias = @target_alias@
lib_LTLIBRARIES = libOggFLAC.la
@DEBUG_TRUE at DEBUGCFLAGS =
+AM_CFLAGS = @OGG_CFLAGS@ $(DEBUGCFLAGS)
SUBDIRS = include .
m4datadir = $(datadir)/aclocal
m4data_DATA = libOggFLAC.m4
@@ -278,7 +293,7 @@
libOggFLAC_la_LIBADD = @OGG_LIBS@ ../libFLAC/libFLAC.la
# see 'http://www.gnu.org/software/libtool/manual.html#SEC35' for numbering convention
-libOggFLAC_la_LDFLAGS = -version-info 2:1:1
+libOggFLAC_la_LDFLAGS = -version-info 3:0:0
libOggFLAC_la_SOURCES = \
file_decoder.c \
file_encoder.c \
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/Makefile.lite
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/Makefile.lite 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/Makefile.lite 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# libOggFLAC - Free Lossless Audio Codec + Ogg library
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -44,7 +44,7 @@
DEFINES =
endif
endif
-INCLUDES = -I./include -I$(topdir)/include -I$(HOME)/local/include
+INCLUDES = -I./include -I$(topdir)/include -I$(OGG_INCLUDE_DIR)
DEBUG_CFLAGS =
SRCS_C = \
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/file_decoder.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/file_decoder.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/file_decoder.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/file_encoder.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/file_encoder.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/file_encoder.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# libOggFLAC - Free Lossless Audio Codec + Ogg library
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# libOggFLAC - Free Lossless Audio Codec + Ogg library
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -89,6 +89,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -124,10 +125,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -140,12 +149,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/private/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/private/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/private/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# libOggFLAC - Free Lossless Audio Codec + Ogg library
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/private/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/private/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/private/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# libOggFLAC - Free Lossless Audio Codec + Ogg library
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -85,6 +85,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -120,10 +121,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -136,12 +145,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/private/all.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/private/all.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/private/all.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/private/ogg_decoder_aspect.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/private/ogg_decoder_aspect.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/private/ogg_decoder_aspect.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/private/ogg_encoder_aspect.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/private/ogg_encoder_aspect.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/private/ogg_encoder_aspect.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/private/ogg_helper.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/private/ogg_helper.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/private/ogg_helper.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2004 Josh Coalson
+ * Copyright (C) 2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/private/ogg_mapping.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/private/ogg_mapping.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/private/ogg_mapping.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2004 Josh Coalson
+ * Copyright (C) 2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# libOggFLAC - Free Lossless Audio Codec + Ogg library
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# libOggFLAC - Free Lossless Audio Codec + Ogg library
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -85,6 +85,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -120,10 +121,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -136,12 +145,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/all.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/all.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/all.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/file_decoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/file_decoder.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/file_decoder.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -33,7 +33,6 @@
#define OggFLAC__PROTECTED__FILE_DECODER_H
#include "OggFLAC/file_decoder.h"
-#include "private/ogg_decoder_aspect.h"
typedef struct OggFLAC__FileDecoderProtected {
OggFLAC__FileDecoderState state;
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/file_encoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/file_encoder.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/file_encoder.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/seekable_stream_decoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/seekable_stream_decoder.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/seekable_stream_decoder.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -33,7 +33,6 @@
#define OggFLAC__PROTECTED__SEEKABLE_STREAM_DECODER_H
#include "OggFLAC/seekable_stream_decoder.h"
-#include "private/ogg_decoder_aspect.h"
typedef struct OggFLAC__SeekableStreamDecoderProtected {
FLAC__bool md5_checking; /* if true, generate MD5 signature of decoded data and compare against signature in the STREAMINFO metadata block */
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/seekable_stream_encoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/seekable_stream_encoder.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/seekable_stream_encoder.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/stream_decoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/stream_decoder.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/stream_decoder.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/stream_encoder.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/stream_encoder.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/include/protected/stream_encoder.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/ogg_decoder_aspect.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/ogg_decoder_aspect.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/ogg_decoder_aspect.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/ogg_encoder_aspect.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/ogg_encoder_aspect.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/ogg_encoder_aspect.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/ogg_helper.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/ogg_helper.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/ogg_helper.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2004 Josh Coalson
+ * Copyright (C) 2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -102,7 +102,7 @@
}
/* allocate space for the page header */
- if(0 == (page->header = malloc(OGG_MAX_HEADER_LEN))) {
+ if(0 == (page->header = (unsigned char *)malloc(OGG_MAX_HEADER_LEN))) {
encoder->protected_->state = OggFLAC__SEEKABLE_STREAM_ENCODER_MEMORY_ALLOCATION_ERROR;
return false;
}
@@ -144,7 +144,7 @@
}
/* allocate space for the page body */
- if(0 == (page->body = malloc(page->body_len))) {
+ if(0 == (page->body = (unsigned char *)malloc(page->body_len))) {
encoder->protected_->state = OggFLAC__SEEKABLE_STREAM_ENCODER_MEMORY_ALLOCATION_ERROR;
return false;
}
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/ogg_mapping.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/ogg_mapping.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/ogg_mapping.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2004 Josh Coalson
+ * Copyright (C) 2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/seekable_stream_decoder.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/seekable_stream_decoder.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/seekable_stream_decoder.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -35,6 +35,7 @@
#include "FLAC/assert.h"
#include "protected/seekable_stream_decoder.h"
#include "protected/stream_decoder.h"
+#include "../libFLAC/include/private/float.h" /* @@@ ugly hack, but how else to do? we need to reuse the float formats but don't want to expose it */
#include "../libFLAC/include/private/md5.h" /* @@@ ugly hack, but how else to do? we need to reuse the md5 code but don't want to expose it */
/***********************************************************************
@@ -721,6 +722,11 @@
(void)decoder;
if(seekable_stream_decoder->private_->eof_callback(seekable_stream_decoder, seekable_stream_decoder->private_->client_data)) {
*bytes = 0;
+#if 0
+ /*@@@@@@ we used to do this: */
+ seekable_stream_decoder->protected_->state = OggFLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM;
+ /* but it causes a problem because the Ogg decoding layer reads as much as it can to get pages, so the state will get to end-of-stream before the bitbuffer does */
+#endif
return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
}
else if(*bytes > 0) {
@@ -730,6 +736,11 @@
}
if(*bytes == 0) {
if(seekable_stream_decoder->private_->eof_callback(seekable_stream_decoder, seekable_stream_decoder->private_->client_data)) {
+#if 0
+ /*@@@@@@ we used to do this: */
+ seekable_stream_decoder->protected_->state = OggFLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM;
+ /* but it causes a problem because the Ogg decoding layer reads as much as it can to get pages, so the state will get to end-of-stream before the bitbuffer does */
+#endif
return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
}
else
@@ -831,7 +842,7 @@
FLAC__uint64 left_pos = 0, right_pos = stream_length;
FLAC__uint64 left_sample = 0, right_sample = decoder->private_->stream_info.total_samples;
FLAC__uint64 this_frame_sample = 0; /* only initialized to avoid compiler warning */
- FLAC__uint64 pos; /* only initialized to avoid compiler warning */
+ FLAC__uint64 pos = 0; /* only initialized to avoid compiler warning */
FLAC__bool did_a_seek;
unsigned iteration = 0;
@@ -862,12 +873,20 @@
pos = (right_pos + left_pos) / 2;
}
else {
+#ifndef FLAC__INTEGER_ONLY_LIBRARY
#if defined _MSC_VER || defined __MINGW32__
/* with MSVC you have to spoon feed it the casting */
- pos = (FLAC__uint64)((double)(FLAC__int64)(target_sample - left_sample) / (double)(FLAC__int64)(right_sample - left_sample) * (double)(FLAC__int64)(right_pos - left_pos));
+ pos = (FLAC__uint64)((FLAC__double)(FLAC__int64)(target_sample - left_sample) / (FLAC__double)(FLAC__int64)(right_sample - left_sample) * (FLAC__double)(FLAC__int64)(right_pos - left_pos));
#else
- pos = (FLAC__uint64)((double)(target_sample - left_sample) / (double)(right_sample - left_sample) * (double)(right_pos - left_pos));
+ pos = (FLAC__uint64)((FLAC__double)(target_sample - left_sample) / (FLAC__double)(right_sample - left_sample) * (FLAC__double)(right_pos - left_pos));
#endif
+#else
+ /* a little less accurate: */
+ if ((target_sample-left_sample <= 0xffffffff) && (right_pos-left_pos <= 0xffffffff))
+ pos = (FLAC__int64)(((target_sample-left_sample) * (right_pos-left_pos)) / (right_sample-left_sample));
+ else /* @@@ WATCHOUT, ~2TB limit */
+ pos = (FLAC__int64)((((target_sample-left_sample)>>8) * ((right_pos-left_pos)>>8)) / ((right_sample-left_sample)>>16));
+#endif
/* @@@ TODO: might want to limit pos to some distance
* before EOF, to make sure we land before the last frame,
* thereby getting a this_fram_sample and so having a better
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/seekable_stream_encoder.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/seekable_stream_encoder.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/seekable_stream_encoder.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/stream_decoder.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/stream_decoder.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/stream_decoder.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/stream_encoder.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/stream_encoder.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC/stream_encoder.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# libOggFLAC++ - Free Lossless Audio Codec + Ogg library
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -29,7 +29,6 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
lib_LTLIBRARIES = libOggFLAC++.la
-CXXFLAGS = @CXXFLAGS@
m4datadir = $(datadir)/aclocal
m4data_DATA = libOggFLAC++.m4
@@ -41,7 +40,7 @@
libOggFLAC++.m4
# see 'http://www.gnu.org/software/libtool/manual.html#SEC35' for numbering convention
-libOggFLAC___la_LDFLAGS = -version-info 1:1:1
+libOggFLAC___la_LDFLAGS = -version-info 2:0:0
libOggFLAC___la_LIBADD = ../libOggFLAC/libOggFLAC.la
libOggFLAC___la_SOURCES = \
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# libOggFLAC++ - Free Lossless Audio Codec + Ogg library
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -113,6 +113,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -148,10 +149,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -164,12 +173,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -264,7 +278,7 @@
# see 'http://www.gnu.org/software/libtool/manual.html#SEC35' for numbering convention
-libOggFLAC___la_LDFLAGS = -version-info 1:1:1
+libOggFLAC___la_LDFLAGS = -version-info 2:0:0
libOggFLAC___la_LIBADD = ../libOggFLAC/libOggFLAC.la
libOggFLAC___la_SOURCES = \
file_decoder.cpp \
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/Makefile.lite
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/Makefile.lite 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/Makefile.lite 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# libOggFLAC++ - Free Lossless Audio Codec + Ogg library
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/file_decoder.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/file_decoder.cpp 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/file_decoder.cpp 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC++ - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -238,5 +238,5 @@
instance->error_callback(status);
}
- };
-};
+ }
+}
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/file_encoder.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/file_encoder.cpp 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/file_encoder.cpp 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC++ - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -349,5 +349,5 @@
instance->progress_callback(bytes_written, samples_written, frames_written, total_frames_estimate);
}
- };
-};
+ }
+}
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/seekable_stream_decoder.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/seekable_stream_decoder.cpp 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/seekable_stream_decoder.cpp 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC++ - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -288,5 +288,5 @@
instance->error_callback(status);
}
- };
-};
+ }
+}
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/seekable_stream_encoder.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/seekable_stream_encoder.cpp 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/seekable_stream_encoder.cpp 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC++ - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -362,5 +362,5 @@
return instance->write_callback(buffer, bytes, samples, current_frame);
}
- };
-};
+ }
+}
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/stream_decoder.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/stream_decoder.cpp 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/stream_decoder.cpp 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC++ - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -224,5 +224,5 @@
instance->error_callback(status);
}
- };
-};
+ }
+}
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/stream_encoder.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/stream_encoder.cpp 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libOggFLAC++/stream_encoder.cpp 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libOggFLAC++ - Free Lossless Audio Codec + Ogg library
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -342,5 +342,5 @@
instance->metadata_callback(metadata);
}
- };
-};
+ }
+}
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# metaflac - Command-line FLAC metadata editor
-# Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -16,7 +16,6 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
bin_PROGRAMS = metaflac
-CFLAGS = @CFLAGS@
EXTRA_DIST = \
Makefile.lite \
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# metaflac - Command-line FLAC metadata editor
-# Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -107,6 +107,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -142,10 +143,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -158,12 +167,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/Makefile.lite
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/Makefile.lite 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/Makefile.lite 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# metaflac - Command-line FLAC metadata editor
-# Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -20,11 +20,18 @@
#
topdir = ../..
+libdir = $(topdir)/obj/$(BUILD)/lib
PROGRAM_NAME = metaflac
-INCLUDES = -I./include -I$(topdir)/include
-LIBS = -lgrabbag -lFLAC -lreplaygain_analysis -lgetopt -lutf8 -lm
+INCLUDES = -I./include -I$(topdir)/include
+
+ifeq ($(DARWIN_BUILD),yes)
+EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libFLAC.a $(libdir)/libreplaygain_analysis.a $(libdir)/libgetopt.a $(libdir)/libutf8.a -L$(ICONV_LIB_DIR) -liconv -lm
+else
+LIBS = -lgrabbag -lFLAC -lreplaygain_analysis -lgetopt -lutf8 -L$(ICONV_LIB_DIR) -liconv -lm
+endif
+
SRCS_C = \
main.c \
operations.c \
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/main.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/main.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/main.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* metaflac - Command-line FLAC metadata editor
- * Copyright (C) 2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/operations.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/operations.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/operations.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* metaflac - Command-line FLAC metadata editor
- * Copyright (C) 2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -110,6 +110,7 @@
if(!FLAC__metadata_chain_read(chain, filename)) {
print_error_with_chain_status(chain, "%s: ERROR: reading metadata", filename);
+ FLAC__metadata_chain_delete(chain);
return false;
}
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/operations.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/operations.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/operations.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* metaflac - Command-line FLAC metadata editor
- * Copyright (C) 2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/operations_shorthand_cuesheet.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/operations_shorthand_cuesheet.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/operations_shorthand_cuesheet.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* metaflac - Command-line FLAC metadata editor
- * Copyright (C) 2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/operations_shorthand_seektable.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/operations_shorthand_seektable.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/operations_shorthand_seektable.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* metaflac - Command-line FLAC metadata editor
- * Copyright (C) 2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/operations_shorthand_streaminfo.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/operations_shorthand_streaminfo.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/operations_shorthand_streaminfo.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* metaflac - Command-line FLAC metadata editor
- * Copyright (C) 2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/operations_shorthand_vorbiscomment.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/operations_shorthand_vorbiscomment.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/operations_shorthand_vorbiscomment.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* metaflac - Command-line FLAC metadata editor
- * Copyright (C) 2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -192,7 +192,7 @@
entry.length = strlen((const char *)entry.entry);
- if(!FLAC__metadata_object_vorbiscomment_insert_comment(block, block->data.vorbis_comment.num_comments, entry, /*copy=*/true)) {
+ if(!FLAC__metadata_object_vorbiscomment_append_comment(block, entry, /*copy=*/true)) {
if(needs_free)
free(converted);
fprintf(stderr, "%s: ERROR: memory allocation failure\n", filename);
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/options.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/options.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/options.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* metaflac - Command-line FLAC metadata editor
- * Copyright (C) 2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -183,7 +183,7 @@
if(options->num_files > 0) {
unsigned i = 0;
- if(0 == (options->filenames = malloc(sizeof(char *) * options->num_files)))
+ if(0 == (options->filenames = (char**)malloc(sizeof(char*) * options->num_files)))
die("out of memory allocating space for file names list");
while(share__optind < argc)
options->filenames[i++] = local_strdup(argv[share__optind++]);
@@ -655,14 +655,14 @@
{
if(options->ops.capacity == 0) {
options->ops.capacity = 50;
- if(0 == (options->ops.operations = malloc(sizeof(Operation) * options->ops.capacity)))
+ if(0 == (options->ops.operations = (Operation*)malloc(sizeof(Operation) * options->ops.capacity)))
die("out of memory allocating space for option list");
memset(options->ops.operations, 0, sizeof(Operation) * options->ops.capacity);
}
if(options->ops.capacity <= options->ops.num_operations) {
unsigned original_capacity = options->ops.capacity;
options->ops.capacity *= 4;
- if(0 == (options->ops.operations = realloc(options->ops.operations, sizeof(Operation) * options->ops.capacity)))
+ if(0 == (options->ops.operations = (Operation*)realloc(options->ops.operations, sizeof(Operation) * options->ops.capacity)))
die("out of memory allocating space for option list");
memset(options->ops.operations + original_capacity, 0, sizeof(Operation) * (options->ops.capacity - original_capacity));
}
@@ -674,14 +674,14 @@
{
if(options->args.capacity == 0) {
options->args.capacity = 50;
- if(0 == (options->args.arguments = malloc(sizeof(Argument) * options->args.capacity)))
+ if(0 == (options->args.arguments = (Argument*)malloc(sizeof(Argument) * options->args.capacity)))
die("out of memory allocating space for option list");
memset(options->args.arguments, 0, sizeof(Argument) * options->args.capacity);
}
if(options->args.capacity <= options->args.num_arguments) {
unsigned original_capacity = options->args.capacity;
options->args.capacity *= 4;
- if(0 == (options->args.arguments = realloc(options->args.arguments, sizeof(Argument) * options->args.capacity)))
+ if(0 == (options->args.arguments = (Argument*)realloc(options->args.arguments, sizeof(Argument) * options->args.capacity)))
die("out of memory allocating space for option list");
memset(options->args.arguments + original_capacity, 0, sizeof(Argument) * (options->args.capacity - original_capacity));
}
@@ -897,7 +897,7 @@
/* make space */
FLAC__ASSERT(out->num_entries > 0);
- if(0 == (out->entries = malloc(sizeof(unsigned) * out->num_entries)))
+ if(0 == (out->entries = (unsigned*)malloc(sizeof(unsigned) * out->num_entries)))
die("out of memory allocating space for option list");
/* load 'em up */
@@ -936,7 +936,7 @@
/* make space */
FLAC__ASSERT(out->num_entries > 0);
- if(0 == (out->entries = malloc(sizeof(Argument_BlockTypeEntry) * out->num_entries)))
+ if(0 == (out->entries = (Argument_BlockTypeEntry*)malloc(sizeof(Argument_BlockTypeEntry) * out->num_entries)))
die("out of memory allocating space for option list");
/* load 'em up */
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/options.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/options.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/options.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* metaflac - Command-line FLAC metadata editor
- * Copyright (C) 2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/usage.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/usage.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/usage.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* metaflac - Command-line FLAC metadata editor
- * Copyright (C) 2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -25,7 +25,7 @@
{
fprintf(out, "==============================================================================\n");
fprintf(out, "metaflac - Command-line FLAC metadata editor version %s\n", FLAC__VERSION_STRING);
- fprintf(out, "Copyright (C) 2001,2002,2003,2004 Josh Coalson\n");
+ fprintf(out, "Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson\n");
fprintf(out, "\n");
fprintf(out, "This program is free software; you can redistribute it and/or\n");
fprintf(out, "modify it under the terms of the GNU General Public License\n");
@@ -57,7 +57,7 @@
fprintf(out, " (the default if more than one FLAC file is specified)\n");
fprintf(out, "--no-filename Do not prefix each output line with the FLAC file name\n");
fprintf(out, " (the default if only one FLAC file is specified)\n");
- fprintf(out, "--no-utf8-convert Do not convert Vorbis comments from UTF-8 to local charset,\n");
+ fprintf(out, "--no-utf8-convert Do not convert tags from UTF-8 to local charset,\n");
fprintf(out, " or vice versa. This is useful for scripts.\n");
fprintf(out, "--dont-use-padding By default metaflac tries to use padding where possible\n");
fprintf(out, " to avoid rewriting the entire file if the metadata size\n");
@@ -130,12 +130,12 @@
fprintf(out, "--export-tags-to=FILE Export tags to a file. Use '-' for stdin. Each line\n");
fprintf(out, " will be of the form NAME=VALUE. Specify\n");
fprintf(out, " --no-utf8-convert if necessary.\n");
- fprintf(out, "--import-cuesheet-from=FILE Import a cuesheet from a file. Only one FLAC\n");
- fprintf(out, " file may be specified. A seekpoint will be added for\n");
- fprintf(out, " each index point in the cuesheet to the SEEKTABLE unless\n");
- fprintf(out, " --no-cued-seekpoints is specified.\n");
+ fprintf(out, "--import-cuesheet-from=FILE Import a cuesheet from a file. Use '-' for stdin.\n");
+ fprintf(out, " Only one FLAC file may be specified. A seekpoint will be\n");
+ fprintf(out, " added for each index point in the cuesheet to the SEEKTABLE\n");
+ fprintf(out, " unless --no-cued-seekpoints is specified.\n");
fprintf(out, "--export-cuesheet-to=FILE Export CUESHEET block to a cuesheet file, suitable\n");
- fprintf(out, " for use by CD authoring software. Use '-' for stdin.\n");
+ fprintf(out, " for use by CD authoring software. Use '-' for stdout.\n");
fprintf(out, " Only one FLAC file may be specified on the command line.\n");
fprintf(out, "--add-replay-gain Calculates the title and album gains/peaks of the given\n");
fprintf(out, " FLAC files as if all the files were part of one album,\n");
@@ -180,7 +180,7 @@
fprintf(out, "\n");
fprintf(out, " --block-type=type[,type[...]]\n");
fprintf(out, " --except-block-type=type[,type[...]]\n");
- fprintf(out, " An optional comma-separated list of block types to included or ignored\n");
+ fprintf(out, " An optional comma-separated list of block types to be included or ignored\n");
fprintf(out, " with this option. Use only one of --block-type or --except-block-type.\n");
fprintf(out, " The valid block types are: STREAMINFO, PADDING, APPLICATION, SEEKTABLE,\n");
fprintf(out, " VORBIS_COMMENT. You may narrow down the types of APPLICATION blocks\n");
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/usage.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/usage.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/usage.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* metaflac - Command-line FLAC metadata editor
- * Copyright (C) 2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/utils.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/utils.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/utils.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* metaflac - Command-line FLAC metadata editor
- * Copyright (C) 2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -64,7 +64,7 @@
if(nsource == 0)
return;
- *dest = realloc(*dest, ndest + nsource + 1);
+ *dest = (char*)realloc(*dest, ndest + nsource + 1);
if(0 == *dest)
die("out of memory growing string");
strcpy((*dest)+ndest, source);
@@ -220,24 +220,16 @@
if(!raw) {
/*
- * utf8_decode() works on NULL-terminated strings, so
- * we append a null to the entry. @@@ Note, this means
- * that comments that contain an embedded null will be
- * truncated by utf_decode().
+ * WATCHOUT: comments that contain an embedded null will
+ * be truncated by utf_decode().
*/
- char *terminated, *converted;
+ char *converted;
- if(0 == (terminated = malloc(entry->length + 1)))
- die("out of memory allocating space for vorbis comment");
- memcpy(terminated, entry->entry, entry->length);
- terminated[entry->length] = '\0';
- if(utf8_decode(terminated, &converted) >= 0) {
+ if(utf8_decode(entry->entry, &converted) >= 0) {
(void) local_fwrite(converted, 1, strlen(converted), f);
- free(terminated);
free(converted);
}
else {
- free(terminated);
(void) local_fwrite(entry->entry, 1, entry->length, f);
}
}
@@ -246,7 +238,7 @@
}
}
- fprintf(f, "\n");
+ putc('\n', f);
}
void write_vc_fields(const char *filename, const char *field_name, const FLAC__StreamMetadata_VorbisComment_Entry entry[], unsigned num_entries, FLAC__bool raw, FILE *f)
@@ -255,7 +247,7 @@
const unsigned field_name_length = (0 != field_name)? strlen(field_name) : 0;
for(i = 0; i < num_entries; i++) {
- if(0 == field_name || FLAC__metadata_object_vorbiscomment_entry_matches(entry + i, field_name, field_name_length))
+ if(0 == field_name || FLAC__metadata_object_vorbiscomment_entry_matches(entry[i], field_name, field_name_length))
write_vc_field(filename, entry + i, raw, f);
}
}
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/utils.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/utils.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/metaflac/utils.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* metaflac - Command-line FLAC metadata editor
- * Copyright (C) 2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/monkeys_audio_utilities/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/monkeys_audio_utilities/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/monkeys_audio_utilities/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/monkeys_audio_utilities/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/monkeys_audio_utilities/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/monkeys_audio_utilities/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
@@ -76,6 +76,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -111,10 +112,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -127,12 +136,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/monkeys_audio_utilities/flac_mac/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/monkeys_audio_utilities/flac_mac/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/monkeys_audio_utilities/flac_mac/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# flac_mac - wedge utility to add FLAC support to Monkey's Audio
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/monkeys_audio_utilities/flac_mac/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/monkeys_audio_utilities/flac_mac/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/monkeys_audio_utilities/flac_mac/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# flac_mac - wedge utility to add FLAC support to Monkey's Audio
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -67,6 +67,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -102,10 +103,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -118,12 +127,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/monkeys_audio_utilities/flac_mac/main.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/monkeys_audio_utilities/flac_mac/main.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/monkeys_audio_utilities/flac_mac/main.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* flac_mac - wedge utility to add FLAC support to Monkey's Audio
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/monkeys_audio_utilities/flac_ren/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/monkeys_audio_utilities/flac_ren/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/monkeys_audio_utilities/flac_ren/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# flac_ren - renamer part of utility to add FLAC support to Monkey's Audio
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/monkeys_audio_utilities/flac_ren/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/monkeys_audio_utilities/flac_ren/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/monkeys_audio_utilities/flac_ren/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# flac_ren - renamer part of utility to add FLAC support to Monkey's Audio
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -67,6 +67,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -102,10 +103,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -118,12 +127,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/monkeys_audio_utilities/flac_ren/main.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/monkeys_audio_utilities/flac_ren/main.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/monkeys_audio_utilities/flac_ren/main.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* flac_ren - renamer part of utility to add FLAC support to Monkey's Audio
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,4 +1,19 @@
-## Process this file with automake to produce Makefile.in
+# plugin_common - Routines common to several plugins
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
AUTOMAKE_OPTIONS = foreign
@@ -8,18 +23,16 @@
noinst_HEADERS = \
all.h \
- canonical_tag.h \
charset.h \
defs.h \
dither.h \
locale_hack.h \
- vorbiscomment.h
+ tags.h
libplugin_common_la_SOURCES = \
- canonical_tag.c \
charset.c \
dither.c \
- vorbiscomment.c
+ tags.c
EXTRA_DIST = \
Makefile.lite \
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -14,7 +14,24 @@
@SET_MAKE@
+# plugin_common - Routines common to several plugins
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
SOURCES = $(libplugin_common_la_SOURCES)
srcdir = @srcdir@
@@ -50,15 +67,13 @@
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libplugin_common_la_LIBADD =
-am_libplugin_common_la_OBJECTS = canonical_tag.lo charset.lo dither.lo \
- vorbiscomment.lo
+am_libplugin_common_la_OBJECTS = charset.lo dither.lo tags.lo
libplugin_common_la_OBJECTS = $(am_libplugin_common_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/canonical_tag.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/charset.Plo ./$(DEPDIR)/dither.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/vorbiscomment.Plo
+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/charset.Plo ./$(DEPDIR)/dither.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/tags.Plo
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
@@ -77,6 +92,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -112,10 +128,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -128,12 +152,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -222,18 +251,16 @@
noinst_LTLIBRARIES = libplugin_common.la
noinst_HEADERS = \
all.h \
- canonical_tag.h \
charset.h \
defs.h \
dither.h \
locale_hack.h \
- vorbiscomment.h
+ tags.h
libplugin_common_la_SOURCES = \
- canonical_tag.c \
charset.c \
dither.c \
- vorbiscomment.c
+ tags.c
EXTRA_DIST = \
Makefile.lite \
@@ -291,10 +318,9 @@
distclean-compile:
-rm -f *.tab.c
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/canonical_tag.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/charset.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dither.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/vorbiscomment.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tags.Plo at am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/Makefile.lite
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/Makefile.lite 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/Makefile.lite 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,18 +1,34 @@
+# plugin_common - Routines common to several plugins
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+#
# GNU makefile
#
topdir = ../..
LIB_NAME = libplugin_common
-INCLUDES = -I$(topdir)/include -I$(HOME)/local/include
+INCLUDES = -I$(topdir)/include -I$(HOME)/local/include -I$(ICONV_INCLUDE_DIR)
DEFINES =
SRCS_C = \
- canonical_tag.c \
charset.c \
dither.c \
- vorbiscomment.c
+ tags.c
include $(topdir)/build/lib.mk
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/all.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/all.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/all.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* plugin_common - Routines common to several plugins
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -19,10 +19,9 @@
#ifndef FLAC__PLUGIN_COMMON__ALL_H
#define FLAC__PLUGIN_COMMON__ALL_H
-#include "canonical_tag.h"
#include "charset.h"
#include "dither.h"
#include "locale_hack.h"
-#include "vorbiscomment.h"
+#include "tags.h"
#endif
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/charset.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/charset.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/charset.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* plugin_common - Routines common to several plugins
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Only slightly modified charset.c from:
* EasyTAG - Tag editor for MP3 and OGG files
@@ -83,7 +83,7 @@
/* Due to a GLIBC bug, round outbuf_size up to a multiple of 4 */
/* + 1 for nul in case len == 1 */
outsize = ((length + 3) & ~3) + 1;
- out = malloc(outsize);
+ out = (char*)malloc(outsize);
outleft = outsize - 1;
outptr = out;
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/charset.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/charset.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/charset.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* plugin_common - Routines common to several plugins
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Only slightly modified charset.h from:
* charset.h - 2001/12/04
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/defs.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/defs.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/defs.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* plugin_common - Routines common to several plugins
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/dither.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/dither.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/dither.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* plugin_common - Routines common to several plugins
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* dithering routine derived from (other GPLed source):
* mad - MPEG audio decoder
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/dither.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/dither.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/dither.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* plugin_common - Routines common to several plugins
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/locale_hack.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/locale_hack.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/locale_hack.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* plugin_common - Routines common to several plugins
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* Based on:
* locale.h - 2000/05/05 13:10 Jerome Couderc
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/plugin_common_static.dsp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/plugin_common_static.dsp 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/plugin_common_static.dsp 2005-10-20 12:55:24 UTC (rev 10204)
@@ -85,10 +85,6 @@
# PROP Default_Filter "cpp"
# Begin Source File
-SOURCE=.\canonical_tag.c
-# End Source File
-# Begin Source File
-
SOURCE=.\charset.c
# End Source File
# Begin Source File
@@ -97,7 +93,7 @@
# End Source File
# Begin Source File
-SOURCE=.\vorbiscomment.c
+SOURCE=.\tags.c
# End Source File
# End Group
# Begin Group "Public Header Files"
@@ -109,10 +105,6 @@
# End Source File
# Begin Source File
-SOURCE=.\canonical_tag.h
-# End Source File
-# Begin Source File
-
SOURCE=.\charset.h
# End Source File
# Begin Source File
@@ -125,7 +117,7 @@
# End Source File
# Begin Source File
-SOURCE=.\vorbiscomment.h
+SOURCE=.\tags.h
# End Source File
# End Group
# End Target
Added: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/tags.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/tags.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/tags.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -0,0 +1,307 @@
+/* plugin_common - Routines common to several plugins
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "tags.h"
+#include "FLAC/assert.h"
+#include "FLAC/metadata.h"
+
+
+static __inline unsigned local__wide_strlen(const FLAC__uint16 *s)
+{
+ unsigned n = 0;
+ while(*s++)
+ n++;
+ return n;
+}
+
+static __inline unsigned local__utf8len(const FLAC__byte *utf8)
+{
+ FLAC__ASSERT(0 != utf8);
+ if ((utf8[0] & 0x80) == 0)
+ return 1;
+ else if ((utf8[0] & 0xE0) == 0xC0 && (utf8[1] & 0xC0) == 0x80)
+ return 2;
+ else if ((utf8[0] & 0xF0) == 0xE0 && (utf8[1] & 0xC0) == 0x80 && (utf8[2] & 0xC0) == 0x80)
+ return 3;
+ else
+ return 0;
+}
+
+static __inline unsigned local__utf8_to_ucs2(const FLAC__byte *utf8, FLAC__uint16 *ucs2)
+{
+ const unsigned len = local__utf8len(utf8);
+
+ FLAC__ASSERT(0 != ucs2);
+
+ if (len == 1)
+ *ucs2 = *utf8;
+ else if (len == 2)
+ *ucs2 = (*utf8 & 0x3F)<<6 | (*(utf8+1) & 0x3F);
+ else if (len == 3)
+ *ucs2 = (*utf8 & 0x1F)<<12 | (*(utf8+1) & 0x3F)<<6 | (*(utf8+2) & 0x3F);
+
+ return len;
+}
+
+static FLAC__uint16 *local__convert_utf8_to_ucs2(const char *src, unsigned length)
+{
+ FLAC__uint16 *out;
+ unsigned chars = 0;
+
+ FLAC__ASSERT(0 != src);
+
+ /* calculate length */
+ {
+ const char *s, *end;
+ for (s=src, end=src+length; s<end; chars++) {
+ const unsigned n = local__utf8len(s);
+ if (n == 0)
+ return 0;
+ s += n;
+ }
+ FLAC__ASSERT(s == end);
+ }
+
+ /* allocate */
+ out = (FLAC__uint16*)malloc(chars * sizeof(FLAC__uint16));
+ if (0 == out) {
+ FLAC__ASSERT(0);
+ return 0;
+ }
+
+ /* convert */
+ {
+ FLAC__uint16 *u = out;
+ for ( ; chars; chars--)
+ src += local__utf8_to_ucs2(src, u++);
+ }
+
+ return out;
+}
+
+static __inline unsigned local__ucs2len(FLAC__uint16 ucs2)
+{
+ if (ucs2 < 0x0080)
+ return 1;
+ else if (ucs2 < 0x0800)
+ return 2;
+ else
+ return 3;
+}
+
+static __inline unsigned local__ucs2_to_utf8(FLAC__uint16 ucs2, FLAC__byte *utf8)
+{
+ if (ucs2 < 0x080) {
+ utf8[0] = (FLAC__byte)ucs2;
+ return 1;
+ }
+ else if (ucs2 < 0x800) {
+ utf8[0] = 0xc0 | (ucs2 >> 6);
+ utf8[1] = 0x80 | (ucs2 & 0x3f);
+ return 2;
+ }
+ else {
+ utf8[0] = 0xe0 | (ucs2 >> 12);
+ utf8[1] = 0x80 | ((ucs2 >> 6) & 0x3f);
+ utf8[2] = 0x80 | (ucs2 & 0x3f);
+ return 3;
+ }
+}
+
+static char *local__convert_ucs2_to_utf8(const FLAC__uint16 *src, unsigned length)
+{
+ char *out;
+ unsigned len = 0;
+
+ FLAC__ASSERT(0 != src);
+
+ /* calculate length */
+ {
+ unsigned i;
+ for (i = 0; i < length; i++)
+ len += local__ucs2len(src[i]);
+ }
+
+ /* allocate */
+ out = (char*)malloc(len * sizeof(char));
+ if (0 == out)
+ return 0;
+
+ /* convert */
+ {
+ char *u = out;
+ for ( ; *src; src++)
+ u += local__ucs2_to_utf8(*src, u);
+ local__ucs2_to_utf8(*src, u);
+ }
+
+ return out;
+}
+
+
+FLAC__bool FLAC_plugin__tags_get(const char *filename, FLAC__StreamMetadata **tags)
+{
+ if(!FLAC__metadata_get_tags(filename, tags))
+ if(0 == (*tags = FLAC__metadata_object_new(FLAC__METADATA_TYPE_VORBIS_COMMENT)))
+ return false;
+ return true;
+}
+
+FLAC__bool FLAC_plugin__tags_set(const char *filename, const FLAC__StreamMetadata *tags)
+{
+ FLAC__Metadata_Chain *chain;
+ FLAC__Metadata_Iterator *iterator;
+ FLAC__StreamMetadata *block;
+ FLAC__bool got_vorbis_comments = false;
+ FLAC__bool ok;
+
+ if(0 == (chain = FLAC__metadata_chain_new()))
+ return false;
+
+ if(!FLAC__metadata_chain_read(chain, filename)) {
+ FLAC__metadata_chain_delete(chain);
+ return false;
+ }
+
+ if(0 == (iterator = FLAC__metadata_iterator_new())) {
+ FLAC__metadata_chain_delete(chain);
+ return false;
+ }
+
+ FLAC__metadata_iterator_init(iterator, chain);
+
+ do {
+ if(FLAC__metadata_iterator_get_block_type(iterator) == FLAC__METADATA_TYPE_VORBIS_COMMENT)
+ got_vorbis_comments = true;
+ } while(!got_vorbis_comments && FLAC__metadata_iterator_next(iterator));
+
+ if(0 == (block = FLAC__metadata_object_clone(tags))) {
+ FLAC__metadata_chain_delete(chain);
+ FLAC__metadata_iterator_delete(iterator);
+ return false;
+ }
+
+ if(got_vorbis_comments)
+ ok = FLAC__metadata_iterator_set_block(iterator, block);
+ else
+ ok = FLAC__metadata_iterator_insert_block_after(iterator, block);
+
+ FLAC__metadata_iterator_delete(iterator);
+
+ if(ok) {
+ FLAC__metadata_chain_sort_padding(chain);
+ ok = FLAC__metadata_chain_write(chain, /*use_padding=*/true, /*preserve_file_stats=*/true);
+ }
+
+ FLAC__metadata_chain_delete(chain);
+
+ return ok;
+}
+
+void FLAC_plugin__tags_destroy(FLAC__StreamMetadata **tags)
+{
+ FLAC__metadata_object_delete(*tags);
+ *tags = 0;
+}
+
+const char *FLAC_plugin__tags_get_tag_utf8(const FLAC__StreamMetadata *tags, const char *name)
+{
+ const int i = FLAC__metadata_object_vorbiscomment_find_entry_from(tags, /*offset=*/0, name);
+ return (i < 0? 0 : strchr(tags->data.vorbis_comment.comments[i].entry, '=')+1);
+}
+
+FLAC__uint16 *FLAC_plugin__tags_get_tag_ucs2(const FLAC__StreamMetadata *tags, const char *name)
+{
+ const char *utf8 = FLAC_plugin__tags_get_tag_utf8(tags, name);
+ if(0 == utf8)
+ return 0;
+ return local__convert_utf8_to_ucs2(utf8, strlen(utf8)+1); /* +1 for terminating null */
+}
+
+int FLAC_plugin__tags_delete_tag(FLAC__StreamMetadata *tags, const char *name)
+{
+ return FLAC__metadata_object_vorbiscomment_remove_entries_matching(tags, name);
+}
+
+int FLAC_plugin__tags_delete_all(FLAC__StreamMetadata *tags)
+{
+ int n = (int)tags->data.vorbis_comment.num_comments;
+ if(n > 0) {
+ if(!FLAC__metadata_object_vorbiscomment_resize_comments(tags, 0))
+ n = -1;
+ }
+ return n;
+}
+
+FLAC__bool FLAC_plugin__tags_add_tag_utf8(FLAC__StreamMetadata *tags, const char *name, const char *value, const char *separator)
+{
+ int i;
+
+ FLAC__ASSERT(0 != tags);
+ FLAC__ASSERT(0 != name);
+ FLAC__ASSERT(0 != value);
+
+ if(separator && (i = FLAC__metadata_object_vorbiscomment_find_entry_from(tags, /*offset=*/0, name)) >= 0) {
+ FLAC__StreamMetadata_VorbisComment_Entry *entry = tags->data.vorbis_comment.comments+i;
+ const size_t value_len = strlen(value);
+ const size_t separator_len = strlen(separator);
+ FLAC__byte *new_entry;
+ if(0 == (new_entry = (FLAC__byte*)realloc(entry->entry, entry->length + value_len + separator_len + 1)))
+ return false;
+ memcpy(new_entry+entry->length, separator, separator_len);
+ entry->length += separator_len;
+ memcpy(new_entry+entry->length, value, value_len);
+ entry->length += value_len;
+ new_entry[entry->length] = '\0';
+ entry->entry = new_entry;
+ }
+ else {
+ FLAC__StreamMetadata_VorbisComment_Entry entry;
+ if(!FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair(&entry, name, value))
+ return false;
+ FLAC__metadata_object_vorbiscomment_append_comment(tags, entry, /*copy=*/false);
+ }
+ return true;
+}
+
+FLAC__bool FLAC_plugin__tags_set_tag_ucs2(FLAC__StreamMetadata *tags, const char *name, const FLAC__uint16 *value, FLAC__bool replace_all)
+{
+ FLAC__StreamMetadata_VorbisComment_Entry entry;
+
+ FLAC__ASSERT(0 != tags);
+ FLAC__ASSERT(0 != name);
+ FLAC__ASSERT(0 != value);
+
+ {
+ char *utf8 = local__convert_ucs2_to_utf8(value, local__wide_strlen(value)+1); /* +1 for the terminating null */
+ if(0 == utf8)
+ return false;
+ if(!FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair(&entry, name, utf8)) {
+ free(utf8);
+ return false;
+ }
+ free(utf8);
+ }
+ if(!FLAC__metadata_object_vorbiscomment_replace_comment(tags, entry, replace_all, /*copy=*/false))
+ return false;
+ return true;
+}
Added: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/tags.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/tags.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_common/tags.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -0,0 +1,74 @@
+/* plugin_common - Routines common to several plugins
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef FLAC__PLUGIN_COMMON__TAGS_H
+#define FLAC__PLUGIN_COMMON__TAGS_H
+
+#include "FLAC/format.h"
+
+FLAC__bool FLAC_plugin__tags_get(const char *filename, FLAC__StreamMetadata **tags);
+FLAC__bool FLAC_plugin__tags_set(const char *filename, const FLAC__StreamMetadata *tags);
+
+/*
+ * Deletes the tags object and sets '*tags' to NULL.
+ */
+void FLAC_plugin__tags_destroy(FLAC__StreamMetadata **tags);
+
+/*
+ * Gets the value (in UTF-8) of the first tag with the given name (NULL if no
+ * such tag exists).
+ */
+const char *FLAC_plugin__tags_get_tag_utf8(const FLAC__StreamMetadata *tags, const char *name);
+
+/*
+ * Gets the value (in UCS-2) of the first tag with the given name (NULL if no
+ * such tag exists).
+ *
+ * NOTE: the returned string is malloc()ed and must be free()d by the caller.
+ */
+FLAC__uint16 *FLAC_plugin__tags_get_tag_ucs2(const FLAC__StreamMetadata *tags, const char *name);
+
+/*
+ * Removes all tags with the given 'name'. Returns the number of tags removed,
+ * or -1 on memory allocation error.
+ */
+int FLAC_plugin__tags_delete_tag(FLAC__StreamMetadata *tags, const char *name);
+
+/*
+ * Removes all tags. Returns the number of tags removed, or -1 on memory
+ * allocation error.
+ */
+int FLAC_plugin__tags_delete_all(FLAC__StreamMetadata *tags);
+
+/*
+ * Adds a "name=value" tag to the tags. 'value' must be in UTF-8. If
+ * 'separator' is non-NULL and 'tags' already contains a tag for 'name', the
+ * first such tag's value is appended with separator, then value.
+ */
+FLAC__bool FLAC_plugin__tags_add_tag_utf8(FLAC__StreamMetadata *tags, const char *name, const char *value, const char *separator);
+
+/*
+ * Adds a "name=value" tag to the tags. 'value' must be in UCS-2. If 'tags'
+ * already contains a tag or tags for 'name', then they will be replaced
+ * according to 'replace_all': if 'replace_all' is false, only the first such
+ * tag will be replaced; if true, all matching tags will be replaced by the one
+ * new tag.
+ */
+FLAC__bool FLAC_plugin__tags_set_tag_ucs2(FLAC__StreamMetadata *tags, const char *name, const FLAC__uint16 *value, FLAC__bool replace_all);
+
+#endif
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# in_flac - Winamp2 FLAC input plugin
-# Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# in_flac - Winamp2 FLAC input plugin
-# Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -76,6 +76,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -111,10 +112,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -127,12 +136,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/config.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/config.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/config.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* in_flac - Winamp2 FLAC input plugin
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -39,6 +39,20 @@
static const char default_format[] = "[%artist% - ]$if2(%title%,%filename%)";
static const char default_sep[] = ", ";
+static wchar_t *convert_ansi_to_wide_(const char *src)
+{
+ int len;
+ wchar_t *dest;
+
+ FLAC__ASSERT(0 != src);
+
+ len = strlen(src) + 1;
+ /* copy */
+ dest = malloc(len*sizeof(wchar_t));
+ if (dest) mbstowcs(dest, src, len);
+ return dest;
+}
+
void InitConfig()
{
char *p;
@@ -56,7 +70,7 @@
RS(flac_cfg.title.tag_format, sizeof(flac_cfg.title.tag_format), default_format);
if (flac_cfg.title.tag_format_w)
free(flac_cfg.title.tag_format_w);
- flac_cfg.title.tag_format_w = FLAC_plugin__convert_ansi_to_wide(flac_cfg.title.tag_format);
+ flac_cfg.title.tag_format_w = convert_ansi_to_wide_(flac_cfg.title.tag_format);
/* @@@ FIXME: trailing spaces */
RS(flac_cfg.title.sep, sizeof(flac_cfg.title.sep), default_sep);
RI(flac_cfg.tag.reserve_space, 1);
@@ -129,7 +143,7 @@
if (flac_cfg.title.tag_format_w)
free(flac_cfg.title.tag_format_w);
GetDlgItemText(hwnd, IDC_SEP, flac_cfg.title.sep, sizeof(flac_cfg.title.sep));
- flac_cfg.title.tag_format_w = FLAC_plugin__convert_ansi_to_wide(flac_cfg.title.tag_format);
+ flac_cfg.title.tag_format_w = convert_ansi_to_wide_(flac_cfg.title.tag_format);
/*! flac_cfg.tag.reserve_space = GetCheck(IDC_RESERVE); */
flac_cfg.display.show_bps = GetCheck(IDC_BPS);
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/config.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/config.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/config.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* in_flac - Winamp2 FLAC input plugin
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/in_flac.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/in_flac.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/in_flac.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* in_flac - Winamp2 FLAC input plugin
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -24,7 +24,7 @@
#include "infobox.h"
#include "tagz.h"
-#define PLUGIN_VERSION "1.1.1"
+#define PLUGIN_VERSION "1.1.2"
static In_Module mod_; /* the input module (declared near the bottom of this file) */
static char lastfn_[MAX_PATH]; /* currently playing file (used for getting info on the current file) */
@@ -265,37 +265,61 @@
* title formatting
*/
-static const T_CHAR *get_tag(const T_CHAR *tag, void *param)
+static T_CHAR *get_tag(const T_CHAR *tag, void *param)
{
- FLAC_Plugin__CanonicalTag *t = (FLAC_Plugin__CanonicalTag*)param;
- const T_CHAR *val = FLAC_plugin__canonical_get(t, tag);
+ FLAC__StreamMetadata *tags = (FLAC__StreamMetadata*)param;
+ char *tagname, *p;
+ T_CHAR *val;
+
+ if (!tag)
+ return 0;
+ /* Vorbis comment names must be ASCII, so convert 'tag' first */
+ tagname = malloc(wcslen(tag)+1);
+ for(p=tagname;*tag;) {
+ if(*tag > 0x7d) {
+ free(tagname);
+ return 0;
+ }
+ else
+ *p++ = (char)(*tag++);
+ }
+ *p++ = '\0';
+ /* now get it */
+ val = FLAC_plugin__tags_get_tag_ucs2(tags, tagname);
+ free(tagname);
/* some "user friendly cheavats" */
if (!val)
{
if (!wcsicmp(tag, L"ARTIST"))
{
- val = FLAC_plugin__canonical_get(t, L"PERFORMER");
- if (!val) val = FLAC_plugin__canonical_get(t, L"COMPOSER");
+ val = FLAC_plugin__tags_get_tag_ucs2(tags, "PERFORMER");
+ if (!val) val = FLAC_plugin__tags_get_tag_ucs2(tags, "COMPOSER");
}
else if (!wcsicmp(tag, L"YEAR") || !wcsicmp(tag, L"DATE"))
{
- val = FLAC_plugin__canonical_get(t, L"YEAR_RECORDED");
- if (!val) val = FLAC_plugin__canonical_get(t, L"YEAR_PERFORMED");
+ val = FLAC_plugin__tags_get_tag_ucs2(tags, "YEAR_RECORDED");
+ if (!val) val = FLAC_plugin__tags_get_tag_ucs2(tags, "YEAR_PERFORMED");
}
}
return val;
}
+static void free_tag(T_CHAR *tag, void *param)
+{
+ (void)param;
+ free(tag);
+}
+
static void format_title(const char *filename, WCHAR *title, unsigned max_size)
{
- FLAC_Plugin__CanonicalTag tag;
+ FLAC__StreamMetadata *tags;
- ReadTags(filename, &tag, true);
+ ReadTags(filename, &tags, /*forDisplay=*/true);
- tagz_format(flac_cfg.title.tag_format_w, get_tag, NULL, &tag, title, max_size);
+ tagz_format(flac_cfg.title.tag_format_w, get_tag, free_tag, tags, title, max_size);
- FLAC_plugin__canonical_tag_clear(&tag);
+ FLAC_plugin__tags_destroy(&tags);
}
static void getfileinfo(char *filename, char *title, int *length_in_msec)
@@ -307,7 +331,7 @@
filename = lastfn_;
if (length_in_msec)
{
- *length_in_msec = file_info_.length_in_msec;
+ *length_in_msec = (int)file_info_.length_in_msec;
length_in_msec = 0; /* force skip in following code */
}
}
@@ -327,7 +351,8 @@
}
if (length_in_msec)
- *length_in_msec = (int)(streaminfo.data.stream_info.total_samples*10 / (streaminfo.data.stream_info.sample_rate/100));
+ /* with VC++ you have to spoon feed it the casting from uint64->int64->double */
+ *length_in_msec = (int)((double)(FLAC__int64)streaminfo.data.stream_info.total_samples / (double)streaminfo.data.stream_info.sample_rate * 1000.0 + 0.5);
}
/*
@@ -368,7 +393,7 @@
static In_Module mod_ =
{
IN_VER,
- "Reference FLAC Decoder v" PLUGIN_VERSION,
+ "FLAC Decoder v" PLUGIN_VERSION,
0, /* hMainWindow */
0, /* hDllInstance */
"FLAC\0FLAC Audio File (*.FLAC)\0",
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/in_flac.dsp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/in_flac.dsp 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/in_flac.dsp 2005-10-20 12:55:24 UTC (rev 10204)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "in_flac_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /WX /GX /Ox /Og /Oi /Os /Op /Gf /Gy /I "include" /I ".." /I "..\..\include" /D "NDEBUG" /D VERSION=\"1.1.1\" /D "in_flac_EXPORTS" /D "FLAC__NO_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAGZ_UNICODE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /WX /GX /Ox /Og /Oi /Os /Op /Gf /Gy /I "include" /I ".." /I "..\..\include" /D "NDEBUG" /D VERSION=\"1.1.2\" /D "in_flac_EXPORTS" /D "FLAC__NO_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAGZ_UNICODE" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "in_flac_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I ".." /I "..\..\include" /D "_DEBUG" /D "REAL_STDIO" /D VERSION=\"1.1.1\" /D "in_flac_EXPORTS" /D "FLAC__NO_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAGZ_UNICODE" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I ".." /I "..\..\include" /D "_DEBUG" /D "REAL_STDIO" /D VERSION=\"1.1.2\" /D "in_flac_EXPORTS" /D "FLAC__NO_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAGZ_UNICODE" /YX /FD /GZ /c
# SUBTRACT CPP /WX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/include/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/include/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/include/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# in_flac - Winamp2 FLAC input plugin
-# Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/include/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/include/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/include/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# in_flac - Winamp2 FLAC input plugin
-# Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -76,6 +76,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -111,10 +112,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -127,12 +136,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/include/winamp2/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/include/winamp2/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/include/winamp2/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# in_flac - Winamp2 FLAC input plugin
-# Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/include/winamp2/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/include/winamp2/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/include/winamp2/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# in_flac - Winamp2 FLAC input plugin
-# Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -67,6 +67,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -102,10 +103,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -118,12 +127,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/infobox.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/infobox.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/infobox.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* in_flac - Winamp2 FLAC input plugin
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -28,10 +28,10 @@
typedef struct
{
char filename[MAX_PATH];
- FLAC_Plugin__CanonicalTag tag;
+ FLAC__StreamMetadata *tags;
} LOCALDATA;
-static char buffer[1024];
+static char buffer[8192];
static char *genres = NULL;
static DWORD genresSize = 0, genresCount = 0;
static BOOL genresChanged = FALSE, isNT;
@@ -174,27 +174,46 @@
}
}
+static wchar_t *AnsiToWide(const char *src)
+{
+ int len;
+ wchar_t *dest;
+
+ FLAC__ASSERT(0 != src);
+
+ len = strlen(src) + 1;
+ /* copy */
+ dest = (wchar_t*)malloc(len*sizeof(wchar_t));
+ if (dest) mbstowcs(dest, src, len);
+ return dest;
+}
+
/*
* Infobox helpers
*/
-#define SetText(x,y) WideCharToMultiByte(CP_ACP, WC_COMPOSITECHECK, FLAC_plugin__canonical_get(&data->tag, y), -1, buffer, sizeof(buffer), NULL, NULL); \
+#define SetText(x,y) ucs2 = FLAC_plugin__tags_get_tag_ucs2(data->tags, y); \
+ WideCharToMultiByte(CP_ACP, WC_COMPOSITECHECK, ucs2, -1, buffer, sizeof(buffer), NULL, NULL); \
+ if(ucs2) free(ucs2); \
SetDlgItemText(hwnd, x, buffer)
#define GetText(x,y) GetDlgItemText(hwnd, x, buffer, sizeof(buffer)); \
- if (*buffer) FLAC_plugin__canonical_set_ansi(&data->tag, y, buffer); \
- else FLAC_plugin__canonical_remove_all(&data->tag, y)
+ if (*buffer) { ucs2 = AnsiToWide(buffer); FLAC_plugin__tags_set_tag_ucs2(data->tags, y, ucs2, /*replace_all=*/false); free(ucs2); } \
+ else FLAC_plugin__tags_delete_tag(data->tags, y)
-#define SetTextW(x,y) SetDlgItemTextW(hwnd, x, FLAC_plugin__canonical_get(&data->tag, y))
+#define SetTextW(x,y) ucs2 = FLAC_plugin__tags_get_tag_ucs2(data->tags, y); \
+ SetDlgItemTextW(hwnd, x, ucs2); \
+ free(ucs2)
#define GetTextW(x,y) GetDlgItemTextW(hwnd, x, (WCHAR*)buffer, sizeof(buffer)/2); \
- if (*(WCHAR*)buffer) FLAC_plugin__canonical_set(&data->tag, y, (WCHAR*)buffer); \
- else FLAC_plugin__canonical_remove_all(&data->tag, y)
+ if (*(WCHAR*)buffer) FLAC_plugin__tags_set_tag_ucs2(data->tags, y, (WCHAR*)buffer, /*replace_all=*/false); \
+ else FLAC_plugin__tags_delete_tag(data->tags, y)
static BOOL InitInfoboxInfo(HWND hwnd, const char *file)
{
LOCALDATA *data = LocalAlloc(LPTR, sizeof(LOCALDATA));
+ wchar_t *ucs2;
FLAC__StreamMetadata streaminfo;
DWORD length, bps, ratio, rg;
LONGLONG filesize;
@@ -208,13 +227,13 @@
if (!filesize) return FALSE;
if (!FLAC__metadata_get_streaminfo(file, &streaminfo))
return FALSE;
- ReadTags(file, &data->tag, false);
+ ReadTags(file, &data->tags, false);
length = (DWORD)(streaminfo.data.stream_info.total_samples / streaminfo.data.stream_info.sample_rate);
bps = (DWORD)(filesize / (125*streaminfo.data.stream_info.total_samples/streaminfo.data.stream_info.sample_rate));
ratio = bps*1000000 / (streaminfo.data.stream_info.sample_rate*streaminfo.data.stream_info.channels*streaminfo.data.stream_info.bits_per_sample);
- rg = FLAC_plugin__canonical_get(&data->tag, L"REPLAYGAIN_TRACK_GAIN") ? 1 : 0;
- rg |= FLAC_plugin__canonical_get(&data->tag, L"REPLAYGAIN_ALBUM_GAIN") ? 2 : 0;
+ rg = FLAC_plugin__tags_get_tag_utf8(data->tags, "REPLAYGAIN_TRACK_GAIN") ? 1 : 0;
+ rg |= FLAC_plugin__tags_get_tag_utf8(data->tags, "REPLAYGAIN_ALBUM_GAIN") ? 2 : 0;
sprintf(buffer, "Sample rate: %d Hz\nChannels: %d\nBits per sample: %d\nMin block size: %d\nMax block size: %d\n"
"File size: %I64d bytes\nTotal samples: %I64d\nLength: %d:%02d\nAvg. bitrate: %d\nCompression ratio: %d.%d%%\n"
@@ -228,33 +247,33 @@
/* tag */
if (isNT)
{
- SetTextW(IDC_TITLE, L"TITLE");
- SetTextW(IDC_ARTIST, L"ARTIST");
- SetTextW(IDC_ALBUM, L"ALBUM");
- SetTextW(IDC_COMMENT, L"COMMENT");
- SetTextW(IDC_YEAR, L"DATE");
- SetTextW(IDC_TRACK, L"TRACKNUMBER");
- SetTextW(IDC_GENRE, L"GENRE");
+ SetTextW(IDC_TITLE, "TITLE");
+ SetTextW(IDC_ARTIST, "ARTIST");
+ SetTextW(IDC_ALBUM, "ALBUM");
+ SetTextW(IDC_COMMENT, "COMMENT");
+ SetTextW(IDC_YEAR, "DATE");
+ SetTextW(IDC_TRACK, "TRACKNUMBER");
+ SetTextW(IDC_GENRE, "GENRE");
}
else
{
- SetText(IDC_TITLE, L"TITLE");
- SetText(IDC_ARTIST, L"ARTIST");
- SetText(IDC_ALBUM, L"ALBUM");
- SetText(IDC_COMMENT, L"COMMENT");
- SetText(IDC_YEAR, L"DATE");
- SetText(IDC_TRACK, L"TRACKNUMBER");
- SetText(IDC_GENRE, L"GENRE");
+ SetText(IDC_TITLE, "TITLE");
+ SetText(IDC_ARTIST, "ARTIST");
+ SetText(IDC_ALBUM, "ALBUM");
+ SetText(IDC_COMMENT, "COMMENT");
+ SetText(IDC_YEAR, "DATE");
+ SetText(IDC_TRACK, "TRACKNUMBER");
+ SetText(IDC_GENRE, "GENRE");
}
return TRUE;
}
-static void __inline SetTag(HWND hwnd, const char *filename, FLAC_Plugin__CanonicalTag *tag)
+static void __inline SetTag(HWND hwnd, const char *filename, FLAC__StreamMetadata *tags)
{
strcpy(buffer, infoTitle);
- if (FLAC_plugin__vorbiscomment_set(filename, tag))
+ if (FLAC_plugin__tags_set(filename, tags))
strcat(buffer, " [Updated]");
else strcat(buffer, " [Failed]");
@@ -264,42 +283,45 @@
static void UpdateTag(HWND hwnd)
{
LOCALDATA *data = (LOCALDATA*)GetWindowLong(hwnd, GWL_USERDATA);
+ wchar_t *ucs2;
/* get fields */
if (isNT)
{
- GetTextW(IDC_TITLE, L"TITLE");
- GetTextW(IDC_ARTIST, L"ARTIST");
- GetTextW(IDC_ALBUM, L"ALBUM");
- GetTextW(IDC_COMMENT, L"COMMENT");
- GetTextW(IDC_YEAR, L"DATE");
- GetTextW(IDC_TRACK, L"TRACKNUMBER");
- GetTextW(IDC_GENRE, L"GENRE");
+ GetTextW(IDC_TITLE, "TITLE");
+ GetTextW(IDC_ARTIST, "ARTIST");
+ GetTextW(IDC_ALBUM, "ALBUM");
+ GetTextW(IDC_COMMENT, "COMMENT");
+ GetTextW(IDC_YEAR, "DATE");
+ GetTextW(IDC_TRACK, "TRACKNUMBER");
+ GetTextW(IDC_GENRE, "GENRE");
- WideCharToMultiByte(CP_ACP, WC_COMPOSITECHECK, FLAC_plugin__canonical_get(&data->tag, L"GENRE"), -1, buffer, sizeof(buffer), NULL, NULL);
+ ucs2 = FLAC_plugin__tags_get_tag_ucs2(data->tags, "GENRE");
+ WideCharToMultiByte(CP_ACP, WC_COMPOSITECHECK, ucs2, -1, buffer, sizeof(buffer), NULL, NULL);
+ free(ucs2);
}
else
{
- GetText(IDC_TITLE, L"TITLE");
- GetText(IDC_ARTIST, L"ARTIST");
- GetText(IDC_ALBUM, L"ALBUM");
- GetText(IDC_COMMENT, L"COMMENT");
- GetText(IDC_YEAR, L"DATE");
- GetText(IDC_TRACK, L"TRACKNUMBER");
- GetText(IDC_GENRE, L"GENRE");
+ GetText(IDC_TITLE, "TITLE");
+ GetText(IDC_ARTIST, "ARTIST");
+ GetText(IDC_ALBUM, "ALBUM");
+ GetText(IDC_COMMENT, "COMMENT");
+ GetText(IDC_YEAR, "DATE");
+ GetText(IDC_TRACK, "TRACKNUMBER");
+ GetText(IDC_GENRE, "GENRE");
}
/* update genres list (buffer should contain genre) */
if (buffer[0]) AddGenre(hwnd, buffer);
/* write tag */
- SetTag(hwnd, data->filename, &data->tag);
+ SetTag(hwnd, data->filename, data->tags);
}
static void RemoveTag(HWND hwnd)
{
LOCALDATA *data = (LOCALDATA*)GetWindowLong(hwnd, GWL_USERDATA);
- FLAC_plugin__canonical_tag_clear(&data->tag);
+ FLAC_plugin__tags_delete_all(data->tags);
SetDlgItemText(hwnd, IDC_TITLE, "");
SetDlgItemText(hwnd, IDC_ARTIST, "");
@@ -309,7 +331,7 @@
SetDlgItemText(hwnd, IDC_TRACK, "");
SetDlgItemText(hwnd, IDC_GENRE, "");
- SetTag(hwnd, data->filename, &data->tag);
+ SetTag(hwnd, data->filename, data->tags);
}
@@ -329,7 +351,7 @@
case WM_DESTROY:
{
LOCALDATA *data = (LOCALDATA*)GetWindowLong(hwnd, GWL_USERDATA);
- FLAC_plugin__canonical_tag_clear(&data->tag);
+ FLAC_plugin__tags_destroy(&data->tags);
LocalFree(data);
DeinitGenres(hwnd, FALSE);
}
@@ -390,20 +412,25 @@
return (char*)c;
}
-void ReadTags(const char *fileName, FLAC_Plugin__CanonicalTag *tag, BOOL forDisplay)
+void ReadTags(const char *fileName, FLAC__StreamMetadata **tags, BOOL forDisplay)
{
- FLAC_plugin__canonical_tag_init(tag);
- FLAC_plugin__vorbiscomment_get(fileName, tag, forDisplay ? flac_cfg.title.sep : NULL);
+ if(FLAC_plugin__tags_get(fileName, tags)) {
- /* add file name */
- if (forDisplay)
- {
- char *c;
- FLAC_plugin__canonical_set_ansi(tag, L"filepath", fileName);
+ /* add file name */
+ if (forDisplay)
+ {
+ char *c;
+ wchar_t *ucs2;
+ ucs2 = AnsiToWide(fileName);
+ FLAC_plugin__tags_set_tag_ucs2(*tags, "filepath", ucs2, /*replace_all=*/true);
+ free(ucs2);
- strcpy(buffer, GetFileName(fileName));
- if (c = strrchr(buffer, '.')) *c = 0;
- FLAC_plugin__canonical_set_ansi(tag, L"filename", buffer);
+ strcpy(buffer, GetFileName(fileName));
+ if (c = strrchr(buffer, '.')) *c = 0;
+ ucs2 = AnsiToWide(buffer);
+ FLAC_plugin__tags_set_tag_ucs2(*tags, "filename", ucs2, /*replace_all=*/true);
+ free(ucs2);
+ }
}
}
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/infobox.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/infobox.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/infobox.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* in_flac - Winamp2 FLAC input plugin
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -21,7 +21,7 @@
*/
ULONGLONG FileSize(const char *fileName);
-void ReadTags(const char *fileName, FLAC_Plugin__CanonicalTag *tag, BOOL forDisplay);
+void ReadTags(const char *fileName, FLAC__StreamMetadata **tags, BOOL forDisplay);
void InitInfobox();
void DeinitInfobox();
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/playback.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/playback.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/playback.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* in_flac - Winamp2 FLAC input plugin
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -72,7 +72,7 @@
file_info->abort_flag = true;
return;
}
- file_info->length_in_msec = file_info->total_samples * 10 / (file_info->sample_rate / 100);
+ file_info->length_in_msec = (unsigned)((double)file_info->total_samples / (double)file_info->sample_rate * 1000.0 + 0.5);
}
else if (metadata->type == FLAC__METADATA_TYPE_VORBIS_COMMENT)
{
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/playback.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/playback.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/playback.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* in_flac - Winamp2 FLAC input plugin
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/tagz.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/tagz.cpp 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/tagz.cpp 2005-10-20 12:55:24 UTC (rev 10204)
@@ -737,7 +737,7 @@
while(*s1 && *s1!='%') s1++;
if (!*s1) {Error();break;}
*s1=0;
- const T_CHAR * tag=f(spec,fp);
+ T_CHAR * tag=f(spec,fp);
*s1='%';
/*if (!tag) tag=tag_unknown; */
if (tag && tag[0])
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/tagz.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/tagz.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_winamp2/tagz.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -14,8 +14,8 @@
#define T_CHAR char
#endif
-typedef const T_CHAR* (*TAGFUNC)(const T_CHAR *tag,void *p); /* return 0 if not found */
-typedef void (*TAGFREEFUNC)(const T_CHAR *tag,void *p);
+typedef T_CHAR* (*TAGFUNC)(const T_CHAR *tag,void *p); /* return 0 if not found */
+typedef void (*TAGFREEFUNC)(T_CHAR *tag,void *p);
UINT tagz_format(const T_CHAR * spec,TAGFUNC f,TAGFREEFUNC ff,void *fp,T_CHAR * out,UINT max);
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# libxmms-flac - XMMS FLAC input plugin
-# Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -25,9 +25,12 @@
noinst_HEADERS = \
charset.h \
configure.h \
+ http.h \
+ plugin.h \
tag.h
-CFLAGS = @CFLAGS@ @XMMS_CFLAGS@
+AM_CFLAGS = @XMMS_CFLAGS@
+
INCLUDES = -I$(top_srcdir)/src
if FLaC__INSTALL_XMMS_PLUGIN_LOCALLY
xmmsinputplugindir = $(HOME)/.xmms/Plugins
@@ -40,7 +43,7 @@
xmmsinputplugin_LTLIBRARIES = libxmms-flac.la
-plugin_sources = charset.c configure.c plugin.c tag.c fileinfo.c
+plugin_sources = charset.c configure.c fileinfo.c http.c plugin.c tag.c
libxmms_flac_la_SOURCES = $(plugin_sources)
@@ -60,5 +63,6 @@
$(top_builddir)/src/share/utf8/libutf8.la \
$(top_builddir)/src/libFLAC/libFLAC.la \
-L$(top_builddir)/src/libFLAC/.libs \
- @XMMS_LIBS@
+ @XMMS_LIBS@ \
+ @LIBICONV@
libxmms_flac_la_LDFLAGS = -module -avoid-version
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# libxmms-flac - XMMS FLAC input plugin
-# Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -79,7 +79,8 @@
$(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \
$(top_builddir)/src/share/utf8/libutf8.la \
$(top_builddir)/src/libFLAC/libFLAC.la
-am__objects_1 = charset.lo configure.lo plugin.lo tag.lo fileinfo.lo
+am__objects_1 = charset.lo configure.lo fileinfo.lo http.lo plugin.lo \
+ tag.lo
am_libxmms_flac_la_OBJECTS = $(am__objects_1)
libxmms_flac_la_OBJECTS = $(am_libxmms_flac_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -87,7 +88,8 @@
am__depfiles_maybe = depfiles
@AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/charset.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/configure.Plo ./$(DEPDIR)/fileinfo.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/plugin.Plo ./$(DEPDIR)/tag.Plo
+ at AMDEP_TRUE@ ./$(DEPDIR)/http.Plo ./$(DEPDIR)/plugin.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/tag.Plo
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
@@ -106,6 +108,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -114,7 +117,7 @@
CCAS = @CCAS@
CCASFLAGS = @CCASFLAGS@
CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@ @XMMS_CFLAGS@
+CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
@@ -141,10 +144,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -157,12 +168,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -254,13 +270,16 @@
noinst_HEADERS = \
charset.h \
configure.h \
+ http.h \
+ plugin.h \
tag.h
+AM_CFLAGS = @XMMS_CFLAGS@
INCLUDES = -I$(top_srcdir)/src
@FLaC__INSTALL_XMMS_PLUGIN_LOCALLY_FALSE at xmmsinputplugindir = @XMMS_INPUT_PLUGIN_DIR@
@FLaC__INSTALL_XMMS_PLUGIN_LOCALLY_TRUE at xmmsinputplugindir = $(HOME)/.xmms/Plugins
xmmsinputplugin_LTLIBRARIES = libxmms-flac.la
-plugin_sources = charset.c configure.c plugin.c tag.c fileinfo.c
+plugin_sources = charset.c configure.c fileinfo.c http.c plugin.c tag.c
libxmms_flac_la_SOURCES = $(plugin_sources)
# work around the bug in libtool where its relinking fails with a different DESTDIR
@@ -279,7 +298,8 @@
$(top_builddir)/src/share/utf8/libutf8.la \
$(top_builddir)/src/libFLAC/libFLAC.la \
-L$(top_builddir)/src/libFLAC/.libs \
- @XMMS_LIBS@
+ @XMMS_LIBS@ \
+ @LIBICONV@
libxmms_flac_la_LDFLAGS = -module -avoid-version
all: all-am
@@ -354,6 +374,7 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/charset.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/configure.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fileinfo.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/http.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/plugin.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tag.Plo at am__quote@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/Makefile.lite
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/Makefile.lite 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/Makefile.lite 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# libxmms-flac - XMMS FLAC input plugin
-# Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -24,13 +24,14 @@
LIB_NAME = libxmms-flac
INCLUDES = $(shell xmms-config --cflags) -I./include -I$(topdir)/include -I..
# refer to the static libs explicitly
-LIBS = $(topdir)/obj/$(BUILD)/lib/libFLAC.a $(topdir)/obj/$(BUILD)/lib/libplugin_common.a $(topdir)/obj/$(BUILD)/lib/libgrabbag.a $(topdir)/obj/$(BUILD)/lib/libreplaygain_analysis.a $(topdir)/obj/$(BUILD)/lib/libreplaygain_synthesis.a -lstdc++ -lz
+LIBS = $(topdir)/obj/$(BUILD)/lib/libFLAC.a $(topdir)/obj/$(BUILD)/lib/libplugin_common.a $(topdir)/obj/$(BUILD)/lib/libgrabbag.a $(topdir)/obj/$(BUILD)/lib/libreplaygain_analysis.a $(topdir)/obj/$(BUILD)/lib/libreplaygain_synthesis.a -L$(ICONV_LIB_DIR) -liconv -lstdc++ -lz
SRCS_C = \
charset.c \
configure.c \
plugin.c \
fileinfo.c \
+ http.c \
tag.c
include $(topdir)/build/lib.mk
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/charset.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/charset.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/charset.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libxmms-flac - XMMS FLAC input plugin
- * Copyright (C) 2002,2003,2004 Daisuke Shimamura
+ * Copyright (C) 2002,2003,2004,2005 Daisuke Shimamura
*
* Almost from charset.c
* EasyTAG - Tag editor for MP3 and OGG files
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/charset.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/charset.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/charset.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libxmms-flac - XMMS FLAC input plugin
- * Copyright (C) 2002,2003,2004 Daisuke Shimamura
+ * Copyright (C) 2002,2003,2004,2005 Daisuke Shimamura
*
* Almost from charset.h - 2001/12/04
* EasyTAG - Tag editor for MP3 and OGG files
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/configure.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/configure.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/configure.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libxmms-flac - XMMS FLAC input plugin
- * Copyright (C) 2002,2003,2004 Daisuke Shimamura
+ * Copyright (C) 2002,2003,2004,2005 Daisuke Shimamura
*
* Based on mpg123 plugin
* and prefs.c - 2000/05/06
@@ -50,6 +50,21 @@
FALSE, /* convert_char_set */
NULL /* user_char_set */
},
+ /* stream */
+ {
+ 100 /* KB */, /* http_buffer_size */
+ 50, /* http_prebuffer */
+ FALSE, /* use_proxy */
+ "", /* proxy_host */
+ 0, /* proxy_port */
+ FALSE, /* proxy_use_auth */
+ "", /* proxy_user */
+ "", /* proxy_pass */
+ FALSE, /* save_http_stream */
+ "", /* save_http_path */
+ FALSE, /* cast_title_streaming */
+ FALSE /* use_udp_channel */
+ },
/* output */
{
/* replaygain */
@@ -95,6 +110,18 @@
static GtkWidget *resolution_replaygain_bps_out_radio_16bps;
static GtkWidget *resolution_replaygain_bps_out_radio_24bps;
+static GtkObject *streaming_size_adj, *streaming_pre_adj;
+static GtkWidget *streaming_proxy_use, *streaming_proxy_host_entry;
+static GtkWidget *streaming_proxy_port_entry, *streaming_save_use, *streaming_save_entry;
+static GtkWidget *streaming_proxy_auth_use;
+static GtkWidget *streaming_proxy_auth_pass_entry, *streaming_proxy_auth_user_entry;
+static GtkWidget *streaming_proxy_auth_user_label, *streaming_proxy_auth_pass_label;
+#ifdef FLAC_ICECAST
+static GtkWidget *streaming_cast_title, *streaming_udp_title;
+#endif
+static GtkWidget *streaming_proxy_hbox, *streaming_proxy_auth_hbox, *streaming_save_dirbrowser;
+static GtkWidget *streaming_save_hbox;
+
static gchar *gtk_entry_get_text_1 (GtkWidget *widget);
static void flac_configurewin_ok(GtkWidget * widget, gpointer data);
static void configure_destroy(GtkWidget * w, gpointer data);
@@ -127,6 +154,61 @@
xmms_cfg_write_boolean(cfg, "flac", "output.resolution.replaygain.dither", flac_cfg.output.resolution.replaygain.dither);
xmms_cfg_write_int(cfg, "flac", "output.resolution.replaygain.noise_shaping", flac_cfg.output.resolution.replaygain.noise_shaping);
xmms_cfg_write_int(cfg, "flac", "output.resolution.replaygain.bps_out", flac_cfg.output.resolution.replaygain.bps_out);
+ /* streaming */
+ flac_cfg.stream.http_buffer_size = (gint) GTK_ADJUSTMENT(streaming_size_adj)->value;
+ flac_cfg.stream.http_prebuffer = (gint) GTK_ADJUSTMENT(streaming_pre_adj)->value;
+
+ flac_cfg.stream.use_proxy = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(streaming_proxy_use));
+ g_free(flac_cfg.stream.proxy_host);
+ flac_cfg.stream.proxy_host = g_strdup(gtk_entry_get_text(GTK_ENTRY(streaming_proxy_host_entry)));
+ flac_cfg.stream.proxy_port = atoi(gtk_entry_get_text(GTK_ENTRY(streaming_proxy_port_entry)));
+
+ flac_cfg.stream.proxy_use_auth = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(streaming_proxy_auth_use));
+
+ if(flac_cfg.stream.proxy_user)
+ g_free(flac_cfg.stream.proxy_user);
+ flac_cfg.stream.proxy_user = NULL;
+ if(strlen(gtk_entry_get_text(GTK_ENTRY(streaming_proxy_auth_user_entry))) > 0)
+ flac_cfg.stream.proxy_user = g_strdup(gtk_entry_get_text(GTK_ENTRY(streaming_proxy_auth_user_entry)));
+
+ if(flac_cfg.stream.proxy_pass)
+ g_free(flac_cfg.stream.proxy_pass);
+ flac_cfg.stream.proxy_pass = NULL;
+ if(strlen(gtk_entry_get_text(GTK_ENTRY(streaming_proxy_auth_pass_entry))) > 0)
+ flac_cfg.stream.proxy_pass = g_strdup(gtk_entry_get_text(GTK_ENTRY(streaming_proxy_auth_pass_entry)));
+
+
+ flac_cfg.stream.save_http_stream = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(streaming_save_use));
+ if (flac_cfg.stream.save_http_path)
+ g_free(flac_cfg.stream.save_http_path);
+ flac_cfg.stream.save_http_path = g_strdup(gtk_entry_get_text(GTK_ENTRY(streaming_save_entry)));
+
+#ifdef FLAC_ICECAST
+ flac_cfg.stream.cast_title_streaming = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(streaming_cast_title));
+ flac_cfg.stream.use_udp_channel = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(streaming_udp_title));
+#endif
+
+ xmms_cfg_write_int(cfg, "flac", "stream.http_buffer_size", flac_cfg.stream.http_buffer_size);
+ xmms_cfg_write_int(cfg, "flac", "stream.http_prebuffer", flac_cfg.stream.http_prebuffer);
+ xmms_cfg_write_boolean(cfg, "flac", "stream.use_proxy", flac_cfg.stream.use_proxy);
+ xmms_cfg_write_string(cfg, "flac", "stream.proxy_host", flac_cfg.stream.proxy_host);
+ xmms_cfg_write_int(cfg, "flac", "stream.proxy_port", flac_cfg.stream.proxy_port);
+ xmms_cfg_write_boolean(cfg, "flac", "stream.proxy_use_auth", flac_cfg.stream.proxy_use_auth);
+ if(flac_cfg.stream.proxy_user)
+ xmms_cfg_write_string(cfg, "flac", "stream.proxy_user", flac_cfg.stream.proxy_user);
+ else
+ xmms_cfg_remove_key(cfg, "flac", "stream.proxy_user");
+ if(flac_cfg.stream.proxy_pass)
+ xmms_cfg_write_string(cfg, "flac", "stream.proxy_pass", flac_cfg.stream.proxy_pass);
+ else
+ xmms_cfg_remove_key(cfg, "flac", "stream.proxy_pass");
+ xmms_cfg_write_boolean(cfg, "flac", "stream.save_http_stream", flac_cfg.stream.save_http_stream);
+ xmms_cfg_write_string(cfg, "flac", "stream.save_http_path", flac_cfg.stream.save_http_path);
+#ifdef FLAC_ICECAST
+ xmms_cfg_write_boolean(cfg, "flac", "stream.cast_title_streaming", flac_cfg.stream.cast_title_streaming);
+ xmms_cfg_write_boolean(cfg, "flac", "stream.use_udp_channel", flac_cfg.stream.use_udp_channel);
+#endif
+
xmms_cfg_write_file(cfg, filename);
xmms_cfg_free(cfg);
g_free(filename);
@@ -225,7 +307,63 @@
;
}
+static void proxy_use_cb(GtkWidget * w, gpointer data)
+{
+ gboolean use_proxy, use_proxy_auth;
+ (void) w;
+ (void) data;
+ use_proxy = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(streaming_proxy_use));
+ use_proxy_auth = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(streaming_proxy_auth_use));
+
+ gtk_widget_set_sensitive(streaming_proxy_hbox, use_proxy);
+ gtk_widget_set_sensitive(streaming_proxy_auth_use, use_proxy);
+ gtk_widget_set_sensitive(streaming_proxy_auth_hbox, use_proxy && use_proxy_auth);
+}
+
+static void proxy_auth_use_cb(GtkWidget *w, gpointer data)
+{
+ gboolean use_proxy, use_proxy_auth;
+ (void) w;
+ (void) data;
+
+ use_proxy = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(streaming_proxy_use));
+ use_proxy_auth = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(streaming_proxy_auth_use));
+
+ gtk_widget_set_sensitive(streaming_proxy_auth_hbox, use_proxy && use_proxy_auth);
+}
+
+static void streaming_save_dirbrowser_cb(gchar * dir)
+{
+ gtk_entry_set_text(GTK_ENTRY(streaming_save_entry), dir);
+}
+
+static void streaming_save_browse_cb(GtkWidget * w, gpointer data)
+{
+ (void) w;
+ (void) data;
+ if (!streaming_save_dirbrowser)
+ {
+ streaming_save_dirbrowser = xmms_create_dir_browser(_("Select the directory where you want to store the MPEG streams:"),
+ flac_cfg.stream.save_http_path, GTK_SELECTION_SINGLE, streaming_save_dirbrowser_cb);
+ gtk_signal_connect(GTK_OBJECT(streaming_save_dirbrowser), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), &streaming_save_dirbrowser);
+ gtk_window_set_transient_for(GTK_WINDOW(streaming_save_dirbrowser), GTK_WINDOW(flac_configurewin));
+ gtk_widget_show(streaming_save_dirbrowser);
+ }
+}
+
+static void streaming_save_use_cb(GtkWidget * w, gpointer data)
+{
+ gboolean save_stream;
+ (void) w;
+ (void) data;
+
+ save_stream = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(streaming_save_use));
+
+ gtk_widget_set_sensitive(streaming_save_hbox, save_stream);
+}
+
+
void FLAC_XMMS__configure(void)
{
GtkWidget *title_frame, *title_tag_vbox, *title_tag_label;
@@ -237,6 +375,19 @@
GtkWidget *bbox, *ok, *cancel;
GList *list;
+ GtkWidget *streaming_vbox;
+ GtkWidget *streaming_buf_frame, *streaming_buf_hbox;
+ GtkWidget *streaming_size_box, *streaming_size_label, *streaming_size_spin;
+ GtkWidget *streaming_pre_box, *streaming_pre_label, *streaming_pre_spin;
+ GtkWidget *streaming_proxy_frame, *streaming_proxy_vbox;
+ GtkWidget *streaming_proxy_port_label, *streaming_proxy_host_label;
+ GtkWidget *streaming_save_frame, *streaming_save_vbox;
+ GtkWidget *streaming_save_label, *streaming_save_browse;
+#ifdef FLAC_ICECAST
+ GtkWidget *streaming_cast_frame, *streaming_cast_vbox;
+#endif
+ char *temp;
+
if (flac_configurewin != NULL) {
gdk_window_raise(flac_configurewin->window);
return;
@@ -459,6 +610,153 @@
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), output_vbox, gtk_label_new(_("Output")));
+ /* Streaming */
+
+ streaming_vbox = gtk_vbox_new(FALSE, 0);
+
+ streaming_buf_frame = gtk_frame_new(_("Buffering:"));
+ gtk_container_set_border_width(GTK_CONTAINER(streaming_buf_frame), 5);
+ gtk_box_pack_start(GTK_BOX(streaming_vbox), streaming_buf_frame, FALSE, FALSE, 0);
+
+ streaming_buf_hbox = gtk_hbox_new(TRUE, 5);
+ gtk_container_set_border_width(GTK_CONTAINER(streaming_buf_hbox), 5);
+ gtk_container_add(GTK_CONTAINER(streaming_buf_frame), streaming_buf_hbox);
+
+ streaming_size_box = gtk_hbox_new(FALSE, 5);
+ /*gtk_table_attach_defaults(GTK_TABLE(streaming_buf_table),streaming_size_box,0,1,0,1); */
+ gtk_box_pack_start(GTK_BOX(streaming_buf_hbox), streaming_size_box, TRUE, TRUE, 0);
+ streaming_size_label = gtk_label_new(_("Buffer size (kb):"));
+ gtk_box_pack_start(GTK_BOX(streaming_size_box), streaming_size_label, FALSE, FALSE, 0);
+ streaming_size_adj = gtk_adjustment_new(flac_cfg.stream.http_buffer_size, 4, 4096, 4, 4, 4);
+ streaming_size_spin = gtk_spin_button_new(GTK_ADJUSTMENT(streaming_size_adj), 8, 0);
+ gtk_widget_set_usize(streaming_size_spin, 60, -1);
+ gtk_box_pack_start(GTK_BOX(streaming_size_box), streaming_size_spin, FALSE, FALSE, 0);
+
+ streaming_pre_box = gtk_hbox_new(FALSE, 5);
+ /*gtk_table_attach_defaults(GTK_TABLE(streaming_buf_table),streaming_pre_box,1,2,0,1); */
+ gtk_box_pack_start(GTK_BOX(streaming_buf_hbox), streaming_pre_box, TRUE, TRUE, 0);
+ streaming_pre_label = gtk_label_new(_("Pre-buffer (percent):"));
+ gtk_box_pack_start(GTK_BOX(streaming_pre_box), streaming_pre_label, FALSE, FALSE, 0);
+ streaming_pre_adj = gtk_adjustment_new(flac_cfg.stream.http_prebuffer, 0, 90, 1, 1, 1);
+ streaming_pre_spin = gtk_spin_button_new(GTK_ADJUSTMENT(streaming_pre_adj), 1, 0);
+ gtk_widget_set_usize(streaming_pre_spin, 60, -1);
+ gtk_box_pack_start(GTK_BOX(streaming_pre_box), streaming_pre_spin, FALSE, FALSE, 0);
+
+ /*
+ * Proxy config.
+ */
+ streaming_proxy_frame = gtk_frame_new(_("Proxy:"));
+ gtk_container_set_border_width(GTK_CONTAINER(streaming_proxy_frame), 5);
+ gtk_box_pack_start(GTK_BOX(streaming_vbox), streaming_proxy_frame, FALSE, FALSE, 0);
+
+ streaming_proxy_vbox = gtk_vbox_new(FALSE, 5);
+ gtk_container_set_border_width(GTK_CONTAINER(streaming_proxy_vbox), 5);
+ gtk_container_add(GTK_CONTAINER(streaming_proxy_frame), streaming_proxy_vbox);
+
+ streaming_proxy_use = gtk_check_button_new_with_label(_("Use proxy"));
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(streaming_proxy_use), flac_cfg.stream.use_proxy);
+ gtk_signal_connect(GTK_OBJECT(streaming_proxy_use), "clicked", GTK_SIGNAL_FUNC(proxy_use_cb), NULL);
+ gtk_box_pack_start(GTK_BOX(streaming_proxy_vbox), streaming_proxy_use, FALSE, FALSE, 0);
+
+ streaming_proxy_hbox = gtk_hbox_new(FALSE, 5);
+ gtk_widget_set_sensitive(streaming_proxy_hbox, flac_cfg.stream.use_proxy);
+ gtk_box_pack_start(GTK_BOX(streaming_proxy_vbox), streaming_proxy_hbox, FALSE, FALSE, 0);
+
+ streaming_proxy_host_label = gtk_label_new(_("Host:"));
+ gtk_box_pack_start(GTK_BOX(streaming_proxy_hbox), streaming_proxy_host_label, FALSE, FALSE, 0);
+
+ streaming_proxy_host_entry = gtk_entry_new();
+ gtk_entry_set_text(GTK_ENTRY(streaming_proxy_host_entry), flac_cfg.stream.proxy_host);
+ gtk_box_pack_start(GTK_BOX(streaming_proxy_hbox), streaming_proxy_host_entry, TRUE, TRUE, 0);
+
+ streaming_proxy_port_label = gtk_label_new(_("Port:"));
+ gtk_box_pack_start(GTK_BOX(streaming_proxy_hbox), streaming_proxy_port_label, FALSE, FALSE, 0);
+
+ streaming_proxy_port_entry = gtk_entry_new();
+ gtk_widget_set_usize(streaming_proxy_port_entry, 50, -1);
+ temp = g_strdup_printf("%d", flac_cfg.stream.proxy_port);
+ gtk_entry_set_text(GTK_ENTRY(streaming_proxy_port_entry), temp);
+ g_free(temp);
+ gtk_box_pack_start(GTK_BOX(streaming_proxy_hbox), streaming_proxy_port_entry, FALSE, FALSE, 0);
+
+ streaming_proxy_auth_use = gtk_check_button_new_with_label(_("Use authentication"));
+ gtk_widget_set_sensitive(streaming_proxy_auth_use, flac_cfg.stream.use_proxy);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(streaming_proxy_auth_use), flac_cfg.stream.proxy_use_auth);
+ gtk_signal_connect(GTK_OBJECT(streaming_proxy_auth_use), "clicked", GTK_SIGNAL_FUNC(proxy_auth_use_cb), NULL);
+ gtk_box_pack_start(GTK_BOX(streaming_proxy_vbox), streaming_proxy_auth_use, FALSE, FALSE, 0);
+
+ streaming_proxy_auth_hbox = gtk_hbox_new(FALSE, 5);
+ gtk_widget_set_sensitive(streaming_proxy_auth_hbox, flac_cfg.stream.use_proxy && flac_cfg.stream.proxy_use_auth);
+ gtk_box_pack_start(GTK_BOX(streaming_proxy_vbox), streaming_proxy_auth_hbox, FALSE, FALSE, 0);
+
+ streaming_proxy_auth_user_label = gtk_label_new(_("Username:"));
+ gtk_box_pack_start(GTK_BOX(streaming_proxy_auth_hbox), streaming_proxy_auth_user_label, FALSE, FALSE, 0);
+
+ streaming_proxy_auth_user_entry = gtk_entry_new();
+ if(flac_cfg.stream.proxy_user)
+ gtk_entry_set_text(GTK_ENTRY(streaming_proxy_auth_user_entry), flac_cfg.stream.proxy_user);
+ gtk_box_pack_start(GTK_BOX(streaming_proxy_auth_hbox), streaming_proxy_auth_user_entry, TRUE, TRUE, 0);
+
+ streaming_proxy_auth_pass_label = gtk_label_new(_("Password:"));
+ gtk_box_pack_start(GTK_BOX(streaming_proxy_auth_hbox), streaming_proxy_auth_pass_label, FALSE, FALSE, 0);
+
+ streaming_proxy_auth_pass_entry = gtk_entry_new();
+ if(flac_cfg.stream.proxy_pass)
+ gtk_entry_set_text(GTK_ENTRY(streaming_proxy_auth_pass_entry), flac_cfg.stream.proxy_pass);
+ gtk_entry_set_visibility(GTK_ENTRY(streaming_proxy_auth_pass_entry), FALSE);
+ gtk_box_pack_start(GTK_BOX(streaming_proxy_auth_hbox), streaming_proxy_auth_pass_entry, TRUE, TRUE, 0);
+
+
+ /*
+ * Save to disk config.
+ */
+ streaming_save_frame = gtk_frame_new(_("Save stream to disk:"));
+ gtk_container_set_border_width(GTK_CONTAINER(streaming_save_frame), 5);
+ gtk_box_pack_start(GTK_BOX(streaming_vbox), streaming_save_frame, FALSE, FALSE, 0);
+
+ streaming_save_vbox = gtk_vbox_new(FALSE, 5);
+ gtk_container_set_border_width(GTK_CONTAINER(streaming_save_vbox), 5);
+ gtk_container_add(GTK_CONTAINER(streaming_save_frame), streaming_save_vbox);
+
+ streaming_save_use = gtk_check_button_new_with_label(_("Save stream to disk"));
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(streaming_save_use), flac_cfg.stream.save_http_stream);
+ gtk_signal_connect(GTK_OBJECT(streaming_save_use), "clicked", GTK_SIGNAL_FUNC(streaming_save_use_cb), NULL);
+ gtk_box_pack_start(GTK_BOX(streaming_save_vbox), streaming_save_use, FALSE, FALSE, 0);
+
+ streaming_save_hbox = gtk_hbox_new(FALSE, 5);
+ gtk_widget_set_sensitive(streaming_save_hbox, flac_cfg.stream.save_http_stream);
+ gtk_box_pack_start(GTK_BOX(streaming_save_vbox), streaming_save_hbox, FALSE, FALSE, 0);
+
+ streaming_save_label = gtk_label_new(_("Path:"));
+ gtk_box_pack_start(GTK_BOX(streaming_save_hbox), streaming_save_label, FALSE, FALSE, 0);
+
+ streaming_save_entry = gtk_entry_new();
+ gtk_entry_set_text(GTK_ENTRY(streaming_save_entry), flac_cfg.stream.save_http_path);
+ gtk_box_pack_start(GTK_BOX(streaming_save_hbox), streaming_save_entry, TRUE, TRUE, 0);
+
+ streaming_save_browse = gtk_button_new_with_label(_("Browse"));
+ gtk_signal_connect(GTK_OBJECT(streaming_save_browse), "clicked", GTK_SIGNAL_FUNC(streaming_save_browse_cb), NULL);
+ gtk_box_pack_start(GTK_BOX(streaming_save_hbox), streaming_save_browse, FALSE, FALSE, 0);
+
+#ifdef FLAC_ICECAST
+ streaming_cast_frame = gtk_frame_new(_("SHOUT/Icecast:"));
+ gtk_container_set_border_width(GTK_CONTAINER(streaming_cast_frame), 5);
+ gtk_box_pack_start(GTK_BOX(streaming_vbox), streaming_cast_frame, FALSE, FALSE, 0);
+
+ streaming_cast_vbox = gtk_vbox_new(5, FALSE);
+ gtk_container_add(GTK_CONTAINER(streaming_cast_frame), streaming_cast_vbox);
+
+ streaming_cast_title = gtk_check_button_new_with_label(_("Enable SHOUT/Icecast title streaming"));
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(streaming_cast_title), flac_cfg.stream.cast_title_streaming);
+ gtk_box_pack_start(GTK_BOX(streaming_cast_vbox), streaming_cast_title, FALSE, FALSE, 0);
+
+ streaming_udp_title = gtk_check_button_new_with_label(_("Enable Icecast Metadata UDP Channel"));
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(streaming_udp_title), flac_cfg.stream.use_udp_channel);
+ gtk_box_pack_start(GTK_BOX(streaming_cast_vbox), streaming_udp_title, FALSE, FALSE, 0);
+#endif
+
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), streaming_vbox, gtk_label_new(_("Streaming")));
+
/* Buttons */
bbox = gtk_hbutton_box_new();
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/configure.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/configure.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/configure.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libxmms-flac - XMMS FLAC input plugin
- * Copyright (C) 2002,2003,2004 Daisuke Shimamura
+ * Copyright (C) 2002,2003,2004,2005 Daisuke Shimamura
*
* Based on mpg123 plugin
*
@@ -32,6 +32,21 @@
} title;
struct {
+ gint http_buffer_size;
+ gint http_prebuffer;
+ gboolean use_proxy;
+ gchar *proxy_host;
+ gint proxy_port;
+ gboolean proxy_use_auth;
+ gchar *proxy_user;
+ gchar *proxy_pass;
+ gboolean save_http_stream;
+ gchar *save_http_path;
+ gboolean cast_title_streaming;
+ gboolean use_udp_channel;
+ } stream;
+
+ struct {
struct {
gboolean enable;
gboolean album_mode;
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/fileinfo.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/fileinfo.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/fileinfo.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,7 +1,7 @@
/* XMMS - Cross-platform multimedia player
* Copyright (C) 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies
* Copyright (C) 1999,2000 Håvard Kvålen
- * Copyright (C) 2002,2003,2004 Daisuke Shimamura
+ * Copyright (C) 2002,2003,2004,2005 Daisuke Shimamura
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@
#include "FLAC/metadata.h"
#include "charset.h"
#include "configure.h"
-#include "plugin_common/vorbiscomment.h"
+#include "plugin_common/tags.h"
#include "plugin_common/locale_hack.h"
static GtkWidget *window = NULL;
@@ -40,7 +40,7 @@
static GtkWidget *flac_samplerate, *flac_channels, *flac_bits_per_sample, *flac_blocksize, *flac_filesize, *flac_samples, *flac_bitrate;
static gchar *current_filename = NULL;
-static FLAC_Plugin__CanonicalTag *canonical_tag = NULL;
+static FLAC__StreamMetadata *tags_ = NULL;
static const gchar *vorbis_genres[] =
{
@@ -102,20 +102,16 @@
g_free(tempstr);
}
-static void set_entry_tag(GtkEntry * entry, const wchar_t * tag)
+static void set_entry_tag(GtkEntry * entry, const char * utf8)
{
-
- if(tag) {
- char *utf8 = FLAC_plugin__convert_ucs2_to_utf8(tag);
+ if(utf8) {
if(flac_cfg.title.convert_char_set) {
char *text = convert_from_utf8_to_user(utf8);
gtk_entry_set_text(entry, text);
free(text);
}
- else {
+ else
gtk_entry_set_text(entry, utf8);
- }
- free(utf8);
}
else
gtk_entry_set_text(entry, "");
@@ -134,7 +130,7 @@
else
utf8 = text;
- FLAC_plugin__canonical_add_utf8(canonical_tag, name, utf8, (unsigned)(-1), (unsigned)(-1), /*sep=*/0);
+ FLAC_plugin__tags_add_tag_utf8(tags_, name, utf8, /*separator=*/0);
if(flac_cfg.title.convert_char_set)
free(utf8);
@@ -142,13 +138,13 @@
static void show_tag()
{
- set_entry_tag(GTK_ENTRY(title_entry) , FLAC_plugin__canonical_get(canonical_tag, L"TITLE"));
- set_entry_tag(GTK_ENTRY(artist_entry) , FLAC_plugin__canonical_get(canonical_tag, L"ARTIST"));
- set_entry_tag(GTK_ENTRY(album_entry) , FLAC_plugin__canonical_get(canonical_tag, L"ALBUM"));
- set_entry_tag(GTK_ENTRY(date_entry) , FLAC_plugin__canonical_get(canonical_tag, L"DATE"));
- set_entry_tag(GTK_ENTRY(tracknum_entry) , FLAC_plugin__canonical_get(canonical_tag, L"TRACKNUMBER"));
- set_entry_tag(GTK_ENTRY(comment_entry) , FLAC_plugin__canonical_get(canonical_tag, L"DESCRIPTION"));
- set_entry_tag(GTK_ENTRY(GTK_COMBO(genre_combo)->entry), FLAC_plugin__canonical_get(canonical_tag, L"GENRE"));
+ set_entry_tag(GTK_ENTRY(title_entry) , FLAC_plugin__tags_get_tag_utf8(tags_, "TITLE"));
+ set_entry_tag(GTK_ENTRY(artist_entry) , FLAC_plugin__tags_get_tag_utf8(tags_, "ARTIST"));
+ set_entry_tag(GTK_ENTRY(album_entry) , FLAC_plugin__tags_get_tag_utf8(tags_, "ALBUM"));
+ set_entry_tag(GTK_ENTRY(date_entry) , FLAC_plugin__tags_get_tag_utf8(tags_, "DATE"));
+ set_entry_tag(GTK_ENTRY(tracknum_entry) , FLAC_plugin__tags_get_tag_utf8(tags_, "TRACKNUMBER"));
+ set_entry_tag(GTK_ENTRY(comment_entry) , FLAC_plugin__tags_get_tag_utf8(tags_, "DESCRIPTION"));
+ set_entry_tag(GTK_ENTRY(GTK_COMBO(genre_combo)->entry), FLAC_plugin__tags_get_tag_utf8(tags_, "GENRE"));
}
static void save_tag(GtkWidget * w, gpointer data)
@@ -156,13 +152,13 @@
(void)w;
(void)data;
- while (FLAC_plugin__canonical_remove(canonical_tag, L"TITLE")) ;
- while (FLAC_plugin__canonical_remove(canonical_tag, L"ARTIST")) ;
- while (FLAC_plugin__canonical_remove(canonical_tag, L"ALBUM")) ;
- while (FLAC_plugin__canonical_remove(canonical_tag, L"DATE")) ;
- while (FLAC_plugin__canonical_remove(canonical_tag, L"TRACKNUMBER")) ;
- while (FLAC_plugin__canonical_remove(canonical_tag, L"DESCRIPTION")) ;
- while (FLAC_plugin__canonical_remove(canonical_tag, L"GENRE")) ;
+ FLAC_plugin__tags_delete_tag(tags_, "TITLE");
+ FLAC_plugin__tags_delete_tag(tags_, "ARTIST");
+ FLAC_plugin__tags_delete_tag(tags_, "ALBUM");
+ FLAC_plugin__tags_delete_tag(tags_, "DATE");
+ FLAC_plugin__tags_delete_tag(tags_, "TRACKNUMBER");
+ FLAC_plugin__tags_delete_tag(tags_, "DESCRIPTION");
+ FLAC_plugin__tags_delete_tag(tags_, "GENRE");
get_entry_tag(GTK_ENTRY(title_entry) , "TITLE");
get_entry_tag(GTK_ENTRY(artist_entry) , "ARTIST");
@@ -172,7 +168,7 @@
get_entry_tag(GTK_ENTRY(comment_entry) , "DESCRIPTION");
get_entry_tag(GTK_ENTRY(GTK_COMBO(genre_combo)->entry), "GENRE");
- FLAC_plugin__vorbiscomment_set(current_filename, canonical_tag);
+ FLAC_plugin__tags_set(current_filename, tags_);
gtk_widget_destroy(window);
}
@@ -181,15 +177,15 @@
(void)w;
(void)data;
- while (FLAC_plugin__canonical_remove(canonical_tag, L"TITLE")) ;
- while (FLAC_plugin__canonical_remove(canonical_tag, L"ARTIST")) ;
- while (FLAC_plugin__canonical_remove(canonical_tag, L"ALBUM")) ;
- while (FLAC_plugin__canonical_remove(canonical_tag, L"DATE")) ;
- while (FLAC_plugin__canonical_remove(canonical_tag, L"TRACKNUMBER")) ;
- while (FLAC_plugin__canonical_remove(canonical_tag, L"DESCRIPTION")) ;
- while (FLAC_plugin__canonical_remove(canonical_tag, L"GENRE")) ;
+ FLAC_plugin__tags_delete_tag(tags_, "TITLE");
+ FLAC_plugin__tags_delete_tag(tags_, "ARTIST");
+ FLAC_plugin__tags_delete_tag(tags_, "ALBUM");
+ FLAC_plugin__tags_delete_tag(tags_, "DATE");
+ FLAC_plugin__tags_delete_tag(tags_, "TRACKNUMBER");
+ FLAC_plugin__tags_delete_tag(tags_, "DESCRIPTION");
+ FLAC_plugin__tags_delete_tag(tags_, "GENRE");
- FLAC_plugin__vorbiscomment_set(current_filename, canonical_tag);
+ FLAC_plugin__tags_set(current_filename, tags_);
gtk_widget_destroy(window);
}
@@ -416,12 +412,10 @@
gtk_entry_set_text(GTK_ENTRY(filename_entry), filename);
gtk_editable_set_position(GTK_EDITABLE(filename_entry), -1);
- if(canonical_tag)
- FLAC_plugin__canonical_tag_clear(canonical_tag);
- else
- canonical_tag = FLAC_plugin__canonical_tag_new();
+ if(tags_)
+ FLAC_plugin__tags_destroy(&tags_);
- FLAC_plugin__vorbiscomment_get(current_filename, canonical_tag, /*sep=*/0);
+ FLAC_plugin__tags_get(current_filename, &tags_);
show_tag();
show_file_info();
Added: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/http.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/http.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/http.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -0,0 +1,896 @@
+/* XMMS - Cross-platform multimedia player
+ * Copyright (C) 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+/* modified for FLAC support by Steven Richman (2003) */
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <glib.h>
+#include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <pthread.h>
+
+#include <xmms/util.h>
+#include <xmms/plugin.h>
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "configure.h"
+#include "plugin_common/locale_hack.h"
+#include "FLAC/format.h"
+#include "plugin.h"
+
+#ifndef HAVE_SOCKLEN_T
+typedef unsigned int socklen_t;
+#endif
+
+#define min(x,y) ((x)<(y)?(x):(y))
+#define min3(x,y,z) (min(x,y)<(z)?min(x,y):(z))
+#define min4(x,y,z,w) (min3(x,y,z)<(w)?min3(x,y,z):(w))
+
+static gchar *icy_name = NULL;
+static gint icy_metaint = 0;
+
+extern InputPlugin flac_ip;
+
+#undef DEBUG_UDP
+
+/* Static udp channel functions */
+static int udp_establish_listener (gint *sock);
+static int udp_check_for_data(gint sock);
+
+static char *flac_http_get_title(char *url);
+
+static gboolean prebuffering, going, eof = FALSE;
+static gint sock, rd_index, wr_index, buffer_length, prebuffer_length;
+static guint64 buffer_read = 0;
+static gchar *buffer;
+static guint64 offset;
+static pthread_t thread;
+static GtkWidget *error_dialog = NULL;
+
+static FILE *output_file = NULL;
+
+#define BASE64_LENGTH(len) (4 * (((len) + 2) / 3))
+
+/* Encode the string S of length LENGTH to base64 format and place it
+ to STORE. STORE will be 0-terminated, and must point to a writable
+ buffer of at least 1+BASE64_LENGTH(length) bytes. */
+static void base64_encode (const gchar *s, gchar *store, gint length)
+{
+ /* Conversion table. */
+ static gchar tbl[64] = {
+ 'A','B','C','D','E','F','G','H',
+ 'I','J','K','L','M','N','O','P',
+ 'Q','R','S','T','U','V','W','X',
+ 'Y','Z','a','b','c','d','e','f',
+ 'g','h','i','j','k','l','m','n',
+ 'o','p','q','r','s','t','u','v',
+ 'w','x','y','z','0','1','2','3',
+ '4','5','6','7','8','9','+','/'
+ };
+ gint i;
+ guchar *p = (guchar *)store;
+
+ /* Transform the 3x8 bits to 4x6 bits, as required by base64. */
+ for (i = 0; i < length; i += 3)
+ {
+ *p++ = tbl[s[0] >> 2];
+ *p++ = tbl[((s[0] & 3) << 4) + (s[1] >> 4)];
+ *p++ = tbl[((s[1] & 0xf) << 2) + (s[2] >> 6)];
+ *p++ = tbl[s[2] & 0x3f];
+ s += 3;
+ }
+ /* Pad the result if necessary... */
+ if (i == length + 1)
+ *(p - 1) = '=';
+ else if (i == length + 2)
+ *(p - 1) = *(p - 2) = '=';
+ /* ...and zero-terminate it. */
+ *p = '\0';
+}
+
+/* Create the authentication header contents for the `Basic' scheme.
+ This is done by encoding the string `USER:PASS' in base64 and
+ prepending `HEADER: Basic ' to it. */
+static gchar *basic_authentication_encode (const gchar *user, const gchar *passwd, const gchar *header)
+{
+ gchar *t1, *t2, *res;
+ gint len1 = strlen (user) + 1 + strlen (passwd);
+ gint len2 = BASE64_LENGTH (len1);
+
+ t1 = g_strdup_printf("%s:%s", user, passwd);
+ t2 = g_malloc0(len2 + 1);
+ base64_encode (t1, t2, len1);
+ res = g_strdup_printf("%s: Basic %s\r\n", header, t2);
+ g_free(t2);
+ g_free(t1);
+
+ return res;
+}
+
+static void parse_url(const gchar * url, gchar ** user, gchar ** pass, gchar ** host, int *port, gchar ** filename)
+{
+ gchar *h, *p, *pt, *f, *temp, *ptr;
+
+ temp = g_strdup(url);
+ ptr = temp;
+
+ if (!strncasecmp("http://", ptr, 7))
+ ptr += 7;
+ h = strchr(ptr, '@');
+ f = strchr(ptr, '/');
+ if (h != NULL && (!f || h < f))
+ {
+ *h = '\0';
+ p = strchr(ptr, ':');
+ if (p != NULL && p < h)
+ {
+ *p = '\0';
+ p++;
+ *pass = g_strdup(p);
+ }
+ else
+ *pass = NULL;
+ *user = g_strdup(ptr);
+ h++;
+ ptr = h;
+ }
+ else
+ {
+ *user = NULL;
+ *pass = NULL;
+ h = ptr;
+ }
+ pt = strchr(ptr, ':');
+ if (pt != NULL && (f == NULL || pt < f))
+ {
+ *pt = '\0';
+ *port = atoi(pt + 1);
+ }
+ else
+ {
+ if (f)
+ *f = '\0';
+ *port = 80;
+ }
+ *host = g_strdup(h);
+
+ if (f)
+ *filename = g_strdup(f + 1);
+ else
+ *filename = NULL;
+ g_free(temp);
+}
+
+void flac_http_close(void)
+{
+ going = FALSE;
+
+ pthread_join(thread, NULL);
+ g_free(icy_name);
+ icy_name = NULL;
+}
+
+
+static gint http_used(void)
+{
+ if (wr_index >= rd_index)
+ return wr_index - rd_index;
+ return buffer_length - (rd_index - wr_index);
+}
+
+static gint http_free(void)
+{
+ if (rd_index > wr_index)
+ return (rd_index - wr_index) - 1;
+ return (buffer_length - (wr_index - rd_index)) - 1;
+}
+
+static void http_wait_for_data(gint bytes)
+{
+ while ((prebuffering || http_used() < bytes) && !eof && going)
+ xmms_usleep(10000);
+}
+
+static void show_error_message(gchar *error)
+{
+ if(!error_dialog)
+ {
+ GDK_THREADS_ENTER();
+ error_dialog = xmms_show_message(_("Error"), error, _("Ok"), FALSE,
+ NULL, NULL);
+ gtk_signal_connect(GTK_OBJECT(error_dialog),
+ "destroy",
+ GTK_SIGNAL_FUNC(gtk_widget_destroyed),
+ &error_dialog);
+ GDK_THREADS_LEAVE();
+ }
+}
+
+int flac_http_read(gpointer data, gint length)
+{
+ gint len, cnt, off = 0, meta_len, meta_off = 0, i;
+ gchar *meta_data, **tags, *temp, *title;
+ if (length > buffer_length) {
+ length = buffer_length;
+ }
+
+ http_wait_for_data(length);
+
+ if (!going)
+ return 0;
+ len = min(http_used(), length);
+
+ while (len && http_used())
+ {
+ if ((flac_cfg.stream.cast_title_streaming) && (icy_metaint > 0) && (buffer_read % icy_metaint) == 0 && (buffer_read > 0))
+ {
+ meta_len = *((guchar *) buffer + rd_index) * 16;
+ rd_index = (rd_index + 1) % buffer_length;
+ if (meta_len > 0)
+ {
+ http_wait_for_data(meta_len);
+ meta_data = g_malloc0(meta_len);
+ if (http_used() >= meta_len)
+ {
+ while (meta_len)
+ {
+ cnt = min(meta_len, buffer_length - rd_index);
+ memcpy(meta_data + meta_off, buffer + rd_index, cnt);
+ rd_index = (rd_index + cnt) % buffer_length;
+ meta_len -= cnt;
+ meta_off += cnt;
+ }
+ tags = g_strsplit(meta_data, "';", 0);
+
+ for (i = 0; tags[i]; i++)
+ {
+ if (!strncasecmp(tags[i], "StreamTitle=", 12))
+ {
+ temp = g_strdup(tags[i] + 13);
+ title = g_strdup_printf("%s (%s)", temp, icy_name);
+ set_track_info(title, -1);
+ g_free(title);
+ g_free(temp);
+ }
+
+ }
+ g_strfreev(tags);
+
+ }
+ g_free(meta_data);
+ }
+ if (!http_used())
+ http_wait_for_data(length - off);
+ cnt = min3(len, buffer_length - rd_index, http_used());
+ }
+ else if ((icy_metaint > 0) && (flac_cfg.stream.cast_title_streaming))
+ cnt = min4(len, buffer_length - rd_index, http_used(), icy_metaint - (gint) (buffer_read % icy_metaint));
+ else
+ cnt = min3(len, buffer_length - rd_index, http_used());
+ if (output_file)
+ fwrite(buffer + rd_index, 1, cnt, output_file);
+
+ memcpy((gchar *)data + off, buffer + rd_index, cnt);
+ rd_index = (rd_index + cnt) % buffer_length;
+ buffer_read += cnt;
+ len -= cnt;
+ off += cnt;
+ }
+ if (!off) {
+ fprintf(stderr, "returning zero\n");
+ }
+ return off;
+}
+
+static gboolean http_check_for_data(void)
+{
+
+ fd_set set;
+ struct timeval tv;
+ gint ret;
+
+ tv.tv_sec = 0;
+ tv.tv_usec = 20000;
+ FD_ZERO(&set);
+ FD_SET(sock, &set);
+ ret = select(sock + 1, &set, NULL, NULL, &tv);
+ if (ret > 0)
+ return TRUE;
+ return FALSE;
+}
+
+gint flac_http_read_line(gchar * buf, gint size)
+{
+ gint i = 0;
+
+ while (going && i < size - 1)
+ {
+ if (http_check_for_data())
+ {
+ if (read(sock, buf + i, 1) <= 0)
+ return -1;
+ if (buf[i] == '\n')
+ break;
+ if (buf[i] != '\r')
+ i++;
+ }
+ }
+ if (!going)
+ return -1;
+ buf[i] = '\0';
+ return i;
+}
+
+/* returns the file descriptor of the socket, or -1 on error */
+static int http_connect (gchar *url_, gboolean head, guint64 offset)
+{
+ gchar line[1024], *user, *pass, *host, *filename,
+ *status, *url, *temp, *file;
+ gchar *chost;
+ gint cnt, error, err_len, port, cport;
+ gboolean redirect;
+ int udp_sock = 0;
+ fd_set set;
+ struct hostent *hp;
+ struct sockaddr_in address;
+ struct timeval tv;
+
+ url = g_strdup (url_);
+
+ do
+ {
+ redirect=FALSE;
+
+ g_strstrip(url);
+
+ parse_url(url, &user, &pass, &host, &port, &filename);
+
+ if ((!filename || !*filename) && url[strlen(url) - 1] != '/')
+ temp = g_strconcat(url, "/", NULL);
+ else
+ temp = g_strdup(url);
+ g_free(url);
+ url = temp;
+
+ chost = flac_cfg.stream.use_proxy ? flac_cfg.stream.proxy_host : host;
+ cport = flac_cfg.stream.use_proxy ? flac_cfg.stream.proxy_port : port;
+
+ sock = socket(AF_INET, SOCK_STREAM, 0);
+ fcntl(sock, F_SETFL, O_NONBLOCK);
+ address.sin_family = AF_INET;
+
+ status = g_strdup_printf(_("LOOKING UP %s"), chost);
+ flac_ip.set_info_text(status);
+ g_free(status);
+
+ if (!(hp = gethostbyname(chost)))
+ {
+ status = g_strdup_printf(_("Couldn't look up host %s"), chost);
+ show_error_message(status);
+ g_free(status);
+
+ flac_ip.set_info_text(NULL);
+ eof = TRUE;
+ }
+
+ if (!eof)
+ {
+ memcpy(&address.sin_addr.s_addr, *(hp->h_addr_list), sizeof (address.sin_addr.s_addr));
+ address.sin_port = (gint) g_htons(cport);
+
+ status = g_strdup_printf(_("CONNECTING TO %s:%d"), chost, cport);
+ flac_ip.set_info_text(status);
+ g_free(status);
+ if (connect(sock, (struct sockaddr *) &address, sizeof (struct sockaddr_in)) == -1)
+ {
+ if (errno != EINPROGRESS)
+ {
+ status = g_strdup_printf(_("Couldn't connect to host %s"), chost);
+ show_error_message(status);
+ g_free(status);
+
+ flac_ip.set_info_text(NULL);
+ eof = TRUE;
+ }
+ }
+ while (going)
+ {
+ tv.tv_sec = 0;
+ tv.tv_usec = 10000;
+ FD_ZERO(&set);
+ FD_SET(sock, &set);
+ if (select(sock + 1, NULL, &set, NULL, &tv) > 0)
+ {
+ err_len = sizeof (error);
+ getsockopt(sock, SOL_SOCKET, SO_ERROR, &error, &err_len);
+ if (error)
+ {
+ status = g_strdup_printf(_("Couldn't connect to host %s"),
+ chost);
+ show_error_message(status);
+ g_free(status);
+
+ flac_ip.set_info_text(NULL);
+ eof = TRUE;
+
+ }
+ break;
+ }
+ }
+ if (!eof)
+ {
+ gchar *auth = NULL, *proxy_auth = NULL;
+ gchar udpspace[30];
+ int udp_port;
+
+ if (flac_cfg.stream.use_udp_channel)
+ {
+ udp_port = udp_establish_listener (&udp_sock);
+ if (udp_port > 0)
+ sprintf (udpspace, "x-audiocast-udpport: %d\r\n", udp_port);
+ else
+ udp_sock = 0;
+ }
+
+ if(user && pass)
+ auth = basic_authentication_encode(user, pass, "Authorization");
+
+ if (flac_cfg.stream.use_proxy)
+ {
+ file = g_strdup(url);
+ if(flac_cfg.stream.proxy_use_auth && flac_cfg.stream.proxy_user && flac_cfg.stream.proxy_pass)
+ {
+ proxy_auth = basic_authentication_encode(flac_cfg.stream.proxy_user,
+ flac_cfg.stream.proxy_pass,
+ "Proxy-Authorization");
+ }
+ }
+ else
+ file = g_strconcat("/", filename, NULL);
+
+ temp = g_strdup_printf("GET %s HTTP/1.0\r\n"
+ "Host: %s\r\n"
+ "User-Agent: %s/%s\r\n"
+ "%s%s%s%s",
+ file, host, "Reference FLAC Player", FLAC__VERSION_STRING,
+ proxy_auth ? proxy_auth : "", auth ? auth : "",
+ flac_cfg.stream.cast_title_streaming ? "Icy-MetaData:1\r\n" : "",
+ flac_cfg.stream.use_udp_channel ? udpspace : "");
+ if (offset && !head) {
+ gchar *temp_dead = temp;
+ temp = g_strconcat ("%sRange: %ll-\r\n", temp, offset);
+ fprintf (stderr, "%s", temp);
+ g_free (temp_dead);
+ }
+
+ g_free(file);
+ if(proxy_auth)
+ g_free(proxy_auth);
+ if(auth)
+ g_free(auth);
+ write(sock, temp, strlen(temp));
+ write(sock, "\r\n", 2);
+ g_free(temp);
+ flac_ip.set_info_text(_("CONNECTED: WAITING FOR REPLY"));
+ while (going && !eof)
+ {
+ if (http_check_for_data())
+ {
+ if (flac_http_read_line(line, 1024))
+ {
+ status = strchr(line, ' ');
+ if (status)
+ {
+ if (status[1] == '2')
+ break;
+ else if(status[1] == '3' && status[2] == '0' && status[3] == '2')
+ {
+ while(going)
+ {
+ if(http_check_for_data())
+ {
+ if((cnt = flac_http_read_line(line, 1024)) != -1)
+ {
+ if(!cnt)
+ break;
+ if(!strncmp(line, "Location:", 9))
+ {
+ g_free(url);
+ url = g_strdup(line+10);
+ }
+ }
+ else
+ {
+ eof=TRUE;
+ flac_ip.set_info_text(NULL);
+ break;
+ }
+ }
+ }
+ redirect=TRUE;
+ break;
+ }
+ else
+ {
+ status = g_strdup_printf(_("Couldn't connect to host %s\nServer reported: %s"), chost, status);
+ show_error_message(status);
+ g_free(status);
+ break;
+ }
+ }
+ }
+ else
+ {
+ eof = TRUE;
+ flac_ip.set_info_text(NULL);
+ }
+ }
+ }
+
+ while (going && !redirect)
+ {
+ if (http_check_for_data())
+ {
+ if ((cnt = flac_http_read_line(line, 1024)) != -1)
+ {
+ if (!cnt)
+ break;
+ if (!strncmp(line, "icy-name:", 9))
+ icy_name = g_strdup(line + 9);
+ else if (!strncmp(line, "x-audiocast-name:", 17))
+ icy_name = g_strdup(line + 17);
+ if (!strncmp(line, "icy-metaint:", 12))
+ icy_metaint = atoi(line + 12);
+ if (!strncmp(line, "x-audiocast-udpport:", 20)) {
+#ifdef DEBUG_UDP
+ fprintf (stderr, "Server wants udp messages on port %d\n", atoi (line + 20));
+#endif
+ /*udp_serverport = atoi (line + 20);*/
+ }
+
+ }
+ else
+ {
+ eof = TRUE;
+ flac_ip.set_info_text(NULL);
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ if(redirect)
+ {
+ if (output_file)
+ {
+ fclose(output_file);
+ output_file = NULL;
+ }
+ close(sock);
+ }
+
+ g_free(user);
+ g_free(pass);
+ g_free(host);
+ g_free(filename);
+ } while(redirect);
+
+ g_free(url);
+ return eof ? -1 : sock;
+}
+
+static void *http_buffer_loop(void *arg)
+{
+ gchar *status, *url, *temp, *file;
+ gint cnt, written;
+ int udp_sock = 0;
+
+ url = (gchar *) arg;
+ sock = http_connect (url, false, offset);
+
+ if (sock >= 0 && flac_cfg.stream.save_http_stream) {
+ gchar *output_name;
+ file = flac_http_get_title(url);
+ output_name = file;
+ if (!strncasecmp(output_name, "http://", 7))
+ output_name += 7;
+ temp = strrchr(output_name, '.');
+ if (temp && (!strcasecmp(temp, ".fla") || !strcasecmp(temp, ".flac")))
+ *temp = '\0';
+
+ while ((temp = strchr(output_name, '/')))
+ *temp = '_';
+ output_name = g_strdup_printf("%s/%s.flac", flac_cfg.stream.save_http_path, output_name);
+
+ g_free(file);
+
+ output_file = fopen(output_name, "wb");
+ g_free(output_name);
+ }
+
+ while (going)
+ {
+
+ if (!http_used() && !flac_ip.output->buffer_playing())
+ prebuffering = TRUE;
+ if (http_free() > 0 && !eof)
+ {
+ if (http_check_for_data())
+ {
+ cnt = min(http_free(), buffer_length - wr_index);
+ if (cnt > 1024)
+ cnt = 1024;
+ written = read(sock, buffer + wr_index, cnt);
+ if (written <= 0)
+ {
+ eof = TRUE;
+ if (prebuffering)
+ {
+ prebuffering = FALSE;
+
+ flac_ip.set_info_text(NULL);
+ }
+
+ }
+ else
+ wr_index = (wr_index + written) % buffer_length;
+ }
+
+ if (prebuffering)
+ {
+ if (http_used() > prebuffer_length)
+ {
+ prebuffering = FALSE;
+ flac_ip.set_info_text(NULL);
+ }
+ else
+ {
+ status = g_strdup_printf(_("PRE-BUFFERING: %dKB/%dKB"), http_used() / 1024, prebuffer_length / 1024);
+ flac_ip.set_info_text(status);
+ g_free(status);
+ }
+
+ }
+ }
+ else
+ xmms_usleep(10000);
+
+ if (flac_cfg.stream.use_udp_channel && udp_sock != 0)
+ if (udp_check_for_data(udp_sock) < 0)
+ {
+ close(udp_sock);
+ udp_sock = 0;
+ }
+ }
+ if (output_file)
+ {
+ fclose(output_file);
+ output_file = NULL;
+ }
+ if (sock >= 0) {
+ close(sock);
+ }
+ if (udp_sock != 0)
+ close(udp_sock);
+
+ g_free(buffer);
+ g_free(url);
+
+ pthread_exit(NULL);
+ return NULL; /* avoid compiler warning */
+}
+
+int flac_http_open(gchar * _url, guint64 _offset)
+{
+ gchar *url;
+
+ url = g_strdup(_url);
+
+ rd_index = 0;
+ wr_index = 0;
+ buffer_length = flac_cfg.stream.http_buffer_size * 1024;
+ prebuffer_length = (buffer_length * flac_cfg.stream.http_prebuffer) / 100;
+ buffer_read = 0;
+ icy_metaint = 0;
+ prebuffering = TRUE;
+ going = TRUE;
+ eof = FALSE;
+ buffer = g_malloc(buffer_length);
+ offset = _offset;
+
+ pthread_create(&thread, NULL, http_buffer_loop, url);
+
+ return 0;
+}
+
+char *flac_http_get_title(char *url)
+{
+ if (icy_name)
+ return g_strdup(icy_name);
+ if (g_basename(url) && strlen(g_basename(url)) > 0)
+ return g_strdup(g_basename(url));
+ return g_strdup(url);
+}
+
+/* Start UDP Channel specific stuff */
+
+/* Find a good local udp port and bind udp_sock to it, return the port */
+static int udp_establish_listener(int *sock)
+{
+ struct sockaddr_in sin;
+ socklen_t sinlen = sizeof (struct sockaddr_in);
+
+#ifdef DEBUG_UDP
+ fprintf (stderr,"Establishing udp listener\n");
+#endif
+
+ if ((*sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
+ {
+ g_log(NULL, G_LOG_LEVEL_CRITICAL,
+ "udp_establish_listener(): unable to create socket");
+ return -1;
+ }
+
+ memset(&sin, 0, sinlen);
+ sin.sin_family = AF_INET;
+ sin.sin_addr.s_addr = g_htonl(INADDR_ANY);
+
+ if (bind(*sock, (struct sockaddr *)&sin, sinlen) < 0)
+ {
+ g_log(NULL, G_LOG_LEVEL_CRITICAL,
+ "udp_establish_listener(): Failed to bind socket to localhost: %s", strerror(errno));
+ close(*sock);
+ return -1;
+ }
+ if (fcntl(*sock, F_SETFL, O_NONBLOCK) < 0)
+ {
+ g_log(NULL, G_LOG_LEVEL_CRITICAL,
+ "udp_establish_listener(): Failed to set flags: %s", strerror(errno));
+ close(*sock);
+ return -1;
+ }
+
+ memset(&sin, 0, sinlen);
+ if (getsockname(*sock, (struct sockaddr *)&sin, &sinlen) < 0)
+ {
+ g_log(NULL, G_LOG_LEVEL_CRITICAL,
+ "udp_establish_listener(): Failed to retrieve socket info: %s", strerror(errno));
+ close(*sock);
+ return -1;
+ }
+
+#ifdef DEBUG_UDP
+ fprintf (stderr,"Listening on local %s:%d\n", inet_ntoa(sin.sin_addr), g_ntohs(sin.sin_port));
+#endif
+
+ return g_ntohs(sin.sin_port);
+}
+
+static int udp_check_for_data(int sock)
+{
+ char buf[1025], **lines;
+ char *valptr;
+ gchar *title;
+ gint len, i;
+ struct sockaddr_in from;
+ socklen_t fromlen;
+
+ fromlen = sizeof(struct sockaddr_in);
+
+ if ((len = recvfrom(sock, buf, 1024, 0, (struct sockaddr *)&from, &fromlen)) < 0)
+ {
+ if (errno != EAGAIN)
+ {
+ g_log(NULL, G_LOG_LEVEL_CRITICAL,
+ "udp_read_data(): Error reading from socket: %s", strerror(errno));
+ return -1;
+ }
+ return 0;
+ }
+ buf[len] = '\0';
+#ifdef DEBUG_UDP
+ fprintf (stderr,"Received: [%s]\n", buf);
+#endif
+ lines = g_strsplit(buf, "\n", 0);
+ if (!lines)
+ return 0;
+
+ for (i = 0; lines[i]; i++)
+ {
+ while ((lines[i][strlen(lines[i]) - 1] == '\n') ||
+ (lines[i][strlen(lines[i]) - 1] == '\r'))
+ lines[i][strlen(lines[i]) - 1] = '\0';
+
+ valptr = strchr(lines[i], ':');
+
+ if (!valptr)
+ continue;
+ else
+ valptr++;
+
+ g_strstrip(valptr);
+ if (!strlen(valptr))
+ continue;
+
+ if (strstr(lines[i], "x-audiocast-streamtitle") != NULL)
+ {
+ title = g_strdup_printf ("%s (%s)", valptr, icy_name);
+ if (going)
+ set_track_info(title, -1);
+ g_free (title);
+ }
+
+#if 0
+ else if (strstr(lines[i], "x-audiocast-streamlength") != NULL)
+ {
+ if (atoi(valptr) != -1)
+ set_track_info(NULL, atoi(valptr));
+ }
+#endif
+
+ else if (strstr(lines[i], "x-audiocast-streammsg") != NULL)
+ {
+ /* set_track_info(title, -1); */
+/* xmms_show_message(_("Message"), valptr, _("Ok"), */
+/* FALSE, NULL, NULL); */
+ g_message("Stream_message: %s", valptr);
+ }
+
+#if 0
+ /* Use this to direct your webbrowser.. yeah right.. */
+ else if (strstr(lines[i], "x-audiocast-streamurl") != NULL)
+ {
+ if (lasturl && g_strcmp (valptr, lasturl))
+ {
+ c_message (stderr, "Song URL: %s\n", valptr);
+ g_free (lasturl);
+ lasturl = g_strdup (valptr);
+ }
+ }
+#endif
+ else if (strstr(lines[i], "x-audiocast-udpseqnr:") != NULL)
+ {
+ gchar obuf[60];
+ sprintf(obuf, "x-audiocast-ack: %ld \r\n", atol(valptr));
+ if (sendto(sock, obuf, strlen(obuf), 0, (struct sockaddr *) &from, fromlen) < 0)
+ {
+ g_log(NULL, G_LOG_LEVEL_WARNING,
+ "udp_check_for_data(): Unable to send ack to server: %s", strerror(errno));
+ }
+#ifdef DEBUG_UDP
+ else
+ fprintf(stderr,"Sent ack: %s", obuf);
+ fprintf (stderr,"Remote: %s:%d\n", inet_ntoa(from.sin_addr), g_ntohs(from.sin_port));
+#endif
+ }
+ }
+ g_strfreev(lines);
+ return 0;
+}
Added: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/http.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/http.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/http.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -0,0 +1,26 @@
+/* libxmms-flac - XMMS FLAC input plugin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __HTTP_H__
+#define __HTTP_H__
+
+extern int flac_http_open(gchar * url, guint64 offset);
+extern void flac_http_close(void);
+extern int flac_http_read(gpointer data, gint length);
+
+
+#endif
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/plugin.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/plugin.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/plugin.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libxmms-flac - XMMS FLAC input plugin
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -21,6 +21,9 @@
#include <string.h>
#include <stdio.h>
#include <glib.h>
+#include <pwd.h>
+#include <sys/types.h>
+#include <unistd.h>
#include <xmms/plugin.h>
#include <xmms/util.h>
@@ -41,6 +44,7 @@
#include "share/replaygain_synthesis.h"
#include "configure.h"
#include "charset.h"
+#include "http.h"
#include "tag.h"
#ifdef min
@@ -76,6 +80,35 @@
DitherContext dither_context;
} file_info_struct;
+typedef FLAC__StreamDecoderWriteStatus (*WriteCallback) (const void *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
+typedef void (*MetadataCallback) (const void *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
+typedef void (*ErrorCallback) (const void *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
+
+typedef struct {
+ FLAC__bool seekable;
+ void* (*new_decoder) (void);
+ FLAC__bool (*set_md5_checking) (void *decoder, FLAC__bool value);
+ FLAC__bool (*set_source) (void *decoder, const char* source);
+ FLAC__bool (*set_metadata_ignore_all) (void *decoder);
+ FLAC__bool (*set_metadata_respond) (void *decoder, FLAC__MetadataType type);
+ FLAC__bool (*set_write_callback) (void *decoder, WriteCallback value);
+ FLAC__bool (*set_metadata_callback) (void *decoder, MetadataCallback value);
+ FLAC__bool (*set_error_callback) (void *decoder, ErrorCallback value);
+ FLAC__bool (*set_client_data) (void *decoder, void *value);
+ FLAC__bool (*decoder_init) (void *decoder);
+ void (*safe_decoder_finish) (void *decoder);
+ void (*safe_decoder_delete) (void *decoder);
+ FLAC__bool (*process_until_end_of_metadata) (void *decoder);
+ FLAC__bool (*process_single) (void *decoder);
+ FLAC__bool (*is_eof) (void *decoder);
+} decoder_funcs_t;
+
+#define NUM_DECODER_TYPES 2
+typedef enum {
+ DECODER_FILE,
+ DECODER_HTTP
+} decoder_t;
+
static void FLAC_XMMS__init();
static int FLAC_XMMS__is_our_file(char *filename);
static void FLAC_XMMS__play_file(char *filename);
@@ -87,18 +120,22 @@
static void FLAC_XMMS__get_song_info(char *filename, char **title, int *length);
static void *play_loop_(void *arg);
-static FLAC__bool safe_decoder_init_(const char *filename, FLAC__FileDecoder *decoder);
-static void safe_decoder_finish_(FLAC__FileDecoder *decoder);
-static void safe_decoder_delete_(FLAC__FileDecoder *decoder);
-static FLAC__StreamDecoderWriteStatus write_callback_(const FLAC__FileDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
-static void metadata_callback_(const FLAC__FileDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
-static void error_callback_(const FLAC__FileDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
+static FLAC__bool safe_decoder_init_(const char *filename, void **decoderp, decoder_funcs_t const ** fnsp);
+static void file_decoder_safe_decoder_finish_(void *decoder);
+static void file_decoder_safe_decoder_delete_(void *decoder);
+static FLAC__StreamDecoderWriteStatus write_callback_(const void *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
+static void metadata_callback_(const void *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
+static void error_callback_(const void *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
+
+static void init_decoder_func_tables();
+static decoder_t source_to_decoder_type (const char *source);
+
InputPlugin flac_ip =
{
NULL,
NULL,
- "Reference FLAC Player v" VERSION,
+ "FLAC Player v" VERSION,
FLAC_XMMS__init,
FLAC_XMMS__aboutbox,
FLAC_XMMS__configure,
@@ -127,7 +164,7 @@
static FLAC__byte sample_buffer_[SAMPLE_BUFFER_SIZE];
static unsigned sample_buffer_first_, sample_buffer_last_;
-static FLAC__FileDecoder *decoder_ = 0;
+static void *decoder_ = 0;
static file_info_struct file_info_;
static pthread_t decode_thread_;
static FLAC__bool audio_error_ = false;
@@ -138,18 +175,48 @@
#define BITRATE_HIST_SIZE 50
static unsigned bitrate_history_[BITRATE_HIST_SIZE];
+/* A table of sets of decoder functions, indexed by decoder_t */
+static const decoder_funcs_t* DECODER_FUNCS[NUM_DECODER_TYPES];
+static decoder_funcs_t const * decoder_func_table_;
+
+
InputPlugin *get_iplugin_info()
{
flac_ip.description = g_strdup_printf("Reference FLAC Player v%s", FLAC__VERSION_STRING);
return &flac_ip;
}
+void set_track_info(const char* title, int length_in_msec)
+{
+ if (file_info_.is_playing) {
+ flac_ip.set_info((char*) title, length_in_msec, file_info_.sample_rate * file_info_.channels * file_info_.bits_per_sample, file_info_.sample_rate, file_info_.channels);
+ }
+}
+
+static gchar* homedir()
+{
+ gchar *result;
+ char *env_home = getenv("HOME");
+ if (env_home) {
+ result = g_strdup (env_home);
+ } else {
+ uid_t uid = getuid();
+ struct passwd *pwent;
+ do {
+ pwent = getpwent();
+ } while (pwent && pwent->pw_uid != uid);
+ result = pwent ? g_strdup (pwent->pw_dir) : NULL;
+ endpwent();
+ }
+ return result;
+}
+
void FLAC_XMMS__init()
{
ConfigFile *cfg;
FLAC__uint32 test = 1;
-
+
is_big_endian_host_ = (*((FLAC__byte*)(&test)))? false : true;
flac_cfg.title.tag_override = FALSE;
@@ -190,8 +257,30 @@
if(!xmms_cfg_read_int(cfg, "flac", "output.resolution.replaygain.bps_out", &flac_cfg.output.resolution.replaygain.bps_out))
flac_cfg.output.resolution.replaygain.bps_out = 16;
- decoder_ = FLAC__file_decoder_new();
+ /* stream */
+ xmms_cfg_read_int(cfg, "flac", "stream.http_buffer_size", &flac_cfg.stream.http_buffer_size);
+ xmms_cfg_read_int(cfg, "flac", "stream.http_prebuffer", &flac_cfg.stream.http_prebuffer);
+ xmms_cfg_read_boolean(cfg, "flac", "stream.use_proxy", &flac_cfg.stream.use_proxy);
+ xmms_cfg_read_string(cfg, "flac", "stream.proxy_host", &flac_cfg.stream.proxy_host);
+ xmms_cfg_read_int(cfg, "flac", "stream.proxy_port", &flac_cfg.stream.proxy_port);
+ xmms_cfg_read_boolean(cfg, "flac", "stream.proxy_use_auth", &flac_cfg.stream.proxy_use_auth);
+ xmms_cfg_read_string(cfg, "flac", "stream.proxy_user", &flac_cfg.stream.proxy_user);
+ xmms_cfg_read_string(cfg, "flac", "stream.proxy_pass", &flac_cfg.stream.proxy_pass);
+ xmms_cfg_read_boolean(cfg, "flac", "stream.save_http_stream", &flac_cfg.stream.save_http_stream);
+ if (!xmms_cfg_read_string(cfg, "flac", "stream.save_http_path", &flac_cfg.stream.save_http_path) ||
+ ! *flac_cfg.stream.save_http_path) {
+ if (flac_cfg.stream.save_http_path)
+ g_free (flac_cfg.stream.save_http_path);
+ flac_cfg.stream.save_http_path = homedir();
+ }
+ xmms_cfg_read_boolean(cfg, "flac", "stream.cast_title_streaming", &flac_cfg.stream.cast_title_streaming);
+ xmms_cfg_read_boolean(cfg, "flac", "stream.use_udp_channel", &flac_cfg.stream.use_udp_channel);
+
+ init_decoder_func_tables();
+ decoder_func_table_ = DECODER_FUNCS [DECODER_FILE];
+ decoder_ = decoder_func_table_ -> new_decoder();
+
xmms_cfg_free(cfg);
}
@@ -218,14 +307,16 @@
file_info_.play_thread_open = false;
file_info_.has_replaygain = false;
- if(0 == (f = fopen(filename, "r")))
- return;
- fclose(f);
+ if (source_to_decoder_type (filename) == DECODER_FILE) {
+ if(0 == (f = fopen(filename, "r")))
+ return;
+ fclose(f);
+ }
if(decoder_ == 0)
return;
- if(!safe_decoder_init_(filename, decoder_))
+ if(!safe_decoder_init_(filename, &decoder_, &decoder_func_table_))
return;
if(file_info_.has_replaygain && flac_cfg.output.replaygain.enable) {
@@ -240,7 +331,7 @@
else {
/*@@@ need some error here like wa2: MessageBox(mod_.hMainWindow, "ERROR: plugin can only handle 8/16-bit samples\n", "ERROR: plugin can only handle 8/16-bit samples", 0); */
fprintf(stderr, "libxmms-flac: can't handle %d bit output\n", flac_cfg.output.resolution.replaygain.bps_out);
- safe_decoder_finish_(decoder_);
+ decoder_func_table_ -> safe_decoder_finish(decoder_);
return;
}
}
@@ -256,7 +347,7 @@
else {
/*@@@ need some error here like wa2: MessageBox(mod_.hMainWindow, "ERROR: plugin can only handle 8/16-bit samples\n", "ERROR: plugin can only handle 8/16-bit samples", 0); */
fprintf(stderr, "libxmms-flac: can't handle %d bit output\n", file_info_.bits_per_sample);
- safe_decoder_finish_(decoder_);
+ decoder_func_table_ -> safe_decoder_finish(decoder_);
return;
}
}
@@ -265,7 +356,7 @@
if(flac_ip.output->open_audio(file_info_.sample_format, file_info_.sample_rate, file_info_.channels) == 0) {
audio_error_ = true;
- safe_decoder_finish_(decoder_);
+ decoder_func_table_ -> safe_decoder_finish(decoder_);
return;
}
@@ -286,7 +377,7 @@
pthread_join(decode_thread_, NULL);
}
flac_ip.output->close_audio();
- safe_decoder_finish_(decoder_);
+ decoder_func_table_ -> safe_decoder_finish (decoder_);
}
}
@@ -297,11 +388,13 @@
void FLAC_XMMS__seek(int time)
{
- file_info_.seek_to_in_sec = time;
- file_info_.eof = false;
+ if (decoder_func_table_->seekable) {
+ file_info_.seek_to_in_sec = time;
+ file_info_.eof = false;
- while(file_info_.seek_to_in_sec != -1)
- xmms_usleep(10000);
+ while(file_info_.seek_to_in_sec != -1)
+ xmms_usleep(10000);
+ }
}
int FLAC_XMMS__get_time()
@@ -316,7 +409,7 @@
void FLAC_XMMS__cleanup()
{
- safe_decoder_delete_(decoder_);
+ decoder_func_table_ -> safe_decoder_delete(decoder_);
decoder_ = 0;
}
@@ -330,9 +423,13 @@
if(!FLAC__metadata_get_streaminfo(filename, &streaminfo)) {
/* @@@ how to report the error? */
if(title) {
- static const char *errtitle = "Invalid FLAC File: ";
- *title = g_malloc(strlen(errtitle) + 1 + strlen(filename) + 1 + 1);
- sprintf(*title, "%s\"%s\"", errtitle, filename);
+ if (source_to_decoder_type (filename) == DECODER_FILE) {
+ static const char *errtitle = "Invalid FLAC File: ";
+ *title = g_malloc(strlen(errtitle) + 1 + strlen(filename) + 1 + 1);
+ sprintf(*title, "%s\"%s\"", errtitle, filename);
+ } else {
+ *title = NULL;
+ }
}
if(length_in_msec)
*length_in_msec = -1;
@@ -343,7 +440,7 @@
*title = flac_format_song_title(filename);
}
if(length_in_msec)
- *length_in_msec = streaminfo.data.stream_info.total_samples * 10 / (streaminfo.data.stream_info.sample_rate / 100);
+ *length_in_msec = (unsigned)((double)streaminfo.data.stream_info.total_samples / (double)streaminfo.data.stream_info.sample_rate * 1000.0 + 0.5);
}
/***********************************************************************
@@ -363,11 +460,11 @@
unsigned s;
s = sample_buffer_last_ - sample_buffer_first_;
- if(FLAC__file_decoder_get_state(decoder_) == FLAC__FILE_DECODER_END_OF_FILE) {
+ if(decoder_func_table_ -> is_eof(decoder_)) {
file_info_.eof = true;
break;
}
- else if(!FLAC__file_decoder_process_single(decoder_)) {
+ else if (!decoder_func_table_ -> process_single(decoder_)) {
/*@@@ this should probably be a dialog */
fprintf(stderr, "libxmms-flac: READ ERROR processing frame\n");
file_info_.eof = true;
@@ -375,7 +472,7 @@
}
blocksize = sample_buffer_last_ - sample_buffer_first_ - s;
decode_position_frame_last = decode_position_frame;
- if(!FLAC__file_decoder_get_decode_position(decoder_, &decode_position_frame))
+ if(!decoder_func_table_->seekable || !FLAC__file_decoder_get_decode_position(decoder_, &decode_position_frame))
decode_position_frame = 0;
}
if(sample_buffer_last_ - sample_buffer_first_ > 0) {
@@ -414,7 +511,7 @@
}
else
xmms_usleep(10000);
- if(file_info_.seek_to_in_sec != -1) {
+ if(decoder_func_table_->seekable && file_info_.seek_to_in_sec != -1) {
const double distance = (double)file_info_.seek_to_in_sec * 1000.0 / (double)file_info_.length_in_msec;
unsigned target_sample = (unsigned)(distance * (double)file_info_.total_samples);
if(FLAC__file_decoder_seek_absolute(decoder_, (FLAC__uint64)target_sample)) {
@@ -437,7 +534,7 @@
}
}
- safe_decoder_finish_(decoder_);
+ decoder_func_table_ -> safe_decoder_finish(decoder_);
/* are these two calls necessary? */
flac_ip.output->buffer_free();
@@ -449,47 +546,186 @@
return 0; /* to silence the compiler warning about not returning a value */
}
-FLAC__bool safe_decoder_init_(const char *filename, FLAC__FileDecoder *decoder)
+/*********** File decoder functions */
+
+static FLAC__bool file_decoder_init (void *decoder)
{
- if(decoder == 0)
- return false;
+ return FLAC__file_decoder_init( (FLAC__FileDecoder*) decoder) == FLAC__FILE_DECODER_OK;
+}
- safe_decoder_finish_(decoder);
+static void file_decoder_safe_decoder_finish_(void *decoder)
+{
+ if(decoder && FLAC__file_decoder_get_state((FLAC__FileDecoder *) decoder) != FLAC__FILE_DECODER_UNINITIALIZED)
+ FLAC__file_decoder_finish((FLAC__FileDecoder *) decoder);
+}
- FLAC__file_decoder_set_md5_checking(decoder, false);
- FLAC__file_decoder_set_filename(decoder, filename);
- FLAC__file_decoder_set_metadata_ignore_all(decoder);
- FLAC__file_decoder_set_metadata_respond(decoder, FLAC__METADATA_TYPE_STREAMINFO);
- FLAC__file_decoder_set_metadata_respond(decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT);
- FLAC__file_decoder_set_write_callback(decoder, write_callback_);
- FLAC__file_decoder_set_metadata_callback(decoder, metadata_callback_);
- FLAC__file_decoder_set_error_callback(decoder, error_callback_);
- FLAC__file_decoder_set_client_data(decoder, &file_info_);
- if(FLAC__file_decoder_init(decoder) != FLAC__FILE_DECODER_OK)
- return false;
+static void file_decoder_safe_decoder_delete_(void *decoder)
+{
+ if(decoder) {
+ file_decoder_safe_decoder_finish_(decoder);
+ FLAC__file_decoder_delete( (FLAC__FileDecoder *) decoder);
+ }
+}
- if(!FLAC__file_decoder_process_until_end_of_metadata(decoder))
- return false;
+static FLAC__bool file_decoder_is_eof(void *decoder)
+{
+ return FLAC__file_decoder_get_state((FLAC__FileDecoder *) decoder) == FLAC__FILE_DECODER_END_OF_FILE;
+}
+static const decoder_funcs_t FILE_DECODER_FUNCTIONS = {
+ true,
+ (void* (*) (void)) FLAC__file_decoder_new,
+ (FLAC__bool (*) (void *, FLAC__bool)) FLAC__file_decoder_set_md5_checking,
+ (FLAC__bool (*) (void *, const char*)) FLAC__file_decoder_set_filename,
+ (FLAC__bool (*) (void *)) FLAC__file_decoder_set_metadata_ignore_all,
+ (FLAC__bool (*) (void *, FLAC__MetadataType)) FLAC__file_decoder_set_metadata_respond,
+ (FLAC__bool (*) (void *, WriteCallback)) FLAC__file_decoder_set_write_callback,
+ (FLAC__bool (*) (void *, MetadataCallback)) FLAC__file_decoder_set_metadata_callback,
+ (FLAC__bool (*) (void *, ErrorCallback)) FLAC__file_decoder_set_error_callback,
+ (FLAC__bool (*) (void *, void *)) FLAC__file_decoder_set_client_data,
+ (FLAC__bool (*) (void *)) file_decoder_init,
+ (void (*) (void *)) file_decoder_safe_decoder_finish_,
+ (void (*) (void *)) file_decoder_safe_decoder_delete_,
+ (FLAC__bool (*) (void *)) FLAC__file_decoder_process_until_end_of_metadata,
+ (FLAC__bool (*) (void *)) FLAC__file_decoder_process_single,
+ file_decoder_is_eof
+};
+
+/*********** HTTP decoder functions */
+
+static gchar *url_;
+
+static FLAC__bool http_decoder_set_md5_checking (void *decoder, FLAC__bool value)
+{
+ (void) value;
+ // operation unsupported
+ return FLAC__stream_decoder_get_state ((const FLAC__StreamDecoder *) decoder) ==
+ FLAC__STREAM_DECODER_UNINITIALIZED;
+}
+
+static FLAC__bool http_decoder_set_url (void *decoder, const char* url)
+{
+ (void) decoder;
+ url_ = g_strdup (url);
return true;
}
-void safe_decoder_finish_(FLAC__FileDecoder *decoder)
+static FLAC__StreamDecoderReadStatus http_decoder_read_callback (const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data)
{
- if(decoder && FLAC__file_decoder_get_state(decoder) != FLAC__FILE_DECODER_UNINITIALIZED)
- FLAC__file_decoder_finish(decoder);
+ (void) decoder;
+ (void) client_data;
+ *bytes = flac_http_read (buffer, *bytes);
+ return *bytes ? FLAC__STREAM_DECODER_READ_STATUS_CONTINUE : FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
}
-void safe_decoder_delete_(FLAC__FileDecoder *decoder)
+static FLAC__bool http_decoder_init (void *decoder)
{
+ flac_http_open (url_, 0);
+ g_free (url_);
+ FLAC__stream_decoder_set_read_callback (decoder, http_decoder_read_callback);
+ return FLAC__stream_decoder_init( (FLAC__StreamDecoder*) decoder) == FLAC__STREAM_DECODER_SEARCH_FOR_METADATA;
+}
+
+static void http_decoder_safe_decoder_finish_(void *decoder)
+{
+ if(decoder && FLAC__stream_decoder_get_state((FLAC__StreamDecoder *) decoder) != FLAC__STREAM_DECODER_UNINITIALIZED) {
+ FLAC__stream_decoder_finish((FLAC__StreamDecoder *) decoder);
+ flac_http_close();
+ }
+}
+
+static void http_decoder_safe_decoder_delete_(void *decoder)
+{
if(decoder) {
- safe_decoder_finish_(decoder);
- FLAC__file_decoder_delete(decoder);
+ http_decoder_safe_decoder_finish_(decoder);
+ FLAC__stream_decoder_delete( (FLAC__StreamDecoder *) decoder);
}
}
-FLAC__StreamDecoderWriteStatus write_callback_(const FLAC__FileDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
+static FLAC__bool http_decoder_is_eof(void *decoder)
{
+ return FLAC__stream_decoder_get_state((FLAC__StreamDecoder *) decoder) == FLAC__STREAM_DECODER_END_OF_STREAM;
+}
+
+static const decoder_funcs_t HTTP_DECODER_FUNCTIONS = {
+ false,
+ (void* (*) (void)) FLAC__stream_decoder_new,
+ http_decoder_set_md5_checking,
+ (FLAC__bool (*) (void *, const char*)) http_decoder_set_url,
+ (FLAC__bool (*) (void *)) FLAC__stream_decoder_set_metadata_ignore_all,
+ (FLAC__bool (*) (void *, FLAC__MetadataType)) FLAC__stream_decoder_set_metadata_respond,
+ (FLAC__bool (*) (void *, WriteCallback)) FLAC__stream_decoder_set_write_callback,
+ (FLAC__bool (*) (void *, MetadataCallback)) FLAC__stream_decoder_set_metadata_callback,
+ (FLAC__bool (*) (void *, ErrorCallback)) FLAC__stream_decoder_set_error_callback,
+ (FLAC__bool (*) (void *, void *)) FLAC__stream_decoder_set_client_data,
+ (FLAC__bool (*) (void *)) http_decoder_init,
+ (void (*) (void *)) http_decoder_safe_decoder_finish_,
+ (void (*) (void *)) http_decoder_safe_decoder_delete_,
+ (FLAC__bool (*) (void *)) FLAC__stream_decoder_process_until_end_of_metadata,
+ (FLAC__bool (*) (void *)) FLAC__stream_decoder_process_single,
+ http_decoder_is_eof
+};
+
+static decoder_funcs_t const *decoder_func_table_;
+
+static void init_decoder_func_tables()
+{
+ DECODER_FUNCS [DECODER_FILE] = & FILE_DECODER_FUNCTIONS;
+ DECODER_FUNCS [DECODER_HTTP] = & HTTP_DECODER_FUNCTIONS;
+}
+
+static decoder_t source_to_decoder_type (const char *source)
+{
+ return strncasecmp(source, "http://", 7) ? DECODER_FILE : DECODER_HTTP;
+}
+
+static void change_decoder_if_needed (decoder_t new_decoder_type, void **decoderp, decoder_funcs_t const ** fntabp)
+{
+ const decoder_funcs_t *new_fn_table = DECODER_FUNCS [new_decoder_type];
+ if (*fntabp != new_fn_table) {
+ (*fntabp)->safe_decoder_delete(*decoderp);
+ *fntabp = new_fn_table;
+ *decoderp = new_fn_table -> new_decoder();
+ }
+}
+
+FLAC__bool safe_decoder_init_(const char *filename, void **decoderp, decoder_funcs_t const ** fntabp)
+{
+ if(decoderp == 0 || *decoderp == 0)
+ return false;
+
+ (*fntabp)->safe_decoder_finish(*decoderp);
+
+ change_decoder_if_needed(source_to_decoder_type(filename), decoderp, fntabp);
+
+ {
+ decoder_funcs_t const *fntab = *fntabp;
+ void *decoder = *decoderp;
+
+ decoder = *decoderp;
+ fntab = *fntabp;
+
+ fntab -> set_md5_checking(decoder, false);
+ fntab -> set_source(decoder, filename);
+ fntab -> set_metadata_ignore_all(decoder);
+ fntab -> set_metadata_respond(decoder, FLAC__METADATA_TYPE_STREAMINFO);
+ fntab -> set_metadata_respond(decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT);
+ fntab -> set_write_callback(decoder, write_callback_);
+ fntab -> set_metadata_callback(decoder, metadata_callback_);
+ fntab -> set_error_callback(decoder, error_callback_);
+ fntab -> set_client_data(decoder, &file_info_);
+ if(!fntab -> decoder_init(decoder))
+ return false;
+
+ if(!fntab -> process_until_end_of_metadata(decoder))
+ return false;
+ }
+
+ return true;
+}
+
+FLAC__StreamDecoderWriteStatus write_callback_(const void *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
+{
file_info_struct *file_info = (file_info_struct *)client_data;
const unsigned channels = file_info->channels, wide_samples = frame->header.blocksize;
const unsigned bits_per_sample = file_info->bits_per_sample;
@@ -548,7 +784,7 @@
return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
}
-void metadata_callback_(const FLAC__FileDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
+void metadata_callback_(const void *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
{
file_info_struct *file_info = (file_info_struct *)client_data;
(void)decoder;
@@ -558,7 +794,7 @@
file_info->bits_per_sample = metadata->data.stream_info.bits_per_sample;
file_info->channels = metadata->data.stream_info.channels;
file_info->sample_rate = metadata->data.stream_info.sample_rate;
- file_info->length_in_msec = (FLAC__uint64)file_info->total_samples * 10 / (file_info->sample_rate / 100);
+ file_info->length_in_msec = (unsigned)((double)file_info->total_samples / (double)file_info->sample_rate * 1000.0 + 0.5);
}
else if(metadata->type == FLAC__METADATA_TYPE_VORBIS_COMMENT) {
double gain, peak;
@@ -569,7 +805,7 @@
}
}
-void error_callback_(const FLAC__FileDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
+void error_callback_(const void *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
{
file_info_struct *file_info = (file_info_struct *)client_data;
(void)decoder;
Added: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/plugin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/plugin.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/plugin.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -0,0 +1,24 @@
+/* libxmms-flac - XMMS FLAC input plugin
+ * Copyright (C) 2004,2005 Josh Coalson
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef FLAC__PLUGIN_XMMS__PLUGIN_H
+#define FLAC__PLUGIN_XMMS__PLUGIN_H
+
+void set_track_info(const char* title, int length_in_msec);
+
+#endif
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/tag.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/tag.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/tag.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,6 +1,6 @@
/* libxmms-flac - XMMS FLAC input plugin
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
- * Copyright (C) 2002,2003,2004 Daisuke Shimamura
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Daisuke Shimamura
*
* Based on FLAC plugin.c and mpg123 plugin
*
@@ -29,8 +29,7 @@
#include <xmms/titlestring.h>
#include "FLAC/metadata.h"
-#include "plugin_common/canonical_tag.h"
-#include "plugin_common/vorbiscomment.h"
+#include "plugin_common/tags.h"
#include "charset.h"
#include "configure.h"
@@ -65,21 +64,19 @@
return 0;
}
-static char *local__getfield(FLAC_Plugin__CanonicalTag *tag, const wchar_t *name)
+static char *local__getfield(const FLAC__StreamMetadata *tags, const char *name)
{
- const wchar_t *ucs2 = FLAC_plugin__canonical_get(tag, name);
- if (0 != ucs2) {
- char *utf8 = FLAC_plugin__convert_ucs2_to_utf8(FLAC_plugin__canonical_get(tag, name));
- if(flac_cfg.title.convert_char_set) {
- char *user = convert_from_utf8_to_user(utf8);
- free(utf8);
- return user;
+ if (0 != tags) {
+ const char *utf8 = FLAC_plugin__tags_get_tag_utf8(tags, name);
+ if (0 != utf8) {
+ if(flac_cfg.title.convert_char_set)
+ return convert_from_utf8_to_user(utf8);
+ else
+ return strdup(utf8);
}
- else
- return utf8;
}
- else
- return 0;
+
+ return 0;
}
static void local__safe_free(char *s)
@@ -99,22 +96,20 @@
{
char *ret = NULL;
TitleInput *input = NULL;
- FLAC_Plugin__CanonicalTag tag;
+ FLAC__StreamMetadata *tags;
char *title, *artist, *performer, *album, *date, *tracknumber, *genre, *description;
- FLAC_plugin__canonical_tag_init(&tag);
+ FLAC_plugin__tags_get(filename, &tags);
- FLAC_plugin__vorbiscomment_get(filename, &tag, /*sep=*/0);
+ title = local__getfield(tags, "TITLE");
+ artist = local__getfield(tags, "ARTIST");
+ performer = local__getfield(tags, "PERFORMER");
+ album = local__getfield(tags, "ALBUM");
+ date = local__getfield(tags, "DATE");
+ tracknumber = local__getfield(tags, "TRACKNUMBER");
+ genre = local__getfield(tags, "GENRE");
+ description = local__getfield(tags, "DESCRIPTION");
- title = local__getfield(&tag, L"TITLE");
- artist = local__getfield(&tag, L"ARTIST");
- performer = local__getfield(&tag, L"PERFORMER");
- album = local__getfield(&tag, L"ALBUM");
- date = local__getfield(&tag, L"DATE");
- tracknumber = local__getfield(&tag, L"TRACKNUMBER");
- genre = local__getfield(&tag, L"GENRE");
- description = local__getfield(&tag, L"DESCRIPTION");
-
XMMS_NEW_TITLEINPUT(input);
input->performer = local__getstr(performer);
@@ -142,7 +137,7 @@
*(local__extname(ret) - 1) = '\0'; /* removes period */
}
- FLAC_plugin__canonical_tag_clear(&tag);
+ FLAC_plugin__tags_destroy(&tags);
local__safe_free(title);
local__safe_free(artist);
local__safe_free(performer);
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/tag.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/tag.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/plugin_xmms/tag.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* libxmms-flac - XMMS FLAC input plugin
- * Copyright (C) 2002,2003,2004 Daisuke Shimamura
+ * Copyright (C) 2002,2003,2004,2005 Daisuke Shimamura
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
@@ -76,6 +76,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -111,10 +112,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -127,12 +136,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/Makefile.lite
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/Makefile.lite 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/Makefile.lite 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/getopt/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/getopt/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/getopt/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -74,6 +74,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -109,10 +110,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -125,12 +134,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/getopt/getopt.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/getopt/getopt.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/getopt/getopt.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -125,7 +125,7 @@
Also, when `ordering' is RETURN_IN_ORDER,
each non-option ARGV-element is returned here. */
-char *share__optarg;
+char *share__optarg = 0; /*[JEC] initialize to avoid being a 'Common' symbol */
/* Index in ARGV of the next element to be scanned.
This is used for communication to and from the caller
@@ -146,7 +146,7 @@
causes problems with re-calling getopt as programs generally don't
know that. */
-int share____getopt_initialized;
+static int share____getopt_initialized = 0;
/* The next char to be scanned in the option-element
in which the last option character we returned was found.
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/grabbag/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/grabbag/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/grabbag/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -74,6 +74,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -109,10 +110,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -125,12 +134,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/grabbag/cuesheet.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/grabbag/cuesheet.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/grabbag/cuesheet.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* grabbag - Convenience lib for various routines common to several tools
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/grabbag/file.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/grabbag/file.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/grabbag/file.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* grabbag - Convenience lib for various routines common to several tools
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/grabbag/replaygain.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/grabbag/replaygain.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/grabbag/replaygain.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* grabbag - Convenience lib for various routines common to several tools
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -102,7 +102,7 @@
entry.entry = (FLAC__byte *)buffer;
entry.length = strlen(buffer);
- return FLAC__metadata_object_vorbiscomment_insert_comment(block, block->data.vorbis_comment.num_comments, entry, /*copy=*/true);
+ return FLAC__metadata_object_vorbiscomment_append_comment(block, entry, /*copy=*/true);
}
FLAC__bool grabbag__replaygain_is_valid_sample_frequency(unsigned sample_frequency)
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/grabbag/seektable.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/grabbag/seektable.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/grabbag/seektable.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* grabbag - Convenience lib for various routines common to several tools
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -61,7 +61,7 @@
double sec = atof(pt);
if(sec > 0.0) {
#if defined _MSC_VER || defined __MINGW32__
- /* with VC++ you have to spoon feed it the casting */
+ /* with MSVC you have to spoon feed it the casting */
unsigned n = (unsigned)((double)(FLAC__int64)total_samples_to_encode / (sec * (double)sample_rate));
#else
unsigned n = (unsigned)((double)total_samples_to_encode / (sec * (double)sample_rate));
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/replaygain_analysis/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/replaygain_analysis/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/replaygain_analysis/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -72,6 +72,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -107,10 +108,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -123,12 +132,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/replaygain_synthesis/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/replaygain_synthesis/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/replaygain_synthesis/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -79,6 +79,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -114,10 +115,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -130,12 +139,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/replaygain_synthesis/include/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/replaygain_synthesis/include/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/replaygain_synthesis/include/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# replaygain_synthesis - Routines for applying ReplayGain to a signal
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/replaygain_synthesis/include/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/replaygain_synthesis/include/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/replaygain_synthesis/include/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# replaygain_synthesis - Routines for applying ReplayGain to a signal
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -76,6 +76,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -111,10 +112,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -127,12 +136,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/replaygain_synthesis/include/private/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/replaygain_synthesis/include/private/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/replaygain_synthesis/include/private/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# replaygain_synthesis - Routines for applying ReplayGain to a signal
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/replaygain_synthesis/include/private/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/replaygain_synthesis/include/private/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/replaygain_synthesis/include/private/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# replaygain_synthesis - Routines for applying ReplayGain to a signal
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -72,6 +72,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -107,10 +108,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -123,12 +132,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/replaygain_synthesis/replaygain_synthesis.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/replaygain_synthesis/replaygain_synthesis.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/replaygain_synthesis/replaygain_synthesis.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* replaygain_synthesis - Routines for applying ReplayGain to a signal
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -46,7 +46,7 @@
#define FLAC__INLINE
#endif
-/* adjust for compilers that can't understand using LLU suffix for uint64_t literals */
+/* adjust for compilers that can't understand using LL suffix for int64_t literals */
#ifdef _MSC_VER
#define FLAC__I64L(x) x
#else
@@ -236,10 +236,14 @@
static FLAC__INLINE FLAC__int64 dither_output_(DitherContext *d, FLAC__bool do_dithering, int shapingtype, int i, double Sum, int k)
{
- double doubletmp, Sum2;
+ union {
+ double d;
+ FLAC__int64 i;
+ } doubletmp;
+ double Sum2;
FLAC__int64 val;
-#define ROUND64(x) ( doubletmp = (x) + d->Add + (FLAC__int64)FLAC__I64L(0x001FFFFD80000000), *(FLAC__int64*)(&doubletmp) - (FLAC__int64)FLAC__I64L(0x433FFFFD80000000) )
+#define ROUND64(x) ( doubletmp.d = (x) + d->Add + (FLAC__int64)FLAC__I64L(0x001FFFFD80000000), doubletmp.i - (FLAC__int64)FLAC__I64L(0x433FFFFD80000000) )
if(do_dithering) {
if(shapingtype == 0) {
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/utf8/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/utf8/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/utf8/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -72,6 +72,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -107,10 +108,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -123,12 +132,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/utf8/Makefile.lite
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/utf8/Makefile.lite 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/share/utf8/Makefile.lite 2005-10-20 12:55:24 UTC (rev 10204)
@@ -5,7 +5,7 @@
topdir = ../../..
LIB_NAME = libutf8
-INCLUDES = -I$(topdir)/include -I$(topdir)/include/share
+INCLUDES = -I$(topdir)/include -I$(topdir)/include/share -I$(ICONV_INCLUDE_DIR)
SRCS_C = \
charset.c \
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_grabbag/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_grabbag/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_grabbag/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_grabbag/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_grabbag/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_grabbag/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
@@ -76,6 +76,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -111,10 +112,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -127,12 +136,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_grabbag/Makefile.lite
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_grabbag/Makefile.lite 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_grabbag/Makefile.lite 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# test_grabbag - Simple testers for the grabbag library
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_grabbag/cuesheet/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_grabbag/cuesheet/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_grabbag/cuesheet/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# test_cuesheet - Simple tester for cuesheet routines in grabbag
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -19,8 +19,6 @@
Makefile.lite \
test_cuesheet.dsp
-CFLAGS = @CFLAGS@
-
noinst_PROGRAMS = test_cuesheet
test_cuesheet_SOURCES = \
main.c
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_grabbag/cuesheet/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_grabbag/cuesheet/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_grabbag/cuesheet/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# test_cuesheet - Simple tester for cuesheet routines in grabbag
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -92,6 +92,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -127,10 +128,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -143,12 +152,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_grabbag/cuesheet/Makefile.lite
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_grabbag/cuesheet/Makefile.lite 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_grabbag/cuesheet/Makefile.lite 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# test_cuesheet - Simple tester for cuesheet routines in grabbag
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -20,10 +20,18 @@
#
topdir = ../../..
+libdir = $(topdir)/obj/$(BUILD)/lib
PROGRAM_NAME = test_cuesheet
-INCLUDES = -I./include -I$(topdir)/include
-LIBS = -lgrabbag -lreplaygain_analysis -lFLAC -lm
+
+INCLUDES = -I./include -I$(topdir)/include
+
+ifeq ($(DARWIN_BUILD),yes)
+EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libreplaygain_analysis.a $(libdir)/libFLAC.a -lm
+else
+LIBS = -lgrabbag -lreplaygain_analysis -lFLAC -lm
+endif
+
SRCS_C = \
main.c
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_grabbag/cuesheet/main.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_grabbag/cuesheet/main.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_grabbag/cuesheet/main.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_cuesheet - Simple tester for cuesheet routines in grabbag
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# test_libFLAC - Unit tester for libFLAC
-# Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -19,7 +19,6 @@
Makefile.lite \
test_libFLAC.dsp
-CFLAGS = @CFLAGS@
INCLUDES = -I$(top_srcdir)/src/libFLAC/include
noinst_PROGRAMS = test_libFLAC
@@ -33,6 +32,7 @@
decoders.c \
encoders.c \
file_utils.c \
+ format.c \
main.c \
metadata.c \
metadata_manip.c \
@@ -42,5 +42,6 @@
decoders.h \
encoders.h \
file_utils.h \
+ format.h \
metadata.h \
metadata_utils.h
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# test_libFLAC - Unit tester for libFLAC
-# Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -66,8 +66,8 @@
CONFIG_CLEAN_FILES =
PROGRAMS = $(noinst_PROGRAMS)
am_test_libFLAC_OBJECTS = bitbuffer.$(OBJEXT) decoders.$(OBJEXT) \
- encoders.$(OBJEXT) file_utils.$(OBJEXT) main.$(OBJEXT) \
- metadata.$(OBJEXT) metadata_manip.$(OBJEXT) \
+ encoders.$(OBJEXT) file_utils.$(OBJEXT) format.$(OBJEXT) \
+ main.$(OBJEXT) metadata.$(OBJEXT) metadata_manip.$(OBJEXT) \
metadata_object.$(OBJEXT) metadata_utils.$(OBJEXT)
test_libFLAC_OBJECTS = $(am_test_libFLAC_OBJECTS)
test_libFLAC_DEPENDENCIES = \
@@ -79,8 +79,8 @@
am__depfiles_maybe = depfiles
@AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/bitbuffer.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/decoders.Po ./$(DEPDIR)/encoders.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/file_utils.Po ./$(DEPDIR)/main.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/metadata.Po \
+ at AMDEP_TRUE@ ./$(DEPDIR)/file_utils.Po ./$(DEPDIR)/format.Po \
+ at AMDEP_TRUE@ ./$(DEPDIR)/main.Po ./$(DEPDIR)/metadata.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/metadata_manip.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/metadata_object.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/metadata_utils.Po
@@ -101,6 +101,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -136,10 +137,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -152,12 +161,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -257,6 +271,7 @@
decoders.c \
encoders.c \
file_utils.c \
+ format.c \
main.c \
metadata.c \
metadata_manip.c \
@@ -266,6 +281,7 @@
decoders.h \
encoders.h \
file_utils.h \
+ format.h \
metadata.h \
metadata_utils.h
@@ -323,6 +339,7 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/decoders.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/encoders.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/file_utils.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/format.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/metadata.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/metadata_manip.Po at am__quote@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/Makefile.lite
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/Makefile.lite 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/Makefile.lite 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# test_libFLAC - Unit tester for libFLAC
-# Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -20,15 +20,24 @@
#
topdir = ../..
+libdir = $(topdir)/obj/$(BUILD)/lib
PROGRAM_NAME = test_libFLAC
-INCLUDES = -I../libFLAC/include -I$(topdir)/include
-LIBS = -lgrabbag -lreplaygain_analysis -lFLAC -lm
+
+INCLUDES = -I../libFLAC/include -I$(topdir)/include
+
+ifeq ($(DARWIN_BUILD),yes)
+EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libreplaygain_analysis.a $(libdir)/libFLAC.a -lm
+else
+LIBS = -lgrabbag -lreplaygain_analysis -lFLAC -lm
+endif
+
SRCS_C = \
bitbuffer.c \
decoders.c \
encoders.c \
file_utils.c \
+ format.c \
main.c \
metadata.c \
metadata_manip.c \
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/bitbuffer.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/bitbuffer.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/bitbuffer.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libFLAC - Unit tester for libFLAC
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/bitbuffer.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/bitbuffer.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/bitbuffer.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libFLAC - Unit tester for libFLAC
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/decoders.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/decoders.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/decoders.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libFLAC - Unit tester for libFLAC
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/decoders.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/decoders.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/decoders.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libFLAC - Unit tester for libFLAC
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/encoders.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/encoders.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/encoders.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libFLAC - Unit tester for libFLAC
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/encoders.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/encoders.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/encoders.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libFLAC - Unit tester for libFLAC
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/file_utils.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/file_utils.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/file_utils.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libFLAC - Unit tester for libFLAC
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/file_utils.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/file_utils.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/file_utils.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libFLAC - Unit tester for libFLAC
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Added: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/format.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/format.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/format.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -0,0 +1,222 @@
+/* test_libFLAC - Unit tester for libFLAC
+ * Copyright (C) 2004,2005 Josh Coalson
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "FLAC/assert.h"
+#include "FLAC/format.h"
+#include <stdio.h>
+
+static const char *true_false_string_[2] = { "false", "true" };
+
+static struct {
+ unsigned rate;
+ FLAC__bool valid;
+} SAMPLE_RATES[] = {
+ { 0, false },
+ { 1, true },
+ { 9, true },
+ { 10, true },
+ { 4000, true },
+ { 8000, true },
+ { 11025, true },
+ { 12000, true },
+ { 16000, true },
+ { 22050, true },
+ { 24000, true },
+ { 32000, true },
+ { 32768, true },
+ { 44100, true },
+ { 48000, true },
+ { 65000, true },
+ { 65535, true },
+ { 65536, false },
+ { 65540, true },
+ { 65550, true },
+ { 65555, false },
+ { 66000, true },
+ { 66001, false },
+ { 96000, true },
+ { 100000, true },
+ { 100001, false },
+ { 192000, true },
+ { 500000, true },
+ { 500001, false },
+ { 500010, true },
+ { 700000, false },
+ { 700010, false },
+ { 1000000, false },
+ { 1100000, false }
+};
+
+static struct {
+ const char *string;
+ FLAC__bool valid;
+} VCENTRY_NAMES[] = {
+ { "", true },
+ { "a", true },
+ { "=", false },
+ { "a=", false },
+ { "\x01", false },
+ { "\x1f", false },
+ { "\x7d", true },
+ { "\x7e", false },
+ { "\xff", false }
+};
+
+static struct {
+ unsigned length;
+ const FLAC__byte *string;
+ FLAC__bool valid;
+} VCENTRY_VALUES[] = {
+ { 0, (const FLAC__byte*)"", true },
+ { 1, (const FLAC__byte*)"", true },
+ { 1, (const FLAC__byte*)"\x01", true },
+ { 1, (const FLAC__byte*)"\x7f", true },
+ { 1, (const FLAC__byte*)"\x80", false },
+ { 1, (const FLAC__byte*)"\x81", false },
+ { 1, (const FLAC__byte*)"\xc0", false },
+ { 1, (const FLAC__byte*)"\xe0", false },
+ { 1, (const FLAC__byte*)"\xf0", false },
+ { 2, (const FLAC__byte*)"\xc0\x41", false },
+ { 2, (const FLAC__byte*)"\xc1\x41", false },
+ { 2, (const FLAC__byte*)"\xc0\x85", true },
+ { 2, (const FLAC__byte*)"\xc1\x85", true },
+ { 2, (const FLAC__byte*)"\xe0\x41", false },
+ { 2, (const FLAC__byte*)"\xe1\x41", false },
+ { 2, (const FLAC__byte*)"\xe0\x85", false },
+ { 2, (const FLAC__byte*)"\xe1\x85", false },
+ { 3, (const FLAC__byte*)"\xe0\x85\x41", false },
+ { 3, (const FLAC__byte*)"\xe1\x85\x41", false },
+ { 3, (const FLAC__byte*)"\xe0\x85\x80", true },
+ { 3, (const FLAC__byte*)"\xe1\x85\x80", true }
+};
+
+static struct {
+ const FLAC__byte *string;
+ FLAC__bool valid;
+} VCENTRY_VALUES_NT[] = {
+ { (FLAC__byte*)"", true },
+ { (FLAC__byte*)"\x01", true },
+ { (FLAC__byte*)"\x7f", true },
+ { (FLAC__byte*)"\x80", false },
+ { (FLAC__byte*)"\x81", false },
+ { (FLAC__byte*)"\xc0", false },
+ { (FLAC__byte*)"\xe0", false },
+ { (FLAC__byte*)"\xf0", false },
+ { (FLAC__byte*)"\xc0\x41", false },
+ { (FLAC__byte*)"\xc1\x41", false },
+ { (FLAC__byte*)"\xc0\x85", true },
+ { (FLAC__byte*)"\xc1\x85", true },
+ { (FLAC__byte*)"\xe0\x41", false },
+ { (FLAC__byte*)"\xe1\x41", false },
+ { (FLAC__byte*)"\xe0\x85", false },
+ { (FLAC__byte*)"\xe1\x85", false },
+ { (FLAC__byte*)"\xe0\x85\x41", false },
+ { (FLAC__byte*)"\xe1\x85\x41", false },
+ { (FLAC__byte*)"\xe0\x85\x80", true },
+ { (FLAC__byte*)"\xe1\x85\x80", true }
+};
+
+static struct {
+ unsigned length;
+ const FLAC__byte *string;
+ FLAC__bool valid;
+} VCENTRIES[] = {
+ { 0, (const FLAC__byte*)"", false },
+ { 1, (const FLAC__byte*)"a", false },
+ { 1, (const FLAC__byte*)"=", true },
+ { 2, (const FLAC__byte*)"a=", true },
+ { 2, (const FLAC__byte*)"\x01=", false },
+ { 2, (const FLAC__byte*)"\x1f=", false },
+ { 2, (const FLAC__byte*)"\x7d=", true },
+ { 2, (const FLAC__byte*)"\x7e=", false },
+ { 2, (const FLAC__byte *)"\xff=", false },
+ { 3, (const FLAC__byte*)"a=\x01", true },
+ { 3, (const FLAC__byte*)"a=\x7f", true },
+ { 3, (const FLAC__byte*)"a=\x80", false },
+ { 3, (const FLAC__byte*)"a=\x81", false },
+ { 3, (const FLAC__byte*)"a=\xc0", false },
+ { 3, (const FLAC__byte*)"a=\xe0", false },
+ { 3, (const FLAC__byte*)"a=\xf0", false },
+ { 4, (const FLAC__byte*)"a=\xc0\x41", false },
+ { 4, (const FLAC__byte*)"a=\xc1\x41", false },
+ { 4, (const FLAC__byte*)"a=\xc0\x85", true },
+ { 4, (const FLAC__byte*)"a=\xc1\x85", true },
+ { 4, (const FLAC__byte*)"a=\xe0\x41", false },
+ { 4, (const FLAC__byte*)"a=\xe1\x41", false },
+ { 4, (const FLAC__byte*)"a=\xe0\x85", false },
+ { 4, (const FLAC__byte*)"a=\xe1\x85", false },
+ { 5, (const FLAC__byte*)"a=\xe0\x85\x41", false },
+ { 5, (const FLAC__byte*)"a=\xe1\x85\x41", false },
+ { 5, (const FLAC__byte*)"a=\xe0\x85\x80", true },
+ { 5, (const FLAC__byte*)"a=\xe1\x85\x80", true }
+};
+
+FLAC__bool test_format()
+{
+ unsigned i;
+
+ printf("\n+++ libFLAC unit test: format\n\n");
+
+ for(i = 0; i < sizeof(SAMPLE_RATES)/sizeof(SAMPLE_RATES[0]); i++) {
+ printf("testing FLAC__format_sample_rate_is_valid(%u)... ", SAMPLE_RATES[i].rate);
+ if(FLAC__format_sample_rate_is_valid(SAMPLE_RATES[i].rate) != SAMPLE_RATES[i].valid) {
+ printf("FAILED, expected %s, got %s\n", true_false_string_[SAMPLE_RATES[i].valid], true_false_string_[!SAMPLE_RATES[i].valid]);
+ return false;
+ }
+ printf("OK\n");
+ }
+
+ for(i = 0; i < sizeof(VCENTRY_NAMES)/sizeof(VCENTRY_NAMES[0]); i++) {
+ printf("testing FLAC__format_vorbiscomment_entry_name_is_legal(\"%s\")... ", VCENTRY_NAMES[i].string);
+ if(FLAC__format_vorbiscomment_entry_name_is_legal(VCENTRY_NAMES[i].string) != VCENTRY_NAMES[i].valid) {
+ printf("FAILED, expected %s, got %s\n", true_false_string_[VCENTRY_NAMES[i].valid], true_false_string_[!VCENTRY_NAMES[i].valid]);
+ return false;
+ }
+ printf("OK\n");
+ }
+
+ for(i = 0; i < sizeof(VCENTRY_VALUES)/sizeof(VCENTRY_VALUES[0]); i++) {
+ printf("testing FLAC__format_vorbiscomment_entry_value_is_legal(\"%s\", %u)... ", VCENTRY_VALUES[i].string, VCENTRY_VALUES[i].length);
+ if(FLAC__format_vorbiscomment_entry_value_is_legal(VCENTRY_VALUES[i].string, VCENTRY_VALUES[i].length) != VCENTRY_VALUES[i].valid) {
+ printf("FAILED, expected %s, got %s\n", true_false_string_[VCENTRY_VALUES[i].valid], true_false_string_[!VCENTRY_VALUES[i].valid]);
+ return false;
+ }
+ printf("OK\n");
+ }
+
+ for(i = 0; i < sizeof(VCENTRY_VALUES_NT)/sizeof(VCENTRY_VALUES_NT[0]); i++) {
+ printf("testing FLAC__format_vorbiscomment_entry_value_is_legal(\"%s\", -1)... ", VCENTRY_VALUES_NT[i].string);
+ if(FLAC__format_vorbiscomment_entry_value_is_legal(VCENTRY_VALUES_NT[i].string, (unsigned)(-1)) != VCENTRY_VALUES_NT[i].valid) {
+ printf("FAILED, expected %s, got %s\n", true_false_string_[VCENTRY_VALUES_NT[i].valid], true_false_string_[!VCENTRY_VALUES_NT[i].valid]);
+ return false;
+ }
+ printf("OK\n");
+ }
+
+ for(i = 0; i < sizeof(VCENTRIES)/sizeof(VCENTRIES[0]); i++) {
+ printf("testing FLAC__format_vorbiscomment_entry_is_legal(\"%s\", %u)... ", VCENTRIES[i].string, VCENTRIES[i].length);
+ if(FLAC__format_vorbiscomment_entry_is_legal(VCENTRIES[i].string, VCENTRIES[i].length) != VCENTRIES[i].valid) {
+ printf("FAILED, expected %s, got %s\n", true_false_string_[VCENTRIES[i].valid], true_false_string_[!VCENTRIES[i].valid]);
+ return false;
+ }
+ printf("OK\n");
+ }
+
+ printf("\nPASSED!\n");
+ return true;
+}
Added: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/format.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/format.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/format.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -0,0 +1,26 @@
+/* test_libFLAC - Unit tester for libFLAC
+ * Copyright (C) 2004,2005 Josh Coalson
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef FLAC__TEST_LIBFLAC_FORMAT_H
+#define FLAC__TEST_LIBFLAC_FORMAT_H
+
+#include "FLAC/ordinals.h"
+
+FLAC__bool test_format();
+
+#endif
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/main.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/main.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/main.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libFLAC - Unit tester for libFLAC
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -19,6 +19,7 @@
#include "bitbuffer.h"
#include "decoders.h"
#include "encoders.h"
+#include "format.h"
#include "metadata.h"
int main(int argc, char *argv[])
@@ -28,6 +29,9 @@
if(!test_bitbuffer())
return 1;
+ if(!test_format())
+ return 1;
+
if(!test_encoders())
return 1;
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/metadata.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/metadata.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/metadata.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libFLAC - Unit tester for libFLAC
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/metadata.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/metadata.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/metadata.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libFLAC - Unit tester for libFLAC
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/metadata_manip.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/metadata_manip.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/metadata_manip.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libFLAC - Unit tester for libFLAC
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -507,8 +507,8 @@
vorbiscomment.type = FLAC__METADATA_TYPE_VORBIS_COMMENT;
vorbiscomment.length = (4 + vendor_string_length) + 4;
vorbiscomment.data.vorbis_comment.vendor_string.length = vendor_string_length;
- vorbiscomment.data.vorbis_comment.vendor_string.entry = malloc_or_die_(vendor_string_length);
- memcpy(vorbiscomment.data.vorbis_comment.vendor_string.entry, FLAC__VENDOR_STRING, vendor_string_length);
+ vorbiscomment.data.vorbis_comment.vendor_string.entry = malloc_or_die_(vendor_string_length+1);
+ memcpy(vorbiscomment.data.vorbis_comment.vendor_string.entry, FLAC__VENDOR_STRING, vendor_string_length+1);
vorbiscomment.data.vorbis_comment.num_comments = 0;
vorbiscomment.data.vorbis_comment.comments = 0;
}
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/metadata_object.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/metadata_object.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/metadata_object.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libFLAC - Unit tester for libFLAC
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -142,16 +142,18 @@
static void entry_new_(FLAC__StreamMetadata_VorbisComment_Entry *entry, const char *field)
{
entry->length = strlen(field);
- entry->entry = (FLAC__byte*)malloc(entry->length);
+ entry->entry = (FLAC__byte*)malloc(entry->length+1);
FLAC__ASSERT(0 != entry->entry);
memcpy(entry->entry, field, entry->length);
+ entry->entry[entry->length] = '\0';
}
static void entry_clone_(FLAC__StreamMetadata_VorbisComment_Entry *entry)
{
- FLAC__byte *x = (FLAC__byte*)malloc(entry->length);
+ FLAC__byte *x = (FLAC__byte*)malloc(entry->length+1);
FLAC__ASSERT(0 != x);
memcpy(x, entry->entry, entry->length);
+ x[entry->length] = '\0';
entry->entry = x;
}
@@ -200,6 +202,18 @@
vc_calc_len_(block);
}
+static int vc_find_from_(FLAC__StreamMetadata *block, const char *name, unsigned start)
+{
+ const unsigned n = strlen(name);
+ unsigned i;
+ for(i = start; i < block->data.vorbis_comment.num_comments; i++) {
+ const FLAC__StreamMetadata_VorbisComment_Entry *entry = &block->data.vorbis_comment.comments[i];
+ if(entry->length > n && 0 == strncmp(entry->entry, name, n) && entry->entry[n] == '=')
+ return (int)i;
+ }
+ return -1;
+}
+
static void vc_set_vs_new_(FLAC__StreamMetadata_VorbisComment_Entry *entry, FLAC__StreamMetadata *block, const char *field)
{
if(0 != block->data.vorbis_comment.vendor_string.entry)
@@ -238,6 +252,30 @@
vc_calc_len_(block);
}
+static void vc_replace_new_(FLAC__StreamMetadata_VorbisComment_Entry *entry, FLAC__StreamMetadata *block, const char *field, FLAC__bool all)
+{
+ int index;
+ char field_name[256];
+ const char *eq = strchr(field, '=');
+ FLAC__ASSERT(eq>field && (unsigned)(eq-field) < sizeof(field_name));
+ memcpy(field_name, field, eq-field);
+ field_name[eq-field]='\0';
+
+ index = vc_find_from_(block, field_name, 0);
+ if(index < 0)
+ vc_insert_new_(entry, block, block->data.vorbis_comment.num_comments, field);
+ else {
+ vc_set_new_(entry, block, (unsigned)index, field);
+ if(all) {
+ for(index = index+1; index >= 0 && (unsigned)index < block->data.vorbis_comment.num_comments; )
+ if((index = vc_find_from_(block, field_name, (unsigned)index)) >= 0)
+ vc_delete_(block, (unsigned)index);
+ }
+ }
+
+ vc_calc_len_(block);
+}
+
static void track_new_(FLAC__StreamMetadata_CueSheet_Track *track, FLAC__uint64 offset, FLAC__byte number, const char *isrc, FLAC__bool data, FLAC__bool pre_em)
{
track->offset = offset;
@@ -430,6 +468,7 @@
FLAC__StreamMetadata_CueSheet_Index index;
FLAC__StreamMetadata_CueSheet_Track track;
unsigned i, expected_length, seekpoints;
+ int j;
static FLAC__byte dummydata[4] = { 'a', 'b', 'c', 'd' };
printf("\n+++ libFLAC unit test: metadata objects\n\n");
@@ -843,6 +882,55 @@
printf("testing VORBIS_COMMENT\n");
+ {
+ FLAC__StreamMetadata_VorbisComment_Entry entry_;
+ char *field_name, *field_value;
+
+ printf("testing FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair()... ");
+ if(!FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair(&entry_, "name", "value")) {
+ printf("FAILED, returned false\n");
+ return false;
+ }
+ if(strcmp(entry_.entry, "name=value")) {
+ printf("FAILED, field mismatch\n");
+ return false;
+ }
+ printf("OK\n");
+
+ printf("testing FLAC__metadata_object_vorbiscomment_entry_to_name_value_pair()... ");
+ if(!FLAC__metadata_object_vorbiscomment_entry_to_name_value_pair(entry_, &field_name, &field_value)) {
+ printf("FAILED, returned false\n");
+ return false;
+ }
+ if(strcmp(field_name, "name")) {
+ printf("FAILED, field name mismatch\n");
+ return false;
+ }
+ if(strcmp(field_value, "value")) {
+ printf("FAILED, field value mismatch\n");
+ return false;
+ }
+ printf("OK\n");
+
+ printf("testing FLAC__metadata_object_vorbiscomment_entry_matches()... ");
+ if(!FLAC__metadata_object_vorbiscomment_entry_matches(entry_, field_name, strlen(field_name))) {
+ printf("FAILED, expected true, returned false\n");
+ return false;
+ }
+ printf("OK\n");
+
+ printf("testing FLAC__metadata_object_vorbiscomment_entry_matches()... ");
+ if(FLAC__metadata_object_vorbiscomment_entry_matches(entry_, "blah", strlen("blah"))) {
+ printf("FAILED, expected false, returned true\n");
+ return false;
+ }
+ printf("OK\n");
+
+ free(entry_.entry);
+ free(field_name);
+ free(field_value);
+ }
+
printf("testing FLAC__metadata_object_new()... ");
block = FLAC__metadata_object_new(FLAC__METADATA_TYPE_VORBIS_COMMENT);
if(0 == block) {
@@ -896,6 +984,36 @@
return false;
printf("OK\n");
+ printf("testing FLAC__metadata_object_vorbiscomment_append_comment(copy) on empty array...");
+ vc_insert_new_(&entry, vorbiscomment, 0, "name1=field1");
+ if(!FLAC__metadata_object_vorbiscomment_append_comment(block, entry, /*copy=*/true)) {
+ printf("FAILED, returned false\n");
+ return false;
+ }
+ if(!mutils__compare_block(vorbiscomment, block))
+ return false;
+ printf("OK\n");
+
+ printf("testing FLAC__metadata_object_vorbiscomment_append_comment(copy) on non-empty array...");
+ vc_insert_new_(&entry, vorbiscomment, 1, "name2=field2");
+ if(!FLAC__metadata_object_vorbiscomment_append_comment(block, entry, /*copy=*/true)) {
+ printf("FAILED, returned false\n");
+ return false;
+ }
+ if(!mutils__compare_block(vorbiscomment, block))
+ return false;
+ printf("OK\n");
+
+ vc_resize_(vorbiscomment, 0);
+ printf("testing FLAC__metadata_object_vorbiscomment_resize_comments(shrink to %u)...", vorbiscomment->data.vorbis_comment.num_comments);
+ if(!FLAC__metadata_object_vorbiscomment_resize_comments(block, vorbiscomment->data.vorbis_comment.num_comments)) {
+ printf("FAILED, returned false\n");
+ return false;
+ }
+ if(!mutils__compare_block(vorbiscomment, block))
+ return false;
+ printf("OK\n");
+
printf("testing FLAC__metadata_object_vorbiscomment_insert_comment(copy) on empty array...");
vc_insert_new_(&entry, vorbiscomment, 0, "name1=field1");
if(!FLAC__metadata_object_vorbiscomment_insert_comment(block, 0, entry, /*copy=*/true)) {
@@ -936,6 +1054,96 @@
return false;
printf("OK\n");
+ printf("testing FLAC__metadata_object_vorbiscomment_insert_comment(copy) on end of non-empty array...");
+ vc_insert_new_(&entry, vorbiscomment, 4, "name3=field3dup1");
+ if(!FLAC__metadata_object_vorbiscomment_insert_comment(block, 4, entry, /*copy=*/true)) {
+ printf("FAILED, returned false\n");
+ return false;
+ }
+ if(!mutils__compare_block(vorbiscomment, block))
+ return false;
+ printf("OK\n");
+
+ printf("testing FLAC__metadata_object_vorbiscomment_insert_comment(copy) on end of non-empty array...");
+ vc_insert_new_(&entry, vorbiscomment, 5, "name3=field3dup1");
+ if(!FLAC__metadata_object_vorbiscomment_insert_comment(block, 5, entry, /*copy=*/true)) {
+ printf("FAILED, returned false\n");
+ return false;
+ }
+ if(!mutils__compare_block(vorbiscomment, block))
+ return false;
+ printf("OK\n");
+
+ printf("testing FLAC__metadata_object_vorbiscomment_find_entry_from()...");
+ if((j = FLAC__metadata_object_vorbiscomment_find_entry_from(block, 0, "name3")) != 1) {
+ printf("FAILED, expected 1, got %d\n", j);
+ return false;
+ }
+ printf("OK\n");
+
+ printf("testing FLAC__metadata_object_vorbiscomment_find_entry_from()...");
+ if((j = FLAC__metadata_object_vorbiscomment_find_entry_from(block, j+1, "name3")) != 4) {
+ printf("FAILED, expected 4, got %d\n", j);
+ return false;
+ }
+ printf("OK\n");
+
+ printf("testing FLAC__metadata_object_vorbiscomment_find_entry_from()...");
+ if((j = FLAC__metadata_object_vorbiscomment_find_entry_from(block, j+1, "name3")) != 5) {
+ printf("FAILED, expected 5, got %d\n", j);
+ return false;
+ }
+ printf("OK\n");
+
+ printf("testing FLAC__metadata_object_vorbiscomment_find_entry_from()...");
+ if((j = FLAC__metadata_object_vorbiscomment_find_entry_from(block, 0, "name2")) != 0) {
+ printf("FAILED, expected 0, got %d\n", j);
+ return false;
+ }
+ printf("OK\n");
+
+ printf("testing FLAC__metadata_object_vorbiscomment_find_entry_from()...");
+ if((j = FLAC__metadata_object_vorbiscomment_find_entry_from(block, j+1, "name2")) != -1) {
+ printf("FAILED, expected -1, got %d\n", j);
+ return false;
+ }
+ printf("OK\n");
+
+ printf("testing FLAC__metadata_object_vorbiscomment_find_entry_from()...");
+ if((j = FLAC__metadata_object_vorbiscomment_find_entry_from(block, 0, "blah")) != -1) {
+ printf("FAILED, expected -1, got %d\n", j);
+ return false;
+ }
+ printf("OK\n");
+
+ printf("testing FLAC__metadata_object_vorbiscomment_replace_comment(first, copy)...");
+ vc_replace_new_(&entry, vorbiscomment, "name3=field3new1", /*all=*/false);
+ if(!FLAC__metadata_object_vorbiscomment_replace_comment(block, entry, /*all=*/false, /*copy=*/true)) {
+ printf("FAILED, returned false\n");
+ return false;
+ }
+ if(!mutils__compare_block(vorbiscomment, block))
+ return false;
+ if(block->data.vorbis_comment.num_comments != 6) {
+ printf("FAILED, expected 6 comments, got %u\n", block->data.vorbis_comment.num_comments);
+ return false;
+ }
+ printf("OK\n");
+
+ printf("testing FLAC__metadata_object_vorbiscomment_replace_comment(all, copy)...");
+ vc_replace_new_(&entry, vorbiscomment, "name3=field3new2", /*all=*/true);
+ if(!FLAC__metadata_object_vorbiscomment_replace_comment(block, entry, /*all=*/true, /*copy=*/true)) {
+ printf("FAILED, returned false\n");
+ return false;
+ }
+ if(!mutils__compare_block(vorbiscomment, block))
+ return false;
+ if(block->data.vorbis_comment.num_comments != 4) {
+ printf("FAILED, expected 4 comments, got %u\n", block->data.vorbis_comment.num_comments);
+ return false;
+ }
+ printf("OK\n");
+
printf("testing FLAC__metadata_object_clone()... ");
blockcopy = FLAC__metadata_object_clone(block);
if(0 == blockcopy) {
@@ -980,6 +1188,91 @@
return false;
printf("OK\n");
+ printf("testing FLAC__metadata_object_vorbiscomment_append_comment(copy) on non-empty array...");
+ vc_insert_new_(&entry, vorbiscomment, 1, "rem0=val0");
+ if(!FLAC__metadata_object_vorbiscomment_append_comment(block, entry, /*copy=*/true)) {
+ printf("FAILED, returned false\n");
+ return false;
+ }
+ if(!mutils__compare_block(vorbiscomment, block))
+ return false;
+ printf("OK\n");
+
+ printf("testing FLAC__metadata_object_vorbiscomment_append_comment(copy) on non-empty array...");
+ vc_insert_new_(&entry, vorbiscomment, 2, "rem0=val1");
+ if(!FLAC__metadata_object_vorbiscomment_append_comment(block, entry, /*copy=*/true)) {
+ printf("FAILED, returned false\n");
+ return false;
+ }
+ if(!mutils__compare_block(vorbiscomment, block))
+ return false;
+ printf("OK\n");
+
+ printf("testing FLAC__metadata_object_vorbiscomment_append_comment(copy) on non-empty array...");
+ vc_insert_new_(&entry, vorbiscomment, 3, "rem0=val2");
+ if(!FLAC__metadata_object_vorbiscomment_append_comment(block, entry, /*copy=*/true)) {
+ printf("FAILED, returned false\n");
+ return false;
+ }
+ if(!mutils__compare_block(vorbiscomment, block))
+ return false;
+ printf("OK\n");
+
+ printf("testing FLAC__metadata_object_vorbiscomment_remove_entry_matching(\"blah\")...");
+ if((j = FLAC__metadata_object_vorbiscomment_remove_entry_matching(block, "blah")) != 0) {
+ printf("FAILED, expected 0, got %d\n", j);
+ return false;
+ }
+ if(block->data.vorbis_comment.num_comments != 4) {
+ printf("FAILED, expected 4 comments, got %u\n", block->data.vorbis_comment.num_comments);
+ return false;
+ }
+ if(!mutils__compare_block(vorbiscomment, block))
+ return false;
+ printf("OK\n");
+
+ printf("testing FLAC__metadata_object_vorbiscomment_remove_entry_matching(\"rem0\")...");
+ vc_delete_(vorbiscomment, 1);
+ if((j = FLAC__metadata_object_vorbiscomment_remove_entry_matching(block, "rem0")) != 1) {
+ printf("FAILED, expected 1, got %d\n", j);
+ return false;
+ }
+ if(block->data.vorbis_comment.num_comments != 3) {
+ printf("FAILED, expected 3 comments, got %u\n", block->data.vorbis_comment.num_comments);
+ return false;
+ }
+ if(!mutils__compare_block(vorbiscomment, block))
+ return false;
+ printf("OK\n");
+
+ printf("testing FLAC__metadata_object_vorbiscomment_remove_entries_matching(\"blah\")...");
+ if((j = FLAC__metadata_object_vorbiscomment_remove_entries_matching(block, "blah")) != 0) {
+ printf("FAILED, expected 0, got %d\n", j);
+ return false;
+ }
+ if(block->data.vorbis_comment.num_comments != 3) {
+ printf("FAILED, expected 3 comments, got %u\n", block->data.vorbis_comment.num_comments);
+ return false;
+ }
+ if(!mutils__compare_block(vorbiscomment, block))
+ return false;
+ printf("OK\n");
+
+ printf("testing FLAC__metadata_object_vorbiscomment_remove_entries_matching(\"rem0\")...");
+ vc_delete_(vorbiscomment, 1);
+ vc_delete_(vorbiscomment, 1);
+ if((j = FLAC__metadata_object_vorbiscomment_remove_entries_matching(block, "rem0")) != 2) {
+ printf("FAILED, expected 2, got %d\n", j);
+ return false;
+ }
+ if(block->data.vorbis_comment.num_comments != 1) {
+ printf("FAILED, expected 1 comments, got %u\n", block->data.vorbis_comment.num_comments);
+ return false;
+ }
+ if(!mutils__compare_block(vorbiscomment, block))
+ return false;
+ printf("OK\n");
+
printf("testing FLAC__metadata_object_vorbiscomment_set_comment(copy)...");
vc_set_new_(&entry, vorbiscomment, 0, "name5=field5");
FLAC__metadata_object_vorbiscomment_set_comment(block, 0, entry, /*copy=*/true);
@@ -1018,6 +1311,51 @@
return false;
printf("OK\n");
+ printf("testing FLAC__metadata_object_vorbiscomment_append_comment(own) on empty array...");
+ vc_insert_new_(&entry, vorbiscomment, 0, "name1=field1");
+ entry_clone_(&entry);
+ if(!FLAC__metadata_object_vorbiscomment_append_comment(block, entry, /*copy=*/false)) {
+ printf("FAILED, returned false\n");
+ return false;
+ }
+ if(!mutils__compare_block(vorbiscomment, block))
+ return false;
+ printf("OK\n");
+
+ printf("testing FLAC__metadata_object_vorbiscomment_append_comment(own) on non-empty array...");
+ vc_insert_new_(&entry, vorbiscomment, 1, "name2=field2");
+ entry_clone_(&entry);
+ if(!FLAC__metadata_object_vorbiscomment_append_comment(block, entry, /*copy=*/false)) {
+ printf("FAILED, returned false\n");
+ return false;
+ }
+ if(!mutils__compare_block(vorbiscomment, block))
+ return false;
+ printf("OK\n");
+
+ printf("testing FLAC__metadata_object_delete()... ");
+ FLAC__metadata_object_delete(vorbiscomment);
+ FLAC__metadata_object_delete(block);
+ printf("OK\n");
+
+ printf("testing FLAC__metadata_object_new()... ");
+ block = FLAC__metadata_object_new(FLAC__METADATA_TYPE_VORBIS_COMMENT);
+ if(0 == block) {
+ printf("FAILED, returned NULL\n");
+ return false;
+ }
+ printf("OK\n");
+
+ printf("testing FLAC__metadata_object_clone()... ");
+ vorbiscomment = FLAC__metadata_object_clone(block);
+ if(0 == vorbiscomment) {
+ printf("FAILED, returned NULL\n");
+ return false;
+ }
+ if(!mutils__compare_block(vorbiscomment, block))
+ return false;
+ printf("OK\n");
+
printf("testing FLAC__metadata_object_vorbiscomment_insert_comment(own) on empty array...");
vc_insert_new_(&entry, vorbiscomment, 0, "name1=field1");
entry_clone_(&entry);
@@ -1062,6 +1400,58 @@
return false;
printf("OK\n");
+ printf("testing FLAC__metadata_object_vorbiscomment_insert_comment(own) on end of non-empty array...");
+ vc_insert_new_(&entry, vorbiscomment, 4, "name3=field3dup1");
+ entry_clone_(&entry);
+ if(!FLAC__metadata_object_vorbiscomment_insert_comment(block, 4, entry, /*copy=*/false)) {
+ printf("FAILED, returned false\n");
+ return false;
+ }
+ if(!mutils__compare_block(vorbiscomment, block))
+ return false;
+ printf("OK\n");
+
+ printf("testing FLAC__metadata_object_vorbiscomment_insert_comment(own) on end of non-empty array...");
+ vc_insert_new_(&entry, vorbiscomment, 5, "name3=field3dup1");
+ entry_clone_(&entry);
+ if(!FLAC__metadata_object_vorbiscomment_insert_comment(block, 5, entry, /*copy=*/false)) {
+ printf("FAILED, returned false\n");
+ return false;
+ }
+ if(!mutils__compare_block(vorbiscomment, block))
+ return false;
+ printf("OK\n");
+
+ printf("testing FLAC__metadata_object_vorbiscomment_replace_comment(first, own)...");
+ vc_replace_new_(&entry, vorbiscomment, "name3=field3new1", /*all=*/false);
+ entry_clone_(&entry);
+ if(!FLAC__metadata_object_vorbiscomment_replace_comment(block, entry, /*all=*/false, /*copy=*/false)) {
+ printf("FAILED, returned false\n");
+ return false;
+ }
+ if(!mutils__compare_block(vorbiscomment, block))
+ return false;
+ if(block->data.vorbis_comment.num_comments != 6) {
+ printf("FAILED, expected 6 comments, got %u\n", block->data.vorbis_comment.num_comments);
+ return false;
+ }
+ printf("OK\n");
+
+ printf("testing FLAC__metadata_object_vorbiscomment_replace_comment(all, own)...");
+ vc_replace_new_(&entry, vorbiscomment, "name3=field3new2", /*all=*/true);
+ entry_clone_(&entry);
+ if(!FLAC__metadata_object_vorbiscomment_replace_comment(block, entry, /*all=*/true, /*copy=*/false)) {
+ printf("FAILED, returned false\n");
+ return false;
+ }
+ if(!mutils__compare_block(vorbiscomment, block))
+ return false;
+ if(block->data.vorbis_comment.num_comments != 4) {
+ printf("FAILED, expected 4 comments, got %u\n", block->data.vorbis_comment.num_comments);
+ return false;
+ }
+ printf("OK\n");
+
printf("testing FLAC__metadata_object_vorbiscomment_delete_comment() on middle of array...");
vc_delete_(vorbiscomment, 2);
if(!FLAC__metadata_object_vorbiscomment_delete_comment(block, 2)) {
@@ -1114,7 +1504,6 @@
printf("OK\n");
-
printf("testing CUESHEET\n");
{
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/metadata_utils.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/metadata_utils.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/metadata_utils.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libFLAC - Unit tester for libFLAC
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -429,13 +429,13 @@
vorbiscomment->type = FLAC__METADATA_TYPE_VORBIS_COMMENT;
vorbiscomment->length = (4 + vendor_string_length) + 4 + (4 + 5) + (4 + 0);
vorbiscomment->data.vorbis_comment.vendor_string.length = vendor_string_length;
- vorbiscomment->data.vorbis_comment.vendor_string.entry = (FLAC__byte*)malloc_or_die_(vendor_string_length);
- memcpy(vorbiscomment->data.vorbis_comment.vendor_string.entry, FLAC__VENDOR_STRING, vendor_string_length);
+ vorbiscomment->data.vorbis_comment.vendor_string.entry = (FLAC__byte*)malloc_or_die_(vendor_string_length+1);
+ memcpy(vorbiscomment->data.vorbis_comment.vendor_string.entry, FLAC__VENDOR_STRING, vendor_string_length+1);
vorbiscomment->data.vorbis_comment.num_comments = 2;
vorbiscomment->data.vorbis_comment.comments = (FLAC__StreamMetadata_VorbisComment_Entry*)malloc_or_die_(vorbiscomment->data.vorbis_comment.num_comments * sizeof(FLAC__StreamMetadata_VorbisComment_Entry));
vorbiscomment->data.vorbis_comment.comments[0].length = 5;
- vorbiscomment->data.vorbis_comment.comments[0].entry = (FLAC__byte*)malloc_or_die_(5);
- memcpy(vorbiscomment->data.vorbis_comment.comments[0].entry, "ab=cd", 5);
+ vorbiscomment->data.vorbis_comment.comments[0].entry = (FLAC__byte*)malloc_or_die_(5+1);
+ memcpy(vorbiscomment->data.vorbis_comment.comments[0].entry, "ab=cd", 5+1);
vorbiscomment->data.vorbis_comment.comments[1].length = 0;
vorbiscomment->data.vorbis_comment.comments[1].entry = 0;
}
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/metadata_utils.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/metadata_utils.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/metadata_utils.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libFLAC - Unit tester for libFLAC
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/test_libFLAC.dsp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/test_libFLAC.dsp 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC/test_libFLAC.dsp 2005-10-20 12:55:24 UTC (rev 10204)
@@ -105,6 +105,10 @@
# End Source File
# Begin Source File
+SOURCE=.\format.c
+# End Source File
+# Begin Source File
+
SOURCE=.\main.c
# End Source File
# Begin Source File
@@ -145,6 +149,10 @@
# End Source File
# Begin Source File
+SOURCE=.\format.h
+# End Source File
+# Begin Source File
+
SOURCE=.\metadata.h
# End Source File
# Begin Source File
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# test_libFLAC++ - Unit tester for libFLAC++
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -15,8 +15,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-CFLAGS = @CFLAGS@
-
EXTRA_DIST = \
Makefile.lite \
README \
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# test_libFLAC++ - Unit tester for libFLAC++
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -109,6 +109,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -144,10 +145,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -160,12 +169,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/Makefile.lite
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/Makefile.lite 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/Makefile.lite 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# test_libFLAC++ - Unit tester for libFLAC++
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -20,10 +20,18 @@
#
topdir = ../..
+libdir = $(topdir)/obj/$(BUILD)/lib
PROGRAM_NAME = test_libFLAC++
-INCLUDES = -I$(topdir)/include
-LIBS = -lgrabbag -lreplaygain_analysis -lFLAC++ -lFLAC -lm
+
+INCLUDES = -I$(topdir)/include
+
+ifeq ($(DARWIN_BUILD),yes)
+EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libreplaygain_analysis.a $(libdir)/libFLAC++.a $(libdir)/libFLAC.a -lm
+else
+LIBS = -lgrabbag -lreplaygain_analysis -lFLAC++ -lFLAC -lm
+endif
+
SRCS_C = \
file_utils.c \
metadata_utils.c
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/decoders.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/decoders.cpp 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/decoders.cpp 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libFLAC++ - Unit tester for libFLAC++
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/decoders.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/decoders.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/decoders.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libFLAC++ - Unit tester for libFLAC++
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/encoders.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/encoders.cpp 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/encoders.cpp 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libFLAC++ - Unit tester for libFLAC++
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/encoders.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/encoders.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/encoders.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libFLAC++ - Unit tester for libFLAC++
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/file_utils.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/file_utils.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/file_utils.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libFLAC - Unit tester for libFLAC
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/file_utils.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/file_utils.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/file_utils.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libFLAC - Unit tester for libFLAC
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/main.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/main.cpp 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/main.cpp 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libFLAC++ - Unit tester for libFLAC++
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/metadata.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/metadata.cpp 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/metadata.cpp 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libFLAC++ - Unit tester for libFLAC++
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/metadata.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/metadata.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/metadata.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libFLAC++ - Unit tester for libFLAC++
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/metadata_manip.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/metadata_manip.cpp 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/metadata_manip.cpp 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libFLAC++ - Unit tester for libFLAC++
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -500,8 +500,8 @@
vorbiscomment.type = FLAC__METADATA_TYPE_VORBIS_COMMENT;
vorbiscomment.length = (4 + vendor_string_length) + 4;
vorbiscomment.data.vorbis_comment.vendor_string.length = vendor_string_length;
- vorbiscomment.data.vorbis_comment.vendor_string.entry = (FLAC__byte*)malloc_or_die_(vendor_string_length);
- memcpy(vorbiscomment.data.vorbis_comment.vendor_string.entry, FLAC__VENDOR_STRING, vendor_string_length);
+ vorbiscomment.data.vorbis_comment.vendor_string.entry = (FLAC__byte*)malloc_or_die_(vendor_string_length+1);
+ memcpy(vorbiscomment.data.vorbis_comment.vendor_string.entry, FLAC__VENDOR_STRING, vendor_string_length+1);
vorbiscomment.data.vorbis_comment.num_comments = 0;
vorbiscomment.data.vorbis_comment.comments = 0;
}
@@ -591,7 +591,6 @@
static bool test_level_0_()
{
FLAC::Metadata::StreamInfo streaminfo;
- FLAC::Metadata::VorbisComment *tags = 0;
printf("\n\n++++++ testing level 0 interface\n");
@@ -620,19 +619,38 @@
printf("OK\n");
- printf("testing FLAC::Metadata::get_tags()... ");
+ {
+ printf("testing FLAC::Metadata::get_tags(VorbisComment *&)... ");
- if(!FLAC::Metadata::get_tags(flacfile_, tags))
- return die_("during FLAC::Metadata::get_tags()");
+ FLAC::Metadata::VorbisComment *tags = 0;
- /* check to see if some basic data matches (c.f. generate_file_()) */
- if(tags->get_num_comments() != 0)
- return die_("mismatch in tags->get_num_comments()");
+ if(!FLAC::Metadata::get_tags(flacfile_, tags))
+ return die_("during FLAC::Metadata::get_tags()");
- printf("OK\n");
+ /* check to see if some basic data matches (c.f. generate_file_()) */
+ if(tags->get_num_comments() != 0)
+ return die_("mismatch in tags->get_num_comments()");
- delete tags;
+ printf("OK\n");
+ delete tags;
+ }
+
+ {
+ printf("testing FLAC::Metadata::get_tags(VorbisComment &)... ");
+
+ FLAC::Metadata::VorbisComment tags;
+
+ if(!FLAC::Metadata::get_tags(flacfile_, tags))
+ return die_("during FLAC::Metadata::get_tags()");
+
+ /* check to see if some basic data matches (c.f. generate_file_()) */
+ if(tags.get_num_comments() != 0)
+ return die_("mismatch in tags.get_num_comments()");
+
+ printf("OK\n");
+ }
+
if(!remove_file_(flacfile_))
return false;
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/metadata_object.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/metadata_object.cpp 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/metadata_object.cpp 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libFLAC++ - Unit tester for libFLAC++
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -120,16 +120,16 @@
vorbiscomment_.type = ::FLAC__METADATA_TYPE_VORBIS_COMMENT;
vorbiscomment_.length = (4 + 5) + 4 + (4 + 12) + (4 + 12);
vorbiscomment_.data.vorbis_comment.vendor_string.length = 5;
- vorbiscomment_.data.vorbis_comment.vendor_string.entry = (FLAC__byte*)malloc_or_die_(5);
- memcpy(vorbiscomment_.data.vorbis_comment.vendor_string.entry, "name0", 5);
+ vorbiscomment_.data.vorbis_comment.vendor_string.entry = (FLAC__byte*)malloc_or_die_(5+1);
+ memcpy(vorbiscomment_.data.vorbis_comment.vendor_string.entry, "name0", 5+1);
vorbiscomment_.data.vorbis_comment.num_comments = 2;
vorbiscomment_.data.vorbis_comment.comments = (::FLAC__StreamMetadata_VorbisComment_Entry*)malloc_or_die_(vorbiscomment_.data.vorbis_comment.num_comments * sizeof(::FLAC__StreamMetadata_VorbisComment_Entry));
vorbiscomment_.data.vorbis_comment.comments[0].length = 12;
- vorbiscomment_.data.vorbis_comment.comments[0].entry = (FLAC__byte*)malloc_or_die_(12);
- memcpy(vorbiscomment_.data.vorbis_comment.comments[0].entry, "name2=value2", 12);
+ vorbiscomment_.data.vorbis_comment.comments[0].entry = (FLAC__byte*)malloc_or_die_(12+1);
+ memcpy(vorbiscomment_.data.vorbis_comment.comments[0].entry, "name2=value2", 12+1);
vorbiscomment_.data.vorbis_comment.comments[1].length = 12;
- vorbiscomment_.data.vorbis_comment.comments[1].entry = (FLAC__byte*)malloc_or_die_(12);
- memcpy(vorbiscomment_.data.vorbis_comment.comments[1].entry, "name3=value3", 12);
+ vorbiscomment_.data.vorbis_comment.comments[1].entry = (FLAC__byte*)malloc_or_die_(12+1);
+ memcpy(vorbiscomment_.data.vorbis_comment.comments[1].entry, "name3=value3", 12+1);
cuesheet_.is_last = true;
cuesheet_.type = ::FLAC__METADATA_TYPE_CUESHEET;
@@ -254,6 +254,54 @@
printf("OK\n");
}
+ printf("testing StreamInfo::StreamInfo(const ::FLAC__StreamMetadata *, copy=true)... +\n");
+ printf(" StreamInfo::operator!=(const ::FLAC__StreamMetadata *)... ");
+ {
+ FLAC::Metadata::StreamInfo blockcopy(&streaminfo_, /*copy=*/true);
+ if(!blockcopy.is_valid())
+ return die_("!block.is_valid()");
+ if(blockcopy != streaminfo_)
+ return die_("copy is not identical to original");
+ printf("OK\n");
+ }
+
+ printf("testing StreamInfo::StreamInfo(const ::FLAC__StreamMetadata *, copy=false)... +\n");
+ printf(" StreamInfo::operator!=(const ::FLAC__StreamMetadata *)... ");
+ {
+ ::FLAC__StreamMetadata *copy = ::FLAC__metadata_object_clone(&streaminfo_);
+ FLAC::Metadata::StreamInfo blockcopy(copy, /*copy=*/false);
+ if(!blockcopy.is_valid())
+ return die_("!block.is_valid()");
+ if(blockcopy != streaminfo_)
+ return die_("copy is not identical to original");
+ printf("OK\n");
+ }
+
+ printf("testing StreamInfo::assign(const ::FLAC__StreamMetadata *, copy=true)... +\n");
+ printf(" StreamInfo::operator!=(const ::FLAC__StreamMetadata *)... ");
+ {
+ FLAC::Metadata::StreamInfo blockcopy;
+ blockcopy.assign(&streaminfo_, /*copy=*/true);
+ if(!blockcopy.is_valid())
+ return die_("!block.is_valid()");
+ if(blockcopy != streaminfo_)
+ return die_("copy is not identical to original");
+ printf("OK\n");
+ }
+
+ printf("testing StreamInfo::assign(const ::FLAC__StreamMetadata *, copy=false)... +\n");
+ printf(" StreamInfo::operator!=(const ::FLAC__StreamMetadata *)... ");
+ {
+ ::FLAC__StreamMetadata *copy = ::FLAC__metadata_object_clone(&streaminfo_);
+ FLAC::Metadata::StreamInfo blockcopy;
+ blockcopy.assign(copy, /*copy=*/false);
+ if(!blockcopy.is_valid())
+ return die_("!block.is_valid()");
+ if(blockcopy != streaminfo_)
+ return die_("copy is not identical to original");
+ printf("OK\n");
+ }
+
printf("testing StreamInfo::operator=(const StreamInfo &)... +\n");
printf(" StreamInfo::operator==(const StreamInfo &)... ");
{
@@ -439,6 +487,54 @@
printf("OK\n");
}
+ printf("testing Padding::Padding(const ::FLAC__StreamMetadata *, copy=true)... +\n");
+ printf(" Padding::operator!=(const ::FLAC__StreamMetadata *)... ");
+ {
+ FLAC::Metadata::Padding blockcopy(&padding_, /*copy=*/true);
+ if(!blockcopy.is_valid())
+ return die_("!block.is_valid()");
+ if(blockcopy != padding_)
+ return die_("copy is not identical to original");
+ printf("OK\n");
+ }
+
+ printf("testing Padding::Padding(const ::FLAC__StreamMetadata *, copy=false)... +\n");
+ printf(" Padding::operator!=(const ::FLAC__StreamMetadata *)... ");
+ {
+ ::FLAC__StreamMetadata *copy = ::FLAC__metadata_object_clone(&padding_);
+ FLAC::Metadata::Padding blockcopy(copy, /*copy=*/false);
+ if(!blockcopy.is_valid())
+ return die_("!block.is_valid()");
+ if(blockcopy != padding_)
+ return die_("copy is not identical to original");
+ printf("OK\n");
+ }
+
+ printf("testing Padding::assign(const ::FLAC__StreamMetadata *, copy=true)... +\n");
+ printf(" Padding::operator!=(const ::FLAC__StreamMetadata *)... ");
+ {
+ FLAC::Metadata::Padding blockcopy;
+ blockcopy.assign(&padding_, /*copy=*/true);
+ if(!blockcopy.is_valid())
+ return die_("!block.is_valid()");
+ if(blockcopy != padding_)
+ return die_("copy is not identical to original");
+ printf("OK\n");
+ }
+
+ printf("testing Padding::assign(const ::FLAC__StreamMetadata *, copy=false)... +\n");
+ printf(" Padding::operator!=(const ::FLAC__StreamMetadata *)... ");
+ {
+ ::FLAC__StreamMetadata *copy = ::FLAC__metadata_object_clone(&padding_);
+ FLAC::Metadata::Padding blockcopy;
+ blockcopy.assign(copy, /*copy=*/false);
+ if(!blockcopy.is_valid())
+ return die_("!block.is_valid()");
+ if(blockcopy != padding_)
+ return die_("copy is not identical to original");
+ printf("OK\n");
+ }
+
printf("testing Padding::operator=(const Padding &)... +\n");
printf(" Padding::operator==(const Padding &)... ");
{
@@ -552,6 +648,54 @@
printf("OK\n");
}
+ printf("testing Application::Application(const ::FLAC__StreamMetadata *, copy=true)... +\n");
+ printf(" Application::operator!=(const ::FLAC__StreamMetadata *)... ");
+ {
+ FLAC::Metadata::Application blockcopy(&application_, /*copy=*/true);
+ if(!blockcopy.is_valid())
+ return die_("!block.is_valid()");
+ if(blockcopy != application_)
+ return die_("copy is not identical to original");
+ printf("OK\n");
+ }
+
+ printf("testing Application::Application(const ::FLAC__StreamMetadata *, copy=false)... +\n");
+ printf(" Application::operator!=(const ::FLAC__StreamMetadata *)... ");
+ {
+ ::FLAC__StreamMetadata *copy = ::FLAC__metadata_object_clone(&application_);
+ FLAC::Metadata::Application blockcopy(copy, /*copy=*/false);
+ if(!blockcopy.is_valid())
+ return die_("!block.is_valid()");
+ if(blockcopy != application_)
+ return die_("copy is not identical to original");
+ printf("OK\n");
+ }
+
+ printf("testing Application::assign(const ::FLAC__StreamMetadata *, copy=true)... +\n");
+ printf(" Application::operator!=(const ::FLAC__StreamMetadata *)... ");
+ {
+ FLAC::Metadata::Application blockcopy;
+ blockcopy.assign(&application_, /*copy=*/true);
+ if(!blockcopy.is_valid())
+ return die_("!block.is_valid()");
+ if(blockcopy != application_)
+ return die_("copy is not identical to original");
+ printf("OK\n");
+ }
+
+ printf("testing Application::assign(const ::FLAC__StreamMetadata *, copy=false)... +\n");
+ printf(" Application::operator!=(const ::FLAC__StreamMetadata *)... ");
+ {
+ ::FLAC__StreamMetadata *copy = ::FLAC__metadata_object_clone(&application_);
+ FLAC::Metadata::Application blockcopy;
+ blockcopy.assign(copy, /*copy=*/false);
+ if(!blockcopy.is_valid())
+ return die_("!block.is_valid()");
+ if(blockcopy != application_)
+ return die_("copy is not identical to original");
+ printf("OK\n");
+ }
+
printf("testing Application::operator=(const Application &)... +\n");
printf(" Application::operator==(const Application &)... ");
{
@@ -674,6 +818,54 @@
printf("OK\n");
}
+ printf("testing SeekTable::SeekTable(const ::FLAC__StreamMetadata *, copy=true)... +\n");
+ printf(" SeekTable::operator!=(const ::FLAC__StreamMetadata *)... ");
+ {
+ FLAC::Metadata::SeekTable blockcopy(&seektable_, /*copy=*/true);
+ if(!blockcopy.is_valid())
+ return die_("!block.is_valid()");
+ if(blockcopy != seektable_)
+ return die_("copy is not identical to original");
+ printf("OK\n");
+ }
+
+ printf("testing SeekTable::SeekTable(const ::FLAC__StreamMetadata *, copy=false)... +\n");
+ printf(" SeekTable::operator!=(const ::FLAC__StreamMetadata *)... ");
+ {
+ ::FLAC__StreamMetadata *copy = ::FLAC__metadata_object_clone(&seektable_);
+ FLAC::Metadata::SeekTable blockcopy(copy, /*copy=*/false);
+ if(!blockcopy.is_valid())
+ return die_("!block.is_valid()");
+ if(blockcopy != seektable_)
+ return die_("copy is not identical to original");
+ printf("OK\n");
+ }
+
+ printf("testing SeekTable::assign(const ::FLAC__StreamMetadata *, copy=true)... +\n");
+ printf(" SeekTable::operator!=(const ::FLAC__StreamMetadata *)... ");
+ {
+ FLAC::Metadata::SeekTable blockcopy;
+ blockcopy.assign(&seektable_, /*copy=*/true);
+ if(!blockcopy.is_valid())
+ return die_("!block.is_valid()");
+ if(blockcopy != seektable_)
+ return die_("copy is not identical to original");
+ printf("OK\n");
+ }
+
+ printf("testing SeekTable::assign(const ::FLAC__StreamMetadata *, copy=false)... +\n");
+ printf(" SeekTable::operator!=(const ::FLAC__StreamMetadata *)... ");
+ {
+ ::FLAC__StreamMetadata *copy = ::FLAC__metadata_object_clone(&seektable_);
+ FLAC::Metadata::SeekTable blockcopy;
+ blockcopy.assign(copy, /*copy=*/false);
+ if(!blockcopy.is_valid())
+ return die_("!block.is_valid()");
+ if(blockcopy != seektable_)
+ return die_("copy is not identical to original");
+ printf("OK\n");
+ }
+
printf("testing SeekTable::operator=(const SeekTable &)... +\n");
printf(" SeekTable::operator==(const SeekTable &)... ");
{
@@ -795,12 +987,32 @@
return die_("!is_valid()");
printf("OK\n");
+ {
+ printf("testing Entry::Entry(const char *field)... ");
+ FLAC::Metadata::VorbisComment::Entry entry2z("name2=value2");
+ if(!entry2z.is_valid())
+ return die_("!is_valid()");
+ if(strcmp(entry2.get_field(), entry2z.get_field()))
+ return die_("bad value");
+ printf("OK\n");
+ }
+
printf("testing Entry::Entry(const char *field_name, const char *field_value, unsigned field_value_length)... ");
FLAC::Metadata::VorbisComment::Entry entry3("name3", "value3", strlen("value3"));
if(!entry3.is_valid())
return die_("!is_valid()");
printf("OK\n");
+ {
+ printf("testing Entry::Entry(const char *field_name, const char *field_value)... ");
+ FLAC::Metadata::VorbisComment::Entry entry3z("name3", "value3");
+ if(!entry3z.is_valid())
+ return die_("!is_valid()");
+ if(strcmp(entry3.get_field(), entry3z.get_field()))
+ return die_("bad value");
+ printf("OK\n");
+ }
+
printf("testing Entry::Entry(const Entry &entry)... ");
{
FLAC::Metadata::VorbisComment::Entry entry2copy(entry2);
@@ -867,7 +1079,7 @@
return die_("entry mismatch");
printf("OK\n");
- printf("testing Entry::set_field_value()... ");
+ printf("testing Entry::set_field_value(const char *field_value, unsigned field_value_length)... ");
if(!entry1.set_field_value("value1", strlen("value1")))
return die_("returned false");
if(0 != memcmp(entry1.get_field_value(), "value1", strlen("value1")))
@@ -876,7 +1088,16 @@
return die_("entry mismatch");
printf("OK\n");
- printf("testing Entry::set_field()... ");
+ printf("testing Entry::set_field_value(const char *field_value)... ");
+ if(!entry1.set_field_value("value1"))
+ return die_("returned false");
+ if(0 != memcmp(entry1.get_field_value(), "value1", strlen("value1")))
+ return die_("value mismatch");
+ if(0 != memcmp(entry1.get_field(), "name1=value1", strlen("name1=value1")))
+ return die_("entry mismatch");
+ printf("OK\n");
+
+ printf("testing Entry::set_field(const char *field, unsigned field_length)... ");
if(!entry1.set_field("name0=value0", strlen("name0=value0")))
return die_("returned false");
if(0 != memcmp(entry1.get_field_name(), "name0", strlen("name0")))
@@ -887,6 +1108,17 @@
return die_("entry mismatch");
printf("OK\n");
+ printf("testing Entry::set_field(const char *field)... ");
+ if(!entry1.set_field("name0=value0"))
+ return die_("returned false");
+ if(0 != memcmp(entry1.get_field_name(), "name0", strlen("name0")))
+ return die_("value mismatch");
+ if(0 != memcmp(entry1.get_field_value(), "value0", strlen("value0")))
+ return die_("value mismatch");
+ if(0 != memcmp(entry1.get_field(), "name0=value0", strlen("name0=value0")))
+ return die_("entry mismatch");
+ printf("OK\n");
+
printf("PASSED\n\n");
@@ -939,6 +1171,54 @@
printf("OK\n");
}
+ printf("testing VorbisComment::VorbisComment(const ::FLAC__StreamMetadata *, copy=true)... +\n");
+ printf(" VorbisComment::operator!=(const ::FLAC__StreamMetadata *)... ");
+ {
+ FLAC::Metadata::VorbisComment blockcopy(&vorbiscomment_, /*copy=*/true);
+ if(!blockcopy.is_valid())
+ return die_("!block.is_valid()");
+ if(blockcopy != vorbiscomment_)
+ return die_("copy is not identical to original");
+ printf("OK\n");
+ }
+
+ printf("testing VorbisComment::VorbisComment(const ::FLAC__StreamMetadata *, copy=false)... +\n");
+ printf(" VorbisComment::operator!=(const ::FLAC__StreamMetadata *)... ");
+ {
+ ::FLAC__StreamMetadata *copy = ::FLAC__metadata_object_clone(&vorbiscomment_);
+ FLAC::Metadata::VorbisComment blockcopy(copy, /*copy=*/false);
+ if(!blockcopy.is_valid())
+ return die_("!block.is_valid()");
+ if(blockcopy != vorbiscomment_)
+ return die_("copy is not identical to original");
+ printf("OK\n");
+ }
+
+ printf("testing VorbisComment::assign(const ::FLAC__StreamMetadata *, copy=true)... +\n");
+ printf(" VorbisComment::operator!=(const ::FLAC__StreamMetadata *)... ");
+ {
+ FLAC::Metadata::VorbisComment blockcopy;
+ blockcopy.assign(&vorbiscomment_, /*copy=*/true);
+ if(!blockcopy.is_valid())
+ return die_("!block.is_valid()");
+ if(blockcopy != vorbiscomment_)
+ return die_("copy is not identical to original");
+ printf("OK\n");
+ }
+
+ printf("testing VorbisComment::assign(const ::FLAC__StreamMetadata *, copy=false)... +\n");
+ printf(" VorbisComment::operator!=(const ::FLAC__StreamMetadata *)... ");
+ {
+ ::FLAC__StreamMetadata *copy = ::FLAC__metadata_object_clone(&vorbiscomment_);
+ FLAC::Metadata::VorbisComment blockcopy;
+ blockcopy.assign(copy, /*copy=*/false);
+ if(!blockcopy.is_valid())
+ return die_("!block.is_valid()");
+ if(blockcopy != vorbiscomment_)
+ return die_("copy is not identical to original");
+ printf("OK\n");
+ }
+
printf("testing VorbisComment::operator=(const VorbisComment &)... +\n");
printf(" VorbisComment::operator==(const VorbisComment &)... ");
{
@@ -978,17 +1258,56 @@
printf("OK\n");
printf("testing VorbisComment::set_vendor_string()... ");
- if(!block.set_vendor_string(entry1))
+ if(!block.set_vendor_string((const FLAC__byte *)"mame0"))
return die_("returned false");
printf("OK\n");
+ vorbiscomment_.data.vorbis_comment.vendor_string.entry[0] = 'm';
printf("testing VorbisComment::get_vendor_string()... ");
- if(block.get_vendor_string().get_field_name_length() != vorbiscomment_.data.vorbis_comment.vendor_string.length)
+ if(strlen((const char *)block.get_vendor_string()) != vorbiscomment_.data.vorbis_comment.vendor_string.length)
return die_("length mismatch");
- if(0 != memcmp(block.get_vendor_string().get_field_name(), vorbiscomment_.data.vorbis_comment.vendor_string.entry, vorbiscomment_.data.vorbis_comment.vendor_string.length))
+ if(0 != memcmp(block.get_vendor_string(), vorbiscomment_.data.vorbis_comment.vendor_string.entry, vorbiscomment_.data.vorbis_comment.vendor_string.length))
return die_("value mismatch");
printf("OK\n");
+ printf("testing VorbisComment::append_comment()... +\n");
+ printf(" VorbisComment::get_comment()... ");
+ if(!block.append_comment(entry3))
+ return die_("returned false");
+ if(block.get_comment(0).get_field_length() != vorbiscomment_.data.vorbis_comment.comments[1].length)
+ return die_("length mismatch");
+ if(0 != memcmp(block.get_comment(0).get_field(), vorbiscomment_.data.vorbis_comment.comments[1].entry, vorbiscomment_.data.vorbis_comment.comments[1].length))
+ return die_("value mismatch");
+ printf("OK\n");
+
+ printf("testing VorbisComment::append_comment()... +\n");
+ printf(" VorbisComment::get_comment()... ");
+ if(!block.append_comment(entry2))
+ return die_("returned false");
+ if(block.get_comment(1).get_field_length() != vorbiscomment_.data.vorbis_comment.comments[0].length)
+ return die_("length mismatch");
+ if(0 != memcmp(block.get_comment(1).get_field(), vorbiscomment_.data.vorbis_comment.comments[0].entry, vorbiscomment_.data.vorbis_comment.comments[0].length))
+ return die_("value mismatch");
+ printf("OK\n");
+
+ printf("testing VorbisComment::delete_comment()... +\n");
+ printf(" VorbisComment::get_comment()... ");
+ if(!block.delete_comment(0))
+ return die_("returned false");
+ if(block.get_comment(0).get_field_length() != vorbiscomment_.data.vorbis_comment.comments[0].length)
+ return die_("length[0] mismatch");
+ if(0 != memcmp(block.get_comment(0).get_field(), vorbiscomment_.data.vorbis_comment.comments[0].entry, vorbiscomment_.data.vorbis_comment.comments[0].length))
+ return die_("value[0] mismatch");
+ printf("OK\n");
+
+ printf("testing VorbisComment::delete_comment()... +\n");
+ printf(" VorbisComment::get_comment()... ");
+ if(!block.delete_comment(0))
+ return die_("returned false");
+ if(block.get_num_comments() != 0)
+ return die_("block mismatch, expected num_comments = 0");
+ printf("OK\n");
+
printf("testing VorbisComment::insert_comment()... +\n");
printf(" VorbisComment::get_comment()... ");
if(!block.insert_comment(0, entry3))
@@ -1230,6 +1549,54 @@
printf("OK\n");
}
+ printf("testing CueSheet::CueSheet(const ::FLAC__StreamMetadata *, copy=true)... +\n");
+ printf(" CueSheet::operator!=(const ::FLAC__StreamMetadata *)... ");
+ {
+ FLAC::Metadata::CueSheet blockcopy(&cuesheet_, /*copy=*/true);
+ if(!blockcopy.is_valid())
+ return die_("!block.is_valid()");
+ if(blockcopy != cuesheet_)
+ return die_("copy is not identical to original");
+ printf("OK\n");
+ }
+
+ printf("testing CueSheet::CueSheet(const ::FLAC__StreamMetadata *, copy=false)... +\n");
+ printf(" CueSheet::operator!=(const ::FLAC__StreamMetadata *)... ");
+ {
+ ::FLAC__StreamMetadata *copy = ::FLAC__metadata_object_clone(&cuesheet_);
+ FLAC::Metadata::CueSheet blockcopy(copy, /*copy=*/false);
+ if(!blockcopy.is_valid())
+ return die_("!block.is_valid()");
+ if(blockcopy != cuesheet_)
+ return die_("copy is not identical to original");
+ printf("OK\n");
+ }
+
+ printf("testing CueSheet::assign(const ::FLAC__StreamMetadata *, copy=true)... +\n");
+ printf(" CueSheet::operator!=(const ::FLAC__StreamMetadata *)... ");
+ {
+ FLAC::Metadata::CueSheet blockcopy;
+ blockcopy.assign(&cuesheet_, /*copy=*/true);
+ if(!blockcopy.is_valid())
+ return die_("!block.is_valid()");
+ if(blockcopy != cuesheet_)
+ return die_("copy is not identical to original");
+ printf("OK\n");
+ }
+
+ printf("testing CueSheet::assign(const ::FLAC__StreamMetadata *, copy=false)... +\n");
+ printf(" CueSheet::operator!=(const ::FLAC__StreamMetadata *)... ");
+ {
+ ::FLAC__StreamMetadata *copy = ::FLAC__metadata_object_clone(&cuesheet_);
+ FLAC::Metadata::CueSheet blockcopy;
+ blockcopy.assign(copy, /*copy=*/false);
+ if(!blockcopy.is_valid())
+ return die_("!block.is_valid()");
+ if(blockcopy != cuesheet_)
+ return die_("copy is not identical to original");
+ printf("OK\n");
+ }
+
printf("testing CueSheet::operator=(const CueSheet &)... +\n");
printf(" CueSheet::operator==(const CueSheet &)... ");
{
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/metadata_utils.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/metadata_utils.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/metadata_utils.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libFLAC - Unit tester for libFLAC
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -429,13 +429,13 @@
vorbiscomment->type = FLAC__METADATA_TYPE_VORBIS_COMMENT;
vorbiscomment->length = (4 + vendor_string_length) + 4 + (4 + 5) + (4 + 0);
vorbiscomment->data.vorbis_comment.vendor_string.length = vendor_string_length;
- vorbiscomment->data.vorbis_comment.vendor_string.entry = (FLAC__byte*)malloc_or_die_(vendor_string_length);
- memcpy(vorbiscomment->data.vorbis_comment.vendor_string.entry, FLAC__VENDOR_STRING, vendor_string_length);
+ vorbiscomment->data.vorbis_comment.vendor_string.entry = (FLAC__byte*)malloc_or_die_(vendor_string_length+1);
+ memcpy(vorbiscomment->data.vorbis_comment.vendor_string.entry, FLAC__VENDOR_STRING, vendor_string_length+1);
vorbiscomment->data.vorbis_comment.num_comments = 2;
vorbiscomment->data.vorbis_comment.comments = (FLAC__StreamMetadata_VorbisComment_Entry*)malloc_or_die_(vorbiscomment->data.vorbis_comment.num_comments * sizeof(FLAC__StreamMetadata_VorbisComment_Entry));
vorbiscomment->data.vorbis_comment.comments[0].length = 5;
- vorbiscomment->data.vorbis_comment.comments[0].entry = (FLAC__byte*)malloc_or_die_(5);
- memcpy(vorbiscomment->data.vorbis_comment.comments[0].entry, "ab=cd", 5);
+ vorbiscomment->data.vorbis_comment.comments[0].entry = (FLAC__byte*)malloc_or_die_(5+1);
+ memcpy(vorbiscomment->data.vorbis_comment.comments[0].entry, "ab=cd", 5+1);
vorbiscomment->data.vorbis_comment.comments[1].length = 0;
vorbiscomment->data.vorbis_comment.comments[1].entry = 0;
}
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/metadata_utils.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/metadata_utils.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libFLAC++/metadata_utils.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libFLAC - Unit tester for libFLAC
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# test_libOggFLAC - Unit tester for libOggFLAC
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -19,7 +19,8 @@
Makefile.lite \
test_libOggFLAC.dsp
-CFLAGS = @CFLAGS@ @OGG_CFLAGS@
+AM_CFLAGS = @OGG_CFLAGS@
+
INCLUDES =
noinst_PROGRAMS = test_libOggFLAC
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# test_libOggFLAC - Unit tester for libOggFLAC
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -96,6 +96,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -104,7 +105,7 @@
CCAS = @CCAS@
CCASFLAGS = @CCASFLAGS@
CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@ @OGG_CFLAGS@
+CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
@@ -131,10 +132,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -147,12 +156,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -240,6 +254,7 @@
Makefile.lite \
test_libOggFLAC.dsp
+AM_CFLAGS = @OGG_CFLAGS@
INCLUDES =
test_libOggFLAC_LDADD = \
$(top_builddir)/src/share/grabbag/libgrabbag.la \
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/Makefile.lite
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/Makefile.lite 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/Makefile.lite 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# test_libOggFLAC - Unit tester for libOggFLAC
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -20,11 +20,18 @@
#
topdir = ../..
+libdir = $(topdir)/obj/$(BUILD)/lib
PROGRAM_NAME = test_libOggFLAC
-#@@@ TODO: conditionalize ogg lib path and -logg
-INCLUDES = -I$(topdir)/include
-LIBS = -lgrabbag -lreplaygain_analysis -lOggFLAC -lFLAC -L$(HOME)/local/lib -logg -lm
+
+INCLUDES = -I$(topdir)/include
+
+ifeq ($(DARWIN_BUILD),yes)
+EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libreplaygain_analysis.a $(libdir)/libOggFLAC.a $(libdir)/libFLAC.a $(OGG_LIB_DIR)/libogg.a -lm
+else
+LIBS = -lgrabbag -lreplaygain_analysis -lOggFLAC -lFLAC -L$(OGG_LIB_DIR) -logg -lm
+endif
+
SRCS_C = \
decoders.c \
encoders.c \
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/decoders.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/decoders.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/decoders.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libOggFLAC - Unit tester for libOggFLAC
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/decoders.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/decoders.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/decoders.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libOggFLAC - Unit tester for libOggFLAC
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/encoders.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/encoders.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/encoders.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libOggFLAC - Unit tester for libOggFLAC
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/encoders.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/encoders.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/encoders.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libOggFLAC - Unit tester for libOggFLAC
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/file_utils.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/file_utils.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/file_utils.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libOggFLAC - Unit tester for libOggFLAC
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/file_utils.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/file_utils.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/file_utils.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libOggFLAC - Unit tester for libOggFLAC
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/main.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/main.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/main.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libOggFLAC - Unit tester for libOggFLAC
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/metadata_utils.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/metadata_utils.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/metadata_utils.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libFLAC - Unit tester for libFLAC
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -429,13 +429,13 @@
vorbiscomment->type = FLAC__METADATA_TYPE_VORBIS_COMMENT;
vorbiscomment->length = (4 + vendor_string_length) + 4 + (4 + 5) + (4 + 0);
vorbiscomment->data.vorbis_comment.vendor_string.length = vendor_string_length;
- vorbiscomment->data.vorbis_comment.vendor_string.entry = (FLAC__byte*)malloc_or_die_(vendor_string_length);
- memcpy(vorbiscomment->data.vorbis_comment.vendor_string.entry, FLAC__VENDOR_STRING, vendor_string_length);
+ vorbiscomment->data.vorbis_comment.vendor_string.entry = (FLAC__byte*)malloc_or_die_(vendor_string_length+1);
+ memcpy(vorbiscomment->data.vorbis_comment.vendor_string.entry, FLAC__VENDOR_STRING, vendor_string_length+1);
vorbiscomment->data.vorbis_comment.num_comments = 2;
vorbiscomment->data.vorbis_comment.comments = (FLAC__StreamMetadata_VorbisComment_Entry*)malloc_or_die_(vorbiscomment->data.vorbis_comment.num_comments * sizeof(FLAC__StreamMetadata_VorbisComment_Entry));
vorbiscomment->data.vorbis_comment.comments[0].length = 5;
- vorbiscomment->data.vorbis_comment.comments[0].entry = (FLAC__byte*)malloc_or_die_(5);
- memcpy(vorbiscomment->data.vorbis_comment.comments[0].entry, "ab=cd", 5);
+ vorbiscomment->data.vorbis_comment.comments[0].entry = (FLAC__byte*)malloc_or_die_(5+1);
+ memcpy(vorbiscomment->data.vorbis_comment.comments[0].entry, "ab=cd", 5+1);
vorbiscomment->data.vorbis_comment.comments[1].length = 0;
vorbiscomment->data.vorbis_comment.comments[1].entry = 0;
}
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/metadata_utils.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/metadata_utils.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC/metadata_utils.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libFLAC - Unit tester for libFLAC
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# test_libOggFLAC++ - Unit tester for libOggFLAC++
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -20,7 +20,7 @@
README \
test_libOggFLAC++.dsp
-CFLAGS = @CFLAGS@ @OGG_CFLAGS@
+AM_CFLAGS = @OGG_CFLAGS@
noinst_PROGRAMS = test_libOggFLAC++
test_libOggFLAC___LDADD = \
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# test_libOggFLAC++ - Unit tester for libOggFLAC++
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -105,6 +105,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -113,7 +114,7 @@
CCAS = @CCAS@
CCASFLAGS = @CCASFLAGS@
CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@ @OGG_CFLAGS@
+CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
@@ -140,10 +141,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -156,12 +165,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -250,6 +264,7 @@
README \
test_libOggFLAC++.dsp
+AM_CFLAGS = @OGG_CFLAGS@
test_libOggFLAC___LDADD = \
$(top_builddir)/src/share/grabbag/libgrabbag.la \
$(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la \
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/Makefile.lite
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/Makefile.lite 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/Makefile.lite 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# test_libOggFLAC++ - Unit tester for libOggFLAC++
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -20,11 +20,18 @@
#
topdir = ../..
+libdir = $(topdir)/obj/$(BUILD)/lib
PROGRAM_NAME = test_libOggFLAC++
-#@@@ TODO: conditionalize ogg lib path and -logg
-INCLUDES = -I$(topdir)/include
-LIBS = -lgrabbag -lreplaygain_analysis -lOggFLAC++ -lOggFLAC -lFLAC -L$(HOME)/local/lib -logg -lm
+
+INCLUDES = -I$(topdir)/include
+
+ifeq ($(DARWIN_BUILD),yes)
+EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libreplaygain_analysis.a $(libdir)/libOggFLAC++.a $(libdir)/libOggFLAC.a $(libdir)/libFLAC.a $(OGG_LIB_DIR)/libogg.a -lm
+else
+LIBS = -lgrabbag -lreplaygain_analysis -lOggFLAC++ -lOggFLAC -lFLAC -L$(OGG_LIB_DIR) -logg -lm
+endif
+
SRCS_C = \
file_utils.c \
metadata_utils.c
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/decoders.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/decoders.cpp 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/decoders.cpp 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libOggFLAC++ - Unit tester for libOggFLAC++
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/decoders.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/decoders.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/decoders.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libOggFLAC++ - Unit tester for libOggFLAC++
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/encoders.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/encoders.cpp 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/encoders.cpp 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libOggFLAC++ - Unit tester for libOggFLAC++
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/encoders.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/encoders.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/encoders.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libOggFLAC++ - Unit tester for libOggFLAC++
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/file_utils.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/file_utils.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/file_utils.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libOggFLAC - Unit tester for libOggFLAC
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/file_utils.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/file_utils.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/file_utils.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libOggFLAC - Unit tester for libOggFLAC
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/main.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/main.cpp 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/main.cpp 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libOggFLAC++ - Unit tester for libOggFLAC++
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/metadata_utils.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/metadata_utils.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/metadata_utils.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libFLAC - Unit tester for libFLAC
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -429,13 +429,13 @@
vorbiscomment->type = FLAC__METADATA_TYPE_VORBIS_COMMENT;
vorbiscomment->length = (4 + vendor_string_length) + 4 + (4 + 5) + (4 + 0);
vorbiscomment->data.vorbis_comment.vendor_string.length = vendor_string_length;
- vorbiscomment->data.vorbis_comment.vendor_string.entry = (FLAC__byte*)malloc_or_die_(vendor_string_length);
- memcpy(vorbiscomment->data.vorbis_comment.vendor_string.entry, FLAC__VENDOR_STRING, vendor_string_length);
+ vorbiscomment->data.vorbis_comment.vendor_string.entry = (FLAC__byte*)malloc_or_die_(vendor_string_length+1);
+ memcpy(vorbiscomment->data.vorbis_comment.vendor_string.entry, FLAC__VENDOR_STRING, vendor_string_length+1);
vorbiscomment->data.vorbis_comment.num_comments = 2;
vorbiscomment->data.vorbis_comment.comments = (FLAC__StreamMetadata_VorbisComment_Entry*)malloc_or_die_(vorbiscomment->data.vorbis_comment.num_comments * sizeof(FLAC__StreamMetadata_VorbisComment_Entry));
vorbiscomment->data.vorbis_comment.comments[0].length = 5;
- vorbiscomment->data.vorbis_comment.comments[0].entry = (FLAC__byte*)malloc_or_die_(5);
- memcpy(vorbiscomment->data.vorbis_comment.comments[0].entry, "ab=cd", 5);
+ vorbiscomment->data.vorbis_comment.comments[0].entry = (FLAC__byte*)malloc_or_die_(5+1);
+ memcpy(vorbiscomment->data.vorbis_comment.comments[0].entry, "ab=cd", 5+1);
vorbiscomment->data.vorbis_comment.comments[1].length = 0;
vorbiscomment->data.vorbis_comment.comments[1].entry = 0;
}
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/metadata_utils.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/metadata_utils.h 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_libOggFLAC++/metadata_utils.h 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_libFLAC - Unit tester for libFLAC
- * Copyright (C) 2002,2003,2004 Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_seeking/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_seeking/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_seeking/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# test_seeking - Seeking tester for libFLAC and libOggFLAC
-# Copyright (C) 2004 Josh Coalson
+# Copyright (C) 2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -19,12 +19,17 @@
Makefile.lite \
test_seeking.dsp
-CFLAGS = @CFLAGS@ @OGG_CFLAGS@
+AM_CFLAGS = @OGG_CFLAGS@
+
INCLUDES =
+if FLaC__HAS_OGG
+NEED_OGGFLAC_LIB = $(top_builddir)/src/libOggFLAC/libOggFLAC.la
+endif
+
noinst_PROGRAMS = test_seeking
test_seeking_LDADD = \
- $(top_builddir)/src/libOggFLAC/libOggFLAC.la \
+ $(NEED_OGGFLAC_LIB) \
$(top_builddir)/src/libFLAC/libFLAC.la \
@OGG_LIBS@ \
-lm
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_seeking/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_seeking/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_seeking/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# test_seeking - Seeking tester for libFLAC and libOggFLAC
-# Copyright (C) 2004 Josh Coalson
+# Copyright (C) 2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -67,8 +67,8 @@
PROGRAMS = $(noinst_PROGRAMS)
am_test_seeking_OBJECTS = main.$(OBJEXT)
test_seeking_OBJECTS = $(am_test_seeking_OBJECTS)
-test_seeking_DEPENDENCIES = \
- $(top_builddir)/src/libOggFLAC/libOggFLAC.la \
+ at FLaC__HAS_OGG_TRUE@am__DEPENDENCIES_1 = $(top_builddir)/src/libOggFLAC/libOggFLAC.la
+test_seeking_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(top_builddir)/src/libFLAC/libFLAC.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -91,6 +91,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -99,7 +100,7 @@
CCAS = @CCAS@
CCASFLAGS = @CCASFLAGS@
CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@ @OGG_CFLAGS@
+CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
@@ -126,10 +127,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -142,12 +151,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -235,9 +249,11 @@
Makefile.lite \
test_seeking.dsp
+AM_CFLAGS = @OGG_CFLAGS@
INCLUDES =
+ at FLaC__HAS_OGG_TRUE@NEED_OGGFLAC_LIB = $(top_builddir)/src/libOggFLAC/libOggFLAC.la
test_seeking_LDADD = \
- $(top_builddir)/src/libOggFLAC/libOggFLAC.la \
+ $(NEED_OGGFLAC_LIB) \
$(top_builddir)/src/libFLAC/libFLAC.la \
@OGG_LIBS@ \
-lm
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_seeking/Makefile.lite
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_seeking/Makefile.lite 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_seeking/Makefile.lite 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# test_seeking - Seeking tester for libFLAC and libOggFLAC
-# Copyright (C) 2004 Josh Coalson
+# Copyright (C) 2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -20,10 +20,18 @@
#
topdir = ../..
+libdir = $(topdir)/obj/$(BUILD)/lib
PROGRAM_NAME = test_seeking
-INCLUDES = -I../libFLAC/include -I$(topdir)/include
-LIBS = -lOggFLAC -lFLAC -logg -lm
+
+INCLUDES = -I../libFLAC/include -I$(topdir)/include
+
+ifeq ($(DARWIN_BUILD),yes)
+EXPLICIT_LIBS = $(libdir)/libOggFLAC.a $(libdir)/libFLAC.a $(OGG_LIB_DIR)/libogg.a -lm
+else
+LIBS = -lOggFLAC -lFLAC -L$(OGG_LIB_DIR) -logg -lm
+endif
+
SRCS_C = \
main.c
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_seeking/main.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_seeking/main.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_seeking/main.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_seeking - Seeking tester for libFLAC and libOggFLAC
- * Copyright (C) 2004 Josh Coalson
+ * Copyright (C) 2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -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>
@@ -25,12 +29,18 @@
#else
#include <sys/time.h>
#endif
+#include <sys/stat.h> /* for stat() */
#include "FLAC/assert.h"
#include "FLAC/file_decoder.h"
+#ifdef FLAC__HAS_OGG
#include "OggFLAC/file_decoder.h"
+#endif
typedef struct {
+ FLAC__bool got_data;
FLAC__uint64 total_samples;
+ unsigned channels;
+ unsigned bits_per_sample;
FLAC__bool ignore_errors;
FLAC__bool error_occurred;
} decoder_client_data_struct;
@@ -73,6 +83,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,7 +109,18 @@
return false;
}
+#endif
+static off_t get_filesize_(const char *srcpath)
+{
+ struct stat srcstat;
+
+ if(0 == stat(srcpath, &srcstat))
+ return srcstat.st_size;
+ else
+ return -1;
+}
+
static FLAC__StreamDecoderWriteStatus file_decoder_write_callback_(const FLAC__FileDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
{
decoder_client_data_struct *dcd = (decoder_client_data_struct*)client_data;
@@ -141,8 +163,12 @@
if(dcd->error_occurred)
return;
- if (metadata->type == FLAC__METADATA_TYPE_STREAMINFO)
+ if (!dcd->got_data && metadata->type == FLAC__METADATA_TYPE_STREAMINFO) {
+ dcd->got_data = true;
dcd->total_samples = metadata->data.stream_info.total_samples;
+ dcd->channels = metadata->data.stream_info.channels;
+ dcd->bits_per_sample = metadata->data.stream_info.bits_per_sample;
+ }
}
static void file_decoder_error_callback_(const FLAC__FileDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
@@ -162,13 +188,14 @@
}
}
-static FLAC__bool seek_barrage_native_flac(const char *filename, unsigned count)
+static FLAC__bool seek_barrage_native_flac(const char *filename, off_t filesize, unsigned count)
{
FLAC__FileDecoder *decoder;
decoder_client_data_struct decoder_client_data;
unsigned i;
long int n;
+ decoder_client_data.got_data = false;
decoder_client_data.total_samples = 0;
decoder_client_data.ignore_errors = false;
decoder_client_data.error_occurred = false;
@@ -201,12 +228,25 @@
return die_f_("FLAC__file_decoder_process_until_end_of_metadata() FAILED", decoder);
printf("file's total_samples is %llu\n", decoder_client_data.total_samples);
- if (decoder_client_data.total_samples == 0 || decoder_client_data.total_samples > (FLAC__uint64)RAND_MAX) {
- printf("ERROR: must be 0 < total_samples < %u\n", (unsigned)RAND_MAX);
+#if !defined _MSC_VER && !defined __MINGW32__
+ if (decoder_client_data.total_samples > (FLAC__uint64)RAND_MAX) {
+ printf("ERROR: must be total_samples < %u\n", (unsigned)RAND_MAX);
return false;
}
+#endif
n = (long int)decoder_client_data.total_samples;
+ /* if we don't have a total samples count, just guess based on the file size */
+ /* @@@ should get it from last page's granulepos */
+ if(n == 0) {
+ /* 8 would imply no compression, 9 guarantees that we will get some samples off the end of the stream to test that case */
+ n = 9 * filesize / (decoder_client_data.channels * decoder_client_data.bits_per_sample);
+#if !defined _MSC_VER && !defined __MINGW32__
+ if(n > RAND_MAX)
+ n = RAND_MAX;
+#endif
+ }
+
printf("Begin seek barrage, count=%u\n", count);
for (i = 0; !stop_signal_ && (count == 0 || i < count); i++) {
@@ -220,45 +260,90 @@
else if (n >= 10 && i < 20) {
pos = n - 1 - (i-10);
}
+ /* for the third 10, seek past the end and make sure we fail properly as expected */
+ else if (i < 30) {
+ pos = n + (i-20);
+ }
else {
#if !defined _MSC_VER && !defined __MINGW32__
pos = (FLAC__uint64)(random() % n);
#else
- pos = (FLAC__uint64)(rand() % n);
+ /* RAND_MAX is only 32767 in my MSVC */
+ pos = (FLAC__uint64)((rand()<<15|rand()) % n);
#endif
}
printf("seek(%llu)... ", pos);
fflush(stdout);
- if(!FLAC__file_decoder_seek_absolute(decoder, pos))
- return die_f_("FLAC__file_decoder_seek_absolute() FAILED", decoder);
+ if(!FLAC__file_decoder_seek_absolute(decoder, pos)) {
+ if(pos < (FLAC__uint64)n && decoder_client_data.total_samples != 0)
+ return die_f_("FLAC__file_decoder_seek_absolute() FAILED", decoder);
+ else if(decoder_client_data.total_samples == 0)
+ printf("seek failed, assuming it was past EOF... ");
+ else
+ printf("seek past end failed as expected... ");
- printf("decode_frame... ");
- fflush(stdout);
- if(!FLAC__file_decoder_process_single(decoder))
- return die_f_("FLAC__file_decoder_process_single() FAILED", decoder);
+ /* hack to work around a deficiency in the seek API's behavior */
+ /* seeking past EOF sets the file decoder state to non-OK and there's no ..._flush() or ..._reset() call to reset it */
+ if(!FLAC__file_decoder_finish(decoder))
+ return die_f_("FLAC__file_decoder_finish() FAILED", decoder);
- printf("decode_frame... ");
- fflush(stdout);
- if(!FLAC__file_decoder_process_single(decoder))
- return die_f_("FLAC__file_decoder_process_single() FAILED", decoder);
+ if(!FLAC__file_decoder_set_write_callback(decoder, file_decoder_write_callback_))
+ return die_f_("FLAC__file_decoder_set_write_callback() FAILED", decoder);
+ if(!FLAC__file_decoder_set_metadata_callback(decoder, file_decoder_metadata_callback_))
+ return die_f_("FLAC__file_decoder_set_metadata_callback() FAILED", decoder);
+
+ if(!FLAC__file_decoder_set_error_callback(decoder, file_decoder_error_callback_))
+ return die_f_("FLAC__file_decoder_set_error_callback() FAILED", decoder);
+
+ if(!FLAC__file_decoder_set_client_data(decoder, &decoder_client_data))
+ return die_f_("FLAC__file_decoder_set_client_data() FAILED", decoder);
+
+ if(!FLAC__file_decoder_set_filename(decoder, filename))
+ return die_f_("FLAC__file_decoder_set_filename() FAILED", decoder);
+
+ if(FLAC__file_decoder_init(decoder) != FLAC__FILE_DECODER_OK)
+ return die_f_("FLAC__file_decoder_init() FAILED", decoder);
+
+ if(!FLAC__file_decoder_process_until_end_of_metadata(decoder))
+ return die_f_("FLAC__file_decoder_process_until_end_of_metadata() FAILED", decoder);
+ }
+ else {
+ printf("decode_frame... ");
+ fflush(stdout);
+ if(!FLAC__file_decoder_process_single(decoder))
+ return die_f_("FLAC__file_decoder_process_single() FAILED", decoder);
+
+ printf("decode_frame... ");
+ fflush(stdout);
+ if(!FLAC__file_decoder_process_single(decoder))
+ return die_f_("FLAC__file_decoder_process_single() FAILED", decoder);
+ }
+
printf("OK\n");
fflush(stdout);
}
+ if(FLAC__file_decoder_get_state(decoder) != FLAC__FILE_DECODER_UNINITIALIZED) {
+ if(!FLAC__file_decoder_finish(decoder))
+ return die_f_("FLAC__file_decoder_finish() FAILED", decoder);
+ }
+
printf("\nPASSED!\n");
return true;
}
-static FLAC__bool seek_barrage_ogg_flac(const char *filename, unsigned count)
+#ifdef FLAC__HAS_OGG
+static FLAC__bool seek_barrage_ogg_flac(const char *filename, off_t filesize, unsigned count)
{
OggFLAC__FileDecoder *decoder;
decoder_client_data_struct decoder_client_data;
unsigned i;
long int n;
+ decoder_client_data.got_data = false;
decoder_client_data.total_samples = 0;
decoder_client_data.ignore_errors = false;
decoder_client_data.error_occurred = false;
@@ -291,12 +376,24 @@
return die_of_("OggFLAC__file_decoder_process_until_end_of_metadata() FAILED", decoder);
printf("file's total_samples is %llu\n", decoder_client_data.total_samples);
- if (decoder_client_data.total_samples == 0 || decoder_client_data.total_samples > (FLAC__uint64)RAND_MAX) {
- printf("ERROR: must be 0 < total_samples < %u\n", (unsigned)RAND_MAX);
+#if !defined _MSC_VER && !defined __MINGW32__
+ if (decoder_client_data.total_samples > (FLAC__uint64)RAND_MAX) {
+ printf("ERROR: must be total_samples < %u\n", (unsigned)RAND_MAX);
return false;
}
+#endif
n = (long int)decoder_client_data.total_samples;
+ /* if we don't have a total samples count, just guess based on the file size */
+ if(n == 0) {
+ /* 8 would imply no compression, 9 guarantees that we will get some samples off the end of the stream to test that case */
+ n = 9 * filesize / (decoder_client_data.channels * decoder_client_data.bits_per_sample);
+#if !defined _MSC_VER && !defined __MINGW32__
+ if(n > RAND_MAX)
+ n = RAND_MAX;
+#endif
+ }
+
printf("Begin seek barrage, count=%u\n", count);
for (i = 0; !stop_signal_ && (count == 0 || i < count); i++) {
@@ -310,42 +407,87 @@
else if (n >= 10 && i < 20) {
pos = n - 1 - (i-10);
}
+ /* for the third 10, seek past the end and make sure we fail properly as expected */
+ else if (i < 30) {
+ pos = n + (i-20);
+ }
else {
#if !defined _MSC_VER && !defined __MINGW32__
pos = (FLAC__uint64)(random() % n);
#else
- pos = (FLAC__uint64)(rand() % n);
+ /* RAND_MAX is only 32767 in my MSVC */
+ pos = (FLAC__uint64)((rand()<<15|rand()) % n);
#endif
}
printf("seek(%llu)... ", pos);
fflush(stdout);
- if(!OggFLAC__file_decoder_seek_absolute(decoder, pos))
- return die_of_("OggFLAC__file_decoder_seek_absolute() FAILED", decoder);
+ if(!OggFLAC__file_decoder_seek_absolute(decoder, pos)) {
+ if(pos < (FLAC__uint64)n && decoder_client_data.total_samples != 0)
+ return die_of_("OggFLAC__file_decoder_seek_absolute() FAILED", decoder);
+ else if(decoder_client_data.total_samples == 0)
+ printf("seek failed, assuming it was past EOF... ");
+ else
+ printf("seek past end failed as expected... ");
- printf("decode_frame... ");
- fflush(stdout);
- if(!OggFLAC__file_decoder_process_single(decoder))
- return die_of_("OggFLAC__file_decoder_process_single() FAILED", decoder);
+ /* hack to work around a deficiency in the seek API's behavior */
+ /* seeking past EOF sets the file decoder state to non-OK and there's no ..._flush() or ..._reset() call to reset it */
+ if(!OggFLAC__file_decoder_finish(decoder))
+ return die_of_("OggFLAC__file_decoder_finish() FAILED", decoder);
- printf("decode_frame... ");
- fflush(stdout);
- if(!OggFLAC__file_decoder_process_single(decoder))
- return die_of_("OggFLAC__file_decoder_process_single() FAILED", decoder);
+ if(!OggFLAC__file_decoder_set_write_callback(decoder, (OggFLAC__FileDecoderWriteCallback)file_decoder_write_callback_))
+ return die_of_("OggFLAC__file_decoder_set_write_callback() FAILED", decoder);
+ if(!OggFLAC__file_decoder_set_metadata_callback(decoder, (OggFLAC__FileDecoderMetadataCallback)file_decoder_metadata_callback_))
+ return die_of_("OggFLAC__file_decoder_set_metadata_callback() FAILED", decoder);
+
+ if(!OggFLAC__file_decoder_set_error_callback(decoder, (OggFLAC__FileDecoderErrorCallback)file_decoder_error_callback_))
+ return die_of_("OggFLAC__file_decoder_set_error_callback() FAILED", decoder);
+
+ if(!OggFLAC__file_decoder_set_client_data(decoder, &decoder_client_data))
+ return die_of_("OggFLAC__file_decoder_set_client_data() FAILED", decoder);
+
+ if(!OggFLAC__file_decoder_set_filename(decoder, filename))
+ return die_of_("OggFLAC__file_decoder_set_filename() FAILED", decoder);
+
+ if(OggFLAC__file_decoder_init(decoder) != OggFLAC__FILE_DECODER_OK)
+ return die_of_("OggFLAC__file_decoder_init() FAILED", decoder);
+
+ if(!OggFLAC__file_decoder_process_until_end_of_metadata(decoder))
+ return die_of_("OggFLAC__file_decoder_process_until_end_of_metadata() FAILED", decoder);
+ }
+ else {
+ printf("decode_frame... ");
+ fflush(stdout);
+ if(!OggFLAC__file_decoder_process_single(decoder))
+ return die_of_("OggFLAC__file_decoder_process_single() FAILED", decoder);
+
+ printf("decode_frame... ");
+ fflush(stdout);
+ if(!OggFLAC__file_decoder_process_single(decoder))
+ return die_of_("OggFLAC__file_decoder_process_single() FAILED", decoder);
+ }
+
printf("OK\n");
fflush(stdout);
}
+ if(OggFLAC__file_decoder_get_state(decoder) != OggFLAC__FILE_DECODER_UNINITIALIZED) {
+ if(!OggFLAC__file_decoder_finish(decoder))
+ return die_of_("OggFLAC__file_decoder_finish() FAILED", decoder);
+ }
+
printf("\nPASSED!\n");
return true;
}
+#endif
int main(int argc, char *argv[])
{
const char *filename;
unsigned count = 0;
+ off_t filesize;
static const char * const usage = "usage: test_seeking file.flac [#seeks]\n";
@@ -359,14 +501,14 @@
if (argc > 2)
count = strtoul(argv[2], 0, 10);
- if (count < 20)
- fprintf(stderr, "WARNING: random seeks don't kick in until after 20 preprogrammed ones\n");
+ if (count < 30)
+ fprintf(stderr, "WARNING: random seeks don't kick in until after 30 preprogrammed ones\n");
#if !defined _MSC_VER && !defined __MINGW32__
{
struct timeval tv;
- if(gettimeofday(&tv, 0) < 0) {
+ if (gettimeofday(&tv, 0) < 0) {
fprintf(stderr, "WARNING: couldn't seed RNG with time\n");
tv.tv_usec = 4321;
}
@@ -376,14 +518,27 @@
srand(time(0));
#endif
+ filesize = get_filesize_(filename);
+ if (filesize < 0) {
+ fprintf(stderr, "ERROR: can't determine filesize for %s\n", filename);
+ return 1;
+ }
+
(void) signal(SIGINT, our_sigint_handler_);
{
FLAC__bool ok;
- if (strlen(filename) > 4 && 0 == strcmp(filename+strlen(filename)-4, ".ogg"))
- ok = seek_barrage_ogg_flac(filename, count);
- else
- ok = seek_barrage_native_flac(filename, count);
+ if (strlen(filename) > 4 && 0 == strcmp(filename+strlen(filename)-4, ".ogg")) {
+#ifdef FLAC__HAS_OGG
+ ok = seek_barrage_ogg_flac(filename, filesize, count);
+#else
+ fprintf(stderr, "ERROR: Ogg FLAC not supported\n");
+ ok = false;
+#endif
+ }
+ else {
+ ok = seek_barrage_native_flac(filename, filesize, count);
+ }
return ok? 0 : 2;
}
}
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_seeking/test_seeking.dsp
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_seeking/test_seeking.dsp 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_seeking/test_seeking.dsp 2005-10-20 12:55:24 UTC (rev 10204)
@@ -42,7 +42,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "FLAC__NO_DLL" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "FLAC__NO_DLL" /D "FLAC__HAS_OGG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX /Yc /Yu
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "FLAC__NO_DLL" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "FLAC__NO_DLL" /D "FLAC__HAS_OGG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# SUBTRACT CPP /YX /Yc /Yu
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_streams/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_streams/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_streams/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# test_streams - Simple test pattern generator
-# Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -19,8 +19,6 @@
Makefile.lite \
test_streams.dsp
-CFLAGS = @CFLAGS@
-
noinst_PROGRAMS = test_streams
test_streams_SOURCES = \
main.c
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_streams/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_streams/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_streams/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# test_streams - Simple test pattern generator
-# Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -89,6 +89,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -124,10 +125,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -140,12 +149,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_streams/Makefile.lite
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_streams/Makefile.lite 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_streams/Makefile.lite 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# test_streams - Simple test pattern generator
-# Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -20,10 +20,14 @@
#
topdir = ../..
+libdir = $(topdir)/obj/$(BUILD)/lib
PROGRAM_NAME = test_streams
-INCLUDES = -I./include -I$(topdir)/include
-LIBS = -lm
+
+INCLUDES = -I./include -I$(topdir)/include
+
+LIBS = -lm
+
SRCS_C = \
main.c
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_streams/main.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_streams/main.c 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/test_streams/main.c 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
/* test_streams - Simple test pattern generator
- * Copyright (C) 2000,2001,2002,2003,2004 Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005 Josh Coalson
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
@@ -44,6 +44,7 @@
./test_flac.sh \
./test_metaflac.sh \
./test_grabbag.sh \
+ ./test_seeking.sh \
./test_streams.sh \
./test_bins.sh
@@ -59,6 +60,7 @@
test_flac.sh \
test_metaflac.sh \
test_grabbag.sh \
+ test_seeking.sh \
test_streams.sh \
test_bins.sh
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
@@ -76,6 +76,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -111,10 +112,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -127,12 +136,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -233,6 +247,7 @@
./test_flac.sh \
./test_metaflac.sh \
./test_grabbag.sh \
+ ./test_seeking.sh \
./test_streams.sh \
./test_bins.sh
@@ -248,6 +263,7 @@
test_flac.sh \
test_metaflac.sh \
test_grabbag.sh \
+ test_seeking.sh \
test_streams.sh \
test_bins.sh
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/Makefile.lite
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/Makefile.lite 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/Makefile.lite 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
@@ -21,16 +21,21 @@
topdir = ..
+DEFAULT_CONFIG = release
+
+CONFIG = $(DEFAULT_CONFIG)
+
all: clean
- $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_libFLAC.sh
- $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_libFLAC++.sh
- $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_libOggFLAC.sh
- $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_libOggFLAC++.sh
- $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_flac.sh
- $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_metaflac.sh
- $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_grabbag.sh
- $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_streams.sh
- $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_bins.sh
+ $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_libFLAC.sh $(CONFIG)
+ $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_libFLAC++.sh $(CONFIG)
+ $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_libOggFLAC.sh $(CONFIG)
+ $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_libOggFLAC++.sh $(CONFIG)
+ $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_flac.sh $(CONFIG)
+ $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_metaflac.sh $(CONFIG)
+ $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_grabbag.sh $(CONFIG)
+ $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_seeking.sh $(CONFIG)
+ $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_streams.sh $(CONFIG)
+ $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_bins.sh $(CONFIG)
debug : FLAC__EXHAUSTIVE_TESTS=FLAC__EXHAUSTIVE_TESTS=yes
valgrind: FLAC__EXHAUSTIVE_TESTS=FLAC__EXHAUSTIVE_TESTS=no
@@ -40,6 +45,10 @@
valgrind: FLAC__VALGRIND=FLAC__VALGRIND=yes
release : FLAC__VALGRIND=FLAC__VALGRIND=no
+debug : CONFIG = debug
+valgrind: CONFIG = debug
+release : CONFIG = release
+
debug : all
valgrind: all
release : all
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/cuesheets/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/cuesheets/Makefile.am 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/cuesheets/Makefile.am 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,5 +1,5 @@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/cuesheets/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/cuesheets/Makefile.in 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/cuesheets/Makefile.in 2005-10-20 12:55:24 UTC (rev 10204)
@@ -15,7 +15,7 @@
@SET_MAKE@
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
@@ -67,6 +67,7 @@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -102,10 +103,18 @@
FLaC__CPU_SPARC_TRUE = @FLaC__CPU_SPARC_TRUE@
FLaC__EXHAUSTIVE_TESTS_FALSE = @FLaC__EXHAUSTIVE_TESTS_FALSE@
FLaC__EXHAUSTIVE_TESTS_TRUE = @FLaC__EXHAUSTIVE_TESTS_TRUE@
+FLaC__HAS_AS_FALSE = @FLaC__HAS_AS_FALSE@
+FLaC__HAS_AS_TRUE = @FLaC__HAS_AS_TRUE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_DOCBOOK_TO_MAN_FALSE = @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@
FLaC__HAS_DOCBOOK_TO_MAN_TRUE = @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@
FLaC__HAS_DOXYGEN_FALSE = @FLaC__HAS_DOXYGEN_FALSE@
FLaC__HAS_DOXYGEN_TRUE = @FLaC__HAS_DOXYGEN_TRUE@
+FLaC__HAS_GAS_FALSE = @FLaC__HAS_GAS_FALSE@
+FLaC__HAS_GAS_TRUE = @FLaC__HAS_GAS_TRUE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@
+FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE = @FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@
FLaC__HAS_NASM_FALSE = @FLaC__HAS_NASM_FALSE@
FLaC__HAS_NASM_TRUE = @FLaC__HAS_NASM_TRUE@
FLaC__HAS_OGG_FALSE = @FLaC__HAS_OGG_FALSE@
@@ -118,12 +127,17 @@
FLaC__NO_ASM_TRUE = @FLaC__NO_ASM_TRUE@
FLaC__SSE_OS_FALSE = @FLaC__SSE_OS_FALSE@
FLaC__SSE_OS_TRUE = @FLaC__SSE_OS_TRUE@
+FLaC__SYS_DARWIN_FALSE = @FLaC__SYS_DARWIN_FALSE@
+FLaC__SYS_DARWIN_TRUE = @FLaC__SYS_DARWIN_TRUE@
+FLaC__SYS_LINUX_FALSE = @FLaC__SYS_LINUX_FALSE@
+FLaC__SYS_LINUX_TRUE = @FLaC__SYS_LINUX_TRUE@
FLaC__USE_3DNOW_FALSE = @FLaC__USE_3DNOW_FALSE@
FLaC__USE_3DNOW_TRUE = @FLaC__USE_3DNOW_TRUE@
FLaC__USE_ALTIVEC_FALSE = @FLaC__USE_ALTIVEC_FALSE@
FLaC__USE_ALTIVEC_TRUE = @FLaC__USE_ALTIVEC_TRUE@
FLaC__VALGRIND_TESTING_FALSE = @FLaC__VALGRIND_TESTING_FALSE@
FLaC__VALGRIND_TESTING_TRUE = @FLaC__VALGRIND_TESTING_TRUE@
+GAS = @GAS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_bins.sh
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_bins.sh 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_bins.sh 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,7 +1,7 @@
#!/bin/sh
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
@@ -23,9 +23,23 @@
exit 1
}
-LD_LIBRARY_PATH=../src/libFLAC/.libs:../obj/release/lib:../obj/debug/lib:$LD_LIBRARY_PATH
+if [ x = x"$1" ] ; then
+ BUILD=debug
+else
+ BUILD="$1"
+fi
+
+LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/libOggFLAC/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/share/grabbag/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/share/getopt/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/share/replaygain_synthesis/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/share/utf8/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../obj/$BUILD/lib:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH
-PATH=../src/flac:../obj/release/bin:../obj/debug/bin:$PATH
+PATH=../src/flac:$PATH
+PATH=../obj/$BUILD/bin:$PATH
BINS_PATH=../../test_files/bins
flac --help 1>/dev/null 2>/dev/null || die "ERROR can't find flac executable"
@@ -48,7 +62,7 @@
bps=$3
encode_options="$4"
- echo -n "$name (--channels=$channels --bps=$bps $encode_options): encode..."
+ echo -n "$name.bin (--channels=$channels --bps=$bps $encode_options): encode..."
cmd="run_flac --verify --silent --force --force-raw-format --endian=big --sign=signed --sample-rate=44100 --bps=$bps --channels=$channels $encode_options $name.bin"
echo "### ENCODE $name #######################################################" >> ./streams.log
echo "### cmd=$cmd" >> ./streams.log
@@ -72,8 +86,8 @@
echo "Testing bins..."
for f in b00 b01 b02 b03 b04 ; do
- binfile=$BINS_PATH/$f.bin
- if [ -f $binfile ] ; then
+ binfile=$BINS_PATH/$f
+ if [ -f $binfile.bin ] ; then
for disable in '' '--disable-verbatim-subframes --disable-constant-subframes' '--disable-verbatim-subframes --disable-constant-subframes --disable-fixed-subframes' ; do
for channels in 1 2 4 8 ; do
for bps in 8 16 24 ; do
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_flac.sh
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_flac.sh 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_flac.sh 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,7 +1,7 @@
#!/bin/sh
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
@@ -23,9 +23,25 @@
exit 1
}
-LD_LIBRARY_PATH=../src/libFLAC/.libs:../obj/release/lib:../obj/debug/lib:$LD_LIBRARY_PATH
+if [ x = x"$1" ] ; then
+ BUILD=debug
+else
+ BUILD="$1"
+fi
+
+LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/libOggFLAC/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/share/grabbag/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/share/getopt/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/share/replaygain_synthesis/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/share/utf8/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../obj/$BUILD/lib:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH
-PATH=../src/flac:../src/metaflac:../src/test_streams:../obj/release/bin:../obj/debug/bin:$PATH
+PATH=../src/flac:$PATH
+PATH=../src/metaflac:$PATH
+PATH=../src/test_streams:$PATH
+PATH=../obj/$BUILD/bin:$PATH
flac --help 1>/dev/null 2>/dev/null || die "ERROR can't find flac executable"
@@ -41,7 +57,7 @@
run_metaflac ()
{
if [ x"$FLAC__VALGRIND" = xyes ] ; then
- valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --logfile-fd=4 metaflac $* 4>>test_metaflac.valgrind.log
+ valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --logfile-fd=4 metaflac $* 4>>test_flac.valgrind.log
else
metaflac $*
fi
@@ -553,6 +569,25 @@
############################################################################
+# test --input-size
+############################################################################
+
+#@@@@@@ cat will not work on old cygwin, need to fix
+if [ $is_win = no ] ; then
+ echo -n "testing --input-size=50 --skip=10... "
+ cat 50c.raw | run_flac $raw_eopt --input-size=50 --skip=10 -o z50c.skip10.flac - || die "ERROR generating FLAC file"
+ run_flac $raw_dopt -o z50c.skip10.raw z50c.skip10.flac || die "ERROR decoding FLAC file"
+ cmp 50c.skip10.raw z50c.skip10.raw || die "ERROR: file mismatch for --input-size=50 --skip=10"
+ rm -f z50c.skip10.raw z50c.skip10.flac
+ echo OK
+fi
+
+
+############################################################################
+# test --skip and --until
+############################################################################
+
+############################################################################
# test --cue
############################################################################
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_grabbag.sh
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_grabbag.sh 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_grabbag.sh 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,7 +1,7 @@
#!/bin/sh
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
@@ -23,9 +23,19 @@
exit 1
}
-LD_LIBRARY_PATH=../src/libFLAC/.libs:../src/share/grabbag/.libs:../obj/release/lib:../obj/debug/lib:$LD_LIBRARY_PATH
+if [ x = x"$1" ] ; then
+ BUILD=debug
+else
+ BUILD="$1"
+fi
+
+LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/share/grabbag/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../obj/$BUILD/lib:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH
-PATH=../src/test_grabbag/cuesheet:../obj/release/bin:../obj/debug/bin:$PATH
+PATH=../src/test_grabbag/cuesheet:$PATH
+PATH=../obj/$BUILD/bin:$PATH
test_cuesheet -h 1>/dev/null 2>/dev/null || die "ERROR can't find test_cuesheet executable"
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_libFLAC++.sh
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_libFLAC++.sh 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_libFLAC++.sh 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,7 +1,7 @@
#!/bin/sh
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
@@ -23,10 +23,20 @@
exit 1
}
-LD_LIBRARY_PATH=../src/libFLAC++/.libs:../src/libFLAC/.libs:../obj/release/lib:../obj/debug/lib:$LD_LIBRARY_PATH
+if [ x = x"$1" ] ; then
+ BUILD=debug
+else
+ BUILD="$1"
+fi
+
+LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/libFLAC++/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/share/grabbag/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../obj/$BUILD/lib:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH
-PATH=../src/test_libFLAC++:../obj/release/bin:../obj/debug/bin:$PATH
-export PATH
+PATH=../src/test_libFLAC++:$PATH
+PATH=../obj/$BUILD/bin:$PATH
run_test_libFLACpp ()
{
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_libFLAC.sh
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_libFLAC.sh 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_libFLAC.sh 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,7 +1,7 @@
#!/bin/sh
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
@@ -23,10 +23,19 @@
exit 1
}
-LD_LIBRARY_PATH=../src/libFLAC/.libs:../obj/release/lib:../obj/debug/lib:$LD_LIBRARY_PATH
+if [ x = x"$1" ] ; then
+ BUILD=debug
+else
+ BUILD="$1"
+fi
+
+LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/share/grabbag/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../obj/$BUILD/lib:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH
-PATH=../src/test_libFLAC:../obj/release/bin:../obj/debug/bin:$PATH
-export PATH
+PATH=../src/test_libFLAC:$PATH
+PATH=../obj/$BUILD/bin:$PATH
run_test_libFLAC ()
{
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_libOggFLAC++.sh
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_libOggFLAC++.sh 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_libOggFLAC++.sh 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,7 +1,7 @@
#!/bin/sh
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
@@ -23,10 +23,21 @@
exit 1
}
-LD_LIBRARY_PATH=../src/libOggFLAC++/.libs:../src/libOggFLAC/.libs:../src/libFLAC/.libs:../obj/release/lib:../obj/debug/lib:$LD_LIBRARY_PATH
+if [ x = x"$1" ] ; then
+ BUILD=debug
+else
+ BUILD="$1"
+fi
+
+LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/libOggFLAC/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/libOggFLAC++/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/share/grabbag/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../obj/$BUILD/lib:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH
-PATH=../src/test_libOggFLAC++:../obj/release/bin:../obj/debug/bin:$PATH
-export PATH
+PATH=../src/test_libOggFLAC++:$PATH
+PATH=../obj/$BUILD/bin:$PATH
run_test_libOggFLACpp ()
{
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_libOggFLAC.sh
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_libOggFLAC.sh 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_libOggFLAC.sh 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,7 +1,7 @@
#!/bin/sh
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
@@ -23,10 +23,20 @@
exit 1
}
-LD_LIBRARY_PATH=../src/libOggFLAC/.libs../src/libFLAC/.libs:../obj/release/lib:../obj/debug/lib:$LD_LIBRARY_PATH
+if [ x = x"$1" ] ; then
+ BUILD=debug
+else
+ BUILD="$1"
+fi
+
+LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/libOggFLAC/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/share/grabbag/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../obj/$BUILD/lib:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH
-PATH=../src/test_libOggFLAC:../obj/release/bin:../obj/debug/bin:$PATH
-export PATH
+PATH=../src/test_libOggFLAC:$PATH
+PATH=../obj/$BUILD/bin:$PATH
run_test_libOggFLAC ()
{
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_metaflac.sh
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_metaflac.sh 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_metaflac.sh 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,7 +1,7 @@
#!/bin/sh
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2002,2003,2004 Josh Coalson
+# Copyright (C) 2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
@@ -23,9 +23,24 @@
exit 1
}
-LD_LIBRARY_PATH=../src/libFLAC/.libs:../obj/release/lib:../obj/debug/lib:$LD_LIBRARY_PATH
+if [ x = x"$1" ] ; then
+ BUILD=debug
+else
+ BUILD="$1"
+fi
+
+LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/libOggFLAC/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/share/grabbag/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/share/getopt/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/share/replaygain_synthesis/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/share/utf8/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../obj/$BUILD/lib:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH
-PATH=../src/flac:../src/metaflac:../obj/release/bin:../obj/debug/bin:$PATH
+PATH=../src/flac:$PATH
+PATH=../src/metaflac:$PATH
+PATH=../obj/$BUILD/bin:$PATH
flacfile=metaflac.flac
Added: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_seeking.sh
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_seeking.sh 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_seeking.sh 2005-10-20 12:55:24 UTC (rev 10204)
@@ -0,0 +1,133 @@
+#!/bin/sh
+
+# FLAC - Free Lossless Audio Codec
+# Copyright (C) 2004,2005 Josh Coalson
+#
+# This file is part the FLAC project. FLAC is comprised of several
+# components distributed under difference licenses. The codec libraries
+# are distributed under Xiph.Org's BSD-like license (see the file
+# COPYING.Xiph in this distribution). All other programs, libraries, and
+# plugins are distributed under the GPL (see COPYING.GPL). The documentation
+# is distributed under the Gnu FDL (see COPYING.FDL). Each file in the
+# FLAC distribution contains at the top the terms under which it may be
+# distributed.
+#
+# Since this particular file is relevant to all components of FLAC,
+# it may be distributed under the Xiph.Org license, which is the least
+# restrictive of those mentioned above. See the file COPYING.Xiph in this
+# distribution.
+
+die ()
+{
+ echo $* 1>&2
+ exit 1
+}
+
+if [ x = x"$1" ] ; then
+ BUILD=debug
+else
+ BUILD="$1"
+fi
+
+LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../src/libOggFLAC/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../obj/$BUILD/lib:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH
+PATH=../src/flac:$PATH
+PATH=../src/metaflac:$PATH
+PATH=../src/test_seeking:$PATH
+PATH=../src/test_streams:$PATH
+PATH=../obj/$BUILD/bin:$PATH
+
+flac --help 1>/dev/null 2>/dev/null || die "ERROR can't find flac executable"
+metaflac --help 1>/dev/null 2>/dev/null || die "ERROR can't find metaflac executable"
+
+run_flac ()
+{
+ if [ x"$FLAC__VALGRIND" = xyes ] ; then
+ valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --logfile-fd=4 flac $* 4>>test_seeking.valgrind.log
+ else
+ flac $*
+ fi
+}
+
+run_metaflac ()
+{
+ if [ x"$FLAC__VALGRIND" = xyes ] ; then
+ valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --logfile-fd=4 metaflac $* 4>>test_seeking.valgrind.log
+ else
+ metaflac $*
+ fi
+}
+
+run_test_seeking ()
+{
+ if [ x"$FLAC__VALGRIND" = xyes ] ; then
+ valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --logfile-fd=4 test_seeking $* 4>>test_seeking.valgrind.log
+ else
+ test_seeking $*
+ fi
+}
+
+echo "Checking for --ogg support in flac..."
+if flac --ogg --silent --force-raw-format --endian=little --sign=signed --channels=1 --bps=8 --sample-rate=44100 -c $0 1>/dev/null 2>&1 ; then
+ has_ogg=yes;
+ echo "flac --ogg works"
+else
+ has_ogg=no;
+ echo "flac --ogg doesn't work"
+fi
+
+
+echo "Generating streams..."
+if [ ! -f noise.raw ] ; then
+ test_streams || die "ERROR during test_streams"
+fi
+
+echo "generating FLAC files for seeking:"
+run_flac --verify --force --silent --force-raw-format --endian=big --sign=signed --sample-rate=44100 --bps=8 --channels=1 --blocksize=576 --output-name=tiny.flac noise8m32.raw || die "ERROR generating FLAC file"
+run_flac --verify --force --silent --force-raw-format --endian=big --sign=signed --sample-rate=44100 --bps=16 --channels=2 --blocksize=576 --output-name=small.flac noise.raw || die "ERROR generating FLAC file"
+echo "generating Ogg FLAC files for seeking:"
+run_flac --verify --force --silent --force-raw-format --endian=big --sign=signed --sample-rate=44100 --bps=8 --channels=1 --blocksize=576 --output-name=tiny.ogg --ogg noise8m32.raw || die "ERROR generating Ogg FLAC file"
+run_flac --verify --force --silent --force-raw-format --endian=big --sign=signed --sample-rate=44100 --bps=16 --channels=2 --blocksize=576 --output-name=small.ogg --ogg noise.raw || die "ERROR generating Ogg FLAC file"
+
+echo "testing tiny.flac:"
+if run_test_seeking tiny.flac 100 ; then : ; else
+ die "ERROR: during test_seeking"
+fi
+
+echo "testing small.flac:"
+if run_test_seeking small.flac 1000 ; then : ; else
+ die "ERROR: during test_seeking"
+fi
+
+echo "removing sample count from tiny.flac and small.flac:"
+if run_metaflac --no-filename --set-total-samples=0 tiny.flac small.flac ; then : ; else
+ die "ERROR: during metaflac"
+fi
+
+echo "testing tiny.flac with total_samples=0:"
+if run_test_seeking tiny.flac 100 ; then : ; else
+ die "ERROR: during test_seeking"
+fi
+
+echo "testing small.flac with total_samples=0:"
+if run_test_seeking small.flac 1000 ; then : ; else
+ die "ERROR: during test_seeking"
+fi
+
+if [ $has_ogg = "yes" ] ; then
+
+ echo "testing tiny.ogg:"
+ if run_test_seeking tiny.ogg 100 ; then : ; else
+ die "ERROR: during test_seeking"
+ fi
+
+ echo "testing small.ogg:"
+ if run_test_seeking small.ogg 1000 ; then : ; else
+ die "ERROR: during test_seeking"
+ fi
+
+fi
+
+rm -f tiny.flac tiny.ogg small.flac small.ogg
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_streams.sh
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_streams.sh 2005-10-20 12:47:51 UTC (rev 10203)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/test/test_streams.sh 2005-10-20 12:55:24 UTC (rev 10204)
@@ -1,7 +1,7 @@
#!/bin/sh
# FLAC - Free Lossless Audio Codec
-# Copyright (C) 2001,2002,2003,2004 Josh Coalson
+# Copyright (C) 2001,2002,2003,2004,2005 Josh Coalson
#
# This file is part the FLAC project. FLAC is comprised of several
# components distributed under difference licenses. The codec libraries
@@ -23,9 +23,17 @@
exit 1
}
-LD_LIBRARY_PATH=../src/libFLAC/.libs:../obj/release/lib:../obj/debug/lib:$LD_LIBRARY_PATH
+if [ x = x"$1" ] ; then
+ BUILD=debug
+else
+ BUILD="$1"
+fi
+
+LD_LIBRARY_PATH=../obj/$BUILD/lib:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH
-PATH=../src/flac:../src/test_streams:../obj/release/bin:../obj/debug/bin:$PATH
+PATH=../src/flac:$PATH
+PATH=../src/test_streams:$PATH
+PATH=../obj/$BUILD/bin:$PATH
flac --help 1>/dev/null 2>/dev/null || die "ERROR can't find flac executable"
@@ -55,13 +63,13 @@
encode_options="$4"
echo -n "$name (--channels=$channels --bps=$bps $encode_options): encode..."
- cmd="run_flac --verify --silent --force --force-raw-format --endian=big --sign=signed --sample-rate=44100 --bps=$bps --channels=$channels $encode_options $name.raw"
+ cmd="run_flac --verify --silent --force --force-raw-format --endian=little --sign=signed --sample-rate=44100 --bps=$bps --channels=$channels $encode_options $name.raw"
echo "### ENCODE $name #######################################################" >> ./streams.log
echo "### cmd=$cmd" >> ./streams.log
$cmd 2>>./streams.log || die "ERROR during encode of $name"
echo -n "decode..."
- cmd="run_flac --silent --force --endian=big --sign=signed --decode --force-raw-format --output-name=$name.cmp $name.flac"
+ cmd="run_flac --silent --force --endian=little --sign=signed --decode --force-raw-format --output-name=$name.cmp $name.flac"
echo "### DECODE $name #######################################################" >> ./streams.log
echo "### cmd=$cmd" >> ./streams.log
$cmd 2>>./streams.log || die "ERROR during decode of $name"
@@ -91,24 +99,24 @@
echo -n "$name: encode via pipes..."
if [ $is_win = yes ] ; then
- cmd="run_flac --verify --silent --force --force-raw-format --endian=big --sign=signed --sample-rate=44100 --bps=$bps --channels=$channels $encode_options --stdout $name.raw"
+ cmd="run_flac --verify --silent --force --force-raw-format --endian=little --sign=signed --sample-rate=44100 --bps=$bps --channels=$channels $encode_options --stdout $name.raw"
echo "### ENCODE $name #######################################################" >> ./streams.log
echo "### cmd=$cmd" >> ./streams.log
$cmd 1>$name.flac 2>>./streams.log || die "ERROR during encode of $name"
else
- cmd="run_flac --verify --silent --force --force-raw-format --endian=big --sign=signed --sample-rate=44100 --bps=$bps --channels=$channels $encode_options --stdout -"
+ cmd="run_flac --verify --silent --force --force-raw-format --endian=little --sign=signed --sample-rate=44100 --bps=$bps --channels=$channels $encode_options --stdout -"
echo "### ENCODE $name #######################################################" >> ./streams.log
echo "### cmd=$cmd" >> ./streams.log
cat $name.raw | $cmd 1>$name.flac 2>>./streams.log || die "ERROR during encode of $name"
fi
echo -n "decode via pipes..."
if [ $is_win = yes ] ; then
- cmd="run_flac --silent --force --endian=big --sign=signed --decode --force-raw-format --stdout $name.flac"
+ cmd="run_flac --silent --force --endian=little --sign=signed --decode --force-raw-format --stdout $name.flac"
echo "### DECODE $name #######################################################" >> ./streams.log
echo "### cmd=$cmd" >> ./streams.log
$cmd 1>$name.cmp 2>>./streams.log || die "ERROR during decode of $name"
else
- cmd="run_flac --silent --force --endian=big --sign=signed --decode --force-raw-format --stdout -"
+ cmd="run_flac --silent --force --endian=little --sign=signed --decode --force-raw-format --stdout -"
echo "### DECODE $name #######################################################" >> ./streams.log
echo "### cmd=$cmd" >> ./streams.log
cat $name.flac | $cmd 1>$name.cmp 2>>./streams.log || die "ERROR during decode of $name"
More information about the commits
mailing list