From 199a64bf6a2aae18290514cc414429e0c0feff69 Mon Sep 17 00:00:00 2001 From: Jeff Lenk Date: Fri, 21 Feb 2014 16:09:43 -0600 Subject: [PATCH] FS-4657 --resolve update libsndfile to its latest master --- libs/libsndfile/.update | 2 +- libs/libsndfile/ChangeLog | 1852 ++++++++++++++++- libs/libsndfile/M4/Makefile.am | 2 +- libs/libsndfile/M4/add_cflags.m4 | 13 +- libs/libsndfile/M4/add_cxxflags.m4 | 14 +- libs/libsndfile/M4/clang.m4 | 31 + libs/libsndfile/M4/clip_mode.m4 | 6 +- libs/libsndfile/M4/endian.m4 | 14 +- libs/libsndfile/M4/extra_largefile.m4 | 10 +- libs/libsndfile/M4/extra_pkg.m4 | 24 +- libs/libsndfile/M4/flexible_array.m4 | 6 +- libs/libsndfile/M4/gcc_version.m4 | 8 +- libs/libsndfile/M4/llrint.m4 | 6 +- libs/libsndfile/M4/lrint.m4 | 6 +- libs/libsndfile/M4/lrintf.m4 | 6 +- libs/libsndfile/M4/mkoctfile_version.m4 | 6 +- libs/libsndfile/M4/octave.m4 | 16 +- libs/libsndfile/M4/really_gcc.m4 | 33 + libs/libsndfile/M4/stack_protect.m4 | 73 + libs/libsndfile/Makefile.am | 73 +- libs/libsndfile/NEWS | 34 + libs/libsndfile/Octave/Makefile.am | 13 +- libs/libsndfile/Octave/Readme.txt | 23 + libs/libsndfile/Octave/format.h | 21 + libs/libsndfile/Octave/octave_test.m | 8 +- libs/libsndfile/Octave/octave_test.sh | 39 +- libs/libsndfile/Octave/sndfile.cc | 4 +- libs/libsndfile/Octave/sndfile_load.m | 6 +- libs/libsndfile/Octave/sndfile_play.m | 2 +- libs/libsndfile/Octave/sndfile_save.m | 2 +- libs/libsndfile/README | 5 +- libs/libsndfile/README.md | 79 + libs/libsndfile/Scripts/android-configure.sh | 92 + .../Scripts/build-test-tarball.mk.in | 61 + libs/libsndfile/Scripts/clang-sanitize.sh | 13 + libs/libsndfile/Scripts/cstyle.py | 246 +++ libs/libsndfile/Scripts/git-pre-commit-hook | 79 + .../Scripts/linux-to-win-cross-configure.sh | 22 + libs/libsndfile/autogen.sh | 179 ++ libs/libsndfile/binheader_readf_check.py | 62 + libs/libsndfile/configure.ac | 463 +++-- libs/libsndfile/doc/FAQ.html | 213 +- libs/libsndfile/doc/Makefile.am | 3 +- libs/libsndfile/doc/api.html | 136 +- libs/libsndfile/doc/bugs.html | 10 +- libs/libsndfile/doc/command.html | 311 ++- libs/libsndfile/doc/development.html | 43 + libs/libsndfile/doc/dither.html | 5 +- libs/libsndfile/doc/donate.html | 112 + libs/libsndfile/doc/embedded_files.html | 3 +- libs/libsndfile/doc/index.html | 77 +- libs/libsndfile/doc/libsndfile.css | 32 +- libs/libsndfile/doc/libsndfile.css.in | 34 +- .../doc/linux_games_programming.txt | 434 ++++ libs/libsndfile/doc/lists.html | 3 +- libs/libsndfile/doc/octave.html | 37 +- libs/libsndfile/doc/pkgconfig.html | 7 +- libs/libsndfile/doc/print.css | 14 + libs/libsndfile/doc/sndfile_info.html | 3 +- libs/libsndfile/doc/tutorial.html | 3 +- libs/libsndfile/doc/win32.html | 3 +- libs/libsndfile/echo-install-dirs.in | 25 + libs/libsndfile/examples/Makefile.am | 3 +- libs/libsndfile/examples/generate.c | 6 +- libs/libsndfile/examples/generate.cs | 250 +++ libs/libsndfile/examples/list_formats.c | 2 +- libs/libsndfile/examples/make_sine.c | 4 +- libs/libsndfile/examples/sfprocess.c | 149 +- libs/libsndfile/examples/sndfile-to-text.c | 8 +- libs/libsndfile/examples/sndfilehandle.cc | 2 +- libs/libsndfile/libsndfile.spec.in | 2 +- libs/libsndfile/make_lite.py | 491 +++++ libs/libsndfile/man/Makefile.am | 13 +- libs/libsndfile/man/sndfile-cmp.1 | 16 + libs/libsndfile/man/sndfile-concat.1 | 16 + libs/libsndfile/man/sndfile-convert.1 | 2 +- libs/libsndfile/man/sndfile-interleave.1 | 23 + libs/libsndfile/man/sndfile-metadata-get.1 | 26 + libs/libsndfile/programs/Makefile.am | 35 +- libs/libsndfile/programs/common.c | 224 +- libs/libsndfile/programs/common.h | 20 +- libs/libsndfile/programs/sndfile-cmp.c | 58 +- libs/libsndfile/programs/sndfile-concat.c | 169 ++ libs/libsndfile/programs/sndfile-convert.c | 222 +- .../programs/sndfile-deinterleave.c | 194 ++ libs/libsndfile/programs/sndfile-info.c | 207 +- libs/libsndfile/programs/sndfile-interleave.c | 202 ++ .../programs/sndfile-metadata-get.c | 12 +- .../programs/sndfile-metadata-set.c | 20 +- libs/libsndfile/programs/sndfile-play.c | 333 ++- libs/libsndfile/programs/sndfile-salvage.c | 277 +++ .../programs/test-sndfile-metadata-set.py | 5 +- libs/libsndfile/regtest/Makefile.am | 3 +- libs/libsndfile/regtest/Readme.txt | 108 + libs/libsndfile/regtest/checksum.c | 2 +- libs/libsndfile/regtest/database.c | 4 +- libs/libsndfile/regtest/regtest.h | 2 +- libs/libsndfile/regtest/sndfile-regtest.c | 2 +- libs/libsndfile/sndfile.pc.in | 1 + libs/libsndfile/src/ALAC/ALACAudioTypes.h | 200 ++ libs/libsndfile/src/ALAC/ALACBitUtilities.c | 262 +++ libs/libsndfile/src/ALAC/ALACBitUtilities.h | 91 + libs/libsndfile/src/ALAC/ALACDecoder.h | 61 + libs/libsndfile/src/ALAC/ALACEncoder.h | 92 + libs/libsndfile/src/ALAC/EndianPortable.h | 39 + libs/libsndfile/src/ALAC/LICENSE | 170 ++ libs/libsndfile/src/ALAC/ag_dec.c | 355 ++++ libs/libsndfile/src/ALAC/ag_enc.c | 360 ++++ libs/libsndfile/src/ALAC/aglib.h | 81 + libs/libsndfile/src/ALAC/alac_codec.h | 103 + libs/libsndfile/src/ALAC/alac_decoder.c | 646 ++++++ libs/libsndfile/src/ALAC/alac_decoder.h | 61 + libs/libsndfile/src/ALAC/alac_encoder.c | 1342 ++++++++++++ libs/libsndfile/src/ALAC/dp_dec.c | 375 ++++ libs/libsndfile/src/ALAC/dp_enc.c | 380 ++++ libs/libsndfile/src/ALAC/dplib.h | 61 + libs/libsndfile/src/ALAC/matrix_dec.c | 320 +++ libs/libsndfile/src/ALAC/matrix_enc.c | 272 +++ libs/libsndfile/src/ALAC/matrixlib.h | 81 + libs/libsndfile/src/G72x/g72x.h | 2 +- libs/libsndfile/src/G72x/g72x_test.c | 44 +- libs/libsndfile/src/Makefile.am | 126 +- libs/libsndfile/src/Symbols.darwin | 1 + libs/libsndfile/src/Symbols.os2 | 3 +- libs/libsndfile/src/aiff.c | 682 +++--- libs/libsndfile/src/alac.c | 966 +++++++++ libs/libsndfile/src/alaw.c | 82 +- libs/libsndfile/src/au.c | 14 +- libs/libsndfile/src/audio_detect.c | 4 +- libs/libsndfile/src/avr.c | 11 +- libs/libsndfile/src/binheader_writef_check.py | 35 +- libs/libsndfile/src/broadcast.c | 141 +- libs/libsndfile/src/caf.c | 406 +++- libs/libsndfile/src/cart.c | 101 + libs/libsndfile/src/chanmap.c | 262 +++ libs/libsndfile/src/chanmap.h | 32 + libs/libsndfile/src/chunk.c | 235 ++- libs/libsndfile/src/command.c | 42 +- libs/libsndfile/src/common.c | 313 ++- libs/libsndfile/src/common.h | 412 +++- libs/libsndfile/src/create_symbols_file.py | 169 +- libs/libsndfile/src/dither.c | 2 +- libs/libsndfile/src/double64.c | 199 +- libs/libsndfile/src/dwd.c | 27 +- libs/libsndfile/src/dwvw.c | 96 +- libs/libsndfile/src/file_io.c | 369 ++-- libs/libsndfile/src/flac.c | 201 +- libs/libsndfile/src/float32.c | 214 +- libs/libsndfile/src/g72x.c | 50 +- libs/libsndfile/src/gsm610.c | 54 +- libs/libsndfile/src/htk.c | 21 +- libs/libsndfile/src/id3.c | 57 + libs/libsndfile/src/ima_adpcm.c | 107 +- libs/libsndfile/src/ima_oki_adpcm.c | 8 +- libs/libsndfile/src/ima_oki_adpcm.h | 2 +- libs/libsndfile/src/interleave.c | 9 +- libs/libsndfile/src/ircam.c | 15 +- libs/libsndfile/src/libsndfile-1.def | 2 + libs/libsndfile/src/macbinary3.c | 6 +- libs/libsndfile/src/macos.c | 2 +- .../src/make-static-lib-hidden-privates.sh | 14 + libs/libsndfile/src/mat4.c | 17 +- libs/libsndfile/src/mat5.c | 48 +- libs/libsndfile/src/mpc2k.c | 17 +- libs/libsndfile/src/ms_adpcm.c | 59 +- libs/libsndfile/src/new.c | 116 ++ libs/libsndfile/src/nist.c | 46 +- libs/libsndfile/src/ogg.c | 1169 ++--------- libs/libsndfile/src/ogg.h | 52 + libs/libsndfile/src/ogg_opus.c | 149 ++ libs/libsndfile/src/ogg_pcm.c | 164 ++ libs/libsndfile/src/ogg_speex.c | 425 ++++ libs/libsndfile/src/ogg_vorbis.c | 1172 +++++++++++ libs/libsndfile/src/paf.c | 137 +- libs/libsndfile/src/pcm.c | 586 +++--- libs/libsndfile/src/pvf.c | 6 +- libs/libsndfile/src/raw.c | 2 +- libs/libsndfile/src/rf64.c | 342 ++- libs/libsndfile/src/rx2.c | 19 +- libs/libsndfile/src/sd2.c | 117 +- libs/libsndfile/src/sds.c | 146 +- libs/libsndfile/src/sf_unistd.h | 20 +- libs/libsndfile/src/sfconfig.h | 32 +- libs/libsndfile/src/sfendian.h | 252 ++- libs/libsndfile/src/sndfile.c | 712 +++++-- libs/libsndfile/src/sndfile.h.in | 301 ++- libs/libsndfile/src/sndfile.hh | 108 +- libs/libsndfile/src/strings.c | 132 +- libs/libsndfile/src/svx.c | 37 +- libs/libsndfile/src/test_audio_detect.c | 5 +- libs/libsndfile/src/test_broadcast_var.c | 119 ++ libs/libsndfile/src/test_cart_var.c | 91 + libs/libsndfile/src/test_conversions.c | 16 +- libs/libsndfile/src/test_endswap.c | 2 +- libs/libsndfile/src/test_endswap.def | 20 + libs/libsndfile/src/test_endswap.tpl | 36 +- libs/libsndfile/src/test_file_io.c | 64 +- libs/libsndfile/src/test_float.c | 6 +- libs/libsndfile/src/test_ima_oki_adpcm.c | 6 +- libs/libsndfile/src/test_log_printf.c | 32 +- libs/libsndfile/src/test_main.c | 6 +- libs/libsndfile/src/test_main.h | 7 +- libs/libsndfile/src/test_strncpy_crlf.c | 56 + libs/libsndfile/src/txw.c | 53 +- libs/libsndfile/src/ulaw.c | 82 +- libs/libsndfile/src/version-metadata.rc.in | 32 + libs/libsndfile/src/voc.c | 23 +- libs/libsndfile/src/vox_adpcm.c | 38 +- libs/libsndfile/src/w64.c | 12 +- libs/libsndfile/src/wav.c | 816 +++++--- libs/libsndfile/src/wav_w64.c | 138 +- libs/libsndfile/src/wav_w64.h | 14 +- libs/libsndfile/src/windows.c | 93 + libs/libsndfile/src/wve.c | 8 +- libs/libsndfile/src/xi.c | 199 +- libs/libsndfile/tests/Makefile.am | 101 +- libs/libsndfile/tests/aiff_rw_test.c | 22 +- libs/libsndfile/tests/alaw_test.c | 57 +- libs/libsndfile/tests/benchmark-0.0.28 | 40 + libs/libsndfile/tests/benchmark-1.0.0 | 35 + libs/libsndfile/tests/benchmark-1.0.0rc2 | 31 + .../tests/benchmark-1.0.18pre16-hendrix | 38 + .../tests/benchmark-1.0.18pre16-mingus | 38 + .../tests/benchmark-1.0.6pre10-coltrane | 39 + .../tests/benchmark-1.0.6pre10-miles | 39 + .../tests/benchmark-latest-coltrane | 75 + libs/libsndfile/tests/benchmark.c | 2 +- libs/libsndfile/tests/benchmark.def | 8 +- libs/libsndfile/tests/benchmark.tpl | 4 +- libs/libsndfile/tests/channel_test.c | 134 ++ libs/libsndfile/tests/checksum_test.c | 2 +- libs/libsndfile/tests/chunk_test.c | 293 +++ libs/libsndfile/tests/command_test.c | 333 ++- libs/libsndfile/tests/compression_size_test.c | 205 ++ libs/libsndfile/tests/cpp_test.cc | 102 +- libs/libsndfile/tests/dft_cmp.c | 4 +- libs/libsndfile/tests/dft_cmp.h | 2 +- libs/libsndfile/tests/dither_test.c | 11 +- libs/libsndfile/tests/dwvw_test.c | 9 +- libs/libsndfile/tests/error_test.c | 24 +- libs/libsndfile/tests/external_libs_test.c | 2 +- libs/libsndfile/tests/fix_this.c | 52 +- libs/libsndfile/tests/floating_point_test.c | 2 +- libs/libsndfile/tests/floating_point_test.tpl | 33 +- libs/libsndfile/tests/format_check_test.c | 149 ++ libs/libsndfile/tests/generate.c | 6 +- libs/libsndfile/tests/generate.h | 2 +- libs/libsndfile/tests/header_test.c | 30 +- libs/libsndfile/tests/header_test.tpl | 37 +- libs/libsndfile/tests/headerless_test.c | 7 +- libs/libsndfile/tests/largefile_test.c | 2 +- libs/libsndfile/tests/locale_test.c | 130 +- libs/libsndfile/tests/lossy_comp_test.c | 145 +- libs/libsndfile/tests/misc_test.c | 15 +- libs/libsndfile/tests/multi_file_test.c | 25 +- libs/libsndfile/tests/ogg_test.c | 7 +- libs/libsndfile/tests/pcm_test.c | 12 +- libs/libsndfile/tests/pcm_test.tpl | 31 +- libs/libsndfile/tests/peak_chunk_test.c | 74 +- .../tests/pedantic-header-test.sh.in | 58 + libs/libsndfile/tests/pipe_test.c | 6 +- libs/libsndfile/tests/pipe_test.tpl | 6 +- libs/libsndfile/tests/raw_test.c | 11 +- libs/libsndfile/tests/rdwr_test.def | 32 + libs/libsndfile/tests/rdwr_test.tpl | 105 + libs/libsndfile/tests/scale_clip_test.c | 2 +- libs/libsndfile/tests/scale_clip_test.tpl | 12 +- libs/libsndfile/tests/sftest.c | 65 + libs/libsndfile/tests/sfversion.c | 21 +- libs/libsndfile/tests/stdin_test.c | 24 +- libs/libsndfile/tests/stdio_test.c | 5 +- libs/libsndfile/tests/stdout_test.c | 10 +- libs/libsndfile/tests/string_test.c | 215 +- libs/libsndfile/tests/test_wrapper.sh.in | 96 +- libs/libsndfile/tests/ulaw_test.c | 54 +- libs/libsndfile/tests/utils.c | 104 +- libs/libsndfile/tests/utils.h | 29 +- libs/libsndfile/tests/utils.tpl | 156 +- libs/libsndfile/tests/virtual_io_test.c | 8 +- libs/libsndfile/tests/vorbis_test.c | 6 +- libs/libsndfile/tests/win32_ordinal_test.c | 5 +- libs/libsndfile/tests/win32_test.c | 71 +- libs/libsndfile/tests/write_read_test.c | 50 +- libs/libsndfile/tests/write_read_test.def | 22 +- libs/libsndfile/tests/write_read_test.tpl | 169 +- libs/win32/libsndfile/config.h | 5 +- libs/win32/libsndfile/libsndfile.2010.vcxproj | 16 + .../libsndfile.2010.vcxproj.filters | 51 + libs/win32/libsndfile/libsndfile.2012.vcxproj | 20 +- .../libsndfile.2012.vcxproj.filters | 51 + libs/win32/libsndfile/sndfile.h | 295 ++- 291 files changed, 25966 insertions(+), 5745 deletions(-) create mode 100644 libs/libsndfile/M4/clang.m4 create mode 100644 libs/libsndfile/M4/really_gcc.m4 create mode 100644 libs/libsndfile/M4/stack_protect.m4 create mode 100644 libs/libsndfile/Octave/Readme.txt create mode 100644 libs/libsndfile/Octave/format.h create mode 100644 libs/libsndfile/README.md create mode 100644 libs/libsndfile/Scripts/android-configure.sh create mode 100644 libs/libsndfile/Scripts/build-test-tarball.mk.in create mode 100644 libs/libsndfile/Scripts/clang-sanitize.sh create mode 100644 libs/libsndfile/Scripts/cstyle.py create mode 100644 libs/libsndfile/Scripts/git-pre-commit-hook create mode 100644 libs/libsndfile/Scripts/linux-to-win-cross-configure.sh create mode 100644 libs/libsndfile/autogen.sh create mode 100644 libs/libsndfile/binheader_readf_check.py create mode 100644 libs/libsndfile/doc/development.html create mode 100644 libs/libsndfile/doc/donate.html create mode 100644 libs/libsndfile/doc/linux_games_programming.txt create mode 100644 libs/libsndfile/doc/print.css create mode 100644 libs/libsndfile/echo-install-dirs.in create mode 100644 libs/libsndfile/examples/generate.cs create mode 100644 libs/libsndfile/make_lite.py create mode 100644 libs/libsndfile/man/sndfile-cmp.1 create mode 100644 libs/libsndfile/man/sndfile-concat.1 create mode 100644 libs/libsndfile/man/sndfile-interleave.1 create mode 100644 libs/libsndfile/man/sndfile-metadata-get.1 create mode 100644 libs/libsndfile/programs/sndfile-concat.c create mode 100644 libs/libsndfile/programs/sndfile-deinterleave.c create mode 100644 libs/libsndfile/programs/sndfile-interleave.c create mode 100644 libs/libsndfile/programs/sndfile-salvage.c create mode 100644 libs/libsndfile/regtest/Readme.txt create mode 100644 libs/libsndfile/src/ALAC/ALACAudioTypes.h create mode 100644 libs/libsndfile/src/ALAC/ALACBitUtilities.c create mode 100644 libs/libsndfile/src/ALAC/ALACBitUtilities.h create mode 100644 libs/libsndfile/src/ALAC/ALACDecoder.h create mode 100644 libs/libsndfile/src/ALAC/ALACEncoder.h create mode 100644 libs/libsndfile/src/ALAC/EndianPortable.h create mode 100644 libs/libsndfile/src/ALAC/LICENSE create mode 100644 libs/libsndfile/src/ALAC/ag_dec.c create mode 100644 libs/libsndfile/src/ALAC/ag_enc.c create mode 100644 libs/libsndfile/src/ALAC/aglib.h create mode 100644 libs/libsndfile/src/ALAC/alac_codec.h create mode 100644 libs/libsndfile/src/ALAC/alac_decoder.c create mode 100644 libs/libsndfile/src/ALAC/alac_decoder.h create mode 100644 libs/libsndfile/src/ALAC/alac_encoder.c create mode 100644 libs/libsndfile/src/ALAC/dp_dec.c create mode 100644 libs/libsndfile/src/ALAC/dp_enc.c create mode 100644 libs/libsndfile/src/ALAC/dplib.h create mode 100644 libs/libsndfile/src/ALAC/matrix_dec.c create mode 100644 libs/libsndfile/src/ALAC/matrix_enc.c create mode 100644 libs/libsndfile/src/ALAC/matrixlib.h create mode 100644 libs/libsndfile/src/alac.c create mode 100644 libs/libsndfile/src/cart.c create mode 100644 libs/libsndfile/src/chanmap.c create mode 100644 libs/libsndfile/src/chanmap.h create mode 100644 libs/libsndfile/src/id3.c create mode 100644 libs/libsndfile/src/make-static-lib-hidden-privates.sh create mode 100644 libs/libsndfile/src/new.c create mode 100644 libs/libsndfile/src/ogg.h create mode 100644 libs/libsndfile/src/ogg_opus.c create mode 100644 libs/libsndfile/src/ogg_pcm.c create mode 100644 libs/libsndfile/src/ogg_speex.c create mode 100644 libs/libsndfile/src/ogg_vorbis.c create mode 100644 libs/libsndfile/src/test_broadcast_var.c create mode 100644 libs/libsndfile/src/test_cart_var.c create mode 100644 libs/libsndfile/src/test_strncpy_crlf.c create mode 100644 libs/libsndfile/src/version-metadata.rc.in create mode 100644 libs/libsndfile/src/windows.c create mode 100644 libs/libsndfile/tests/benchmark-0.0.28 create mode 100644 libs/libsndfile/tests/benchmark-1.0.0 create mode 100644 libs/libsndfile/tests/benchmark-1.0.0rc2 create mode 100644 libs/libsndfile/tests/benchmark-1.0.18pre16-hendrix create mode 100644 libs/libsndfile/tests/benchmark-1.0.18pre16-mingus create mode 100644 libs/libsndfile/tests/benchmark-1.0.6pre10-coltrane create mode 100644 libs/libsndfile/tests/benchmark-1.0.6pre10-miles create mode 100644 libs/libsndfile/tests/benchmark-latest-coltrane create mode 100644 libs/libsndfile/tests/channel_test.c create mode 100644 libs/libsndfile/tests/chunk_test.c create mode 100644 libs/libsndfile/tests/compression_size_test.c create mode 100644 libs/libsndfile/tests/format_check_test.c create mode 100644 libs/libsndfile/tests/pedantic-header-test.sh.in create mode 100644 libs/libsndfile/tests/rdwr_test.def create mode 100644 libs/libsndfile/tests/rdwr_test.tpl create mode 100644 libs/libsndfile/tests/sftest.c diff --git a/libs/libsndfile/.update b/libs/libsndfile/.update index 1103eb6bc0..cbf0edf709 100644 --- a/libs/libsndfile/.update +++ b/libs/libsndfile/.update @@ -1 +1 @@ -Wed Aug 28 03:22:32 CDT 2013 +Fri Feb 28 03:45:32 CDT 2014 diff --git a/libs/libsndfile/ChangeLog b/libs/libsndfile/ChangeLog index d36eb00e35..d22be00cd7 100644 --- a/libs/libsndfile/ChangeLog +++ b/libs/libsndfile/ChangeLog @@ -1,3 +1,1796 @@ +2013-04-05 Erik de Castro Lopo + + * Makefile.am + Make sure checkprograms are built as part of 'make test-tarball'. + Closes: https://github.com/erikd/libsndfile/issues/37 + +2013-03-29 Erik de Castro Lopo + + * tests/dft_cmp.c + Fix a buffer overflow detected using GCC 4.8's -fsantiize=address runtime + error checking functionality. This was a buffer overflow in libsndfile's + test suite, not in the actual library code. + +2013-03-09 Erik de Castro Lopo + + * M4/gcc_version.m4 + Fix to work with OpenBSD's sed. + +2013-03-07 Erik de Castro Lopo + + * src/ALAC/alac_encoder.c + Patch from Michael Pruett (author of libaudiofile) to add correct byte + swapping for the mChannelLayoutTag field. + +2013-03-02 Erik de Castro Lopo + + * doc/bugs.html + Bugs should bt reported on the github issue tracker. + +2013-02-22 Erik de Castro Lopo + + * configure.ac + Improve sanitization of FLAC_CFLAGS value. + +2013-02-21 Erik de Castro Lopo + + * src/Makefile.am + Call python interpreter instead of using '#!' in script. Thanks to Jan + Stary for reporting this. + + * doc/index.html doc/FAQ.html + Make internal links relative. Patch from Jan Stary. + +2013-02-13 Erik de Castro Lopo + + * src/test_endswap.def src/test_endswap.tpl + Add tests for psf_put_be32() and psf_put_be64(). + + * src/sfendian.h src/test_endswap.(def|tpl) + Add functions psf_get_be(16|32|64) with tests. + These are needed for platforms where un-aligned accesses cause bus faults. + + * src/ALAC/ag_enc.c src/ALAC/alac_decoder.c + Replace all un-aligned accesses with safe alternatives. + Closes: https://github.com/erikd/libsndfile/issues/19 + +2013-02-12 Erik de Castro Lopo + + * src/sfendian.h + Add big endian versions of H2BE_16 and H2BE_32. + +2013-02-11 Erik de Castro Lopo + + * src/ALAC/ + Replace Apple endswap routines with ones from libsndfile. + + * merge from libsndfile-cart repo + Add ability to set and get a cart chunk with WAV and RF64. + Orignal patch by Chris Roberts required a number of + tweaks. + +2013-02-10 Erik de Castro Lopo + + * src/common.h + Bump SF_HEADER_LEN from 8192 to 12292, the value it was in the 1.0.25 + release. + +2013-02-09 Erik de Castro Lopo + + * src/alac.c + Fix segfault when encoding 8 channel files. + Closes: https://github.com/erikd/libsndfile/issues/30 + +2013-02-07 Erik de Castro Lopo + + * src/ALAC/EndianPortable.c + Fall back to compiler's __BYTE_ORDER__ for endian-ness detection. + +2013-02-06 Erik de Castro Lopo + + * configure.ac src/common.h src/ima_adpcm.c src/ms_adpcm.c src/paf.c + Drop tests for and #ifdef hackery for C99 struct flexible array feature. + libsndfile assumes the compiler supports most of the ISO C99 standard. + + * src/alac.c + Fix valgrind invalid realloc. Reported by nu774. + Closes: https://github.com/erikd/libsndfile/issues/31 + +2013-02-05 Erik de Castro Lopo + + * src/alac.c + The 'pakt' chunk header should now be written correctly. + Closes: https://github.com/erikd/libsndfile/issues/24 + + * configure.ac Makefile.am + Use PKG_INSTALLDIR when it exists. Suggestion from Christoph Thompson. + Closes: https://github.com/erikd/libsndfile/pull/28 + +2013-02-03 Erik de Castro Lopo + + * src/common.h src/caf.c + Read the ALAC 'pakt' header and stash the values. + + * src/sfendian.h + Add functions psf_put_be64() and psf_put_be32(). + + * src/alac.c + Start work on filling on the 'pakt' chunk header. + +2013-02-02 Erik de Castro Lopo + + * doc/FAQ.html + Add missing opening

tag. + + * src/alac.c + Increase ALAC_BYTE_BUFFER_SIZE to 82000. + +2013-01-27 Erik de Castro Lopo + + * doc/FAQ.html + Improve question #8. + +2013-01-02 Erik de Castro Lopo + + * src/ogg_opus.c + Add skeleton implementation so someone else can run with it. + +2012-12-12 Erik de Castro Lopo + + * src/common.h src/dwd.c src/rx2.c src/txw.c + Fix for compiling when configured with --enable-experimental. Thanks to + Eric Wong for reporting this. + +2012-12-01 Erik de Castro Lopo + + * configure.ac programs/sndfile-play.c + OS X 10.8 uses a different audio API to previous versions. + Fix compile failure on by disabling sndfile-play on this version. + Someone needs to supply code for the new API. + +2012-11-30 Erik de Castro Lopo + + * Octave/Makefile.am Octave/octave_test.sh + Fix 'make distcheck'. + +2012-10-13 Erik de Castro Lopo + + * M4/octave.m4 + Relax constraints on Octave version. + +2012-10-11 Erik de Castro Lopo + + * tests/utils.tpl + Improve compare_*_or_die() functions. + + * src/command.c + Fix bug reported by Keiler Florian. When reading short or int data from a + file containing float data, and setting SFC_SET_SCALE_FLOAT_INT_READ to + SF_TRUE would fail 3, 5, 7 and other channels counts. Problem was that + psf_calc_signal_max() was not calculating the signal max correctly. + Calculation of the signal max was failing because it was trying to read + a sample count that was not an integer multiple of the channel count. + + * tests/channel_test.c tests/Makefile.am tests/test_wrapper.sh.in + Add test for the above. + +2012-09-25 Erik de Castro Lopo + + * src/sndfile.hh + Added a constructor to allow the use of SF_VIRTUAL_IO. Patch from + DannyDaemonic : https://github.com/erikd/libsndfile/pull/20 + +2012-08-23 Erik de Castro Lopo + + * doc/octave.html + Fix link to octave.sourceforge.net. Thanks to IOhannes m zmoelnig. + + * src/mat5.c + Allow reading of mat5 files without a specified sample rate (default to + 44.1kHz). Thanks to IOhannes m zmoelnig. + +2012-08-19 Erik de Castro Lopo + + * src/paf.c + Error out if channel count is zero. Bug report from William ELla via + launchpad: + https://bugs.launchpad.net/ubuntu/+source/libsndfile/+bug/1036831 + +2012-08-04 Erik de Castro Lopo + + * configure.ac programs/sndfile-play.c + Patch from Ricci Adams to use OSX's AudioQueues on OSX 10.7 and greater. + +2012-07-09 Erik de Castro Lopo + + * programs/common.c + Accept "ogg" as a file extention for Ogg/Vorbis files. + +2012-06-22 Erik de Castro Lopo + + * src/flac.c + Make sure any previously allocated FLAC stream encoder and stream decoder + objects are deleted before a new one is allocated. + +2012-06-20 Erik de Castro Lopo + + * tests/utils.tpl + Rename gen_lowpass_noise_float() to gen_lowpass_signal_float() and add a + sine wave component so that different FLAC compression levels can be + tested. + + * src/sndfile.h.in doc/command.html + Add SFC_SET_COMPRESSION_LEVEL and document it. + + * src/sndfile.c + Catch SFC_SET_VBR_ENCODING_QUALITY command and implement it as the inverse + of SFC_SET_COMPRESSION_LEVEL. + + * src/ogg_vorbis.c src/flac.c + Implement SFC_SET_COMPRESSION_LEVEL command. + + * tests/test_wrapper.sh.in tests/compression_size_test.c + Use the compression_size_test on FLAC as well. + +2012-06-19 Erik de Castro Lopo + + * tests/ + Rename vorbis_test.c -> compression_size_test.c so it can be extended to + test FLAC as well. + +2012-06-18 Erik de Castro Lopo + + * src/broadcast.c + Fix a bug where a file with a 'bext' chunk with a zero length coding + history field would get corrupted when the file was closed. + Reported by Paul Davis of the Ardour project. + + * src/test_broadcast_var.c + Add a test for the above. + +2012-05-19 Erik de Castro Lopo + + * src/sndfile.c + sf_format_check: For SF_FORMAT_AIFF, reject endian-ness setttings for + non-PCM formats. + +2012-04-12 Erik de Castro Lopo + + * src/aiff.c + Fix regression in handling of odd length SSND chunks. + Thanks Olivier Tristan for the example file. + + * src/aiff.c src/wav.c + Exit parser loop when marker == 0. + +2012-04-04 Erik de Castro Lopo + + * doc/FAQ.html + Fix text. Thanks to Richard Collins. + +2012-03-24 Erik de Castro Lopo + + * src/caf.c + Exit parse loop if the marker is zero. Pass jump offsets as size_t instead + of int. + +2012-03-20 Erik de Castro Lopo + + * src/alac.c + Fix segfault when decoding CAF/ALAC file with more than 4 channels. + Fixes github issue #8 reported by Charles Van Winkle. + +2012-03-20 Erik de Castro Lopo + + * src/common.h + Change 'typedef SF_CHUNK_ITERATOR { ... } SF_CHUNK_ITERATOR' into 'struct + SF_CHUNK_ITERATOR { ... }' to prevent older compilers from complaining of + re-typedef-ing of SF_CHUNK_ITERATOR. + + * configure.ac + Fix if test for empty $prefix. + +2012-03-18 Erik de Castro Lopo + + * src/*.c tests/chunk_test.c + Reworking of custom chunk handling code. + - Memory for the iterator is now attached to the SF_PRIVATE struct and + freed one sf_close(). + - Rename sf_create_chunk_iterator() -> sf_get_chunk_iterator(). + - Each SNDFILE handle never has more than one SF_CHUNK_ITERATOR handle. + + * tests/string_test.c + Fix un-initialised char buffer. + +2012-03-17 Erik de Castro Lopo + + * src/*.c tests/chunk_test.c + Add improved handling of custom chunk getting and settings. Set of patches + from IOhannes m zmoelnig submitted via github pull request #6. + + * src/alac.c + Fix calculated frame count for files with zero block length. + +2012-03-13 Erik de Castro Lopo + + * src/avr.c + Remove double assignment to psf->endian. Thanks Kao Dome. + + * src/gsm610.c + Fix clearing of buffers. Thanks Kao Dome. + + * src/paf.c + Remove duplicate code. Thanks Kao Dome. + + * src/test_strncpy_crlf.c + Fix minor error in test. Thanks Kao Dome. + + * src/common.h src/*.c + Fix a bunch of valgrind errors. + +2012-03-13 Erik de Castro Lopo + + * src/sndfile.c + Fix typo in error string 'Uknown' -> 'Unknown'. + + * tests/fix_this.c + Fix potential int overflow. + +2012-03-10 Erik de Castro Lopo + + * src/alac.c + Fix decoding of last block so that the decode length is not a multiple of + the block length. Fixes github issue #4 reported by Charles Van Winkle. + + * src/sfconfig.h src/sfendian.h + Fix for MinGW cross compiling. Use '#if (defined __*66__)' instead of + '#if __*86__' because the MinGW header use '#ifdef __x86_64__'. + +2012-03-10 Erik de Castro Lopo + + * src/ALAC/ src/alac.c + Unify the interface between libsndfile and Apple ALAC codec. Regardless of + file bit width samples are now passed between the two as int32_t that are + justified towards the most significant bit. Without this modification, 16 + conversion functions would have been needed between the libsndfile (short, + int, float, double) types and the ALAC types (16, 20, 24 and 32 bit). With + this mod, only 4 are needed. + + * tests/floating_point_test.tpl tests/write_read_test.(def|tpl) + Add tests for 20 and 24 bit ALAC/CAF files. + + * src/command.c + Add ALAC/CAF to the SFC_GET_FORMAT_* commands. Fixes github issue #5. + + * configure.ac + Only use automake AM_SLIENT_RULES where supported. Thanks Dave Yeo. + + * tests/pipe_test.tpl + Disable tests on OS/2. Thanks Dave Yeo. + +2012-03-09 Erik de Castro Lopo + + * configure.ac src/sfconfig.h src/sfendian.h + For GCC, use inline assembler for endian swapping. This should work with + older versions of GCC like the one currently used in OS/2. + +2012-03-06 Erik de Castro Lopo + + * src/alac.c + Make sure temp file gets opened in binary mode. + + * src/alac.c src/common.c src/common.h + Fix function alac_write16_d(). + + * tests/floating_point_test.tpl + Add tests for 16 bit ALAC/CAF. + + * src/alac.c src/common.c src/common.h + Add support for 32 bit ALAC/CAF files. + + * tests/floating_point_test.tpl tests/write_read_test.tpl + Add tests for 32 bit ALAC/CAF files. + +2012-03-05 Erik de Castro Lopo + + * src/ + Refactor chunk storage so it work on big as well as little endian CPUs. + + * tests/chunk_test.c + Clean up error messages. + + * src/sfendian.h src/*.c + Rename endian swapping macros and add ENDSWAP_64 and BE2H_64. + + * configure.ac + Detect presence of header file. + + * src/sfendian.h + Use intrinsics (ie for MinGW) when is not + present. + Make ENDSWAP_64() work with i686-w64-mingw32 compiler. + + * src/ALAC/EndianPortable.c + Add support for __powerpc__. + + * src/sfconfig.h + Make sure HAVE_X86INTRIN_H is either 1 or 0. + +2012-03-03 Erik de Castro Lopo + + * src/ALAC/* + Big dump of code for Apple's ALAC file format. The copyyright to this code + is owned by Apple who have released it under an Apache style license. A few + small modifications were made to allow this to be integrated into libsndfile + but unfortunately the history of those changes were lost because they were + developed in a Bzr tree and during that time libsndfile moved to Git. + + * src/alac.c src/caf.c src/common.[ch] src/Makefile.am src/sndfile.h.in + src/sndfile.c + Hook new ALAC codec in. + + * programs/sndfile-convert.c + Add support for alac codec. + + * tests/write_read_test.tpl + Expand tests to cover ALAC. + +2012-03-02 Erik de Castro Lopo + + * src/aiff.c src/wav.c + Fix a couple of regressions from version 1.0.25. + +2012-03-01 Erik de Castro Lopo + + * src/strings.c + Minor refactoring. Make sure that the memory allocation size if always > 0 + to avoid undefined behaviour. + +2012-02-29 Erik de Castro Lopo + + * src/chunk.c + Fix buffer overrun introduced in recently added chunk logging. This chunk + logging has not yet made it to a libsndfile release version. Thanks to + Olivier Tristan for providing an example file. + + * src/wav.c + Fix handling of odd sized chunks which was causing the parser to lose some + chunks. Thanks to Olivier Tristan for providing an example file. + +2012-02-26 Erik de Castro Lopo + + * tests/util.tpl + Used gnu_printf format checking with mingw-w64 compiler. + + * tests/header_test.tpl + Printf format fixes. + +2012-02-25 Erik de Castro Lopo + + * M4/extra_pkg.m4 + Update PKG_CHECK_MOD_VERSION macro to add an AC_TRY_LINK step. This fix + allows the configure process to catch attempts to link incompatible + libraries. For example, linking 32 bit version of eg libFLAC to a 64 bit + version of libsndfile will now fail. Similarly, when cross compiling + libsndfile from Linux to Windows linking the Linux versions of a library + to the Windows version of libsndfile will now also fail. + + * src/sndfile.h.in src/sndfile.c src/common.h src/create_symbols_file.py + Add API function sf_current_byterate(). + + * src/dwvw.c src/flac.c src/ogg_vorbis.c src/sds.c + Add codec specific handlers for current byterate. + + * tests/floating_point_test.tpl + Add initial test for sf_current_byterate(). + +2012-02-24 Erik de Castro Lopo + + * src/common.[ch] + Add function psf_decode_frame_count(). + + * src/dwvw.c + Fix a termnation bug that caused the decoder to go into an infinite loop. + +2012-02-24 Erik de Castro Lopo + + * src/wav.c + Fix a regression in the WAV header parser. Thanks to Olivier Tristan for + bug report and the example file. + +2012-02-21 Erik de Castro Lopo + + * src/sndfile.c + Return error when SF_BROADCAST_INFO struct has bad coding_history_size. + Thanks to Alex Weiss for the report. + +2012-02-20 Erik de Castro Lopo + + * src/au.c src/flac.c src/g72x.c src/ogg_vorbis.c src/wav_w64.c + Don't fake psf->bytewidth values. + +2012-02-19 Erik de Castro Lopo + + * tests/string_test.c + Fix valgrind warnings. + + * src/common.h src/sndfile.c src/strings.c + Make string storage dynamically allocated. + + * src/sndfile.c + Add extra validation for custom chunk handling. + +2012-02-18 Erik de Castro Lopo + + * src/wav.c + Improve handlling unknown chunk types. Thanks to Olivier Tristan for sending + example files. + + * src/utils.tpl + Add GCC specific testing for format string parameters for exit_if_true(). + + * tests/*.c tests/*.tpl + Fix all printf format warnings. + + * programs/sndfile-play.c + Remove un-needed OSX include . Thanks jamesfmilne for github + issue #3. + + * tests/chunk_test.c + Extend custom chunk test. + +2012-02-12 Erik de Castro Lopo + + * src/wav.c + Jump over some more chunk types while parsing. + +2012-02-04 Erik de Castro Lopo + + * src/common.h src/strings.c + Change way strings are stored in SF_PRIVATE in preparation for dynamically + allocating the storage. + +2012-02-02 Erik de Castro Lopo + + * src/common.h src*.c + Improve encapsulation of string data in SF_PRIVATE. + +2012-02-01 Erik de Castro Lopo + + * src/common.h src*.c + Remove the buffer union from SF_PRIVATE. Most uses of this have been + replaced with a BUF_UNION that is allocated on the stack. + +2012-01-31 Erik de Castro Lopo + + * src/common.h src*.c + Rename logbuffer field of SF_PRIVATE to parselog and reduce its size. + Put the parselog buffer and the index inside a struct within SF_PRIVATE. + +2012-01-26 Erik de Castro Lopo + + * configure.ac + Fix typo, FLAC_CLFAGS -> FLAC_CFLAGS. Thanks to Jeremy Friesner. + +2012-01-21 Erik de Castro Lopo + + * src/sndfile.c src/ogg.c + Fix misleading error message when trying to create an SF_FORMAT_OGG file + with anything other than SF_FORMAT_FILE. Thanks to Charles Van Winkle for + the bug report. Github issue #1. + +2012-01-20 Erik de Castro Lopo + + * src/sndfile.c src/wav.c + Allow files opened in RDWR mode with string data in the tailer to be + extended. Thanks to Bodo for the patch. + + * tests/string_test.c + Add tests for the above changes (patch from Bodo). + +2012-01-09 Erik de Castro Lopo + + * src/aiff.c + Refactor reading of chunk size and use of psf_store_read_chunk(). + + * src/(caf|wav).c + Correct storing of chunk offset. + +2012-01-05 Erik de Castro Lopo + + * src/aiff.c src/wav.c src/common.h + Refactor common code into src/common.h. + + * src/caf.c + Make custom chunks work for CAF files. + + * tests/chunk_test.c tests/test_wrapper.sh.in + Test CAF files with custom chunks. + + * src/sndfile.c + Prevent psf->codec_close() being called more than once. + +2012-01-04 Erik de Castro Lopo + + * programs/sndfile-cmp.c + Catch the case where the second file has more frames than the first. + +2012-01-02 Erik de Castro Lopo + + * src/create_symbols_file.py + Add sf_set_chunk/sf_get_chunk_size/sf_get_chunk_data. + +2011-12-31 Erik de Castro Lopo + + * tests/chunk_test.c tests/Makefile.am + New test for custom chunks. + + * src/aiff.c src/chunk.c src/common.h src/sndfile.c + Make custom chunks work on AIFF files. + + * src/wav.c + Make custom chunks work on WAV files (includes refactoring). + +2011-11-12 Erik de Castro Lopo + + * src/sndfile.h.in src/common.h src/sndfile.c + Start working on setting/getting chunks. + +2011-11-24 Erik de Castro Lopo + + * src/binheader_writef_check.py src/create_symbols_file.py + Make it work for Python 2 and 3. Thanks Michael. + +2011-11-19 Erik de Castro Lopo + + * libsndfile.spec.in + Change field name 'URL' to 'Url'. + + * src/sndfile.h.in + Add SF_SEEK_SET/CUR/END. + +2011-11-05 Erik de Castro Lopo + + * src/id3.c + Fix a stack overflow that can occur when parsing a file with multiple + ID3 headers which would cause libsndfile to go into an infinite recursion + until it blew the stack. Thanks to Anders Svensson for supplying an example + file. + +2011-10-30 Erik de Castro Lopo + + * src/double64.c src/float32.c src/common.h + Make (float32|double_64)_(be|le)_read() functions const correct. + +2011-10-28 Erik de Castro Lopo + + * src/sfendian.h + Minor tweaking of types. Cast to ptr to correct final type rather void*. + + * programs/sndfile-play.c tests/utils.tpl + Fix compiler warnings with latest MinGW cross compiler. + +2011-10-13 Erik de Castro Lopo + + * src/file_io.c + Use the non-deprecated resource fork name on OSX. Thanks to Olivier Tristan. + +2011-10-12 Erik de Castro Lopo + + * src/wav.c + Jump over the 'olym' chunks when parsing. + +2011-10-06 Erik de Castro Lopo + + * tests/write_read_test.tpl + Remove windows only truncate() implementation. + +2011-09-04 Erik de Castro Lopo + + * src/sd2.c src/sndfile.c + Make sure 23 bit PCM SD2 files are readable/writeable. + + * tests/write_read_test.tpl + Add tests for 32 bit PCM SD2 files. + +2011-08-23 Erik de Castro Lopo + + * configure.ac + Use AC_SYS_LARGEFILE instead of AC_SYS_EXTRA_LARGEFILE as suggested by + Jan Willies. + +2011-08-07 Erik de Castro Lopo + + * configure.ac Makefile.am + Move ACLOCAL_AMFLAGS setup to Makefile.am. + +2011-07-15 Erik de Castro Lopo + + * doc/command.html + Merge two separate blocks of SFC_SET_VBR_ENCODING_QUALITY documentation. + + * src/paf.c + Replace ppaf24->samplesperblock with a compile time constant. + +2011-07-13 Erik de Castro Lopo + + * src/ogg_vorbis.c + Fix return value of SFC_SET_VBR_ENCODING_QUALITY command. + + * doc/command.html + Document SFC_SET_VBR_ENCODING_QUALITY, SFC_GET/SET_LOOP_INFO and + SFC_GET_INSTRUMENT. + + * NEWS README configure.ac doc/*.html + Updates for 1.0.25. + +2011-07-07 Erik de Castro Lopo + + * src/sfconfig.h + Add handling for HAVE_SYS_WAIT_H. + + * Makefile.am src/Makefile.am tests/Makefile.am + Add 'checkprograms' target. + +2011-07-05 Erik de Castro Lopo + + * src/common.h src/sndfile.c + Purge SF_ASSERT macro. Use standard C assert instead. + + * src/paf.c src/common.h src/sndfile.c + Fix for Secunia Advisory SA45125, heap overflow (heap gets overwritten with + byte value of 0) due to integer overflow if PAF file handler. + + * src/ima_adpcm.c src/ms_adpcm.c src/paf.c + Use calloc instead of malloc followed by memset. + + * tests/utils.tpl + Clean up use of memset. + +2011-07-05 Erik de Castro Lopo + + * src/ogg.c + Fix log message. + + * tests/format_check_test.c + Fix compiler warnings. + +2011-07-04 Erik de Castro Lopo + + * src/sndfile.c + Fix error message for erro code SFE_ZERO_MINOR_FORMAT. + + * tests/format_check_test.c + Add a test to for SF_FINFO format field validation. + + * src/ogg.c src/ogg_vorbis.c src/ogg.h src/ogg_pcm.c src/ogg_speex.c + src/common.h src/Makefile.am + Move vorbis specific code to ogg_vorbis.c, add new files for handling PCM + and Speex codecs in an Ogg container. The later two are only enabled with + ENABLE_EXPERIMENTAL_CODE config variable. + +2011-06-28 Erik de Castro Lopo + + * src/strings.c + Clean up and refactor storage of SF_STR_SOFTWARE. + +2011-06-23 Erik de Castro Lopo + + * src/sndfile.h.in doc/api.html + Fix definition of SF_STR_LAST and update SF_STR_* related docs. Thanks to + Tim van der Molen for the patch. + +2011-06-21 Erik de Castro Lopo + + * programs/sndfile-interleave.c + Fix handling of argc. Thanks to Marius Hennecke. + + * src/wav_w64.c + Accept broken WAV files with blockalign == 0. Thanks to Olivier Tristan for + providing example files. + + * src/wav.c + Jump over 'FLLR' chunks. + +2011-06-14 Erik de Castro Lopo + + * src/sndfile.h.in + Fix -Wundef warning due to ENABLE_SNDFILE_WINDOWS_PROTOTYPES. + + * configure.ac + Add -Wundef to CFLAGS. + + * src/ogg.c + Fix -Wunder warning. + +2011-05-18 Erik de Castro Lopo + + * configure.ac + Use int64_t instead of off_t when they are the same size. + + * src/Makefile.am tests/Makefile.am + Use check_PROGRAMS instead of noinst_PROGRAMS where appropriate. + +2011-05-08 Erik de Castro Lopo + + * src/wav.c + Don't allow unknown and/or un-editable chunks to prevent the file from being + opened in SFM_RDWR mode. + +2011-04-25 Erik de Castro Lopo + + * tests/format_check_test.c + Fix segfault in test program. + +2011-04-25 Erik de Castro Lopo + + * tests/format_check_test.c + New test program to check to make sure that sf_open() and sf_check_format() + agree as to what is a valid program. + + * tests/Makefile.am tests/test_wrapper.sh.in + Hook into build and test runner. + + * src/sndfile.c + Fix some sf_format_check() problems. Thanks to Charles Van Winkle for the + notification. + +2011-04-06 Erik de Castro Lopo + + * src/caf.c + Add validation to size of 'data' chunk and fix size of written 'data' + chunk. Thanks to Michael Pruett for reporting this. + +2011-03-28 Erik de Castro Lopo + + * src/* tests/* programs/* + Fix a bunch of compiler warnings with gcc-4.6. + +2011-03-25 Erik de Castro Lopo + + * tests/util.tpl + Add NOT macro to util.h. + + * src/strings.c + Fix handling of SF_STR_SOFTWARE that resulted in a segfault due to calling + strlen() on an unterminated string. Thanks to Francois Thibaud for reporting + this problem. + + * tests/string_test.c + Add test for SF_STR_SOFTWARE segfault bug. + + * configure.ac + Sanitize FLAC_CFLAGS value supplied by pkg-config which returns a value of + '-I${includedir}/FLAC'. However FLAC also provides an include file + which clashes with the Standard C header of the same name. The + solution is strip the 'FLAC' part off the end and include all FLAC headers + as . + + * configure.ac src/Makefile.am + Use non-recursive make in src/ directory. + +2011-03-23 Erik de Castro Lopo + + * NEWS README docs/*.html + Updates for 1.0.24 release. + +2011-03-22 Erik de Castro Lopo + + * configure.ac + Fix up usage of sed (should not assume GNU sed). + + * M4/add_(c|cxx)flags.m4 + Test flags in isolation. + + * tests/cpp_test.cc + Fix a broken test (test segfaults). Report by Dave Flogeras. + +2011-03-21 Erik de Castro Lopo + + * programs/common.[ch] + Add function program_name() which returns the program name minus the path + from argv [0]. + + * programs/*.c programs/Makefile.am + Use program_name() where appropriate. Fix build. + +2011-03-20 Erik de Castro Lopo + + * src/wav.c + For u-law and A-law files, write an 18 byte 'fmt ' chunk instead of a 16 + byte one. Win98 accepts files with a 16 but not 18 byte 'fmt' chunk. Later + version accept 18 byte but not 16 byte. + +2011-03-15 Erik de Castro Lopo + + * doc/FAQ.html + Add examples for question 12. + + * doc/libsndfile.css.in + Add tweaks for h4 element. + + * doc/api.html + Add documentation for virtual I/O functionality. Thanks to Uli Franke. + + * tests/util.tpl + Add static inline functions sf_info_clear() and sf_info_setup(). + + * tests/(alaw|dwvw|ulaw)_test.c + Use functions sf_info_clear() and sf_info_setup(). + +2011-03-08 Erik de Castro Lopo + + * configure.ac + Fail more gracefully if pkg-config is missing. Suggestion from Brian + Willoughby. + +2011-02-27 Erik de Castro Lopo + + * src/common.c + Use size_t instead of int for size params with varargs. + +2011-02-09 Erik de Castro Lopo + + * doc/index.html + Update supported platforms with more Debian platforms and Android. + +2011-01-27 Erik de Castro Lopo + + * src/sndfile.hh + Add an LPCWSTR version of the SndfileHandle constructor to the SndfileHandle + class definition. Thanks to Eric Eizenman for pointing out this was missing. + + * tests/cpp_test.cc + Add test for LPCWSTR version of the SndfileHandle constructor. + +2011-01-19 Erik de Castro Lopo + + * programs/sndfile-play.c + Remove cruft. + +2010-12-01 Erik de Castro Lopo + + * src/sndfile.hh + Add methods rawHandle() and takeOwnership(). Thanks to Tim Blechmann for + the patch. + + * tests/cpp_test.cc + Add tests for above two methods. Also supplied by Tim Blechmann. + +2010-11-11 Erik de Castro Lopo + + * doc/api.html + Add mention of use of sf_strerror() when sf_open() fails. + +2010-11-01 Erik de Castro Lopo + + * configure.ac + Make TYPEOF_SF_COUNT_T int64_t where possible. This may fix problems where + people are compiling on a 64 bit system with the GCC -m32 flag. + + * src/sndfile.h.in + Fix comments on sf_count_t. + +2010-10-26 Erik de Castro Lopo + + * src/aiff.c + Handle non-zero offset field in SSND chunk. Thanks to Michael Chinen. + +2010-10-20 Erik de Castro Lopo + + * configure.ac + Sed fix for FreeBSD. Thanks Tony Theodore. + +2010-10-14 Erik de Castro Lopo + + * shave.in M4/shave.m4 + Fix shave invocation of windres compiler. Thanks Damien Lespiau (upstream + shave author). + + * configure.ac M4/shave.m4 shave-libtool.in shave.in + Switch from shave to automake-1.11's AM_SILENT_RULES. + +2010-10-13 Erik de Castro Lopo + + * shave-libtool.in shave.in + Sync to upstream version. + + * src/rf64.c + More work to make the parser more robust and accepting of mal-formed files. + +2010-10-12 Erik de Castro Lopo + + * src/common.h + Add functions psf_strlcpy() and psf_strlcat(). + + * src/broadcast.c src/sndfile.c src/strings.c src/test_main.c + src/test_main.h src/test_strncpy_crlf.c + Use functions psf_strlcpy() and psf_strlcat() as appropriate. + + * tests/string_test.c + Add tests for SF_STR_GENRE and SF_STR_TRACKNUMBER. + + * src/rf64.c + Fix size of 'ds64' chunk when writing RF64. + +2010-10-10 Erik de Castro Lopo + + * programs/*.c + Add the libsndfile version to the usage message of all programs. + +2010-10-10 Erik de Castro Lopo + + * configure.ac src/version-metadata.rc.in src/Makefile.am + Add version string resources to the windows DLL. + + * doc/api.html + Update to add missing SF_FORMAT_* values. Closed Debian bug #545257. + + * NEWS README configure.ac doc/*.html + Updates for 1.0.23 release. + +2010-10-09 Erik de Castro Lopo + + * tests/pedantic-header-test.sh.in + Handle unusual values of CC environment variable. + + * src/rf64.c + Minor tweaks and additional sanity checking. + + * src/Makefile.am src/binheader_writef_check.py + Use python 2.6. + +2010-10-08 Erik de Castro Lopo + + * src/sndfile.hh + Add a missing 'inline' before a constructor defintion. + +2010-10-06 Erik de Castro Lopo + + * src/common.h + Add macro NOT. + + * src/rf64.c + Minor tweaks. + + * Makefile.am */Makefile.am + Add *~ to CLEANFILES. + +2010-10-05 Erik de Castro Lopo + + * src/sndfile.c + Fix a typo in the error string for SFE_OPEN_PIPE_RDWR. Thanks to Charles + Van Winkle for the report. + +2010-10-04 Erik de Castro Lopo + + * src/flac.c src/ogg.c src/sndfile.h.in src/strings.c src/wav.c + Add ability to read/write tracknumber and genre to flac/ogg/wav files. + Thanks to Matti Nykyri for the patch. + + * src/common.h src/broadcast.c src/strings.c + Add function psf_safe_strncpy() and use where appropriate. + +2010-10-04 Erik de Castro Lopo + + * NEWS README configure.ac doc/*.html + Updates for 1.0.22 release. + +2010-10-03 Erik de Castro Lopo + + * src/common.h src/broadcast.c src/rf64.c src/sndfile.c src/wav.c + Rewrite of SF_BROADCAST_INFO handling. + + * src/test_broadcast_var.c tests/command_test.c + Tweak SF_BROADCAST_INFO tests. + + * src/test_broadcast_var.c + Fix OSX stack check error. + +2010-09-30 Erik de Castro Lopo + + * src/sds.c + Set sustain_loop_end to 0 as suggested by Brian Lewis. + +2010-09-29 Erik de Castro Lopo + + * src/sds.c + Make sure the correct frame count gets written into the header. + + * tests/write_read_test.tpl + Don't allow SDS files to have a long frame count. + +2010-09-17 Erik de Castro Lopo + + * src/sds.c + Apply a pair of patches from Brian Lewis to fix the packet number location + and the checksum. + +2010-09-10 Erik de Castro Lopo + + * src/aiff.c src/file_io.c src/ogg.c src/rf64.c src/sndfile.c + src/strings.c src/test_audio_detect.c src/test_strncpy_crlf.c + src/wav.c tests/pcm_test.tpl + Fix a bunch of minor issues found using static analysis. + +2010-08-23 Erik de Castro Lopo + + * src/test_broadcast_var.c + New file containing tests for broadcast_set_var(). + + * src/Makefile.am src/test_main.[ch] + Hook test_broadcast_var.c into tests. + +2010-08-22 Erik de Castro Lopo + + * src/broadcast.c src/common.(c|h) + Move function strncpy_crlf() to src/common.c so the function can be tested + in isolation. + + * src/test_strncpy_crlf.c + New file. + + * src/Makefile.am src/test_main.[ch] + Hook test_strncpy_crlf.c into tests. + +2010-08-18 Erik de Castro Lopo + + * src/common.h + Move code around to make comments make sense. + + * src/broadcast.c + Add debugging code that is disabled by default. + +2010-08-02 Erik de Castro Lopo + + * src/flac.c + When the file meta data says the file has zero frames set psf->sf.frames + to SF_COUNT_MAX. Fixes Debian bug #590752. + + * programs/sndfile-info.c + Print 'unknown' if frame count == SF_COUNT_MAX. + +2010-06-27 Erik de Castro Lopo + + * src/sndfile.c + Only support writing mono SVX files. Multichannel SVX files are not + interleaved and there is no support infrastructure to cache and write + multiple channels to create a non-interleaved file. + + * src/file_io.c + Don't call close() on a file descriptor of -1. Thanks to Jeremy Friesner + for the bug report. + +2010-06-09 Erik de Castro Lopo + + * src/common.h + Add macro SF_ASSERT. + + * src/sndfile.c + Use SF_ASSERT to ensure sizeof (sf_count_t) == 8. + + * src/svx.c + Add support for reading and writing stereo SVX files. + +2010-05-07 Erik de Castro Lopo + + * configure.ac + When compiling with x86_64-w64-mingw32-gcc link with -static-libgcc flags. + + * programs/common.c programs/sndfile-metadata-set.c + Update metadata after the audio data is copied. Other minor fixes. Patch + from Marius Hennecke. + +2010-05-04 Erik de Castro Lopo + + * src/nist.c + Fix a regression reported by Hugh Secker-Walker. + + * src/api.html + Add comment about sf_open_fd() not working on Windows if the application + and the libsndfile DLL are linked to different versions of the Microsoft + C runtime DLL. + +2010-04-23 Erik de Castro Lopo + + * tests/pedantic-header-test.sh.in + Fix 'make distcheck'. + +2010-04-21 Erik de Castro Lopo + + * tests/pedantic-header-test.sh.in + New file to test whether sndfile.h can be compiled with gcc's -pedantic + flag. + + * configure.ac tests/test_wrapper.sh.in + Hook pedantic-header-test into test suite. + + * src/sndfile.h.in + Fix -pedantic warning. + +2010-04-19 Erik de Castro Lopo + + * programs/sndfile-salvage.c programs/Makefile.am + New program to salvage the audio data from WAV/WAVEX/AIFF files which are + greater than 4Gig in size. + +2010-04-09 Erik de Castro Lopo + + * programs/sndfile-convert.c + Fix valgrind warning. + +2010-04-06 Erik de Castro Lopo + + * programs/sndfile-cmp.c + When files differ in the PCM data, also print the difference offset. + Minor cleanup. + +2010-03-19 Erik de Castro Lopo + + * src/aiff.c + Don't use the 'twos' marker for 24 and 32 bit PCM, use 'in24' and 'in32' + instead. Thanks to Paul Davis (Ardour) for this suggestion. + +2010-02-28 Erik de Castro Lopo + + * configure.ac + Clean up configure report. + + * tests/utils.tpl + Add functions test_read_raw_or_die and test_write_raw_or_die. + + * tests/rdwr_test.(def|tpl) tests/Makefile.am + Add new test program and hook into build. + + * src/sndfile.c + Fix minor issues with sf_read/write_raw(). Bug reported by Milan Křápek. + + * tests/test_wrapper.sh.in + Add rdwr_test to the test wrapper script. + +2010-02-22 Erik de Castro Lopo + + * configure.ac + Remove -fpascal-strings from OSX's OS_SPECIFIC_CFLAGS. + + * programs/common.[ch] programs/sndfile-metadata-set.c + Apply a patch from Robin Gareus allowing the setting of the time reference + field of the BEXT chunk. + +2010-02-06 Erik de Castro Lopo + + * src/ima_adpcm.c + Add a fix from Jonatan Liljedahl to handle predictor overflow when decoding + IMA4. + +2010-01-26 Erik de Castro Lopo + + * src/sndfile.hh + Add a constructor which takes an existing file descriptor and then calls + sf_open_fd(). Patch from Sakari Bergen. + +2010-01-10 Erik de Castro Lopo + + * programs/sndfile-deinterleave.c programs/sndfile-interleave.c + Improve usage messages. + +2010-01-09 Erik de Castro Lopo + + * src/id3.c src/Makefile.am + Add new file src/id3.c and hook into build. + + * src/sndfile.c src/common.h + Detect and skip and ID3 header at the start of the file. + +2010-01-07 Erik de Castro Lopo + + * programs/common.c + Fix update_strings() copyright, comment, album and license are correctly + written. Thanks to Todd Allen for reporting this. + + * man/Makefile.am + Change GNU makeism to something more widely supported. Thanks to Christian + Weisgerber for reporting this. + + * configure.ac programs/Makefile.am programs/sndfile-play.c + Apply patch from Christian Weisgerber and Jacob Meuserto add support for + OpenBSD's sndio. + +2010-01-05 Erik de Castro Lopo + + * doc/api.html + Discourage the use of sf_read/write_raw(). + +2009-12-28 Erik de Castro Lopo + + * configure.ac + Test for Unix pipe() and waitpid() functions. + + * src/sfconfig.h tests/pipe_test.tpl + Disable pipe_test if pipe() and waitpid() aren't available. + +2009-12-16 Erik de Castro Lopo + + * configure.ac src/Makefile.am src/create_symbols_file.py + src/make-static-lib-hidden-privates.sh + Change name of generated file src/Symbols.linux to Symbols.gnu-binutils and + and use the same symbols file for other systems which use GNU binutils like + Debian's kfreebsd. + + * M4/shave.m4 shave.in + Update shave files from upstream. + +2009-12-15 Erik de Castro Lopo + + * man/sndfile-metadata-get.1 + Fix typo. + + * man/sndfile-interleave.1 man/Makefile.am + New man page. + +2009-12-13 Erik de Castro Lopo + + * src/ogg.c + When decoding to short or int, clip the decoded signal to [-1.0, 1.0] if + its too hot. Thanks to Dmitry Baikov for suggesting this. + + * NEWS README doc/*.html + Updates for 1.0.21. + +2009-12-09 Erik de Castro Lopo + + * programs/sndfile-jackplay.c man/sndfile-jackplay.1 + Remove these which will now be in found in the sndfile-tools package. + + * programs/Makefile.am man/Makefile.am + Remove build rules for sndfile-jackplay. + + * configure.ac + Remove detection of JACK Audio Connect Kit. + + * programs/sndfile-concat.c man/sndfile-concat.1 + Add new program with man page. + + * man/Makefile.am programs/Makefile.am + Hook sndfile-concat into build system. + +2009-12-08 Erik de Castro Lopo + + * tests/error_test.c + Don't terminate when sf_close() returns zero in error_close_test(). + It seems that Windows 7 behaves differently from earlier versions of + Windows. + +2009-12-03 Erik de Castro Lopo + + * configure.ac M4/*.m4 + Rename all custom macros from AC_* to MN_*. + + * programs/sndfile-interleave.c + Make it actually work. + +2009-12-02 Erik de Castro Lopo + + * doc/*.html configure.ac + Corrections and clarifications courtesy of Robin Forder. + + * programs/sndfile-convert.c programs/common.[ch] + Move some code from convert to common for reuse. + + * programs/sndfile-interleave.c programs/sndfile-interleave.c + Add new programs sndfile-interleave and sndfile-deinterleave. + + * programs/Makefile.am + Hook new programs into build. + +2009-12-01 Erik de Castro Lopo + + * src/create_symbols_file.py tests/stdio_test.c tests/win32_test.c + Minor OS/2 tweaks as suggested by David Yeo. + + * tests/multi_file_test.c + Fix file creation flags on windows. Thanks to Bruce Sharpe. + + * src/sf_unistd.h + Set all group and other file create permssions to zero. + + * tests/win32_test.c + Add a new test. + +2009-11-30 Erik de Castro Lopo + + * doc/print.css doc/*.html + Add a print stylesheet and update all HTML documents to reference it. + Thanks to Aditya Bhargava for suggesting this. + + * doc/index.html + Minor corrections. + +2009-11-29 Erik de Castro Lopo + + * sndfile.pc.in + Add a Libs.private entry to assist with static linking. + +2009-11-28 Erik de Castro Lopo + + * src/make-static-lib-hidden-privates.sh src/Makefile.am + Add a script to hide all non-public symbols in the libsndfile.a static + library. + +2009-11-22 Erik de Castro Lopo + + * tests/locale_test.c + Correct usage of ENABLE_SNDFILE_WINDOWS_PROTOTYPES. + +2009-11-20 Erik de Castro Lopo + + * src/windows.c + Correct usage of ENABLE_SNDFILE_WINDOWS_PROTOTYPES. + +2009-11-16 Erik de Castro Lopo + + * programs/sndfile-convert.c + Allow the program to read from stdin by specifying '-' on the command line + as the input file. + + * src/sndfile.h.in + Hash define ENABLE_SNDFILE_WINDOWS_PROTOTYPES to 1 for greater safety. + + * tests/virtual_io_test.c + Add a PAF/PCM_24 test and verify the file length is not negative + immediately after openning the file for write. + +2009-10-18 Erik de Castro Lopo + + * src/wav.c + When writing loop lengths, adjust the end position by one to make up for + Microsoft's screwed up spec. Thanks to Olivier Tristan for the patch. + +2009-10-14 Erik de Castro Lopo + + * src/flac.c + Apply patch from Uli Franke allowing FLAC files to be encoded at any sample + rate. + +2009-10-09 Erik de Castro Lopo + + * src/nist.c + Fix parsing of odd ulaw encoded file provided by Jan Silovsky. + + * configure.ac + Insist on libvorbis >= 1.2.3. Earlier verions have bugs that cause the + libsndfile test suite to fail on MIPS, PowerPC and others. + See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=549899 + +2009-10-06 Erik de Castro Lopo + + * man/sndfile-convert.1 + Fix warning from Debian's lintian checks. + + * man/sndfile-cmp.1 man/sndfile-jackplay.1 man/sndfile-metadata-get.1 + man/Makefile.am + Add three new minimal manpages and hook into build. + +2009-10-05 Erik de Castro Lopo + + * tests/test_wrapper.sh.in + Don't run cpp_test on x86_64-w64-mingw32. + +2009-09-28 Erik de Castro Lopo + + * tests/utils.tpl + On windows, make sure the open() function doesn't get called with a third + parameter of 0 which fails for no good reason. Also make sure this third + parameter doesn't get called with S_IRGRP when compiling for windows because + Wine complains. + + * src/sndfile.hh + Add a SndfileHandle constructor for windows that takes a 'const wchar_t *' + string. + + * doc/FAQ.html + Add Q/A : I'm cross compiling libsndfile for another platform. How can I + run the test suite? + + * src/create_symbols_file.py src/Makefile.am + Add Symbols.static target, a list of symbols, one per line. + +2009-09-27 Erik de Castro Lopo + + * tests/test_wrapper.sh.in + Update to allow all tests to be gathered up into a testsuite tarball and + then be run using this script. + + * build-test-tarball.mk.in + Add a Make script to build a tarball of all the test binaries and the test + wrapper script. This is useful for cross compiling; you can build the + binaries, build test test tarball and transfer the test tarball to the + target machine for testing. + +2009-09-26 Erik de Castro Lopo + + * src/common.h src/*.c + Modify SF_FILE struct to allow it to carry either 8-bit or 16-bit strings + for the file path, directory and name. Fixes for this change throughout. + + * src/windows.c src/Makefile.am + New file defining new windows only public function sf_wchar_open() which + takes a 'const wchar_t *' string (LPCWSTR) for the file name parameter. + + * src/sndfile.h.in + Add SF_CHANNEL_MAP_ABISONIC_* entries. + Add windows only defintion for sf_wchar_open(). + + * src/create_symbols_file.py + Add sf_wchar_open() to the list of public symbols (windows only). + + * tests/locale_test.c + Add a wchar_test() to test sf_wchar_open(). + +2009-09-25 Erik de Castro Lopo + + * src/common.h src/*.c + Split file stuff into PSF_FILE struct within the SF_PRIVATE struct. + +2009-09-23 Erik de Castro Lopo + + * src/aiff.c src/voc.c + When a byte is needed, use unsigned char. + + * src/ima_oki_adpcm.c src/broadcast.c src/test_ima_oki_adpcm.c + Include sfconfig.h to prevent compile errors with MinGW compilers. + + * configure.ac + Remove AM_CONFIG_HEADER due to warnings from autoconf 2.64. + + * tests/locale_test.c + Update to work with xx_XX.UTF-8 style locales. Refactoring. + +2009-09-22 Erik de Castro Lopo + + * configure.ac + Set __USE_MINGW_ANSI_STDIO to 1 when compiling using MinGW compilers. + Remove unneeded AC_SUBST. + Report Host CPU/OS/vendor. + +2009-09-19 Erik de Castro Lopo + + * src/sndfile.c + Fix error message string. + + * src/flac.c + Add 88200 to the list of supported sample rates. + + * src/ogg.c + Fix compiler warning when using gcc-4.5.0. + + * programs/sndfile-info.c tests/utils.tpl + Remove WIN32 snprintf #define. + + * src/ima_adpcm.c + Fix minor bug in aiff_ima_encode_block. Thanks to Denis Fileev for finding + this. + +2009-09-16 Erik de Castro Lopo + + * src/caf.c + Use the correct C99 format specifier for int64_t. + + * M4/endian.m4 + Fix detection of CPU endian-ness when cross compiling. Thanks to Pierre + Ossman for the bug report. + + * src/caf.c src/sndfile.c + Fix reading and writing of PEAK chunks in CAF files. + + * tests/peak_chunk_test.c tests/test_wrapper.sh.in + Run peak_chunk_test on CAF files. + +2009-09-15 Erik de Castro Lopo + + * src/aiff.c src/wav.c + Use the correct C99 format specifier for int64_t. + +2009-08-30 Erik de Castro Lopo + + * src/rf64.c src/sndfile.c src/wav.c src/wav_w64.h + Apply a patch (massaged slightly) from Uli Franke adding handling of the + BEXT chunk in RF64 files. + + * tests/command_test.c + Update channel_map_test() function so WAV test passes. + + * src/rf64.c + Add channel mapping and ambisonic support. + + * src/sndfile.h + Add comments showing correspondance between libsndfile channel map + defintiions and those used by Apple and MS. + + Add handling of reading/writing channel map info. + + * tests/command_test.c tests/test_wrapper.sh.in + Update channel map tests. + +2009-07-29 Erik de Castro Lopo + + * src/common.h + Add function psf_isprint() a replacement for the standard C isprint() + function which ignores any locale settings and treats all input as ASCII. + + * src/(aiff|common|rf64|sd2|strings|svx|wav).c + Use psf_isprint() instead of isprint(). + +2009-07-13 Erik de Castro Lopo + + * src/command.c + Add string descriptions for SF_FORMAT_RF64 and SF_FORMAT_MPC2K. + +2009-06-30 Erik de Castro Lopo + + * programs/sndfile-play.c + Allow use of Open Sound System audio output under FreeBSD. + +2009-06-24 Erik de Castro Lopo + + * configure.ac + Add patch from Conrad Parker to add --disable-jack. + +2009-05-28 Erik de Castro Lopo + + * src/alaw.c src/float32.c src/htk.c src/pcm.c src/sds.c src/ulaw.c + Fix bugs where invalid files can cause a divide by zero error (SIGFPE). + Thanks to Sami Liedes for reporting this a Debian bug #530831. + +2009-05-26 Erik de Castro Lopo + + * src/chanmap.[ch] + New files for channel map decoding/encoding. + +2009-05-25 Erik de Castro Lopo + + * configure.ac src/sndfile.h.in + Fix MSVC definition of sf_count_t. + +2009-05-24 Erik de Castro Lopo + + * src/wav_w64.[ch] + Add wavex_channelmask to WAV_PRIVATE struct and add a function to convert + an array of SF_CHANNEL_MASK_* values into a bit mask for use in WAV files. + + * src/wav.c + Add ability to write the channel mask. + +2009-05-23 Erik de Castro Lopo + + * programs/sndfile-info.c + Add -c command line option to dump the channel map information. + + * src/wav_w64.c + Don't bail from parser if channel map bitmask is faulty. + + * src/common.h src/sndfile.c + Remove error code SFE_W64_BAD_CHANNEL_MAP which is not needed any more. + + * src/sndfile.c + On SFC_SET_CHANNEL_MAP_INFO pass the channel map command down to container's + command handler. + +2009-05-22 Erik de Castro Lopo + + * src/sndfile.h.in src/common.h src/sndfile.c src/wav_w64.c + Apply a patch from Lennart Poettering (PulseAudio) to allow reading of + channel data in WAV and W64 files. + Add a test for the above. + +2009-05-20 Erik de Castro Lopo + + * src/FAQ.html + Update the section about pre-compiled binaries for Win64. + +2009-05-14 Erik de Castro Lopo + + * src/common.h src/test_conversions.c + Be more careful when including so compiling on pre-C99 platforms + (hello Slowlaris) might actually work. + + * NEWS README doc/*.html + Updates for 1.0.20. + +2009-04-21 Erik de Castro Lopo + + * src/voc.c + Fix a bug whereby opening a specially crafted VOC file could result in a + heap overflow. Thanks to Tobias Klein (http://www.trapkit.de) for reporting + this issue. + + * src/aiff.c + Fix potential (heap) buffer overflow when parsing 'MARK' chunk. + +2009-04-12 Erik de Castro Lopo + + * tests/stdin_test.c + Check psf->error after opening file. + + * src/file_io.c + Fix obscure seeking bug reported by Hugh Secker-Walker. + + * tests/utils.tpl + Add check of sf_error to test_open_file_or_die(). + + * src/sndfile.c + Clear error if opening resource fork fails. + +2009-04-11 Erik de Castro Lopo + + * tests/alaw_test.c tests/locale_test.c tests/ulaw_test.c + Cleanup output. + +2009-03-25 Erik de Castro Lopo + + * src/float32.c + Fix f2s_clip_array. + +2009-03-24 Erik de Castro Lopo + + * src/float32.c + In host_read_f2s call convert instead of f2s_array. + + * src/ima_adpcm.c + Remove dead code. + + * src/test_ima_oki_adpcm.c examples/generate.c tests/dither_test.c + tests/dwvw_test.c tests/fix_this.c tests/generate.c + tests/multi_file_test.c + Minor fixes. + +2009-03-23 Erik de Castro Lopo + + * M4/shave.m4 shave.in + Pulled update from upstream. + +2009-03-19 Erik de Castro Lopo + + * doc/api.html + Add pointers to example programs in source code tarball. + +2009-03-17 Erik de Castro Lopo + + * src/common.h + Define SF_PLATFORM_S64 for non-gcc compilers with 'long long' type. + + * configure.ac + Add documentation for --disable-external-libs and improve error handling + for that option. + + * src/sndfile.c src/sndfile.h.in src/create_symbols_file.py + Add public function sf_version_string. + + * tests/sfversion.c + Test function sf_version_string. + + * M4/shave.m4 shave-libtool.in shave.in + Add new files from 'git clone git://git.lespiau.name/shave'. + + * configure.ac + Enable shave. + + * src/Makefile.am src/binheader_writef_check.py Octave/* + Shave related tweaks. + +2009-03-15 Erik de Castro Lopo + + * src/common.h src/caf.c src/sndfile.c + Add SF_MAX_CHANNELS (set to 256) and use it. + + * src/sndfile.h.in + Check for either _MSCVER or _MSC_VER being defined. + +2009-03-04 Erik de Castro Lopo + + * tests/vorbis_test.c + Relax test slighly to allow test to pass on more CPUs etc. + 2009-03-03 Erik de Castro Lopo * configure.ac @@ -122,7 +1915,7 @@ * src/wav.c Handle four zero bytes as a marker within a LIST or INFO chunk. - Thanks to Rogério Brito for supplying an example file. + Thanks to Rogério Brito for supplying an example file. 2009-02-14 Erik de Castro Lopo @@ -683,7 +2476,7 @@ 2008-06-14 Erik de Castro Lopo * src/aiff.c - Apply a fix from Axel Roebel where if the second loop in the instrument + Apply a fix from Axel Röbel where if the second loop in the instrument chunk is none, the loop mode is written into the first loop. 2008-05-31 Erik de Castro Lopo @@ -797,7 +2590,7 @@ 2008-04-09 Erik de Castro Lopo * src/aiff.c - Fix up handling of 'APPL' chunk. Thanks to Axel Roebel for bringing up + Fix up handling of 'APPL' chunk. Thanks to Axel Röbel for bringing up this issue. 2008-04-06 Erik de Castro Lopo @@ -948,10 +2741,10 @@ Allow use of either LGPL v2.1 or LGPL v3. * tests/header_test.tpl - Add header_shrink_test from Axel Roebel. + Add header_shrink_test from Axel Röbel. * src/wav.c - Add fix from Axel Roebel for writing files with float data but no peak + Add fix from Axel Röbel for writing files with float data but no peak chunk (ie peak chunk gets removed after the file is opened). * src/aiff.c tests/header_test.tpl @@ -1408,7 +3201,7 @@ 2007-04-14 Erik de Castro Lopo * src/GSM610/long_term.c src/macbinary3.c tests/cpp_test.cc - Add patch from André Pang to clean up compiles on OSX. + Add patch from André Pang to clean up compiles on OSX. * src/wve.c src/common.h src/sndfile.c src/sndfile.h.in examples/sndfile-convert.c @@ -1421,7 +3214,7 @@ * src/sndfile.hh Add a static SndfileHandle::formatCheck method as suggested by Jorge - Jiménez. + Jiménez. 2007-04-09 Erik de Castro Lopo @@ -1926,7 +3719,7 @@ * configure.ac Fix handling of --enable and --disable configure args. Thanks to Diego - 'Flameeyes' Pettenò who sent the patch. + 'Flameeyes' Pettenò who sent the patch. 2006-03-22 Erik de Castro Lopo @@ -2097,11 +3890,11 @@ 2006-01-10 Erik de Castro Lopo * examples/sndfile-play.c - Fix calculation of samples remaining in win32 code. Thanks Axel Roebel. + Fix calculation of samples remaining in win32 code. Thanks Axel Röbel. * src/common.h Make sure length of header buffer can hold header plus strings. Thanks Axel - Roebel. + Röbel. 2006-01-09 Erik de Castro Lopo @@ -2315,7 +4108,7 @@ * tests/locale_test.c Modify the way the unicode strings were encoded so that older compilers - do not complain. Thanks Axel Roebel. + do not complain. Thanks Axel Röbel. * configure.ac Bump the version to 1.0.12 for release. @@ -2544,7 +4337,7 @@ style strings (no terminating character). * src/aiff.c - Move to new (correct) AIFF string style. Thanks to Axel Roebel for being + Move to new (correct) AIFF string style. Thanks to Axel Röbel for being so persistent on this issue. 2005-07-11 Erik de Castro Lopo @@ -2703,7 +4496,7 @@ 2005-05-10 Erik de Castro Lopo * src/ircam.c - Fix writing of IRCAM files on big endian systems (thanks to Axel Roebel). + Fix writing of IRCAM files on big endian systems (thanks to Axel Röbel). * src/wav.c Add workaround for files created by the Peak audio editor on Mac which can @@ -3302,7 +5095,7 @@ 2004-04-03 Erik de Castro Lopo * configure.ac - Improve printout configuration summary (as suggested by Axel Röbel). + Improve printout configuration summary (as suggested by Axel Röbel). * doc/index.html Add link to pre-release location. @@ -3576,7 +5369,7 @@ 2003-12-07 Erik de Castro Lopo * src/file_io.c - Axel Roebel pointed out that on Mac OSX a pipe is not considered a fifo + Axel Röbel pointed out that on Mac OSX a pipe is not considered a fifo (S_ISFIFO (st.st_mode) is false) but a socket (S_ISSOCK (st.st_mode) is true). The test has therefore been changed to is S_ISREG and anything which which does not return true for S_ISREG is considered a pipe. @@ -3780,11 +5573,11 @@ * src/aiff.c Fixed a bug where opening a file with a non-trival header in SFM_RDWR mode - would over-write part of the header. Thanks to Axel Roebel for pointing + would over-write part of the header. Thanks to Axel Röbel for pointing this out. Axel also provided a patch to fix this but I came up with a neater and more general solution. Return error when openning an AIFF file with data after the SSND chunk - (Thanks Axel Roebel). + (Thanks Axel Röbel). * tests/aiff_rw_test.c Improvements to test program which will later allow it to be generalised to @@ -4068,28 +5861,28 @@ * src/common.c src/common.h src/file_io.h Added is_pipe field to SF_PRIVATE and declaration of psf_is_pipe() - function. (Axel Roebel) + function. (Axel Röbel) * src/sndfile.c - Fixed determination of whether the file is a pipe. (Axel Roebel) + Fixed determination of whether the file is a pipe. (Axel Röbel) * src/paf.c - Force paf24 to start with undefined mode. (Axel Roebel) + Force paf24 to start with undefined mode. (Axel Röbel) * tests/pipe_test.c Mods to make this test work and actually do the test on RAW files. (Axel - Roebel). + Röbel). 2003-05-05 Erik de Castro Lopo * src/sndfile.c Fixed a potential bug where psf->sf.seekable was being set to FALSE when operating on stdin or stdout but then the default initialiser was reseting - it to TRUE. Thanks to Axel Roebel. + it to TRUE. Thanks to Axel Röbel. * src/aiff.c Fixed a bug in the header parser where it was not handling an odd length - COMM chunk correctly. Thanks to Axel Roebel. + COMM chunk correctly. Thanks to Axel Röbel. * src/test_file_io.c Add more tests. @@ -7013,7 +8806,7 @@ This is the boundary between version 1 of the library above and version 0 below. * src/paf.c src/wav_gsm610.c Removed two printf()s which had escaped notice for some time (thanks - Sigbjørn Skjæret). + Sigbjørn Skjæret). 2001-07-19 Erik de Castro Lopo @@ -7333,7 +9126,7 @@ This is the boundary between version 1 of the library above and version 0 below. * src/sndfile.h Removed prototype of unimplemented function sf_get_info(). Added prototype - for sf_error_number() Thanks to Sigbjørn Skjæret for spotting these. + for sf_error_number() Thanks to Sigbjørn Skjæret for spotting these. 2000-08-18 Erik de Castro Lopo @@ -7343,8 +9136,8 @@ This is the boundary between version 1 of the library above and version 0 below. 2000-08-15 Erik de Castro Lopo * src/sndfile.c - Fixed a leak of FILE* pointers in sf_open_write(). Thanks to Sigbjørn - Skjæret for spotting this one. + Fixed a leak of FILE* pointers in sf_open_write(). Thanks to Sigbjørn + Skjæret for spotting this one. 2000-08-13 Erik de Castro Lopo @@ -7438,7 +9231,7 @@ This is the boundary between version 1 of the library above and version 0 below. * src/wav.c Fixed bug in GSM 6.10 handling for big-endian machines. Thanks - to Sigbjørn Skjæret for reporting this. + to Sigbjørn Skjæret for reporting this. 2000-04-25 Erik de Castro Lopo @@ -7620,7 +9413,7 @@ This is the boundary between version 1 of the library above and version 0 below. * src/aiff.c Fixed calculation of datalength when reading SSND chunk. Thanks to - Sigbjørn Skjæret for pointing out this error. + Sigbjørn Skjæret for pointing out this error. 1999-07-29 Erik de Castro Lopo @@ -7969,4 +9762,3 @@ This is the boundary between version 1 of the library above and version 0 below. * src/aiff.c: Changed reading of 'COMM' chunk to avoid reading an int which overlaps an int (4 byte) boundary. - diff --git a/libs/libsndfile/M4/Makefile.am b/libs/libsndfile/M4/Makefile.am index 1ec5172e57..e2d984a43a 100644 --- a/libs/libsndfile/M4/Makefile.am +++ b/libs/libsndfile/M4/Makefile.am @@ -1,5 +1,5 @@ ## Process this file with automake to produce Makefile.in -EXTRA_DIST = add_cflags.m4 clip_mode.m4 endian.m4 extra_largefile.m4 \ +EXTRA_DIST = add_cflags.m4 clip_mode.m4 endian.m4 \ flexible_array.m4 llrint.m4 lrint.m4 lrintf.m4 octave.m4 extra_pkg.m4 diff --git a/libs/libsndfile/M4/add_cflags.m4 b/libs/libsndfile/M4/add_cflags.m4 index 7b6b555c7f..55a326c580 100644 --- a/libs/libsndfile/M4/add_cflags.m4 +++ b/libs/libsndfile/M4/add_cflags.m4 @@ -1,17 +1,18 @@ -dnl @synopsis AC_ADD_CFLAGS +dnl @synopsis MN_ADD_CFLAGS dnl dnl Add the given option to CFLAGS, if it doesn't break the compiler -AC_DEFUN([AC_ADD_CFLAGS], +AC_DEFUN([MN_ADD_CFLAGS], [AC_MSG_CHECKING([if $CC accepts $1]) ac_add_cflags__old_cflags="$CFLAGS" - CFLAGS="$CFLAGS $1" + CFLAGS="$1" AC_TRY_LINK([ #include ], [puts("Hello, World!"); return 0;], - AC_MSG_RESULT([yes]), + AC_MSG_RESULT([yes]) + CFLAGS="$ac_add_cflags__old_cflags $1", AC_MSG_RESULT([no]) - CFLAGS="$ac_add_cflags__old_cflags" + CFLAGS="$ac_add_cflags__old_cflags" ) -])# AC_ADD_CFLAGS +])# MN_ADD_CFLAGS diff --git a/libs/libsndfile/M4/add_cxxflags.m4 b/libs/libsndfile/M4/add_cxxflags.m4 index 5e6489faf2..1c0a4deb96 100644 --- a/libs/libsndfile/M4/add_cxxflags.m4 +++ b/libs/libsndfile/M4/add_cxxflags.m4 @@ -1,17 +1,19 @@ -dnl @synopsis AC_ADD_CXXFLAGS +dnl @synopsis MN_ADD_CXXFLAGS dnl dnl Add the given option to CXXFLAGS, if it doesn't break the compiler -AC_DEFUN([AC_ADD_CXXFLAGS], +AC_DEFUN([MN_ADD_CXXFLAGS], [AC_MSG_CHECKING([if $CXX accepts $1]) + AC_LANG_ASSERT([C++]) ac_add_cxxflags__old_cxxflags="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS $1" + CXXFLAGS="$1" AC_TRY_LINK([ #include ], [puts("Hello, World!"); return 0;], - AC_MSG_RESULT([yes]), + AC_MSG_RESULT([yes]) + CXXFLAGS="$ac_add_cxxflags__old_cxxflags $1", AC_MSG_RESULT([no]) - CXXFLAGS="$ac_add_cxxflags__old_cxxflags" + CXXFLAGS="$ac_add_cxxflags__old_cxxflags" ) -])# AC_ADD_CXXFLAGS +])# MN_ADD_CXXFLAGS diff --git a/libs/libsndfile/M4/clang.m4 b/libs/libsndfile/M4/clang.m4 new file mode 100644 index 0000000000..4cf3077d64 --- /dev/null +++ b/libs/libsndfile/M4/clang.m4 @@ -0,0 +1,31 @@ +dnl @synopsis MN_C_COMPILER_IS_CLANG +dnl +dnl Find out if a compiler claiming to be gcc really is gcc (fuck you clang). +dnl @version 1.0 Oct 31 2013 +dnl @author Erik de Castro Lopo +dnl +dnl Permission to use, copy, modify, distribute, and sell this file for any +dnl purpose is hereby granted without fee, provided that the above copyright +dnl and this permission notice appear in all copies. No representations are +dnl made about the suitability of this software for any purpose. It is +dnl provided "as is" without express or implied warranty. +dnl + + +AC_DEFUN([MN_C_COMPILER_IS_CLANG], +[AC_CACHE_CHECK(whether we are using the CLANG C compiler, + mn_cv_c_compiler_clang, + [ AC_LANG_ASSERT(C) + AC_TRY_LINK([ + #include + ], + [ + #ifndef __clang__ + This is not clang! + #endif + ], + mn_cv_c_compiler_clang=yes, + mn_cv_c_compiler_clang=no + ]) + ) +]) diff --git a/libs/libsndfile/M4/clip_mode.m4 b/libs/libsndfile/M4/clip_mode.m4 index 57c94a9626..4556b937a0 100644 --- a/libs/libsndfile/M4/clip_mode.m4 +++ b/libs/libsndfile/M4/clip_mode.m4 @@ -1,4 +1,4 @@ -dnl @synopsis AC_C_CLIP_MODE +dnl @synopsis MN_C_CLIP_MODE dnl dnl Determine the clipping mode when converting float to int. dnl @version 1.0 May 17 2003 @@ -20,7 +20,7 @@ dnl Find the clipping mode in the following way: dnl 1) If we are not cross compiling test it. dnl 2) IF we are cross compiling, assume that clipping isn't done correctly. -AC_DEFUN([AC_C_CLIP_MODE], +AC_DEFUN([MN_C_CLIP_MODE], [AC_CACHE_CHECK(processor clipping capabilities, ac_cv_c_clip_type, @@ -119,6 +119,6 @@ case "$ac_cv_c_clip_positive$ac_cv_c_clip_negative" in ) ] -)# AC_C_CLIP_MODE +)# MN_C_CLIP_MODE diff --git a/libs/libsndfile/M4/endian.m4 b/libs/libsndfile/M4/endian.m4 index b3a4589764..5d766ff39e 100644 --- a/libs/libsndfile/M4/endian.m4 +++ b/libs/libsndfile/M4/endian.m4 @@ -1,4 +1,4 @@ -dnl @synopsis AC_C_FIND_ENDIAN +dnl @synopsis MN_C_FIND_ENDIAN dnl dnl Determine endian-ness of target processor. dnl @version 1.1 Mar 03 2002 @@ -20,7 +20,7 @@ dnl 2) If 1) fails, look in and . dnl 3) If 1) and 2) fails and not cross compiling run a test program. dnl 4) If 1) and 2) fails and cross compiling then guess based on target. -AC_DEFUN([AC_C_FIND_ENDIAN], +AC_DEFUN([MN_C_FIND_ENDIAN], [AC_CACHE_CHECK(processor byte ordering, ac_cv_c_byte_order, @@ -92,13 +92,11 @@ if test $ac_cv_c_byte_order = unknown ; then [ case "$target_cpu" in alpha* | i?86* | mipsel* | ia64*) - ac_cv_c_big_endian=0 - ac_cv_c_little_endian=1 + ac_cv_c_byte_order=little ;; m68* | mips* | powerpc* | hppa* | sparc*) - ac_cv_c_big_endian=1 - ac_cv_c_little_endian=0 + ac_cv_c_byte_order=big ;; esac @@ -116,7 +114,6 @@ if test $ac_cv_c_byte_order = unknown ; then return (u.c [sizeof (long) - 1] == 1); } ]], , ac_cv_c_byte_order=big, - ac_cv_c_byte_order=unknown ) AC_TRY_RUN( @@ -129,7 +126,6 @@ if test $ac_cv_c_byte_order = unknown ; then u.l = 1 ; return (u.c [0] == 1); }]], , ac_cv_c_byte_order=little, - ac_cv_c_byte_order=unknown ) fi fi @@ -154,6 +150,6 @@ else fi ] -)# AC_C_FIND_ENDIAN +)# MN_C_FIND_ENDIAN diff --git a/libs/libsndfile/M4/extra_largefile.m4 b/libs/libsndfile/M4/extra_largefile.m4 index 47401f85a4..3e614c3f70 100644 --- a/libs/libsndfile/M4/extra_largefile.m4 +++ b/libs/libsndfile/M4/extra_largefile.m4 @@ -6,8 +6,8 @@ dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html dnl Written by Paul Eggert . dnl Internal subroutine of AC_SYS_EXTRA_LARGEFILE. -dnl AC_SYS_EXTRA_LARGEFILE_FLAGS(FLAGSNAME) -AC_DEFUN([AC_SYS_EXTRA_LARGEFILE_FLAGS], +dnl MN_SYS_EXTRA_LARGEFILE_FLAGS(FLAGSNAME) +AC_DEFUN([MN_SYS_EXTRA_LARGEFILE_FLAGS], [AC_CACHE_CHECK([for $1 value to request large file support], ac_cv_sys_largefile_$1, [ac_cv_sys_largefile_$1=`($GETCONF LFS_$1) 2>/dev/null` || { @@ -67,9 +67,9 @@ AC_DEFUN([AC_SYS_EXTRA_LARGEFILE], [ --disable-largefile omit support for large files]) if test "$enable_largefile" != no; then AC_CHECK_TOOL(GETCONF, getconf) - AC_SYS_EXTRA_LARGEFILE_FLAGS(CFLAGS) - AC_SYS_EXTRA_LARGEFILE_FLAGS(LDFLAGS) - AC_SYS_EXTRA_LARGEFILE_FLAGS(LIBS) + MN_SYS_EXTRA_LARGEFILE_FLAGS(CFLAGS) + MN_SYS_EXTRA_LARGEFILE_FLAGS(LDFLAGS) + MN_SYS_EXTRA_LARGEFILE_FLAGS(LIBS) for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do case "$ac_flag" in diff --git a/libs/libsndfile/M4/extra_pkg.m4 b/libs/libsndfile/M4/extra_pkg.m4 index a92d090d69..afe474e224 100644 --- a/libs/libsndfile/M4/extra_pkg.m4 +++ b/libs/libsndfile/M4/extra_pkg.m4 @@ -1,5 +1,6 @@ # extra_pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# +# +# Copyright (c) 2008-2012 Erik de Castro Lopo # Copyright (c) 2004 Scott James Remnant . # # This program is free software; you can redistribute it and/or modify @@ -40,6 +41,25 @@ AC_MSG_CHECKING([for $2 ]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) +pkg_link_saved_CFLAGS=$CFLAGS +pkg_link_saved_LIBS=$LIBS + +eval "pkg_CFLAGS=\${pkg_cv_[]$1[]_CFLAGS}" +eval "pkg_LIBS=\${pkg_cv_[]$1[]_LIBS}" + +CFLAGS="$CFLAGS $pkg_CFLAGS" +LIBS="$LIBS $pkg_LIBS" + +AC_TRY_LINK([], puts ("");, pkg_link=yes, pkg_link=no) + +CFLAGS=$pkg_link_saved_CFLAGS +LIBS=$pkg_link_saved_LIBS + +if test $pkg_link = no ; then + $as_echo_n "link failed ... " + pkg_failed=yes + fi + m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS and $1[]_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details.]) @@ -48,7 +68,7 @@ if test $pkg_failed = yes; then _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` fi # Put the nasty error message in config.log where it belongs diff --git a/libs/libsndfile/M4/flexible_array.m4 b/libs/libsndfile/M4/flexible_array.m4 index 7f558d3ebd..661da17b23 100644 --- a/libs/libsndfile/M4/flexible_array.m4 +++ b/libs/libsndfile/M4/flexible_array.m4 @@ -1,4 +1,4 @@ -dnl @synopsis AC_C99_FLEXIBLE_ARRAY +dnl @synopsis MN_C99_FLEXIBLE_ARRAY dnl dnl Dose the compiler support the 1999 ISO C Standard "stuct hack". dnl @version 1.1 Mar 15 2004 @@ -10,7 +10,7 @@ dnl and this permission notice appear in all copies. No representations are dnl made about the suitability of this software for any purpose. It is dnl provided "as is" without express or implied warranty. -AC_DEFUN([AC_C99_FLEXIBLE_ARRAY], +AC_DEFUN([MN_C99_FLEXIBLE_ARRAY], [AC_CACHE_CHECK(C99 struct flexible array support, ac_cv_c99_flexible_array, @@ -28,5 +28,5 @@ AC_TRY_LINK([[ ac_cv_c99_flexible_array=yes, ac_cv_c99_flexible_array=no ))] -) # AC_C99_FLEXIBLE_ARRAY +) # MN_C99_FLEXIBLE_ARRAY diff --git a/libs/libsndfile/M4/gcc_version.m4 b/libs/libsndfile/M4/gcc_version.m4 index 84a5ba8d74..f8c5cbebe4 100644 --- a/libs/libsndfile/M4/gcc_version.m4 +++ b/libs/libsndfile/M4/gcc_version.m4 @@ -1,4 +1,4 @@ -dnl @synopsis AC_GCC_VERSION +dnl @synopsis MN_GCC_VERSION dnl dnl Find the version of gcc. dnl @version 1.0 Nov 05 2007 @@ -11,7 +11,7 @@ dnl made about the suitability of this software for any purpose. It is dnl provided "as is" without express or implied warranty. dnl -AC_DEFUN([AC_GCC_VERSION], +AC_DEFUN([MN_GCC_VERSION], [ if test "x$ac_cv_c_compiler_gnu" = "xyes" ; then @@ -20,8 +20,8 @@ if test "x$ac_cv_c_compiler_gnu" = "xyes" ; then AC_MSG_RESULT($GCC_VERSION) changequote(,)dnl - GCC_MINOR_VERSION=`echo $GCC_VERSION | sed "s/^[0-9]\+\.//" | sed "s/\..*//"` GCC_MAJOR_VERSION=`echo $GCC_VERSION | sed "s/\..*//"` + GCC_MINOR_VERSION=`echo $GCC_VERSION | sed "s/$GCC_MAJOR_VERSION\.//" | sed "s/\..*//"` changequote([,])dnl fi @@ -29,5 +29,5 @@ AC_SUBST(GCC_VERSION) AC_SUBST(GCC_MAJOR_VERSION) AC_SUBST(GCC_MINOR_VERSION) -])# AC_GCC_VERSION +])# MN_GCC_VERSION diff --git a/libs/libsndfile/M4/llrint.m4 b/libs/libsndfile/M4/llrint.m4 index 0f5ce698c4..66be206187 100644 --- a/libs/libsndfile/M4/llrint.m4 +++ b/libs/libsndfile/M4/llrint.m4 @@ -1,4 +1,4 @@ -dnl @synopsis AC_C99_FUNC_LLRINT +dnl @synopsis MN_C99_FUNC_LLRINT dnl dnl Check whether C99's llrint function is available. dnl @version 1.1 Sep 30 2002 @@ -10,7 +10,7 @@ dnl and this permission notice appear in all copies. No representations are dnl made about the suitability of this software for any purpose. It is dnl provided "as is" without express or implied warranty. dnl -AC_DEFUN([AC_C99_FUNC_LLRINT], +AC_DEFUN([MN_C99_FUNC_LLRINT], [AC_CACHE_CHECK(for llrint, ac_cv_c99_llrint, [ @@ -34,5 +34,5 @@ if test "$ac_cv_c99_llrint" = yes; then AC_DEFINE(HAVE_LLRINT, 1, [Define if you have C99's llrint function.]) fi -])# AC_C99_FUNC_LLRINT +])# MN_C99_FUNC_LLRINT diff --git a/libs/libsndfile/M4/lrint.m4 b/libs/libsndfile/M4/lrint.m4 index 3e3319e15b..c2c21d60f4 100644 --- a/libs/libsndfile/M4/lrint.m4 +++ b/libs/libsndfile/M4/lrint.m4 @@ -1,4 +1,4 @@ -dnl @synopsis AC_C99_FUNC_LRINT +dnl @synopsis MN_C99_FUNC_LRINT dnl dnl Check whether C99's lrint function is available. dnl @version 1.3 Feb 12 2002 @@ -10,7 +10,7 @@ dnl and this permission notice appear in all copies. No representations are dnl made about the suitability of this software for any purpose. It is dnl provided "as is" without express or implied warranty. dnl -AC_DEFUN([AC_C99_FUNC_LRINT], +AC_DEFUN([MN_C99_FUNC_LRINT], [AC_CACHE_CHECK(for lrint, ac_cv_c99_lrint, [ @@ -33,5 +33,5 @@ if test "$ac_cv_c99_lrint" = yes; then AC_DEFINE(HAVE_LRINT, 1, [Define if you have C99's lrint function.]) fi -])# AC_C99_FUNC_LRINT +])# MN_C99_FUNC_LRINT diff --git a/libs/libsndfile/M4/lrintf.m4 b/libs/libsndfile/M4/lrintf.m4 index f921e9ed29..04f4d6603c 100644 --- a/libs/libsndfile/M4/lrintf.m4 +++ b/libs/libsndfile/M4/lrintf.m4 @@ -1,4 +1,4 @@ -dnl @synopsis AC_C99_FUNC_LRINTF +dnl @synopsis MN_C99_FUNC_LRINTF dnl dnl Check whether C99's lrintf function is available. dnl @version 1.3 Feb 12 2002 @@ -10,7 +10,7 @@ dnl and this permission notice appear in all copies. No representations are dnl made about the suitability of this software for any purpose. It is dnl provided "as is" without express or implied warranty. dnl -AC_DEFUN([AC_C99_FUNC_LRINTF], +AC_DEFUN([MN_C99_FUNC_LRINTF], [AC_CACHE_CHECK(for lrintf, ac_cv_c99_lrintf, [ @@ -33,5 +33,5 @@ if test "$ac_cv_c99_lrintf" = yes; then AC_DEFINE(HAVE_LRINTF, 1, [Define if you have C99's lrintf function.]) fi -])# AC_C99_FUNC_LRINTF +])# MN_C99_FUNC_LRINTF diff --git a/libs/libsndfile/M4/mkoctfile_version.m4 b/libs/libsndfile/M4/mkoctfile_version.m4 index 3704398298..c17333ea25 100644 --- a/libs/libsndfile/M4/mkoctfile_version.m4 +++ b/libs/libsndfile/M4/mkoctfile_version.m4 @@ -1,4 +1,4 @@ -dnl @synopsis AC_MKOCTFILE_VERSION +dnl @synopsis OCTAVE_MKOCTFILE_VERSION dnl dnl Find the version of mkoctfile. dnl @version 1.0 Aug 23 2007 @@ -11,7 +11,7 @@ dnl made about the suitability of this software for any purpose. It is dnl provided "as is" without express or implied warranty. dnl -AC_DEFUN([AC_MKOCTFILE_VERSION], +AC_DEFUN([OCTAVE_MKOCTFILE_VERSION], [ @@ -34,5 +34,5 @@ if test "x$ac_cv_prog_HAVE_MKOCTFILE" = "xyes" ; then AC_SUBST(MKOCTFILE) AC_SUBST(MKOCTFILE_VERSION) -])# AC_MKOCTFILE_VERSION +])# OCTAVE_MKOCTFILE_VERSION diff --git a/libs/libsndfile/M4/octave.m4 b/libs/libsndfile/M4/octave.m4 index 164653456d..88d5a5b9b0 100644 --- a/libs/libsndfile/M4/octave.m4 +++ b/libs/libsndfile/M4/octave.m4 @@ -18,10 +18,10 @@ dnl Find the version of Octave. dnl @version 1.0 Aug 23 2007 dnl @author Erik de Castro Lopo dnl -dnl Permission to use, copy, modify, distribute, and sell this file for any -dnl purpose is hereby granted without fee, provided that the above copyright +dnl Permission to use, copy, modify, distribute, and sell this file for any +dnl purpose is hereby granted without fee, provided that the above copyright dnl and this permission notice appear in all copies. No representations are -dnl made about the suitability of this software for any purpose. It is +dnl made about the suitability of this software for any purpose. It is dnl provided "as is" without express or implied warranty. dnl @@ -52,10 +52,10 @@ dnl Find the version of Octave. dnl @version 1.0 Aug 23 2007 dnl @author Erik de Castro Lopo dnl -dnl Permission to use, copy, modify, distribute, and sell this file for any -dnl purpose is hereby granted without fee, provided that the above copyright +dnl Permission to use, copy, modify, distribute, and sell this file for any +dnl purpose is hereby granted without fee, provided that the above copyright dnl and this permission notice appear in all copies. No representations are -dnl made about the suitability of this software for any purpose. It is +dnl made about the suitability of this software for any purpose. It is dnl provided "as is" without express or implied warranty. dnl @@ -102,7 +102,7 @@ dnl Default to no. OCTAVE_BUILD=no AC_OCTAVE_VERSION -AC_MKOCTFILE_VERSION +OCTAVE_MKOCTFILE_VERSION AC_OCTAVE_CONFIG_VERSION prog_concat="$ac_cv_prog_HAVE_OCTAVE$ac_cv_prog_HAVE_OCTAVE_CONFIG$ac_cv_prog_HAVE_MKOCTFILE" @@ -119,7 +119,7 @@ if test "x$prog_concat" = "xyesyesyes" ; then 2.*) AC_MSG_WARN([Octave version 2.X is not supported.]) ;; - 3.0.*) + 3.*) OCTAVE_DEST_ODIR=`$OCTAVE_CONFIG --oct-site-dir | sed 's%^/usr%${prefix}%'` OCTAVE_DEST_MDIR=`$OCTAVE_CONFIG --m-site-dir | sed 's%^/usr%${prefix}%'` diff --git a/libs/libsndfile/M4/really_gcc.m4 b/libs/libsndfile/M4/really_gcc.m4 new file mode 100644 index 0000000000..67aed7802f --- /dev/null +++ b/libs/libsndfile/M4/really_gcc.m4 @@ -0,0 +1,33 @@ +dnl @synopsis MN_GCC_REALLY_IS_GCC +dnl +dnl Find out if a compiler claiming to be gcc really is gcc (fuck you clang). +dnl @version 1.0 Oct 31 2013 +dnl @author Erik de Castro Lopo +dnl +dnl Permission to use, copy, modify, distribute, and sell this file for any +dnl purpose is hereby granted without fee, provided that the above copyright +dnl and this permission notice appear in all copies. No representations are +dnl made about the suitability of this software for any purpose. It is +dnl provided "as is" without express or implied warranty. +dnl + +# If the configure script has already detected GNU GCC, then make sure it +# isn't CLANG masquerading as GCC. + +AC_DEFUN([MN_GCC_REALLY_IS_GCC], +[ AC_LANG_ASSERT(C) + if test "x$ac_cv_c_compiler_gnu" = "xyes" ; then + AC_TRY_LINK([ + #include + ], + [ + #ifdef __clang__ + This is clang! + #endif + ], + ac_cv_c_compiler_gnu=yes, + ac_cv_c_compiler_gnu=no + ) + fi + +]) diff --git a/libs/libsndfile/M4/stack_protect.m4 b/libs/libsndfile/M4/stack_protect.m4 new file mode 100644 index 0000000000..bf27e6e74f --- /dev/null +++ b/libs/libsndfile/M4/stack_protect.m4 @@ -0,0 +1,73 @@ +dnl Copyright (C) 2013 Xiph.org Foundation +dnl +dnl Redistribution and use in source and binary forms, with or without +dnl modification, are permitted provided that the following conditions +dnl are met: +dnl +dnl - Redistributions of source code must retain the above copyright +dnl notice, this list of conditions and the following disclaimer. +dnl +dnl - Redistributions in binary form must reproduce the above copyright +dnl notice, this list of conditions and the following disclaimer in the +dnl documentation and/or other materials provided with the distribution. +dnl +dnl - Neither the name of the Xiph.org Foundation nor the names of its +dnl contributors may be used to endorse or promote products derived from +dnl this software without specific prior written permission. +dnl +dnl THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +dnl ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +dnl LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +dnl A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR +dnl CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +dnl EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +dnl PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +dnl PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +dnl LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +dnl NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +dnl SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +dnl Want to know of GCC stack protector works, botfor the C and for the C++ +dnl compiler. +dnl +dnl Just checking if the compiler accepts the required CFLAGSs is not enough +dnl because we have seen at least one instance where this check was +dnl in-sufficient. +dnl +dnl Instead, try to compile and link a test program with the stack protector +dnl flags. If that works, we use it. + +AC_DEFUN([XIPH_GCC_STACK_PROTECTOR], +[AC_LANG_ASSERT(C) + AC_MSG_CHECKING([if $CC supports stack smash protection]) + xiph_stack_check_old_cflags="$CFLAGS" + SSP_FLAGS="-fstack-protector --param ssp-buffer-size=4" + CFLAGS=$SSP_FLAGS + AC_TRY_LINK([ + #include + ], + [puts("Hello, World!"); return 0;], + AC_MSG_RESULT([yes]) + CFLAGS="$xiph_stack_check_old_cflags $SSP_FLAGS", + AC_MSG_RESULT([no]) + CFLAGS="$xiph_stack_check_old_cflags" + ) +])# XIPH_GCC_STACK_PROTECTOR + +AC_DEFUN([XIPH_GXX_STACK_PROTECTOR], +[AC_LANG_PUSH([C++]) + AC_MSG_CHECKING([if $CXX supports stack smash protection]) + xiph_stack_check_old_cflags="$CFLAGS" + SSP_FLAGS="-fstack-protector --param ssp-buffer-size=4" + CFLAGS=$SSP_FLAGS + AC_TRY_LINK([ + #include + ], + [puts("Hello, World!"); return 0;], + AC_MSG_RESULT([yes]) + CFLAGS="$xiph_stack_check_old_cflags $SSP_FLAGS", + AC_MSG_RESULT([no]) + CFLAGS="$xiph_stack_check_old_cflags" + ) + AC_LANG_POP([C++]) +])# XIPH_GXX_STACK_PROTECTOR diff --git a/libs/libsndfile/Makefile.am b/libs/libsndfile/Makefile.am index 4fe98eaad4..11d37eeda1 100644 --- a/libs/libsndfile/Makefile.am +++ b/libs/libsndfile/Makefile.am @@ -1,29 +1,44 @@ -## Process this file with automake to produce Makefile.in - -DISTCHECK_CONFIGURE_FLAGS = --enable-gcc-werror - -if BUILD_OCTAVE_MOD -octave_dir = Octave -endif - -SUBDIRS = M4 Win32 src $(octave_dir) -#man doc examples regtest tests programs - -DIST_SUBDIRS = M4 man doc Win32 src Octave examples regtest tests programs - -EXTRA_DIST = libsndfile.spec.in sndfile.pc.in Mingw-make-dist.sh - - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = sndfile.pc - -m4datadir = $(datadir)/aclocal - -test: check-recursive - -# Target to make autogenerated files. -genfiles : - (cd src ; make genfiles) - (cd tests ; make genfiles) - - +## Process this file with automake to produce Makefile.in + +ACLOCAL_AMFLAGS = -I M4 + +DISTCHECK_CONFIGURE_FLAGS = --enable-gcc-werror + +if BUILD_OCTAVE_MOD +octave_dir = Octave +endif + +SUBDIRS = M4 man doc Win32 src $(octave_dir) examples regtest tests programs +DIST_SUBDIRS = M4 man doc Win32 src Octave examples regtest tests programs + +EXTRA_DIST = libsndfile.spec.in sndfile.pc.in Scripts/android-configure.sh \ + Scripts/linux-to-win-cross-configure.sh Scripts/build-test-tarball.mk.in + +CLEANFILES = *~ + +pkgconfig_DATA = sndfile.pc + +m4datadir = $(datadir)/aclocal + +#=============================================================================== + +test: check-recursive + +# Target to make autogenerated files. +genfiles : + (cd src ; make genfiles) + (cd tests ; make genfiles) + +checkprograms : + (cd src ; make libsndfile.la checkprograms) + (cd tests ; make checkprograms) + +testprogs : + (cd src ; make testprogs) + (cd tests ; make testprogs) + + +test-tarball : Scripts/build-test-tarball.mk + (cd src ; make all libsndfile.la checkprograms) + (cd tests ; make all checkprograms) + make -f Scripts/build-test-tarball.mk diff --git a/libs/libsndfile/NEWS b/libs/libsndfile/NEWS index 37bf671e4c..9626d45166 100644 --- a/libs/libsndfile/NEWS +++ b/libs/libsndfile/NEWS @@ -1,3 +1,37 @@ +Version 1.0.25 (2011-07-13) + * Fix for Secunia Advisory SA45125, heap overflow in PAF file handler. + * Accept broken WAV files with blockalign == 0. + * Minor bug fixes and improvements. + +Version 1.0.24 (2011-03-23) + * WAV files now have an 18 byte u-law and A-law fmt chunk. + * Document virtual I/O functionality. + * Two new methods rawHandle() and takeOwnership() in sndfile.hh. + * AIFF fix for non-zero offset value in SSND chunk. + * Minor bug fixes and improvements. + +Version 1.0.23 (2010-10-10) + * Add version metadata to Windows DLL. + * Add a missing 'inline' to sndfile.hh. + * Update docs. + * Minor bug fixes and improvements. + +Version 1.0.22 (2010-10-04) + * Couple of fixes for SDS file writer. + * Fixes arising from static analysis. + * Handle FLAC files with ID3 meta data at start of file. + * Handle FLAC files which report zero length. + * Other minor bug fixes and improvements. + +Version 1.0.21 (2009-12-13) + * Add a couple of new binary programs to programs/ dir. + * Remove sndfile-jackplay (now in sndfile-tools package). + * Add windows only function sf_wchar_open(). + * Bunch of minor bug fixes. + +Version 1.0.20 (2009-05-14) + * Fix potential heap overflow in VOC file parser (Tobias Klein, http://www.trapkit.de/). + Version 1.0.19 (2009-03-02) * Fix for CVE-2009-0186 (Alin Rad Pop, Secunia Research). * Huge number of minor bug fixes as a result of static analysis. diff --git a/libs/libsndfile/Octave/Makefile.am b/libs/libsndfile/Octave/Makefile.am index d905cf6d81..3f0078e18f 100644 --- a/libs/libsndfile/Octave/Makefile.am +++ b/libs/libsndfile/Octave/Makefile.am @@ -21,7 +21,7 @@ OCT_LIB_DIR = @OCT_LIB_DIR@ OCT_LIBS = @OCT_LIBS@ SNDFILEDIR = $(top_builddir)/src -INCLUDES = -I$(SNDFILEDIR) +AM_CPPFLAGS = -I$(SNDFILEDIR) oct_module_srcs = sndfile.cc oct_module_files = sndfile.oct PKG_ADD @@ -30,13 +30,19 @@ oct_module_files = sndfile.oct PKG_ADD noinst_DATA = $(oct_module_files) +# Used by shave which cleans up automake generated Makefile output. +V = @ +Q = $(V:1=) +QUIET_GEN = $(Q:@=@echo ' GEN '$@;) + + # Use Octave's mkoctfile to do all the heavy lifting. Unfortunately, its # a little dumb so we need to guide it carefully. sndfile.oct : sndfile.o - $(MKOCTFILE) -v $(INCLUDES) $(top_builddir)/Octave/$+ -L$(SNDFILEDIR)/.libs -L$(SNDFILEDIR) -lsndfile -o $(top_builddir)/Octave/$@ + $(QUIET_GEN) $(MKOCTFILE) -v $(INCLUDES) $(top_builddir)/Octave/$+ -L$(SNDFILEDIR)/.libs -L$(SNDFILEDIR) -lsndfile -o $(top_builddir)/Octave/$@ > /dev/null sndfile.o : sndfile.cc - $(MKOCTFILE) -v $(INCLUDES) -c $+ -o $(top_builddir)/Octave/$@ + $(QUIET_GEN) $(MKOCTFILE) -v $(INCLUDES) -c $+ -o $(top_builddir)/Octave/$@ > /dev/null # Allow for the test being run in the build dir, but the test script # being located in the source dir. @@ -70,3 +76,4 @@ uninstall-local : clean-local : rm -f sndfile.o sndfile.oct + @if test $(abs_builddir) != $(abs_srcdir) ; then rm -f PKG_ADD ; fi diff --git a/libs/libsndfile/Octave/Readme.txt b/libs/libsndfile/Octave/Readme.txt new file mode 100644 index 0000000000..c38605bffc --- /dev/null +++ b/libs/libsndfile/Octave/Readme.txt @@ -0,0 +1,23 @@ +The libsndfile Modules for GNU Octave +===================================== + +These modules are currently known to work with version 3.0 of GNU Octave on +Linux. They have not been tested elsewhere. + + +Build Requirements +------------------ + +In order to build these libsndfile related modules for GNU Octave on a Debian +GNU/Linux (or Debian derived) system, you will need (on top of what is normally +required to build libsndfile) the package: + + octaveX.Y-headers + +where X.Y matches the version number of your installation of GNU Octave. + +The configure script in the top level libsndfile directory will detect the +presence and correct versions of the Octave build tools. The building of these +modules will only go ahead if everything is correct. + + diff --git a/libs/libsndfile/Octave/format.h b/libs/libsndfile/Octave/format.h new file mode 100644 index 0000000000..ce769b2c69 --- /dev/null +++ b/libs/libsndfile/Octave/format.h @@ -0,0 +1,21 @@ +/* +** Copyright (C) 2007-2011 Erik de Castro Lopo +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU Lesser General Public License as published by +** the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. +** +** You should have received a copy of the GNU Lesser 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. +*/ + +int format_of_str (const std::string & fmt) ; + +void string_of_format (std::string & fmt, int format) ; diff --git a/libs/libsndfile/Octave/octave_test.m b/libs/libsndfile/Octave/octave_test.m index 30b60139b4..25a922e897 100644 --- a/libs/libsndfile/Octave/octave_test.m +++ b/libs/libsndfile/Octave/octave_test.m @@ -1,4 +1,4 @@ -# Copyright (C) 2007 Erik de Castro Lopo +# Copyright (C) 2007-2011 Erik de Castro Lopo # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by @@ -16,9 +16,7 @@ # These tests are nowhere near comprehensive. -printf ("\n\n\n\n\n\n\n") ; - -printf (" Running Octave tests : ") ; +printf (" Running Octave tests : ") ; fflush (stdout) ; filename = "whatever" ; @@ -51,6 +49,4 @@ if (err > 1e-7) printf ("ok") ; -printf ("\n\n\n\n\n\n\n") ; - unlink (filename) ; diff --git a/libs/libsndfile/Octave/octave_test.sh b/libs/libsndfile/Octave/octave_test.sh index 6c8bd10d02..3c6f36e236 100755 --- a/libs/libsndfile/Octave/octave_test.sh +++ b/libs/libsndfile/Octave/octave_test.sh @@ -2,28 +2,34 @@ # Check where we're being run from. -if [ -d Octave ]; then +if test -d Octave ; then cd Octave + octave_src_dir=$(pwd) +elif test -z "$octave_src_dir" ; then + echo + echo "Error : \$octave_src_dir is undefined." + echo + exit 1 +else + octave_src_dir=$(cd $octave_src_dir && pwd) fi # Find libsndfile shared object. libsndfile_lib_location="" -if [ -f "../src/.libs/libsndfile.so" ]; then +if test -f "../src/.libs/libsndfile.so" ; then libsndfile_lib_location="../src/.libs/" -elif [ -f "../src/libsndfile.so" ]; then +elif test -f "../src/libsndfile.so" ; then libsndfile_lib_location="../src/" -elif [ -f "../src/.libs/libsndfile.dylib" ]; then +elif test -f "../src/.libs/libsndfile.dylib" ; then libsndfile_lib_location="../src/.libs/" -elif [ -f "../src/libsndfile.dylib" ]; then +elif test -f "../src/libsndfile.dylib" ; then libsndfile_lib_location="../src/" else - echo echo echo "Not able to find the libsndfile shared lib we've just built." echo "This may cause the following test to fail." echo - echo fi libsndfile_lib_location=`(cd $libsndfile_lib_location && pwd)` @@ -32,9 +38,9 @@ libsndfile_lib_location=`(cd $libsndfile_lib_location && pwd)` # Find sndfile.oct sndfile_oct_location="" -if [ -f .libs/sndfile.oct ]; then +if test -f .libs/sndfile.oct ; then sndfile_oct_location=".libs" -elif [ -f sndfile.oct ]; then +elif test -f sndfile.oct ; then sndfile_oct_location="." else echo "Not able to find the sndfile.oct binaries we've just built." @@ -49,7 +55,7 @@ case `file -b $sndfile_oct_location/sndfile.oct` in exit 0 ;; *) - echo "Not able to find the sndfile.oct binaries we've just built." + echo "Not able to find the sndfile.oct binary we just built." exit 1 ;; esac @@ -57,16 +63,19 @@ case `file -b $sndfile_oct_location/sndfile.oct` in # Make sure the TERM environment variable doesn't contain anything wrong. unset TERM - +# echo "octave_src_dir : $octave_src_dir" # echo "libsndfile_lib_location : $libsndfile_lib_location" # echo "sndfile_oct_location : $sndfile_oct_location" -export LD_LIBRARY_PATH="$libsndfile_lib_location:$LD_LIBRARY_PATH" +if test ! -f PKG_ADD ; then + cp $octave_src_dir/PKG_ADD . + fi -octave_src_dir=`(cd $octave_src_dir && pwd)` +export LD_LIBRARY_PATH="$libsndfile_lib_location:$LD_LIBRARY_PATH" octave_script="$octave_src_dir/octave_test.m" (cd $sndfile_oct_location && octave -qH $octave_script) - - +res=$? +echo +exit $res diff --git a/libs/libsndfile/Octave/sndfile.cc b/libs/libsndfile/Octave/sndfile.cc index e75e3279bd..6e9cd44cc9 100644 --- a/libs/libsndfile/Octave/sndfile.cc +++ b/libs/libsndfile/Octave/sndfile.cc @@ -1,5 +1,5 @@ /* -** Copyright (C) 2007 Erik de Castro Lopo +** Copyright (C) 2007-2011 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -367,7 +367,7 @@ string_of_minor_format (int format) case SF_FORMAT_G723_40 : return "g723_40" ; default : break ; } ; - + return "unknown" ; } /* string_of_minor_format */ diff --git a/libs/libsndfile/Octave/sndfile_load.m b/libs/libsndfile/Octave/sndfile_load.m index d13c21a276..c66198fa35 100644 --- a/libs/libsndfile/Octave/sndfile_load.m +++ b/libs/libsndfile/Octave/sndfile_load.m @@ -1,4 +1,4 @@ -## Copyright (C) 2002 Erik de Castro Lopo +## Copyright (C) 2002-2011 Erik de Castro Lopo ## ## 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 @@ -33,7 +33,7 @@ samplingrate = -1 ; wavedata = -1 ; -eval (sprintf ('load -f %s', filename)) ; +eval (sprintf ('load -f %s', filename)) ; if (samplerate > 0), fs = samplerate ; @@ -42,7 +42,7 @@ elseif (samplingrate > 0), else error ("Not able to find sample rate.") ; endif - + if (max (size (wavedata)) > 1), data = wavedata ; else diff --git a/libs/libsndfile/Octave/sndfile_play.m b/libs/libsndfile/Octave/sndfile_play.m index c0631d94c1..e8a34a74cb 100644 --- a/libs/libsndfile/Octave/sndfile_play.m +++ b/libs/libsndfile/Octave/sndfile_play.m @@ -1,4 +1,4 @@ -## Copyright (C) 2002 Erik de Castro Lopo +## Copyright (C) 2002-2011 Erik de Castro Lopo ## ## 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 diff --git a/libs/libsndfile/Octave/sndfile_save.m b/libs/libsndfile/Octave/sndfile_save.m index cddbc648b2..5b7e7c7d0f 100644 --- a/libs/libsndfile/Octave/sndfile_save.m +++ b/libs/libsndfile/Octave/sndfile_save.m @@ -1,4 +1,4 @@ -## Copyright (C) 2002 Erik de Castro Lopo +## Copyright (C) 2002-2011 Erik de Castro Lopo ## ## 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 diff --git a/libs/libsndfile/README b/libs/libsndfile/README index aeb597d410..8df79c7d9f 100644 --- a/libs/libsndfile/README +++ b/libs/libsndfile/README @@ -1,4 +1,4 @@ -This is libsndfile, 1.0.19 +This is libsndfile, 1.0.25 libsndfile is a library of C routines for reading and writing files containing sampled audio data. @@ -20,6 +20,9 @@ Bormann. Their original code can be found at : The src/G72x directory contains code written and released by Sun Microsystems under a suitably free license. +The src/ALAC directory contains code written and released by Apple Inc and +released under the Apache license. + LINUX ----- diff --git a/libs/libsndfile/README.md b/libs/libsndfile/README.md new file mode 100644 index 0000000000..a7fdaea71f --- /dev/null +++ b/libs/libsndfile/README.md @@ -0,0 +1,79 @@ +# libsndfile + +libsndfile is a C library for reading and writing files containing sampled audio +data. + +## Hacking + +The canonical source code repository for libsndfile is at +[https://github.com/erikd/libsndfile/][github]. + +You can grab the source code using: + + $ git clone git://github.com/erikd/libsndfile.git + +Building on Linux, OSX and Windows (Using GNU GCC) will require a number of GNU +and other Free and Open Source Software tools including: + +* [Autoconf][autoconf] +* [Autogen][autogen] +* [Automake][automake] +* [Libtool][libtool] +* [Pkgconfig][pkgconfig] +* [Python][python] + +If you are on Linux, its probably best to install these via your Linux +distribution's package manager. + +If you want to compile libsndfile with support for formats like FLAC and +Ogg/Vorbis you will also need to install the following optional libraries: + +* [FLAC][flac] +* [libogg][libogg] +* [libvorbis][libvorbis] + +Support for these extra libraries is an all or nothing affair. Unless all of +them are installed none of them will be supported. + + $ ./autogen.sh + +Running `autogen.sh` also installs a git pre-commit hook. The pre-commit hook +is run each time a user tries to commit and checks code about to be committed +against coding guidelines. + +Nest step is to run configure, with the following configure options being +recommended for anyone contemplating sending libsndfile patches: + + $ ./configure --enable-gcc-werror + +Finally libsndfile can be built and tested: + + $ make + $ make check + +## Submitting Patches. + +* Patches should pass all pre-commit hook tests. +* Patches should always be submitted via a either Github "pull request" or a + via emailed patches created using "git format-patch". +* Patches for new features should include tests and documentation. +* Patches to fix bugs should either pass all tests, or modify the tests in some + sane way. +* When a new feature is added for a particular file format and that feature + makes sense for other formats, then it should also be implemented for one + or two of the other formats. + + + + + +[autoconf]: http://www.gnu.org/s/autoconf/ +[autogen]: http://www.gnu.org/s/autogen/ +[automake]: http://www.gnu.org/software/automake/ +[flac]: http://flac.sourceforge.net/ +[github]: https://github.com/erikd/libsndfile/ +[libogg]: http://xiph.org/ogg/ +[libtool]: http://www.gnu.org/software/libtool/ +[libvorbis]: http://www.vorbis.com/ +[pkgconfig]: http://www.freedesktop.org/wiki/Software/pkg-config +[python]: http://www.python.org/ diff --git a/libs/libsndfile/Scripts/android-configure.sh b/libs/libsndfile/Scripts/android-configure.sh new file mode 100644 index 0000000000..c981d4927a --- /dev/null +++ b/libs/libsndfile/Scripts/android-configure.sh @@ -0,0 +1,92 @@ +#!/bin/bash -e + +# Copyright (C) 2013 Erik de Castro Lopo +# +# All rights reserved. +# +# 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. +# * Neither the author nor the names of any 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 COPYRIGHT OWNER 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. + +# Android NDK version number; eg r8e, r9 etc +ANDROID_NDK_VER=r9 + +# Android NDK gcc version; eg 4.7, 4.9 etc. +ANDROID_GCC_VER=4.8 + +# Android API version; eg 9 (Android 2.3), 14 (Android 4.0) etc. +ANDROID_API_VER=9 + +#------------------------------------------------------------------------------- +# No more user config beyond here. + +BUILD_MACHINE=$(uname -s | tr 'A-Z' 'a-z')-$(uname -m) + +function die_with { + echo $1 + exit 1 +} + +export CROSS_COMPILE=arm-linux-androideabi + +# I put all my dev stuff in here +export DEV_PREFIX=$HOME/Android +test -d ${DEV_PREFIX} || die_with "Error : DEV_PREFIX '$DEV_PREFIX' does not exist." + +# Don't forget to adjust this to your NDK path +export ANDROID_NDK=${DEV_PREFIX}/android-ndk-${ANDROID_NDK_VER} +test -d ${ANDROID_NDK} || die_with "Error : ANDROID_NDK '$ANDROID_NDK' does not exist." + +export ANDROID_PREFIX=${ANDROID_NDK}/toolchains/arm-linux-androideabi-${ANDROID_GCC_VER}/prebuilt/${BUILD_MACHINE} +test -d ${ANDROID_PREFIX} || die_with "Error : ANDROID_PREFIX '$ANDROID_PREFIX' does not exist." + +export SYSROOT=${ANDROID_NDK}/platforms/android-${ANDROID_API_VER}/arch-arm +test -d ${SYSROOT} || die_with "Error : SYSROOT '$SYSROOT' does not exist." + +export CROSS_PREFIX=${ANDROID_PREFIX}/bin/${CROSS_COMPILE} +test -f ${CROSS_PREFIX}-gcc || die_with "Error : CROSS_PREFIX compiler '${CROSS_PREFIX}-gcc' does not exist." + + +# Non-exhaustive lists of compiler + binutils +# Depending on what you compile, you might need more binutils than that +export CPP=${CROSS_PREFIX}-cpp +export AR=${CROSS_PREFIX}-ar +export AS=${CROSS_PREFIX}-as +export NM=${CROSS_PREFIX}-nm +export CC=${CROSS_PREFIX}-gcc +export CXX=${CROSS_PREFIX}-g++ +export LD=${CROSS_PREFIX}-ld +export RANLIB=${CROSS_PREFIX}-ranlib + +# Don't mix up .pc files from your host and build target +export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig + +# Set up the needed FLAGS. +export CFLAGS="${CFLAGS} -gstabs --sysroot=${SYSROOT} -I${SYSROOT}/usr/include -I${ANDROID_PREFIX}/include" +export CXXFLAGS="${CXXFLAGS} -gstabs -fno-exceptions --sysroot=${SYSROOT} -I${SYSROOT}/usr/include -I${ANDROID_PREFIX}/include -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${ANDROID_GCC_VER}/include/ -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${ANDROID_GCC_VER}/libs/armeabi/include" + +export CPPFLAGS="${CFLAGS}" +export LDFLAGS="${LDFLAGS} -L${SYSROOT}/usr/lib -L${ANDROID_PREFIX}/lib" + +# Create a symlink to the gdbclient. +test -h gdbclient || ln -s ${ANDROID_PREFIX}/bin/arm-linux-androideabi-gdb gdbclient + +./configure --host=${CROSS_COMPILE} --with-sysroot=${SYSROOT} "$@" diff --git a/libs/libsndfile/Scripts/build-test-tarball.mk.in b/libs/libsndfile/Scripts/build-test-tarball.mk.in new file mode 100644 index 0000000000..931edb6464 --- /dev/null +++ b/libs/libsndfile/Scripts/build-test-tarball.mk.in @@ -0,0 +1,61 @@ +#!/usr/bin/make -f + +# This is probably only going to work with GNU Make. +# This in a separate file instead of in Makefile.am because Automake complains +# about the GNU Make-isms. + +EXEEXT = @EXEEXT@ + +PACKAGE_VERSION = @PACKAGE_VERSION@ + +HOST_TRIPLET = @HOST_TRIPLET@ + +SRC_BINDIR = @SRC_BINDIR@ +TEST_BINDIR = @TEST_BINDIR@ + +LIBRARY := $(SRC_BINDIR)libsndfile.so.$(LIB_VERSION) + +LIB_VERSION := $(shell echo $(PACKAGE_VERSION) | sed -e 's/[a-z].*//') + +TESTNAME = libsndfile-testsuite-$(HOST_TRIPLET)-$(PACKAGE_VERSION) + +TARBALL = $(TESTNAME).tar.gz + +# Find the test programs by grepping the script for the programs it executes. +testprogs := $(shell grep '^\./' tests/test_wrapper.sh | sed -e "s|./||" -e "s/ .*//" | sort | uniq) +# Also add the programs not found by the above. +testprogs += sfversion@EXEEXT@ stdin_test@EXEEXT@ stdout_test@EXEEXT@ cpp_test@EXEEXT@ win32_test@EXEEXT@ + +# Find the single test program in src/ . +srcprogs := $(shell if test -x src/.libs/test_main$(EXEEXT) ; then echo "src/.libs/test_main$(EXEEXT)" ; else echo "src/test_main$(EXEEXT)" ; fi) + +libfiles := $(shell if test ! -z $(EXEEXT) ; then echo "src/libsndfile-1.def src/.libs/libsndfile-1.dll" ; elif test -f $(LIBRARY) ; then echo $(LIBRARY) ; fi ; fi) + +testbins := $(addprefix $(TEST_BINDIR),$(subst @EXEEXT@,$(EXEEXT),$(testprogs))) $(libfiles) $(srcprogs) + + +all : $(TARBALL) + +clean : + rm -rf $(TARBALL) $(TESTNAME)/ + +check : $(TESTNAME)/test_wrapper.sh + (cd ./$(TESTNAME)/ && ./test_wrapper.sh) + +$(TARBALL) : $(TESTNAME)/test_wrapper.sh + tar zcf $@ $(TESTNAME) + rm -rf $(TESTNAME) + @echo + @echo "Created : $(TARBALL)" + @echo + +$(TESTNAME)/test_wrapper.sh : $(testbins) tests/test_wrapper.sh tests/pedantic-header-test.sh + rm -rf $(TESTNAME) + mkdir -p $(TESTNAME)/tests/ + cp $(testbins) $(TESTNAME)/tests/ + cp tests/test_wrapper.sh $(TESTNAME)/ + cp tests/pedantic-header-test.sh $(TESTNAME)/tests/ + chmod u+x $@ + +tests/test_wrapper.sh : tests/test_wrapper.sh.in + (cd tests/ ; make $@) diff --git a/libs/libsndfile/Scripts/clang-sanitize.sh b/libs/libsndfile/Scripts/clang-sanitize.sh new file mode 100644 index 0000000000..2898883c21 --- /dev/null +++ b/libs/libsndfile/Scripts/clang-sanitize.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +# This is known to work with clang-3.4 from Debian testing/unstable. +# 2013/07/14 + +export CC=clang +export CXX=clang++ +export CFLAGS="-O3 -fsanitize=address,integer,undefined" +export CXXFLAGS="-O3 -fsanitize=address,integer,undefined" + +./configure --enable-gcc-werror + +make clean all check diff --git a/libs/libsndfile/Scripts/cstyle.py b/libs/libsndfile/Scripts/cstyle.py new file mode 100644 index 0000000000..94a969c6e2 --- /dev/null +++ b/libs/libsndfile/Scripts/cstyle.py @@ -0,0 +1,246 @@ +#!/usr/bin/python -tt +# +# Copyright (C) 2005-2012 Erik de Castro Lopo +# +# Released under the 2 clause BSD license. + +""" +This program checks C code for compliance to coding standards used in +libsndfile and other projects I run. +""" + +import re +import sys + + +class Preprocessor: + """ + Preprocess lines of C code to make it easier for the CStyleChecker class to + test for correctness. Preprocessing works on a single line at a time but + maintains state between consecutive lines so it can preprocessess multi-line + comments. + Preprocessing involves: + - Strip C++ style comments from a line. + - Strip C comments from a series of lines. When a C comment starts and + ends on the same line it will be replaced with 'comment'. + - Replace arbitrary C strings with the zero length string. + - Replace '#define f(x)' with '#define f (c)' (The C #define requires that + there be no space between defined macro name and the open paren of the + argument list). + Used by the CStyleChecker class. + """ + def __init__ (self): + self.comment_nest = 0 + self.leading_space_re = re.compile ('^(\t+| )') + self.trailing_space_re = re.compile ('(\t+| )$') + self.define_hack_re = re.compile ("(#\s*define\s+[a-zA-Z0-9_]+)\(") + + def comment_nesting (self): + """ + Return the currect comment nesting. At the start and end of the file, + this value should be zero. Inside C comments it should be 1 or + (possibly) more. + """ + return self.comment_nest + + def __call__ (self, line): + """ + Strip the provided line of C and C++ comments. Stripping of multi-line + C comments works as expected. + """ + + line = self.define_hack_re.sub (r'\1 (', line) + + line = self.process_strings (line) + + # Strip C++ style comments. + if self.comment_nest == 0: + line = re.sub ("( |\t*)//.*", '', line) + + # Strip C style comments. + open_comment = line.find ('/*') + close_comment = line.find ('*/') + + if self.comment_nest > 0 and close_comment < 0: + # Inside a comment block that does not close on this line. + return "" + + if open_comment >= 0 and close_comment < 0: + # A comment begins on this line but doesn't close on this line. + self.comment_nest += 1 + return self.trailing_space_re.sub ('', line [:open_comment]) + + if open_comment < 0 and close_comment >= 0: + # Currently open comment ends on this line. + self.comment_nest -= 1 + return self.trailing_space_re.sub ('', line [close_comment + 2:]) + + if open_comment >= 0 and close_comment > 0 and self.comment_nest == 0: + # Comment begins and ends on this line. Replace it with 'comment' + # so we don't need to check whitespace before and after the comment + # we're removing. + newline = line [:open_comment] + "comment" + line [close_comment + 2:] + return self.__call__ (newline) + + return line + + def process_strings (self, line): + """ + Given a line of C code, return a string where all literal C strings have + been replaced with the empty string literal "". + """ + for k in range (0, len (line)): + if line [k] == '"': + start = k + for k in range (start + 1, len (line)): + if line [k] == '"' and line [k - 1] != '\\': + return line [:start + 1] + '"' + self.process_strings (line [k + 1:]) + return line + + +class CStyleChecker: + """ + A class for checking the whitespace and layout of a C code. + """ + def __init__ (self, debug): + self.debug = debug + self.filename = None + self.error_count = 0 + self.line_num = 1 + self.orig_line = '' + self.trailing_newline_re = re.compile ('[\r\n]+$') + self.indent_re = re.compile ("^\s*") + self.last_line_indent = "" + self.last_line_indent_curly = False + self.re_checks = \ + [ ( re.compile (" "), "multiple space instead of tab" ) + , ( re.compile ("\t "), "space after tab" ) + , ( re.compile ("[^ ];"), "missing space before semi-colon" ) + , ( re.compile ("{[^\s}]"), "missing space after open brace" ) + , ( re.compile ("[^{\s]}"), "missing space before close brace" ) + , ( re.compile ("[ \t]+$"), "contains trailing whitespace" ) + + , ( re.compile (",[^\s\n]"), "missing space after comma" ) + , ( re.compile (";[a-zA-Z0-9]"), "missing space after semi-colon" ) + , ( re.compile ("=[^\s\"'=]"), "missing space after assignment" ) + + # Open and close parenthesis. + , ( re.compile ("[^\s\(\[\*&']\("), "missing space before open parenthesis" ) + , ( re.compile ("\)(-[^>]|[^,'\s\n\)\]-])"), "missing space after close parenthesis" ) + , ( re.compile ("\s(do|for|if|when)\s.*{$"), "trailing open parenthesis at end of line" ) + , ( re.compile ("\( [^;]"), "space after open parenthesis" ) + , ( re.compile ("[^;] \)"), "space before close parenthesis" ) + + # Open and close square brace. + , ( re.compile ("[^\s\(\]]\["), "missing space before open square brace" ) + , ( re.compile ("\][^,\)\]\[\s\.-]"), "missing space after close square brace" ) + , ( re.compile ("\[ "), "space after open square brace" ) + , ( re.compile (" \]"), "space before close square brace" ) + + # Space around operators. + , ( re.compile ("[^\s][\*/%+-][=][^\s]"), "missing space around opassign" ) + , ( re.compile ("[^\s][<>!=^/][=]{1,2}[^\s]"), "missing space around comparison" ) + + # Parens around single argument to return. + , ( re.compile ("\s+return\s+\([a-zA-Z0-9_]+\)\s+;"), "parens around return value" ) + ] + + def get_error_count (self): + """ + Return the current error count for this CStyleChecker object. + """ + return self.error_count + + def check_files (self, files): + """ + Run the style checker on all the specified files. + """ + for filename in files: + self.check_file (filename) + + def check_file (self, filename): + """ + Run the style checker on the specified file. + """ + self.filename = filename + cfile = open (filename, "r") + + self.line_num = 1 + + preprocess = Preprocessor () + while 1: + line = cfile.readline () + if not line: + break + + line = self.trailing_newline_re.sub ('', line) + self.orig_line = line + + self.line_checks (preprocess (line)) + + self.line_num += 1 + + cfile.close () + self.filename = None + + # Check for errors finding comments. + if preprocess.comment_nesting () != 0: + print ("Weird, comments nested incorrectly.") + sys.exit (1) + + return + + def line_checks (self, line): + """ + Run the style checker on provided line of text, but within the context + of how the line fits within the file. + """ + + indent = len (self.indent_re.search (line).group ()) + if re.search ("^\s+}", line): + if not self.last_line_indent_curly and indent != self.last_line_indent: + None # self.error ("bad indent on close curly brace") + self.last_line_indent_curly = True + else: + self.last_line_indent_curly = False + + # Now all the regex checks. + for (check_re, msg) in self.re_checks: + if check_re.search (line): + self.error (msg) + + if re.search ("[a-zA-Z0-9][<>!=^/&\|]{1,2}[a-zA-Z0-9]", line): + if not re.search (".*#include.*[a-zA-Z0-9]/[a-zA-Z]", line): + self.error ("missing space around operator") + + self.last_line_indent = indent + return + + def error (self, msg): + """ + Print an error message and increment the error count. + """ + print ("%s (%d) : %s" % (self.filename, self.line_num, msg)) + if self.debug: + print ("'" + self.orig_line + "'") + self.error_count += 1 + +#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- + +if len (sys.argv) < 1: + print ("Usage : yada yada") + sys.exit (1) + +# Create a new CStyleChecker object +if sys.argv [1] == '-d' or sys.argv [1] == '--debug': + cstyle = CStyleChecker (True) + cstyle.check_files (sys.argv [2:]) +else: + cstyle = CStyleChecker (False) + cstyle.check_files (sys.argv [1:]) + + +if cstyle.get_error_count (): + sys.exit (1) + +sys.exit (0) diff --git a/libs/libsndfile/Scripts/git-pre-commit-hook b/libs/libsndfile/Scripts/git-pre-commit-hook new file mode 100644 index 0000000000..6df1308ac3 --- /dev/null +++ b/libs/libsndfile/Scripts/git-pre-commit-hook @@ -0,0 +1,79 @@ +#!/bin/sh +# + +if git rev-parse --verify HEAD >/dev/null 2>&1 ; then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 + fi + +files=$(git diff-index --name-status --cached HEAD | grep -v ^D | sed -r "s/^[A-Z]+[A-Z0-9]*[ \t]+/ /") + +# Redirect output to stderr. +exec 1>&2 + +#------------------------------------------------------------------------------- +# Check the copyright notice of all files to be commited. + +user=`git config --global user.email` +year=`date +"%Y"` + +missing_copyright_year="" +if test $user = "erikd@mega-nerd.com" ; then + for f in $files ; do + if test `head -5 $f | grep -c -i copyright` -gt 0 ; then + user_copyright=`grep -i copyright $f | grep $user | grep -c $year` + if test $user_copyright -lt 1 ; then + missing_copyright_year="$missing_copyright_year $f" + fi + fi + done + fi + +if test -n "$missing_copyright_year" ; then + echo "Missing current year in the copyright notice of the following files:" + for f in $missing_copyright_year ; do + echo " $f" + done + echo "Commit aborted." + exit 1 + fi + +#------------------------------------------------------------------------------- +# Check the formatting of all C files. + +cfiles="" +for f in $files ; do + if test `dirname $f` = "src/ALAC" ; then + echo "Skipping cstyle checking on $f" + elif test `echo $f | grep -c "\.[ch]$"` -gt 0 ; then + cfiles="$cfiles $f" + fi + done + +if test -n "$cfiles" ; then + Scripts/cstyle.py $cfiles + if test $? -ne 0 ; then + echo + echo "Commit aborted. Fix the above error before trying again." + exit 1 + fi + fi + +#------------------------------------------------------------------------------- +# Prevent files with non-ascii filenames from being committed. + +if test $(git diff --cached --name-only --diff-filter=A -z $against | LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 ; then + echo "Error: Attempt to add a non-ascii file name." + echo + echo "This can cause problems if you want to work" + echo "with people on other platforms." + echo + echo "To be portable it is advisable to rename the file ..." + echo + echo "Commit aborted." + exit 1 + fi + +exit 0 diff --git a/libs/libsndfile/Scripts/linux-to-win-cross-configure.sh b/libs/libsndfile/Scripts/linux-to-win-cross-configure.sh new file mode 100644 index 0000000000..c1fdc072b3 --- /dev/null +++ b/libs/libsndfile/Scripts/linux-to-win-cross-configure.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +case "$1" in + w32) + compiler_name=i686-w64-mingw32 + ;; + w64) + compiler_name=x86_64-w64-mingw32 + ;; + *) + echo "$0 (w32|w64) " + exit 0 + ;; + esac + +shift + +build_cpu=$(dpkg-architecture -qDEB_BUILD_GNU_CPU) +build_host=$build_cpu-linux + +./configure --host=$compiler_name --target=$compiler_name --build=$build_host \ + --program-prefix='' --disable-sqlite --disable-static $@ diff --git a/libs/libsndfile/autogen.sh b/libs/libsndfile/autogen.sh new file mode 100644 index 0000000000..5047159fe4 --- /dev/null +++ b/libs/libsndfile/autogen.sh @@ -0,0 +1,179 @@ +#!/bin/sh +# Run this to set up the build system: configure, makefiles, etc. +# (based on the version in enlightenment's cvs) + +package="libsndfile" + +ACLOCAL_FLAGS="-I M4" + +olddir=`pwd` +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +cd "$srcdir" +DIE=0 + +printf "checking for autogen ... " +result="yes" +(autogen --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have GNU autogen installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + result="no" + DIE=1 +} +echo $result + +printf "checking for autoconf ... " +result="yes" +(autoconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + result="no" + DIE=1 +} +echo $result + +VERSIONGREP="sed -e s/.*[^0-9\.]\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/" +VERSIONMKMAJ="sed -e s/\([0-9][0-9]*\)[^0-9].*/\\1/" +VERSIONMKMIN="sed -e s/.*[0-9][0-9]*\.//" + +# do we need automake? +if test -r Makefile.am; then + AM_OPTIONS=`fgrep AUTOMAKE_OPTIONS Makefile.am` + AM_NEEDED=`echo $AM_OPTIONS | $VERSIONGREP` + if test x"$AM_NEEDED" = "x$AM_OPTIONS"; then + AM_NEEDED="" + fi + if test -z $AM_NEEDED; then + printf "checking for automake ... " + AUTOMAKE=automake + ACLOCAL=aclocal + if ($AUTOMAKE --version < /dev/null > /dev/null 2>&1); then + echo "yes" + else + echo "no" + AUTOMAKE= + fi + else + printf "checking for automake $AM_NEEDED or later ... " + majneeded=`echo $AM_NEEDED | $VERSIONMKMAJ` + minneeded=`echo $AM_NEEDED | $VERSIONMKMIN` + for am in automake-$AM_NEEDED automake$AM_NEEDED \ + automake automake-1.7 automake-1.8 automake-1.9 automake-1.10; do + ($am --version < /dev/null > /dev/null 2>&1) || continue + ver=`$am --version < /dev/null | head -n 1 | $VERSIONGREP` + maj=`echo $ver | $VERSIONMKMAJ` + min=`echo $ver | $VERSIONMKMIN` + if test $maj -eq $majneeded -a $min -ge $minneeded; then + AUTOMAKE=$am + echo $AUTOMAKE + break + fi + done + test -z $AUTOMAKE && echo "no" + printf "checking for aclocal $AM_NEEDED or later ... " + for ac in aclocal-$AM_NEEDED aclocal$AM_NEEDED \ + aclocal aclocal-1.7 aclocal-1.8 aclocal-1.9 aclocal-1.10; do + ($ac --version < /dev/null > /dev/null 2>&1) || continue + ver=`$ac --version < /dev/null | head -n 1 | $VERSIONGREP` + maj=`echo $ver | $VERSIONMKMAJ` + min=`echo $ver | $VERSIONMKMIN` + if test $maj -eq $majneeded -a $min -ge $minneeded; then + ACLOCAL=$ac + echo $ACLOCAL + break + fi + done + test -z $ACLOCAL && echo "no" + fi + test -z $AUTOMAKE || test -z $ACLOCAL && { + echo + echo "You must have automake installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + exit 1 + } +fi + +printf "checking for libtool ... " +for LIBTOOLIZE in libtoolize glibtoolize nope; do + ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 && break +done +if test x$LIBTOOLIZE = xnope; then + echo "nope." + LIBTOOLIZE=libtoolize +else + echo $LIBTOOLIZE +fi +($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have libtool installed to compile $package." + echo "Download the appropriate package for your system," + echo "or get the source from one of the GNU ftp sites" + echo "listed in http://www.gnu.org/order/ftp.html" + DIE=1 +} + +printf "checking for pkg-config ... " +result="yes" +(pkg-config --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have pkg-config installed to compile $package." + echo "Download the appropriate package for your distribution." + result="no" + DIE=1 +} +echo $result + + +printf "checking for python ... " +result="yes" +(python --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have Python installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at http://python.org/" + result="no" + DIE=1 +} +echo $result + +if test "$DIE" -eq 1; then + exit 1 +fi + +if test ! -d Cfg ; then + echo "Creating 'Cfg' directory." + mkdir Cfg +fi + +echo "Generating configuration files for $package, please wait ... " + +echo " $ACLOCAL $ACLOCAL_FLAGS" +$ACLOCAL $ACLOCAL_FLAGS || exit 1 +echo " $LIBTOOLIZE --automake --force" +$LIBTOOLIZE --automake --force || exit 1 +echo " autoheader" +autoheader || exit 1 +echo " $AUTOMAKE --add-missing $AUTOMAKE_FLAGS" +$AUTOMAKE --add-missing $AUTOMAKE_FLAGS || exit 1 +echo " autoconf" +autoconf || exit 1 + +cd $olddir + +fprecommit=.git/hooks/pre-commit +if test ! -f $fprecommit ; then + echo + echo "Installing git pre-commit hook for this project." + cat > $fprecommit << 'foobar' +#!/bin/sh +exec Scripts/git-pre-commit-hook +foobar + chmod u+x $fprecommit + echo + fi diff --git a/libs/libsndfile/binheader_readf_check.py b/libs/libsndfile/binheader_readf_check.py new file mode 100644 index 0000000000..774abcd988 --- /dev/null +++ b/libs/libsndfile/binheader_readf_check.py @@ -0,0 +1,62 @@ +g#!/usr/bin/python + +import re, string, sys + +def trim_function_and_params (section): + k = string.find (section, "(") + 1 + brackets = 1 + section_len = len (section) + while k < section_len: + if section [k] == '(': + brackets += 1 + elif section [k] == ')': + brackets -= 1 + if brackets < 1: + return section [:k+1] + k += 1 + print "Whoops!!!!" + sys.exit (1) + +def get_function_calls (filedata): + filedata = string.split (filedata, "psf_binheader_readf") + filedata = filedata [1:] + + func_calls = [] + for section in filedata: + section = "psf_binheader_readf" + section + func_calls.append (trim_function_and_params (section)) + + return func_calls + +def search_for_problems (filename): + filedata = open (filename, "r").read () + + if len (filedata) < 1: + print "Error : file '%s' contains no data." % filename + sys.exit (1) + + count = 0 + + calls = get_function_calls (filedata) + for call in calls: + if string.find (call, "sizeof") > 0: + print "Found : ", call + count += 1 + + if count == 0: + print "%-20s : No problems found." % filename + else: + print "\n%-20s : Found %d errors." % (filename, count) + sys.exit (1) + return + + +#------------------------------------------------------------------------------- + +if len (sys.argv) < 2: + print "Usage : %s " % sys.argv [0] + sys.exit (1) + +for file in sys.argv [1:]: + search_for_problems (file) + diff --git a/libs/libsndfile/configure.ac b/libs/libsndfile/configure.ac index 4bdbfd0969..604b8f767d 100644 --- a/libs/libsndfile/configure.ac +++ b/libs/libsndfile/configure.ac @@ -1,30 +1,48 @@ -# Copyright (C) 1999-2008 Erik de Castro Lopo (erikd AT mega-nerd DOT com). +# Copyright (C) 1999-2013 Erik de Castro Lopo . dnl Require autoconf version AC_PREREQ(2.57) -AC_INIT([libsndfile],[1.0.19],[erikd@mega-nerd.com]) +AC_INIT([libsndfile],[1.0.26pre5],[sndfile@mega-nerd.com], + [libsndfile],[http://www.mega-nerd.com/libsndfile/]) # Put config stuff in Cfg. AC_CONFIG_AUX_DIR(Cfg) -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS" -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS" -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS" - AC_CONFIG_SRCDIR([src/sndfile.c]) AC_CANONICAL_TARGET([]) -AM_INIT_AUTOMAKE AC_CONFIG_MACRO_DIR([M4]) - AC_CONFIG_HEADERS([src/config.h]) -dnl Add parameters for aclocal -AC_SUBST(ACLOCAL_AMFLAGS, "-I M4") +AM_INIT_AUTOMAKE +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_LANG([C]) +AC_PROG_CC_STDC +AC_USE_SYSTEM_EXTENSIONS +AM_PROG_CC_C_O +AC_PROG_CXX + +MN_C_COMPILER_IS_CLANG +MN_GCC_REALLY_IS_GCC + +AC_PROG_SED + +# Do not check for F77. +define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl + +AM_PROG_LIBTOOL +LT_PROG_RC + +AC_PROG_INSTALL +AC_PROG_LN_S + +AC_CHECK_PROG(HAVE_AUTOGEN, autogen, yes, no) +AC_CHECK_PROG(HAVE_WINE, wine, yes, no) +AC_CHECK_PROG(HAVE_XCODE_SELECT, xcode-select, yes, no) + #------------------------------------------------------------------------------------ # Rules for library version information: # @@ -41,22 +59,12 @@ AC_LANG([C]) # 6. If any interfaces have been removed since the last public release, then set age # to 0. -SHARED_VERSION_INFO="1:19:0" +CLEAN_VERSION=`echo $PACKAGE_VERSION | $SED "s/p.*//"` +VERSION_MINOR=`echo $CLEAN_VERSION | $SED "s/.*\.//"` -AC_PROG_CC -AM_PROG_CC_C_O -AC_PROG_CXX +SHARED_VERSION_INFO="1:$VERSION_MINOR:0" -# Do not check for F77. -define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl - -AM_PROG_LIBTOOL - -AC_CHECK_PROG(HAVE_AUTOGEN, autogen, yes, no) -AC_CHECK_PROG(HAVE_WINE, wine, yes, no) - -AC_PROG_INSTALL -AC_PROG_LN_S +#------------------------------------------------------------------------------------ AC_HEADER_STDC @@ -77,19 +85,6 @@ else AM_CONDITIONAL([LINUX_MINGW_CROSS_TEST], [test "$build_os:$target_os:$host_os:$HAVE_WINE" = "linux-gnu:mingw32msvc:mingw32msvc:yes"]) -#==================================================================================== -# Check for support of the struct hack. - -AC_C99_FLEXIBLE_ARRAY - -if test x$ac_cv_c99_flexible_array = xyes ; then - AC_DEFINE([HAVE_FLEXIBLE_ARRAY],1, [Set to 1 if the compile supports the struct hack.]) -else - AC_MSG_WARN([[*** This compiler does not support the 1999 ISO C Standard ***]]) - AC_MSG_WARN([[*** feature known as the flexible array struct member. ***]]) - AC_DEFINE([HAVE_FLEXIBLE_ARRAY],0) - fi - #==================================================================================== # Couple of initializations here. Fill in real values later. @@ -107,8 +102,11 @@ if test x$enable_experimental = xyes ; then fi AC_DEFINE_UNQUOTED([ENABLE_EXPERIMENTAL_CODE],${EXPERIMENTAL_CODE}, [Set to 1 to enable experimental code.]) -AC_ARG_ENABLE(gcc-werror, - AC_HELP_STRING([--enable-gcc-werror], [enable -Werror in all Makefiles])) +AC_ARG_ENABLE(werror, + AC_HELP_STRING([--enable-werror], [enable -Werror in all Makefiles])) + +AC_ARG_ENABLE(stack-smash-protection, + AC_HELP_STRING([--enable-stack-smash-protection], [Enable GNU GCC stack smash protection])) AC_ARG_ENABLE(gcc-pipe, AC_HELP_STRING([--disable-gcc-pipe], [disable gcc -pipe option])) @@ -129,7 +127,7 @@ AC_ARG_ENABLE(alsa, AC_HELP_STRING([--disable-alsa], [disable use of ALSA])) AC_ARG_ENABLE(external-libs, - AC_HELP_STRING([--disable-external-libs], [disable use of FLAC, Ogg and Vorbis])) + AC_HELP_STRING([--disable-external-libs], [disable use of FLAC, Ogg and Vorbis [[default=no]]])) AC_ARG_ENABLE(octave, AC_HELP_STRING([--enable-octave], [disable building of GNU Octave module])) @@ -141,6 +139,7 @@ AM_CONDITIONAL([ENABLE_TEST_COVERAGE], [test "$enable_test_coverage" = yes]) #==================================================================================== # Check types and their sizes. +AC_CHECK_SIZEOF(wchar_t,4) AC_CHECK_SIZEOF(short,2) AC_CHECK_SIZEOF(int,4) AC_CHECK_SIZEOF(long,4) @@ -157,43 +156,48 @@ AC_CHECK_SIZEOF(long long,8) # Unfortunately there is more than one way of ensuring this so need to do some # pretty rigourous testing here. -unset ac_cv_sizeof_off_t +# Check for common 64 bit file offset types. +AC_CHECK_SIZEOF(off_t,1) +AC_CHECK_SIZEOF(loff_t,1) +AC_CHECK_SIZEOF(off64_t,1) + +if test "$enable_largefile:$ac_cv_sizeof_off_t" = "no:8" ; then + echo + echo "Error : Cannot disable large file support because sizeof (off_t) == 8." + echo + exit 1 + fi -AC_CHECK_SIZEOF(off_t,1) # Fake default value. case "$host_os" in - mingw*) + mingw32msvc | mingw32) TYPEOF_SF_COUNT_T="__int64" SF_COUNT_MAX="0x7FFFFFFFFFFFFFFFLL" SIZEOF_SF_COUNT_T=8 + AC_DEFINE([__USE_MINGW_ANSI_STDIO],1,[Set to 1 to use C99 printf/snprintf in MinGW.]) ;; *) + SIZEOF_SF_COUNT_T=0 if test "x$ac_cv_sizeof_off_t" = "x8" ; then # If sizeof (off_t) is 8, no further checking is needed. - TYPEOF_SF_COUNT_T="off_t" + TYPEOF_SF_COUNT_T="int64_t" + SF_COUNT_MAX="0x7FFFFFFFFFFFFFFFLL" + SIZEOF_SF_COUNT_T=8 + elif test "x$ac_cv_sizeof_loff_t" = "x8" ; then + TYPEOF_SF_COUNT_T="int64_t" + SF_COUNT_MAX="0x7FFFFFFFFFFFFFFFLL" + SIZEOF_SF_COUNT_T=8 + elif test "x$ac_cv_sizeof_off64_t" = "x8" ; then + TYPEOF_SF_COUNT_T="int64_t" SF_COUNT_MAX="0x7FFFFFFFFFFFFFFFLL" SIZEOF_SF_COUNT_T=8 else - # Check for common 64 bit file offset types. - AC_CHECK_SIZEOF(loff_t,1) # Fake default value. - AC_CHECK_SIZEOF(off64_t,1) # Fake default value. - - TYPEOF_SF_COUNT_T="unknown" - if test "x$ac_cv_sizeof_loff_t" = "x8" ; then - TYPEOF_SF_COUNT_T="loff_t" - SIZEOF_SF_COUNT_T=8 - elif test "x$ac_cv_sizeof_off64_t" = "x8" ; then - TYPEOF_SF_COUNT_T="off64_t" - SIZEOF_SF_COUNT_T=8 - fi - # Save the old sizeof (off_t) value and then unset it to see if it # changes when Large File Support is enabled. - pre_largefile_sizeof_off_t=$ac_cv_sizeof_off_t unset ac_cv_sizeof_off_t - AC_SYS_EXTRA_LARGEFILE + AC_SYS_LARGEFILE if test "x$ac_cv_sys_largefile_CFLAGS" = "xno" ; then ac_cv_sys_largefile_CFLAGS="" @@ -205,14 +209,11 @@ case "$host_os" in ac_cv_sys_largefile_LIBS="" fi - AC_CHECK_SIZEOF(off_t,1) # Fake default value. + AC_CHECK_SIZEOF(off_t,1) if test "x$ac_cv_sizeof_off_t" = "x8" ; then + TYPEOF_SF_COUNT_T="int64_t" SF_COUNT_MAX="0x7FFFFFFFFFFFFFFFLL" - elif test "x$ac_cv_sizeof_off_t" = "x$pre_largefile_sizeof_off_t" ; then - AC_MSG_WARN([[This machine does not seem to support 64 bit file offsets.]]) - TYPEOF_SF_COUNT_T="off_t" - SIZEOF_SF_COUNT_T=$ac_cv_sizeof_off_t elif test "x$TYPEOF_SF_COUNT_T" = "xunknown" ; then echo echo "*** The configure process has determined that this system is capable" @@ -245,7 +246,7 @@ AC_CHECK_SIZEOF(ssize_t,4) #==================================================================================== # Determine endian-ness of target processor. -AC_C_FIND_ENDIAN +MN_C_FIND_ENDIAN AC_DEFINE_UNQUOTED(CPU_IS_BIG_ENDIAN, ${ac_cv_c_big_endian}, [Target processor is big endian.]) @@ -258,18 +259,19 @@ AC_DEFINE_UNQUOTED(WORDS_BIGENDIAN, ${ac_cv_c_big_endian}, # Check for functions. AC_CHECK_FUNCS(malloc calloc realloc free) -AC_CHECK_FUNCS(open read write lseek pread pwrite) -AC_CHECK_FUNCS(fstat ftruncate fsync) +AC_CHECK_FUNCS(open read write lseek lseek64) +AC_CHECK_FUNCS(fstat fstat64 ftruncate fsync) AC_CHECK_FUNCS(snprintf vsnprintf) AC_CHECK_FUNCS(gmtime gmtime_r localtime localtime_r gettimeofday) AC_CHECK_FUNCS(mmap getpagesize) AC_CHECK_FUNCS(setlocale) +AC_CHECK_FUNCS(pipe waitpid) AC_CHECK_LIB([m],floor) -AC_CHECK_FUNCS(floor ceil fmod) +AC_CHECK_FUNCS(floor ceil fmod lround) -AC_C99_FUNC_LRINT -AC_C99_FUNC_LRINTF +MN_C99_FUNC_LRINT +MN_C99_FUNC_LRINTF #==================================================================================== # Check for requirements for building plugins for other languages/enviroments. @@ -294,46 +296,62 @@ EXTERNAL_LIBS="" # Check for pkg-config outside the if statement. PKG_PROG_PKG_CONFIG +m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], AC_SUBST([pkgconfigdir], ${libdir}/pkgconfig)) -#if test x$enable_external_libs = xno ; then - AC_MSG_WARN([[*** External libs (FLAC, Ogg, Vorbis) disabled. ***]]) -#else -# PKG_CHECK_MOD_VERSION(FLAC, flac >= 1.2.1, ac_cv_flac=yes, ac_cv_flac=no) -# PKG_CHECK_MOD_VERSION(OGG, ogg >= 1.1.3, ac_cv_ogg=yes, ac_cv_ogg=no) +if test -n "$PKG_CONFIG" ; then + if test x$enable_external_libs = xno ; then + AC_MSG_WARN([[*** External libs (FLAC, Ogg, Vorbis) disabled. ***]]) + else + PKG_CHECK_MOD_VERSION(FLAC, flac >= 1.2.1, ac_cv_flac=yes, ac_cv_flac=no) - # Vorbis versions earlier than 1.2.1 are not const correct at the API level. - # Vorbis 1.2.2 adds vorbis_version_string. -# PKG_CHECK_MOD_VERSION(VORBIS, vorbis >= 1.2.0, ac_cv_vorbis=yes, ac_cv_vorbis=no) -# PKG_CHECK_MOD_VERSION(VORBISENC, vorbisenc >= 1.2.0, ac_cv_vorbisenc=yes, ac_cv_vorbisenc=no) -# fi + # Make sure the FLAC_CFLAGS value is sane. + FLAC_CFLAGS=`echo $FLAC_CFLAGS | $SED "s|include/FLAC|include|"` -HAVE_VORBIS_VERSION_STRING=0 -if test x$ac_cv_flac$ac_cv_ogg$ac_cv_vorbis$ac_cv_vorbisenc = "xyesyesyesyes" ; then + PKG_CHECK_MOD_VERSION(OGG, ogg >= 1.1.3, ac_cv_ogg=yes, ac_cv_ogg=no) - save_LIBS="$LIBS" - LIBS="$VORBIS_LIBS $LIBS" - AC_CHECK_LIB(vorbis, vorbis_version_string, HAVE_VORBIS_VERSION_STRING=1) - LIBS="$save_LIBS" + if test x$enable_experimental = xyes ; then + PKG_CHECK_MOD_VERSION(SPEEX, speex >= 1.2, ac_cv_speex=yes, ac_cv_speex=no) + else + SPEEX_CFLAGS="" + SPEEX_LIBS="" + fi - HAVE_EXTERNAL_LIBS=1 - enable_external_libs=yes + # Vorbis versions earlier than 1.2.3 have bugs that cause the libsndfile + # test suite to fail on MIPS, PowerPC and others. + # See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=549899 + PKG_CHECK_MOD_VERSION(VORBIS, vorbis >= 1.2.3, ac_cv_vorbis=yes, ac_cv_vorbis=no) + PKG_CHECK_MOD_VERSION(VORBISENC, vorbisenc >= 1.2.3, ac_cv_vorbisenc=yes, ac_cv_vorbisenc=no) + enable_external_libs=yes + fi - EXTERNAL_CFLAGS="$FLAC_CFLAGS $OGG_CFLAGS $VORBISENC_CFLAGS" - EXTERNAL_LIBS="$FLAC_LIBS $VORBISENC_LIBS" -else - enable_external_libs=no + if test x$ac_cv_flac$ac_cv_ogg$ac_cv_vorbis$ac_cv_vorbisenc = "xyesyesyesyes" ; then + HAVE_EXTERNAL_LIBS=1 + enable_external_libs=yes + + EXTERNAL_CFLAGS="$FLAC_CFLAGS $OGG_CFLAGS $VORBIS_CFLAGS $VORBISENC_CFLAGS $SPEEX_CFLAGS" + EXTERNAL_LIBS="$FLAC_LIBS $OGG_LIBS $VORBIS_LIBS $VORBISENC_LIBS $SPEEX_LIBS " + else + echo + AC_MSG_WARN([[*** One or more of the external libraries (ie libflac, libogg and]]) + AC_MSG_WARN([[*** libvorbis) is either missing (possibly only the development]]) + AC_MSG_WARN([[*** headers) or is of an unsupported version.]]) + AC_MSG_WARN([[***]]) + AC_MSG_WARN([[*** Unfortunately, for ease of maintenance, the external libs]]) + AC_MSG_WARN([[*** are an all or nothing affair.]]) + echo + enable_external_libs=no + fi fi AC_DEFINE_UNQUOTED([HAVE_EXTERNAL_LIBS], $HAVE_EXTERNAL_LIBS, [Will be set to 1 if flac, ogg and vorbis are available.]) -AC_DEFINE_UNQUOTED([HAVE_VORBIS_VERSION_STRING], $HAVE_VORBIS_VERSION_STRING, [Set to 1 if we have vorbis_version_string.]) #==================================================================================== # Check for libsqlite3 (only used in regtest). ac_cv_sqlite3=no -#if test x$enable_sqlite != xno ; then -# PKG_CHECK_MOD_VERSION(SQLITE3, sqlite3 >= 3.2, ac_cv_sqlite3=yes, ac_cv_sqlite3=no) -# fi +if test x$enable_sqlite != xno ; then + PKG_CHECK_MOD_VERSION(SQLITE3, sqlite3 >= 3.2, ac_cv_sqlite3=yes, ac_cv_sqlite3=no) + fi if test x$ac_cv_sqlite3 = "xyes" ; then HAVE_SQLITE3=1 @@ -343,24 +361,11 @@ else AC_DEFINE_UNQUOTED([HAVE_SQLITE3],$HAVE_SQLITE3,[Set to 1 if you have libsqlite3.]) -#==================================================================================== -# Check for JACK (only used for examples/sndfile-jackplay). - -#PKG_CHECK_MOD_VERSION(JACK, jack >= 0.100, ac_cv_jack=yes, ac_cv_jack=no) - -if test x$ac_cv_jack = "xyes" ; then - HAVE_JACK=1 -else - HAVE_JACK=0 - fi - -AC_DEFINE_UNQUOTED([HAVE_JACK],$HAVE_JACK,[Set to 1 if you have JACK.]) - #==================================================================================== # Determine if the processor can do clipping on float to int conversions. if test x$enable_cpu_clip != "xno" ; then - AC_C_CLIP_MODE + MN_C_CLIP_MODE else echo "checking processor clipping capabilities... disabled" ac_cv_c_clip_positive=0 @@ -378,14 +383,19 @@ AC_DEFINE_UNQUOTED(CPU_CLIPS_NEGATIVE, ${ac_cv_c_clip_negative}, OS_SPECIFIC_CFLAGS="" OS_SPECIFIC_LINKS="" os_is_win32=0 -os_is_macosx=0 use_windows_api=0 +osx_darwin_version=0 case "$host_os" in darwin* | rhapsody*) - os_is_macosx=1 - OS_SPECIFIC_CFLAGS="-fpascal-strings -I/Developer/Headers/FlatCarbon" - OS_SPECIFIC_LINKS="-framework CoreAudio" + osx_darwin_version=$(echo "$host_os" | sed 's/\..*//;s/darwin//g') + if test x$HAVE_XCODE_SELECT = xyes ; then + developer_path=`xcode-select --print-path` + else + developer_path="/Developer" + fi + OS_SPECIFIC_CFLAGS="-I${developer_path}/Headers/FlatCarbon" + OS_SPECIFIC_LINKS="-framework CoreAudio -framework AudioToolbox -framework CoreFoundation" ;; mingw*) os_is_win32=1 @@ -395,8 +405,9 @@ case "$host_os" in esac AC_DEFINE_UNQUOTED(OS_IS_WIN32, ${os_is_win32}, [Set to 1 if compiling for Win32]) -AC_DEFINE_UNQUOTED(OS_IS_MACOSX, ${os_is_macosx}, [Set to 1 if compiling for MacOSX]) AC_DEFINE_UNQUOTED(USE_WINDOWS_API, ${use_windows_api}, [Set to 1 to use the native windows API]) +AC_DEFINE_UNQUOTED(OSX_DARWIN_VERSION, ${osx_darwin_version}, [The darwin version, no-zero is valid]) +AM_CONDITIONAL(USE_WIN_VERSION_FILE, test ${use_windows_api} -eq 1) #==================================================================================== # Check for ALSA. @@ -412,16 +423,17 @@ if test x$enable_alsa != xno ; then fi #==================================================================================== -# Test for sanity when cross-compiling. +# Check for OpenBSD's sndio. -if test x$cross_compiling = xyes ; then - AC_MSG_WARN([[******************************************************************]]) - AC_MSG_WARN([[*** We are cross-compiling, so have to assume sizeof (short) == 2 ]]) - AC_MSG_WARN([[*** and sizeof (int) == 4. If this is not the case there is no ]]) - AC_MSG_WARN([[*** chance of this working. Please contact the mantainer. ]]) - AC_MSG_WARN([[******************************************************************]]) +SNDIO_LIBS="" +AC_CHECK_HEADERS(sndio.h) +if test x$ac_cv_header_sndio_h = xyes ; then + SNDIO_LIBS="-lsndio" fi +#==================================================================================== +# Test for sanity when cross-compiling. + if test $ac_cv_sizeof_short != 2 ; then AC_MSG_WARN([[******************************************************************]]) AC_MSG_WARN([[*** sizeof (short) != 2. ]]) @@ -454,14 +466,6 @@ if test x"$ac_cv_prog_HAVE_AUTOGEN" = "xno" ; then #==================================================================================== # Settings for the HTML documentation. -htmldocdir=$prefix/share/doc/libsndfile1-dev/html - -if test $prefix = "NONE" ; then - htmldocdir=/usr/local/share/doc/libsndfile1-dev/html -else - htmldocdir=$prefix/share/doc/libsndfile1-dev/html - fi - if test x$enable_bow_docs = "xyes" ; then HTML_BGCOLOUR="white" HTML_FGCOLOUR="black" @@ -477,49 +481,51 @@ win32_target_dll=0 COMPILER_IS_GCC=0 if test x$ac_cv_c_compiler_gnu = xyes ; then - AC_ADD_CFLAGS(-std=gnu99) + MN_ADD_CFLAGS(-std=gnu99) - AC_GCC_VERSION + MN_GCC_VERSION if test "x$GCC_MAJOR_VERSION$GCC_MINOR_VERSION" = "x42" ; then -# AC_MSG_WARN([****************************************************************]) -# AC_MSG_WARN([** GCC version 4.2 warns about the inline keyword for no good **]) -# AC_MSG_WARN([** reason but the maintainers do not see it as a bug. **]) -# AC_MSG_WARN([** See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=33995 **]) -# AC_MSG_WARN([** Using -fgnu-inline to avoid this stupidity. **]) -# AC_MSG_WARN([****************************************************************]) - AC_ADD_CFLAGS([-fgnu89-inline]) + AC_MSG_WARN([****************************************************************]) + AC_MSG_WARN([** GCC version 4.2 warns about the inline keyword for no good **]) + AC_MSG_WARN([** reason but the maintainers do not see it as a bug. **]) + AC_MSG_WARN([** See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=33995 **]) + AC_MSG_WARN([** Using -fgnu-inline to avoid this stupidity. **]) + AC_MSG_WARN([****************************************************************]) + MN_ADD_CFLAGS([-fgnu89-inline]) fi CFLAGS="$CFLAGS -Wall" CXXFLAGS="$CXXFLAGS -Wall" -# AC_ADD_CFLAGS([-Wextra]) + MN_ADD_CFLAGS([-Wextra]) AC_LANG_PUSH([C++]) -# AC_ADD_CXXFLAGS([-Wextra]) + MN_ADD_CXXFLAGS([-Wextra]) AC_LANG_POP([C++]) - AC_ADD_CFLAGS([-Wdeclaration-after-statement]) - AC_ADD_CFLAGS([-Wpointer-arith]) - AC_ADD_CFLAGS([-funsigned-char]) + MN_ADD_CFLAGS([-Wdeclaration-after-statement]) + MN_ADD_CFLAGS([-Wpointer-arith]) + MN_ADD_CFLAGS([-funsigned-char]) - if test x$enable_gcc_werror = "xyes" ; then - CFLAGS="-Werror $CFLAGS" - CXXFLAGS="-Werror $CXXFLAGS" + MN_ADD_CFLAGS([-D_FORTIFY_SOURCE=2]) + + if test x$enable_stack_smash_protection = "xyes" ; then + XIPH_GCC_STACK_PROTECTOR + XIPH_GXX_STACK_PROTECTOR fi if test x$enable_test_coverage = "xyes" ; then - # AC_ADD_CFLAGS([-ftest-coverage]) - AC_ADD_CFLAGS([-coverage]) + # MN_ADD_CFLAGS([-ftest-coverage]) + MN_ADD_CFLAGS([-coverage]) fi - CFLAGS="$CFLAGS -Wstrict-prototypes -Wmissing-prototypes -Waggregate-return -Wcast-align -Wcast-qual -Wnested-externs -Wshadow -Wbad-function-cast -Wwrite-strings " - # -Wundef -Wmissing-declarations -Winline -Wconversion" - CXXFLAGS="$CXXFLAGS -Wcast-align -Wcast-qual -Wshadow -Wwrite-strings -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual -Wreorder -Wsign-promo " + CFLAGS="$CFLAGS -Wcast-align -Wcast-qual -Wshadow -Wbad-function-cast -Wwrite-strings -Wundef -Wuninitialized -Winit-self -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Waggregate-return" + # -Winline -Wconversion -Wunreachable-code" + CXXFLAGS="$CXXFLAGS -Wcast-align -Wcast-qual -Wshadow -Wwrite-strings -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual -Wreorder -Wsign-promo -Wundef -Wuninitialized -Winit-self" if test "x$enable_gcc_opt" = "xno" ; then - temp_CFLAGS=`echo $CFLAGS | sed "s/O2/O0/"` + temp_CFLAGS=`echo $CFLAGS | $SED "s/O2/O0/"` CFLAGS=$temp_CFLAGS AC_MSG_WARN([[*** Compiler optimisations switched off. ***]]) fi @@ -529,24 +535,24 @@ if test x$ac_cv_c_compiler_gnu = xyes ; then darwin* | rhapsody*) # Disable -Wall, -pedantic and -Wshadow for Apple Darwin/Rhapsody. # System headers on these systems are broken. - temp_CFLAGS=`echo $CFLAGS | sed "s/-Wall -pedantic//" | sed "s/-Wshadow//" | sed "s/-Waggregate-return//"` + temp_CFLAGS=`echo $CFLAGS | $SED "s/-Wall -pedantic//" | $SED "s/-Wshadow//" | $SED "s/-Waggregate-return//"` CFLAGS=$temp_CFLAGS - SHLIB_VERSION_ARG="-Wl,-exported_symbols_list -Wl,\$(srcdir)/Symbols.darwin" + SHLIB_VERSION_ARG="-Wl,-exported_symbols_list -Wl,\$(builddir)/Symbols.darwin" ;; - linux*) - SHLIB_VERSION_ARG="-Wl,--version-script=\$(srcdir)/Symbols.linux" + linux*|kfreebsd*-gnu*|gnu*) + SHLIB_VERSION_ARG="-Wl,--version-script=\$(builddir)/Symbols.gnu-binutils" ;; mingw*) # Linker flag '-Wl,--out-implib' does not work with mingw cross compiler # so we don't use it here. - SHLIB_VERSION_ARG="-Wl,\$(srcdir)/libsndfile-1.def" + SHLIB_VERSION_ARG="-Wl,\$(builddir)/libsndfile-1.def" win32_target_dll=1 if test x"$enable_shared" = xno ; then win32_target_dll=0 fi ;; os2*) - SHLIB_VERSION_ARG="-Wl,-export-symbols \$(srcdir)/Symbols.os2" + SHLIB_VERSION_ARG="-Wl,-export-symbols \$(builddir)/Symbols.os2" ;; *) ;; @@ -558,36 +564,17 @@ if test x$ac_cv_c_compiler_gnu = xyes ; then COMPILER_IS_GCC=1 fi +if test x$enable_werror = "xyes" ; then + MN_ADD_CFLAGS([-Werror]) + + AC_LANG_PUSH([C++]) + MN_ADD_CXXFLAGS([-Werror]) + AC_LANG_POP([C++]) + fi + + AC_DEFINE_UNQUOTED([WIN32_TARGET_DLL], ${win32_target_dll}, [Set to 1 if windows DLL is being built.]) AC_DEFINE_UNQUOTED([COMPILER_IS_GCC], ${COMPILER_IS_GCC}, [Set to 1 if the compile is GNU GCC.]) -AC_DEFUN([AX_COMPILER_VENDOR], -[ -AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor, - [ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=unknown - # note: don't check for gcc first since some other compilers define __GNUC__ - for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do - vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[ -#if !($vencpp) - thisisanerror; -#endif -])], [ax_cv_]_AC_LANG_ABBREV[_compiler_vendor=`echo $ventest | cut -d: -f1`; break]) - done - ]) -]) - -AX_COMPILER_VENDOR - -# Enable 64 bit build -AC_ARG_ENABLE(64, -[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"]) - -if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then - if test "${enable_64}" = "yes"; then - CFLAGS="$CFLAGS -m64" - fi -fi - CFLAGS="$CFLAGS $OS_SPECIFIC_CFLAGS" @@ -596,43 +583,64 @@ if test x"$CFLAGS" = x ; then exit fi +HOST_TRIPLET="${host_cpu}-${host_vendor}-${host_os}" + +AC_DEFINE_UNQUOTED([HOST_TRIPLET], "${HOST_TRIPLET}", [The host triplet of the compiled binary.]) + +if test "$HOST_TRIPLET" = "x86_64-w64-mingw32" ; then + OS_SPECIFIC_LINKS=" -static-libgcc $OS_SPECIFIC_LINKS" + fi + +WIN_RC_VERSION=`echo $PACKAGE_VERSION | $SED -e "s/p.*//" -e "s/\./,/g"` + + +if test "$enable_static" = no ; then + SRC_BINDIR=src/.libs/ + TEST_BINDIR=tests/.libs/ +else + SRC_BINDIR=src/ + TEST_BINDIR=tests/ + fi + #------------------------------------------------------------------------------- -AC_SUBST(htmldocdir) +AC_SUBST(HOST_TRIPLET) + AC_SUBST(HTML_BGCOLOUR) AC_SUBST(HTML_FGCOLOUR) AC_SUBST(SHLIB_VERSION_ARG) AC_SUBST(SHARED_VERSION_INFO) +AC_SUBST(CLEAN_VERSION) +AC_SUBST(WIN_RC_VERSION) + AC_SUBST(OS_SPECIFIC_CFLAGS) AC_SUBST(OS_SPECIFIC_LINKS) AC_SUBST(ALSA_LIBS) -AC_SUBST(ENABLE_EXPERIMENTAL_CODE) +AC_SUBST(SNDIO_LIBS) AC_SUBST(EXTERNAL_CFLAGS) AC_SUBST(EXTERNAL_LIBS) - -AC_SUBST(COMPILER_IS_GCC) -AC_SUBST(GCC_MAJOR_VERSION) - -AC_SUBST(HAVE_JACK) +AC_SUBST(SRC_BINDIR) +AC_SUBST(TEST_BINDIR) dnl The following line causes the libtool distributed with the source dnl to be replaced if the build system has a more recent version. AC_SUBST(LIBTOOL_DEPS) AC_CONFIG_FILES([ \ - src/sndfile.h src/Makefile src/GSM610/Makefile src/G72x/Makefile \ - man/Makefile examples/Makefile tests/Makefile regtest/Makefile \ - M4/Makefile doc/Makefile Win32/Makefile Octave/Makefile \ - programs/Makefile doc/libsndfile.css \ - Makefile libsndfile.spec sndfile.pc \ - tests/test_wrapper.sh \ + src/Makefile man/Makefile examples/Makefile tests/Makefile regtest/Makefile \ + M4/Makefile doc/Makefile Win32/Makefile Octave/Makefile programs/Makefile \ + Makefile \ + src/version-metadata.rc tests/test_wrapper.sh tests/pedantic-header-test.sh \ + doc/libsndfile.css Scripts/build-test-tarball.mk libsndfile.spec sndfile.pc \ + src/sndfile.h \ + echo-install-dirs ]) AC_OUTPUT -# Make it executable. -chmod u+x tests/test_wrapper.sh +# Make sure these are executable. +chmod u+x tests/test_wrapper.sh build-test-tarball.mk echo-install-dirs #==================================================================================== @@ -641,46 +649,45 @@ AC_MSG_RESULT([ Configuration summary : - Version : ............................. ${VERSION} + libsndfile version : .................. ${VERSION} + + Host CPU : ............................ ${host_cpu} + Host Vendor : ......................... ${host_vendor} + Host OS : ............................. ${host_os} + Experimental code : ................... ${enable_experimental:-no} Using ALSA in example programs : ...... ${enable_alsa:-no} External FLAC/Ogg/Vorbis : ............ ${enable_external_libs:-no} - ]) +if test -z "$PKG_CONFIG" ; then + echo " *****************************************************************" + echo " *** The pkg-config program is missing. ***" + echo " *** External FLAC/Ogg/Vorbis libs cannot be found without it. ***" + echo " *** http://pkg-config.freedesktop.org/wiki/ ***" + echo " *****************************************************************" + echo + fi + +echo " Tools :" +echo +echo " Compiler is Clang : ................... ${mn_cv_c_compiler_clang}" +echo " Compiler is GCC : ..................... ${ac_cv_c_compiler_gnu}" + if test x$ac_cv_c_compiler_gnu = xyes ; then - echo -e " Tools :\n" - echo " Compiler is GCC : ..................... ${ac_cv_c_compiler_gnu}" echo " GCC version : ......................... ${GCC_VERSION}" if test $GCC_MAJOR_VERSION -lt 3 ; then - echo -e "\n ** This compiler version allows applications to write" + echo "\n" + echo " ** This compiler version allows applications to write" echo " ** to static strings within the library." echo " ** Compile with GCC version 3.X or above to avoid this problem." fi fi -if test $libdir = "\${exec_prefix}/lib" ; then - libdir="$prefix/lib" - fi +./echo-install-dirs -if test $bindir = "\${exec_prefix}/bin" ; then - bindir="$prefix/bin" - fi - -AC_MSG_RESULT([[ - Installation directories : - - Library directory : ................... $libdir - Program directory : ................... $bindir - Pkgconfig directory : ................. $libdir/pkgconfig - HTML docs directory : ................. $htmldocdir -]]) - -if test x$prefix != "x/usr" ; then - echo "Compiling some other packages against libsndfile may require" - echo -e "the addition of \"$libdir/pkgconfig\" to the" - echo -e "PKG_CONFIG_PATH environment variable.\n" - fi +# Remove symlink created by Scripts/android-configure.sh. +test -h gdbclient && rm -f gdbclient (cd src && make genfiles) (cd tests && make genfiles) diff --git a/libs/libsndfile/doc/FAQ.html b/libs/libsndfile/doc/FAQ.html index f46c4c321f..4465b77bd5 100644 --- a/libs/libsndfile/doc/FAQ.html +++ b/libs/libsndfile/doc/FAQ.html @@ -8,65 +8,70 @@ - + +

libsndfile : Frequently Asked Questions.

-Q1 : Do you plan to support XYZ codec in libsndfile?
+Q1 : Do you plan to support XYZ codec in libsndfile?
Q2 : In version 0 the SF_INFO struct had a pcmbitwidth field - but version 1 does not. Why?
-Q3 : Compiling is really slow on MacOSX. Why?
+ but version 1 does not. Why?
+Q3 : Compiling is really slow on MacOS X. Why?
Q4 : When trying to compile libsndfile on Solaris I get a "bad - substitution" error during linking. What can I do to fix this?
-Q5 : Why doesn't libsndfile do interleaving/de-interleaving?
-Q6 : What's the best format for storing temporary files?
-Q7 : On Linux/Unix/MacOSX, what's the best way of detecting the - presence of libsndfile?
-Q8 : But I just want a simple Makefile! What do I do?
+ substitution" error during linking. What can I do to fix this?
+Q5 : Why doesn't libsndfile do interleaving/de-interleaving?
+Q6 : What's the best format for storing temporary files?
+Q7 : On Linux/Unix/MacOS X, what's the best way of detecting the + presence of libsndfile?
+Q8 : I have libsndfile installed and now I want to use it. I + just want a simple Makefile! What do I do?
Q9 : How about adding the ability to write/read sound files to/from - memory buffers?
+ memory buffers?
Q10 : Reading a 16 bit PCM file as normalised floats and then - writing them back changes some sample values. Why?
+ writing them back changes some sample values. Why?
Q11 : I'm having problems with u-law encoded WAV files generated by - libsndfile in Winamp. Why?
-Q12 : I'm looking at sf_read*. What are items? What are frames?
+ libsndfile in Winamp. Why?
+Q12 : I'm looking at sf_read*. What are items? What are frames?
Q13 : Why can't libsndfile open this Sound Designer II (SD2) - file?
+ file?
Q14 : I'd like to statically link libsndfile to my closed source - application. Can I buy a license so that this is possible?
+ application. Can I buy a license so that this is possible?
Q15 : My program is crashing during a call to a function in libsndfile. - Is this a bug in libsndfile?
+ Is this a bug in libsndfile?
Q16 : Will you accept a fix for compiling libsndfile with compiler X? -
+
Q17 : Can libsndfile read/write files from/to UNIX pipes? -
-Q18 : Is it possible to build a Universal Binary on Mac OSX? -
+
+Q18 : Is it possible to build a Universal Binary on Mac OS X? +
Q19 : I have project files for Visual Studio / XCode / Whatever. Why don't you distribute them with libsndfile? -
+
Q20 : Why doesn't libsndfile support MP3? Lots of other Open Source projects support it! -
+
Q21 : How do I use libsndfile in a closed source or commercial program and comply with the license? -
+
Q22 : What versions of windows does libsndfile work on? -
+
+Q23 : I'm cross compiling libsndfile for another platform. How can I + run the test suite? +

-


Q1 : Do you plan to support XYZ codec in libsnfile?

+


Q1 : Do you plan to support XYZ codec in libsndfile?

If source code for XYZ codec is available under a suitable license (LGPL, BSD, MIT etc) then yes, I'd like to add it.

-If suitable documentation is available on how to decode and enocde the format +If suitable documentation is available on how to decode and encode the format then maybe, depending on how much work is involved.

@@ -80,7 +85,7 @@ If you can't find either then the answer is no.

-


Q2 : In version 0 the SF_INFO struct had a pcmbitwidth field +


Q2 : In version 0 the SF_INFO struct had a pcmbitwidth field but version 1 does not. Why?

This was dropped for a number of reasons: @@ -91,50 +96,50 @@ If you can't find either then the answer is no.

As documented - here -there is now a well defined behavior which ensures that no matter what the + here +there is now a well defined behaviour which ensures that no matter what the bit width of the source file, the scaling always does something sensible. This makes it safe to read 8, 16, 24 and 32 bit PCM files using sf_read_short() -and always have the optimal behavior. +and always have the optimal behaviour.

-


Q3 : Compiling is really slow on MacOSX. Why?

+


Q3 : Compiling is really slow on MacOS X. Why?

When you configure and compile libsndfile, it uses the /bin/sh shell for a number of tasks (ie configure script and libtool). -Older versions of OSX (10.2?) shipped a a really crappy Bourne shell as /bin/sh +Older versions of OS X (10.2?) shipped a really crappy Bourne shell as /bin/sh which resulted in really slow compiles. -New version of OSX ship GNU BASh as /bin/sh and this answer doesn't apply in that +Newer version of OS X ship GNU Bash as /bin/sh and this answer doesn't apply in that case.

To fix this I suggest that you install the GNU Bash shell, rename /bin/sh to -/bin/sh.old and make a softlink from /bin/sh to the bash shell. +/bin/sh.old and make a symlink from /bin/sh to the bash shell. Bash is designed to behave as a Bourne shell when is is called as /bin/sh.

-When I did this on my iBook running MacOSX, compile times dropped from 13 minutes +When I did this on my iBook running MacOS X, compile times dropped from 13 minutes to 3 minutes.

-


Q4 : When trying to compile libsndfile on Solaris I get a "bad +


Q4 : When trying to compile libsndfile on Solaris I get a "bad substitution" error on linking. Why?

It seems that the Solaris Bourne shell disagrees with GNU libtool.

To fix this I suggest that you install the GNU Bash shell, rename /bin/sh to -/bin/sh.old and make a softlink from /bin/sh to the bash shell. +/bin/sh.old and make a symlink from /bin/sh to the bash shell. Bash is designed to behave as a Bourne shell when is is called as /bin/sh.

-


Q5 : Why doesn't libsndfile do interleaving/de-interleaving?

+


Q5 : Why doesn't libsndfile do interleaving/de-interleaving?

This problem is bigger than it may seem at first.

@@ -143,7 +148,7 @@ For a stereo file, it is a pretty safe bet that a simple interleaving/de-interle could satisfy most users. However, for files with more than 2 channels this is unlikely to be the case. If the user has a 4 channel file and want to play that file on a stereo output -sound card they either want the first two channels or they want some mixed combination +sound card they either want the first 2 channels or they want some mixed combination of the 4 channels.

@@ -156,7 +161,7 @@ This means that this feature will not be added any time soon. -


Q6 : What's the best format for storing temporary files?

+


Q6 : What's the best format for storing temporary files?

When you want to store temporary data there are a number of requirements; @@ -184,7 +189,7 @@ regardless of the host CPU. -


Q7 : On Linux/Unix/MaxOSX, what's the best way of detecting the presence +


Q7 : On Linux/Unix/MaxOS X, what's the best way of detecting the presence of libsndfile using autoconf?

@@ -242,7 +247,8 @@ libsndfile configure process. For instance on my system I get this: -


Q8 : But I just want a simple Makefile! What do I do?

+


Q8 : I have libsndfile installed and now I want to use it. I just want + a simple Makefile! What do I do?

The pkg-config program makes finding the correct compiler flag values and @@ -277,7 +283,7 @@ the command would be: -


Q9 : How about adding the ability to write/read sound files to/from +


Q9 : How about adding the ability to write/read sound files to/from memory buffers?

@@ -287,7 +293,7 @@ This has been added for version 1.0.13. -


Q10 : Reading a 16 bit PCM file as normalised floats and then +


Q10 : Reading a 16 bit PCM file as normalised floats and then writing them back changes some sample values. Why?

@@ -335,7 +341,7 @@ other than normalized floats in the application. Alternatives to normalized floats are the short and int data types (ie using sf_read_short or sf_read_int) or using un-normalized floats (see - + SFC_SET_NORM_FLOAT).

@@ -352,7 +358,7 @@ storage format (and which is also supported by most common file types). -


Q11 : I'm having problems with u-law encoded WAV files generated by +


Q11 : I'm having problems with u-law encoded WAV files generated by libsndfile in Winamp. Why?

@@ -381,21 +387,48 @@ is the risk of breaking something that currently works. -


Q12 : I'm looking at sf_read*. What are items? What are frames? +


Q12 : I'm looking at sf_read*. What are items? What are frames?

-For a sound file with only one channel, a frame is the same as a item. +An item is a single sample of the data type you are reading; ie a +single short value for sf_read_short or a single float +for sf_read_float.

+

-For multi channel sound files, a single frame contains a single item for -each channel. +For a sound file with only one channel, a frame is the same as a item (ie a +single sample) while for multi channel sound files, a single frame contains a +single item for each channel.

+

+Here are two simple, correct examples, both of which are assumed to be working +on a stereo file, first using items: +

+ +
+        #define CHANNELS 2
+        short data [CHANNELS * 100] ;
+        sf_count items_read = sf_read_short (file, data, 200) ;
+        assert (items_read == 200) ;
+
+ +

+and now readng the exact same amount of data using frames: +

+ +
+        #define CHANNELS 2
+        short data [CHANNELS * 100] ;
+        sf_count frames_read = sf_readf_short (file, data, 100) ;
+        assert (frames_read == 100) ;
+
+ -


Q13 : Why can't libsndfile open this Sound Designer II (SD2) file? +


Q13 : Why can't libsndfile open this Sound Designer II (SD2) file?

@@ -407,7 +440,7 @@ First some background. SD2 files are native to the Apple Macintosh platform and use features of the Mac filesystem (file resource forks) to store the file's sample rate, number of channels, sample width and more. -When you look at a file and its resource fork on Mac OSX it looks like +When you look at a file and its resource fork on Mac OS X it looks like this:

@@ -419,7 +452,7 @@ this:

Notice how the file itself looks like a directory containing a single file named rsrc. -When libsndfile is compiled for MacOSX, it should open (for write and read) +When libsndfile is compiled for MacOS X, it should open (for write and read) SD2 file with resource forks like this without any problems. It will also handle files with the resource fork in a separate file as described below. @@ -436,8 +469,8 @@ libsndfile to open the file.

However, it is possible to safely move an SD2 file to a Linux or Windows machine. -For instance, when an SD2 file is copied from inside MacOSX to a windows -shared directory or a Samba share (ie Linux), MacOSX is clever enough to +For instance, when an SD2 file is copied from inside MacOS X to a windows +shared directory or a Samba share (ie Linux), MacOS X is clever enough to store the resource fork of the file in a separate hidden file in the same directory like this:

@@ -475,7 +508,7 @@ files are. -


Q14 : I'd like to statically link libsndfile to my closed source +


Q14 : I'd like to statically link libsndfile to my closed source application. Can I buy a license so that this is possible?

@@ -494,7 +527,7 @@ library is if your application is released under the GNU GPL or LGPL. -


Q15 : My program is crashing during a call to a function in libsndfile. +


Q15 : My program is crashing during a call to a function in libsndfile. Is this a bug in libsndfile?

@@ -527,7 +560,7 @@ following: -


Q16 : Will you accept a fix for compiling libsndfile with compiler X? +


Q16 : Will you accept a fix for compiling libsndfile with compiler X?

@@ -548,7 +581,7 @@ This can make compiling libsndfile with some older compilers difficult. -


Q17 : Can libsndfile read/write files from/to UNIX pipes? +


Q17 : Can libsndfile read/write files from/to UNIX pipes?

@@ -583,7 +616,7 @@ See also FAQ Q6. -


Q18 : Is it possible to build a Universal Binary on Mac OSX? +


Q18 : Is it possible to build a Universal Binary on Mac OS X?

@@ -644,7 +677,7 @@ libsndfile is currently working on. -


Q19 : I have project files for Visual Studio / XCode / Whatever. Why +


Q19 : I have project files for Visual Studio / XCode / Whatever. Why don't you distribute them with libsndfile?

@@ -674,7 +707,7 @@ fixing or even testing it.

I currently release sources that I personally test on Win32, Linux and -MacOSX (PowerPC) using the compiler I trust (GNU GCC). +MacOS X (PowerPC) using the compiler I trust (GNU GCC). Supporting one compiler on three (actually much more because GCC is available almost everywhere) platforms is doable without too much pain. I also release binaries for Win32 with instructions on how to use those @@ -696,7 +729,7 @@ Hence, I'm not willing to enter into an arrangement like that again. -


Q20 : Why doesn't libsndfile support MP3? Lots of other Open Source +


Q20 : Why doesn't libsndfile support MP3? Lots of other Open Source projects support it!

@@ -721,8 +754,7 @@ Some of those authors may be students and hence wouldn't be worth pursuing. However, libsndfile is released under the name of a company, Mega Nerd Pty Ltd; a company which has income from from libsamplerate licensing, libsndfile based consulting income and other unrelated consulting income. -Adding MP3 support to libsndfile could place that income would be under legal -threat. +Adding MP3 support to libsndfile could place that income under legal threat.

@@ -734,7 +766,7 @@ John ffitch of the Csound project) in version 1.0.18. -


Q21 : How do I use libsndfile in a closed source or commercial program +


Q21 : How do I use libsndfile in a closed source or commercial program and comply with the license?

@@ -746,7 +778,7 @@ released under, the GNU Lesser General Public License (LGPL):
  • Make sure you are linking to libsndfile as a shared library (Linux and Unix - systems), Dynamic Link Library (Microsoft Windows) or dynlib (Mac OSX). + systems), Dynamic Link Library (Microsoft Windows) or dynlib (Mac OS X). If you are using some other operating system that doesn't allow dynamically linked libraries, you will not be able to use libsndfile unless you release the source code to your program. @@ -762,28 +794,57 @@ released under, the GNU Lesser General Public License (LGPL): -


    Q22 : What versions of windows does libsndfile work on? +


    Q22 : What versions of Windows does libsndfile work on?

    -Currently the precompiled windows binaries are tested in Windows XP. +Currently the precompiled windows binaries are thoroughly tested on Windows XP. As such, they should also work on Win2k and Windows Vista. -They may also work on earlier versions of windows. +They may also work on earlier versions of Windows.

    -libsndfile does not yet work on 64 bit versions of windows. -Support for 64 bit versions of WinXP and Vista is likely to be working some -time late in 2008. +Since version 0.1.18 I have also been releasing precompiled binaries for Win64, +the 64 bit version of Windows. +These binaries have received much less testing than the 32 bit versions, but +should work as expected. +I'd be very interested in receiving feedback on these binaries.

    + + + +


    Q23 : I'm cross compiling libsndfile for another platform. How can I + run the test suite? +

    + +

    +

    + +

    +Since version 1.0.21 the top level Makefile has an extra make target, +'test-tarball'. +Building this target creates a tarball called called: +

    + +
    +libsndfile-testsuite-${host_triplet}-${version}.tar.gz +
    + +

    +in the top level directory. +This tarball can then be copied to the target platform. +Once untarred and test script test_wrapper.sh can be run from +the top level of the extracted tarball. +

    +

    The libsndfile home page is here : http://www.mega-nerd.com/libsndfile/. -
    -Version : 1.0.19 +
    +Version : 1.0.25

    diff --git a/libs/libsndfile/doc/Makefile.am b/libs/libsndfile/doc/Makefile.am index 40a04d970a..b89f1454aa 100644 --- a/libs/libsndfile/doc/Makefile.am +++ b/libs/libsndfile/doc/Makefile.am @@ -1,8 +1,7 @@ ## Process this file with automake to produce Makefile.in -htmldir = $(htmldocdir) html_DATA = index.html libsndfile.jpg libsndfile.css api.html command.html \ - bugs.html sndfile_info.html new_file_type.HOWTO pkgconfig.html \ + bugs.html sndfile_info.html new_file_type.HOWTO \ win32.html FAQ.html lists.html embedded_files.html octave.html \ dither.html tutorial.html diff --git a/libs/libsndfile/doc/api.html b/libs/libsndfile/doc/api.html index 25c52d2dc0..33d53dd02f 100644 --- a/libs/libsndfile/doc/api.html +++ b/libs/libsndfile/doc/api.html @@ -3,12 +3,13 @@ - The libsndfile API. + The libsndfile API - + + @@ -34,9 +35,15 @@ unambiguous. However, since maintaining the documentation is the least fun part of working on libsndfile, these docs can and do fall behind the behaviour of library. - If any errors omissions or ambiguities are found, please notify - - Erik de Castro Lopo. + If any errors, omissions or ambiguities are found, please notify me (erikd) + at mega-nerd dot com. +

    + +

    + To supplement this reference documentation, there are simple example programs + included in the source code tarball. + The test suite which is also part of the source code tarball is also a good + place to look for the correct usage of the library functions.

    @@ -46,7 +53,7 @@

    -

    SYNOPSIS

    +

    Synopsis

    The functions of libsndfile are defined as follows:

    @@ -57,7 +64,7 @@ The functions of libsndfile are defined as follows: SNDFILE* sf_open (const char *path, int mode, SF_INFO *sfinfo) ; SNDFILE* sf_open_fd (int fd, int mode, SF_INFO *sfinfo, int close_desc) ; - + SNDFILE* sf_open_virtual (SF_VIRTUAL_IO *sfvirtual, int mode, SF_INFO *sfinfo, void *user_data) ; int sf_format_check (const SF_INFO *info) ; sf_count_t sf_seek (SNDFILE *sndfile, sf_count_t frames, int whence) ; @@ -186,6 +193,10 @@ Not all combinations of endian-ness and major and minor file types are valid. SF_FORMAT_SD2 = 0x160000, /* Sound Designer 2 */ SF_FORMAT_FLAC = 0x170000, /* FLAC lossless file format */ SF_FORMAT_CAF = 0x180000, /* Core Audio File format */ + SF_FORMAT_WVE = 0x190000, /* Psion WVE format */ + SF_FORMAT_OGG = 0x200000, /* Xiph OGG container */ + SF_FORMAT_MPC2K = 0x210000, /* Akai MPC 2000 sampler */ + SF_FORMAT_RF64 = 0x220000, /* RF64 WAV file */ /* Subtypes from here on. */ @@ -219,6 +230,8 @@ Not all combinations of endian-ness and major and minor file types are valid. SF_FORMAT_DPCM_8 = 0x0050, /* 8 bit differential PCM (XI only) */ SF_FORMAT_DPCM_16 = 0x0051, /* 16 bit differential PCM (XI only) */ + SF_FORMAT_VORBIS = 0x0060, /* Xiph Vorbis encoding. */ + /* Endian-ness options. */ SF_ENDIAN_FILE = 0x00000000, /* Default file endian-ness. */ @@ -238,10 +251,12 @@ memory allocated during the call to sf_open().

    -On success, the sf_open function returns a non NULL pointer which should be +On success, the sf_open function returns a non-NULL pointer which should be passed as the first parameter to all subsequent libsndfile calls dealing with that audio file. On fail, the sf_open function returns a NULL pointer. +An explanation of the error can obtained by passing NULL to + sf_strerror.

    @@ -251,6 +266,11 @@ On fail, the sf_open function returns a NULL pointer. SNDFILE* sf_open_fd (int fd, int mode, SF_INFO *sfinfo, int close_desc) ; +

    +Note: On Microsoft Windows, this function does not work if the +application and the libsndfile DLL are linked to different versions of the +Microsoft C runtime DLL. +

    The second open function takes a file descriptor of a file that has already been opened. @@ -280,12 +300,92 @@ parameter was TRUE when the sf_open_fd() function was called.

    -On success, the sf_open_fd function returns a non NULL pointer which should be +On success, the sf_open_fd function returns a non-NULL pointer which should be passed as the first parameter to all subsequent libsndfile calls dealing with that audio file. On fail, the sf_open_fd function returns a NULL pointer.

    + +

    Virtual File Open Function

    +
    +      SNDFILE* 	sf_open_virtual	(SF_VIRTUAL_IO *sfvirtual, int mode, SF_INFO *sfinfo, void *user_data) ;
+
    +

    + Opens a soundfile from a virtual file I/O context which is provided + by the caller. This is usually used to interface libsndfile to a stream or buffer + based system. Apart from the sfvirtual and the user_data parameters this function behaves + like sf_open. +

    + +
    +      typedef struct
+      {    sf_vio_get_filelen  get_filelen ;
+           sf_vio_seek         seek ;
+           sf_vio_read         read ;
+           sf_vio_write        write ;
+           sf_vio_tell         tell ;
+      } SF_VIRTUAL_IO ;
+
    +

    +Libsndfile calls the callbacks provided by the SF_VIRTUAL_IO structure when opening, reading +and writing to the virtual file context. The user_data pointer is a user defined context which +will be available in the callbacks. +

    +
    +      typedef sf_count_t  (*sf_vio_get_filelen) (void *user_data) ;
+      typedef sf_count_t  (*sf_vio_seek)        (sf_count_t offset, int whence, void *user_data) ;
+      typedef sf_count_t  (*sf_vio_read)        (void *ptr, sf_count_t count, void *user_data) ;
+      typedef sf_count_t  (*sf_vio_write)       (const void *ptr, sf_count_t count, void *user_data) ;
+      typedef sf_count_t  (*sf_vio_tell)        (void *user_data) ;
+
    +

    sf_vio_get_filelen

    +
    +      typedef sf_count_t  (*sf_vio_get_filelen) (void *user_data) ;
+
    +

    +The virtual file contex must return the length of the virtual file in bytes.
    +

    +

    sf_vio_seek

    +
    +      typedef sf_count_t  (*sf_vio_seek)        (sf_count_t offset, int whence, void *user_data) ;
+
    +

    +The virtual file context must seek to offset using the seek mode provided by whence which is one of
    +

    +
    +      SEEK_CUR
+      SEEK_SET
+      SEEK_END
+
    +

    +The return value must contain the new offset in the file. +

    +

    sf_vio_read

    +
    +      typedef sf_count_t  (*sf_vio_read)        (void *ptr, sf_count_t count, void *user_data) ;
+
    +

    +The virtual file context must copy ("read") "count" bytes into the +buffer provided by ptr and return the count of actually copied bytes. +

    +

    sf_vio_write

    +
    +      typedef sf_count_t  (*sf_vio_write)       (const void *ptr, sf_count_t count, void *user_data) ;
+
    +

    +The virtual file context must process "count" bytes stored in the +buffer passed with ptr and return the count of actually processed bytes.
    +

    +

    sf_vio_tell

    +
    +      typedef sf_count_t  (*sf_vio_tell)        (void *user_data) ;
+
    +

    +Return the current position of the virtual file context.
    +

    + +

    Format Check Function

    @@ -541,6 +641,12 @@ same as the frames parameter). sf_count_t sf_write_raw (SNDFILE *sndfile, void *ptr, sf_count_t bytes) ; +

    +Note: Unless you are writing an external decoder/encode that uses +libsndfile to handle the file headers, you should not be using these +functions. +

    +

    The raw read and write functions read raw audio data from the audio file (not to be confused with reading RAW header-less PCM files). The number of bytes read or written @@ -586,12 +692,16 @@ The str_type parameter can be any one of the following string types: SF_STR_SOFTWARE, SF_STR_ARTIST, SF_STR_COMMENT, - SF_STR_DATE + SF_STR_DATE, + SF_STR_ALBUM, + SF_STR_LICENSE, + SF_STR_TRACKNUMBER, + SF_STR_GENRE } ;

    -The sf_get_string() function returns the specificed string if it exists and a +The sf_get_string() function returns the specified string if it exists and a NULL pointer otherwise. In addition to the string ids above, SF_STR_FIRST (== SF_STR_TITLE) and SF_STR_LAST (always the same as the highest numbers string id) are also @@ -648,7 +758,7 @@ would mean that all sample values read from the file will be zero. In order to read these files correctly using integer read methods, it is recommended that you use the sf_command -interface a command of +interface, a command of SFC_SET_SCALE_FLOAT_INT_READ and a parameter of SF_TRUE to force correct scaling.

    @@ -660,7 +770,7 @@ and a parameter of SF_TRUE to force correct scaling. here.

    -Version : 1.0.19 +Version : 1.0.25

    diff --git a/libs/libsndfile/doc/bugs.html b/libs/libsndfile/doc/bugs.html index 94caffecba..3a441fef11 100644 --- a/libs/libsndfile/doc/bugs.html +++ b/libs/libsndfile/doc/bugs.html @@ -6,7 +6,8 @@ Bug Reporting - + + @@ -45,7 +46,7 @@
  • Whether you are using a package provided by your distribution or you compiled it youself.
  • If you compiled it yourself, the compiler you are using. (Also make - sure to run "make check".) + sure to run 'make check'.)
  • A description of the problem.
  • Information generated by the sndfile-info program (see next paragraph).
  • If you are having problems with sndfile-play and ALSA on Linux, I will @@ -67,9 +68,8 @@ problems.

    - Once you have the above information you should email it to one of the - mailing lists - (posting to these lists is limited to the list subscribers). + Once you have the above information you should submit a ticket on the libsnfile + github issue tracker.

    diff --git a/libs/libsndfile/doc/command.html b/libs/libsndfile/doc/command.html index 239e8d2087..f2ed083760 100644 --- a/libs/libsndfile/doc/command.html +++ b/libs/libsndfile/doc/command.html @@ -9,7 +9,8 @@ - + + @@ -27,7 +28,7 @@ Most of these operations are performed on a per-file basis.

    - The cmd parameter is a integer identifier which is defined in <sndfile.h>. + The cmd parameter is an integer identifier which is defined in <sndfile.h>. All of the valid command identifiers have names beginning with "SFC_". Data is passed to and returned from the library by use of a void pointer. The library will not read or write more than datasize bytes from the void pointer. @@ -167,12 +168,12 @@ SFC_GET_CLIPPING - Retreive current clipping setting. + Retrieve current clipping setting. SFC_GET_EMBED_FILE_INFO - Retreive information about audio files embedded inside other files. + Retrieve information about audio files embedded inside other files. @@ -187,7 +188,12 @@ SFC_SET_VBR_ENCODING_QUALITY - Set the the Variable Bit Rate encoding quality + Set the Variable Bit Rate encoding quality + + + + SFC_SET_COMPRESSION_LEVEL + Set the compression level. @@ -205,6 +211,33 @@ Set the Broadcast Chunk info + + SFC_SET_CART_INFO + Set the Cart Chunk info + + + + SFC_GET_CART_INFO + Retrieve the Cart Chunk info + + + + SFC_GET_LOOP_INFO + Get loop info + + + + SFC_GET_INSTRUMENT + Get instrument info + + + + SFC_SET_INSTRUMENT + Set instrument info + + + + + +


    SFC_SET_COMPRESSION_LEVEL

    +

    +Set the compression level. +The compression level should be between 0.0 (minimum compression level) and 1.0 +(highest compression level). +Currenly this command is only implemented for FLAC and Ogg/Vorbis files. +

    +

    +Parameters: +

    +        sndfile  : A valid SNDFILE* pointer
+        cmd      : SFC_SET_COMPRESSION_LEVEL
+        data     : A pointer to a double value
+        datasize : sizeof (double)
+
    +

    +The command must be sent before any audio data is written to the file. +

    +

    +

    +
    +
    Return value:
    +
    SF_TRUE if compression level was set. + SF_FALSE otherwise.
    @@ -1334,7 +1397,7 @@ Parameters:


    SFC_GET_BROADCAST_INFO

    -Retrieve the Broadcast Extention Chunk from WAV (and related) files. +Retrieve the Broadcast Extension Chunk from WAV (and related) files.

    Parameters: @@ -1367,7 +1430,7 @@ The SF_BROADCAST_INFO struct is defined in <sndfile.h> as:

    Return value:
    -
    SF_TRUE if the file contained a Broadcast Extention chunk or SF_FALSE +
    SF_TRUE if the file contained a Broadcast Extension chunk or SF_FALSE otherwise.
    @@ -1375,7 +1438,7 @@ The SF_BROADCAST_INFO struct is defined in <sndfile.h> as:


    SFC_SET_BROADCAST_INFO

    -Set the Broadcast Extention Chunk for WAV (and related) files. +Set the Broadcast Extension Chunk for WAV (and related) files.

    Parameters: @@ -1389,9 +1452,225 @@ Parameters:

    Return value:
    -
    SF_TRUE if setting the Broadcast Extention chunk was successful and SF_FALSE +
    SF_TRUE if setting the Broadcast Extension chunk was successful and SF_FALSE + otherwise. + +
    + + + +


    SFC_GET_CART_INFO

    +

    Retrieve the Cart Chunk from WAV (and related) files. Based on AES46 standard for CartChunk (see CartChunk.org for more information. +

    +

    +Parameters: +

    +
    +        sndfile  : A valid SNDFILE* pointer
+        cmd      : SFC_GET_CART_INFO
+        data     : a pointer to an SF_CART_INFO struct
+        datasize : sizeof (SF_CART_INFO)
+
    +

    +The SF_CART_INFO struct is defined in <sndfile.h> as: +

    +
    +#define SF_CART_INFO_VAR(p_tag_text_size) \
+                        struct
+                        {       char            version [4] ;
+                                char            title [64] ;
+                                char            artist [64] ;
+                                char            cut_id [64] ;
+                                char            client_id [64] ;
+                                char            category [64] ;
+                                char            classification [64] ;
+                                char            out_cue [64] ;
+                                char            start_date [10] ;
+                                char            start_time [8] ;
+                                char            end_date [10] ;
+                                char            end_time [8] ;
+                                char            producer_app_id [64] ;
+                                char            producer_app_version [64] ;
+                                char            user_def [64] ;
+                                long    level_reference ;
+                                SF_CART_TIMER   post_timers [8] ;
+                                char            reserved [276] ;
+                                char            url [1024] ;
+                                unsigned int    tag_text_size ;
+                                char            tag_text[p_tag_text_size] ;
+                        }
+
    + +
    +
    Return value:
    +
    SF_TRUE if the file contained a Cart chunk or SF_FALSE otherwise.
    + + + +


    SFC_SET_CART_INFO

    +

    +Set the Cart Chunk for WAV (and related) files. +

    +

    +Parameters: +

    +
    +        sndfile  : A valid SNDFILE* pointer
+        cmd      : SFC_SET_CART_INFO
+        data     : a pointer to an SF_CART_INFO struct
+        datasize : sizeof (SF_CART_INFO)
+
    + +
    +
    Return value:
    +
    SF_TRUE if setting the Cart chunk was successful and SF_FALSE + otherwise. +
    + + + +


    SFC_GET_LOOP_INFO

    +

    +Retrieve loop information for file including time signature, length in +beats and original MIDI base note +

    +

    +Parameters: +

    +
    +         sndfile  : A valid SNDFILE* pointer
+         cmd      : SFC_GET_LOOP_INFO
+         data     : a pointer to an SF_LOOP_INFO struct
+         datasize : sizeof (SF_LOOP_INFO)
+
    +

    +The SF_BROADCAST_INFO struct is defined in <sndfile.h> as: +

    +
    +        typedef struct
+        {   short    time_sig_num ;   /* any positive integer    > 0  */
+            short    time_sig_den ;   /* any positive power of 2 > 0  */
+            int        loop_mode ;    /* see SF_LOOP enum             */
+
+            int        num_beats ;    /* this is NOT the amount of quarter notes !!!*/
+                                      /* a full bar of 4/4 is 4 beats */
+                                      /* a full bar of 7/8 is 7 beats */
+
+            float    bpm ;            /* suggestion, as it can be calculated using other fields:*/
+                                      /* file's lenght, file's sampleRate and our time_sig_den*/
+                                      /* -> bpms are always the amount of _quarter notes_ per minute */
+
+            int    root_key ;         /* MIDI note, or -1 for None */
+            int future [6] ;
+        } SF_LOOP_INFO ;
+
    +

    +Example: +

    +
    +         SF_LOOP_INFO loop;
+         sf_command (sndfile, SFC_GET_LOOP_INFO, &loop, sizeof (loop)) ;
+
    +
    +
    Return value:
    +
    SF_TRUE if the file header contains loop information for the file. + SF_FALSE otherwise. +
    + + + + + +


    SFC_GET_INSTRUMENT

    +

    +Retrieve instrument information from file including MIDI base note, +keyboard mapping and looping informations(start/stop and mode). +

    +

    +Parameters: +

    +
    +         sndfile  : A valid SNDFILE* pointer
+         cmd      : SFC_GET_INSTRUMENT
+         data     : a pointer to an SF_INSTRUMENT struct
+         datasize : sizeof (SF_INSTRUMENT)
+
    + +

    +The SF_INSTRUMENT struct is defined in <sndfile.h> as: +

    +
    +        enum
+        {    /*
+            **    The loop mode field in SF_INSTRUMENT will be one of the following.
+            */
+            SF_LOOP_NONE = 800,
+            SF_LOOP_FORWARD,
+            SF_LOOP_BACKWARD,
+            SF_LOOP_ALTERNATING
+        } ;
+
+        typedef struct
+        {   int gain ;
+            char basenote, detune ;
+            char velocity_lo, velocity_hi ;
+            char key_lo, key_hi ;
+            int loop_count ;
+
+            struct
+            {   int mode ;
+                unsigned int start ;
+                unsigned int end ;
+                unsigned int count ;
+            } loops [16] ; /* make variable in a sensible way */
+        } SF_INSTRUMENT ;
+
    + +

    +Example: +

    +
    +         SF_INSTRUMENT inst ;
+         sf_command (sndfile, SFC_GET_INSTRUMENT, &inst, sizeof (inst)) ;
+
    +
    +
    Return value:
    +
    SF_TRUE if the file header contains instrument information for the + file. SF_FALSE otherwise. +
    + + + + + +


    SFC_SET_INSTRUMENT

    +

    +Set the instrument information for the file. +

    +

    +Parameters: +

    +
    +         sndfile  : A valid SNDFILE* pointer
+         cmd      : SFC_GET_INSTRUMENT
+         data     : a pointer to an SF_INSTRUMENT struct
+         datasize : sizeof (SF_INSTRUMENT)
+
    +

    +Example: +

    +
    +         SF_INSTRUMENT inst ;
+         sf_command (sndfile, SFC_SET_INSTRUMENT, &inst, sizeof (inst)) ;
+
    +
    +
    Return value:
    +
    SF_TRUE if the file header contains instrument information for the + file. SF_FALSE otherwise. +
    + @@ -1401,7 +1680,7 @@ Parameters: http://www.mega-nerd.com/libsndfile/.
    -Version : 1.0.19 +Version : 1.0.25

    diff --git a/libs/libsndfile/doc/development.html b/libs/libsndfile/doc/development.html new file mode 100644 index 0000000000..4236cdbb87 --- /dev/null +++ b/libs/libsndfile/doc/development.html @@ -0,0 +1,43 @@ + + + + + + libsndfile Development + + + + + + + + +


    libsndfile Development

    + +

    +libsndfile is being developed by a small but growing community of users +and hackers led by Erik de Castro Lopo. +People interested in helping should join the libsndfile-devel + mailing list +where most of the discussion about new features takes place. +

    + +

    +The main repository can be found on Github: +

    + +
    + + https://github.com/erikd/libsndfile/ +
    + +

    +and includes + + instuctions +on how to build libsndfilefrom the Git repo. +

    + + + + diff --git a/libs/libsndfile/doc/dither.html b/libs/libsndfile/doc/dither.html index c1edd17d1b..01a416f8b3 100644 --- a/libs/libsndfile/doc/dither.html +++ b/libs/libsndfile/doc/dither.html @@ -9,7 +9,8 @@ - + + @@ -1009,7 +1010,7 @@ Example: http://www.mega-nerd.com/libsndfile/.
    -Version : 1.0.19 +Version : 1.0.25

    diff --git a/libs/libsndfile/doc/donate.html b/libs/libsndfile/doc/donate.html new file mode 100644 index 0000000000..c611f47ffd --- /dev/null +++ b/libs/libsndfile/doc/donate.html @@ -0,0 +1,112 @@ + + + + + + libsndfile : donate. + + + + + + + + + + + +
    + +
    + libsndfile.jpg +
    + +
    + +

    +Dear libsndfile user, +

    + +

    +This library was developed on Linux for Linux. I am not a Windows user and +maintaining this library for Windows costs me significant amounts of time above +and beyond the time taken to make it work on Linux and Unix-like systems. +

    + +

    +I therefore ask Windows users of libsndfile to donate to ensure that libsndfile's +support for Windows continues. As long as donations continue to flow in at a decent +rate, I will continue to release precompiled Windows binaries in sync with the +Linux/Unix version. If donations are poor, support for windows will fall behind. +

    + + +

    +You are free to donate any amount you chose. +As a guideline: +

    + +
      +
    • If you are simply a user of libsndfile that would like to ensure that + the development of libsndfile continues, a donation of $10US would be more + than adequate. +
      • +
    • If you are shareware author that distributes libsndfile with your app and + makes more than $1000 a year from your shareware, a one off donation of $50 + would be appropriate. +
      • +
    • If your company is a commercial software house that distributes one or more + products that ship with libsndfile, a donation of $100 every second or third + year would be appropriate. +
      • +
    + + +

    +Donations can be made in Bitcoin to the Bitcoin address + 15hVWemFiH6DLJ22SBYPk9b4fgWtxBEvfQ + +which can be verified by checking the following GPG signature. +

    + +
    +-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+libsndfile Bitcoin address : 15hVWemFiH6DLJ22SBYPk9b4fgWtxBEvfQ
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+iQIcBAEBCAAGBQJSK7MUAAoJEEXYQ7zIiotIgXEP/R8hy65tlV7TiPw9bY9BklXS
+/Vl8FU2RhDkBt61ZmxbfDTybyQ5Vce/3wWph15L4RvpoX1OyeintQFmwwuPjOGiq
+eIz0nT9vDorG37Xdo5NZNBu9Tp1Od9MNtxFaAsRWFrDfvKEKljBHrcfM972cYrAp
+DaFd0Ik+bHKom9iQXFB7TFd0w2V4uszVMQDUGqb/vRNeRURZS7ypeMNwc8tZyTKR
+waEGMTa5sxxRjs7MqGRxSovnFT7JV3TNfdkBInUliIR/XvrudFR9J4Fiv+8Dk9P8
+WNjm6uFxvgIqiu1G9bjrwwr+DsBju93ljGNcZoayAKw5vwbX6KTcCbc31k9dP8Hf
+p6YdmPlZVKZmva+P3nLSJBTlxNu24Jm+ha+ZM/svDXTaPFWC8l5FP17kK0Bj8wCq
+N7pDz6RchEn10u+HdhfT1XiUjxj0zNXrr0GGj9apjl0RlT0O49eBttV0oXIdBRLi
+nTEaOWITpCgu7ggw1kWXHIWEncuiaSuJy/iH8PgNepWVj/6PxQRMrTqG4ux2Snk8
+Ua4vO8YHLMZX/XvSUS7eMtgfM7AO6YjJ/ac9bQif9bh6LsYEVVklysMUin6ZRS7Z
+Cms23FnqeQKtJOzdvqSJiV06lK6fP+tYdM4WSYn+AfL4IfYl2v48xXVU8XOOK9BH
+bJPKMDcz1ZvfYtX5mSW1
+=WXGB
+-----END PGP SIGNATURE-----
+
    + +

    +Thanks and regards, +
    +Erik de Castro Lopo +
    +Main libsndfile author and maintainer +

    + + + + + + + + diff --git a/libs/libsndfile/doc/embedded_files.html b/libs/libsndfile/doc/embedded_files.html index 455614d2eb..c73e86a3b5 100644 --- a/libs/libsndfile/doc/embedded_files.html +++ b/libs/libsndfile/doc/embedded_files.html @@ -8,7 +8,8 @@ - + + diff --git a/libs/libsndfile/doc/index.html b/libs/libsndfile/doc/index.html index 362e9529cb..bdd25aad10 100644 --- a/libs/libsndfile/doc/index.html +++ b/libs/libsndfile/doc/index.html @@ -6,11 +6,12 @@ libsndfile - + - + + @@ -47,11 +48,8 @@

    The library was written to compile and run on a Linux system but should compile - and run on just about any Unix (including MacOSX). - It can also be compiled and run on Win32 systems using the Microsoft compiler and - MacOS (OS9 and earlier) using the Metrowerks compiler. - There are directions for compiling libsndfile on these platforms in the Win32 and - MacOS directories of the source code distribution. + and run on just about any Unix (including MacOS X). + There are also pre-compiled binaries available for 32 and 64 bit windows.

    It was designed to handle both little-endian (such as WAV) and big-endian @@ -67,18 +65,19 @@

      -
    • i586-pc-linux-gnu (Linux on PC hardware) -
    • powerpc-unknown-linux-gnu (Linux on Apple Mac hardware) -
    • powerpc-apple-darwin7.0 (Mac OS X 10.3) -
    • sparc-sun-solaris2.8 (using gcc) -
    • mips-sgi-irix5.3 (using gcc) -
    • QNX 6.0 -
    • i386-unknown-openbsd2.9 +
    • Every platform supported by Debian GNU/Linux including x86_64-linux-gnu, + i486-linux-gnu, powerpc-linux-gnu, sparc-linux-gnu, alpha-linux-gnu, + mips-linux-gnu and armel-linux-gnu.
      • +
    • powerpc-apple-darwin7.0 (Mac OS X 10.3)
      • +
    • sparc-sun-solaris2.8 (using gcc)
      • +
    • mips-sgi-irix5.3 (using gcc)
      • +
    • QNX 6.0
      • +
    • i386-unknown-openbsd2.9

    - At the moment, each new release is being tested on i386 Linux, PowerPC Linux, - MacOSX on PowerPC and Win32. + At the moment, each new release is being tested on i386 Linux, x86_64 Linux, + PowerPC Linux, Win32 and Win64.

    @@ -293,7 +292,7 @@ and I have decided that I will not be adding support for MPEG Layer 3 (commonly known as MP3) due to the patent issues surrounding this file format. See - + the FAQ for more.

    @@ -343,7 +342,7 @@ and
  • Version 1.0.5 (May 03 2003) One new file format and new functionality.
  • Version 1.0.6 (Feb 08 2004) Large file fix for Linux/Solaris, new functionality and Win32 improvements. -
  • Version 1.0.7 (Feb 24 2004) Fix build problems on MacOSX and fix ia64/MIPS etc +
  • Version 1.0.7 (Feb 24 2004) Fix build problems on MacOS X and fix ia64/MIPS etc clip mode detction.
  • Version 1.0.8 (Mar 14 2004) Minor bug fixes.
  • Version 1.0.9 (Mar 30 2004) Add AVR format. Improve handling of some WAV files. @@ -360,8 +359,15 @@ and
  • Version 1.0.17 (Aug 31 2006) Add C++ wrapper sndfile.hh. Minor bug fixes and cleanups.
  • Version 1.0.18 (Feb 07 2009) Add Ogg/Vorbis suppport, remove captive libraries, many new features and bug fixes. Generate Win32 and Win64 pre-compiled binaries. -
  • Version 1.0.19 (Mar 02 2009) Fix for CVE-2009-0186. Huge number of minor fixes as a +
  • Version 1.0.19 (Mar 02 2009) Fix for CVE-2009-0186. Huge number of minor fixes as a result of static analysis. +
  • Version 1.0.20 (May 14 2009) Fix for potential heap overflow. +
  • Version 1.0.21 (December 13 2009) Bunch of minor bug fixes. +
  • Version 1.0.22 (October 04 2010) Bunch of minor bug fixes. +
  • Version 1.0.23 (October 10 2010) Minor bug fixes. +
  • Version 1.0.24 (March 23 2011) Minor bug fixes. +
  • Version 1.0.25 (July 13 2011) Fix for Secunia Advisory SA45125. Minor bug fixes and + improvements.
@@ -389,7 +395,7 @@ and version 2.1 and version 3. - To mamximise the compatibility of libsndfile, the user may choose to use libsndfile + To maximise the compatibility of libsndfile, the user may choose to use libsndfile under either of the above two licenses. You can also read a simple explanation of the ideas behind the GPL and the LGPL here. @@ -410,24 +416,12 @@ and Free Software or Open Source. - However, if you put in a great deal of effort building a huge application + However, if you put in a great deal of effort building a significant application which simply uses libsndfile for file I/O, then I have no problem with you releasing that as closed source and charging as much money as you want for it as long as you abide by the license.

-

- What I don't like to see is things like Steve Dekorte's SoundConverter - (no I won't link to his page) for Mac OSX. - Mr Dekorte has grabbed a number of Free Software packages and wrapped them in a - rather amateurish, buggy GUI and released the result as shareware. - He charges US$10 for the full version when his contribution to the whole is, by - his own - - admission, - less than 10%. -

-

Download

@@ -435,23 +429,22 @@ and

The Win32 installer was compiled for Windows XP but should also work on Windows -2000 and Vista. -It may even work on earlier versions of Windows. -The Win64 is pretty much untested. +2000, Vista and Windows 7.

diff --git a/libs/libsndfile/doc/libsndfile.css b/libs/libsndfile/doc/libsndfile.css index 940c136fe8..eab8d0616b 100644 --- a/libs/libsndfile/doc/libsndfile.css +++ b/libs/libsndfile/doc/libsndfile.css @@ -48,24 +48,32 @@ dl { margin-left : 3% ; margin-right : 3% ; } -h1 { - font-size : xx-large ; - background : black ; - color : #5050FF ; - text-align : left ; - margin-left : 3% ; - margin-right : 3% ; -} -h2 { - font-size : x-large ; +h1 { + font-size : xx-large ; background : black ; color : #5050FF ; text-align : left ; margin-left : 3% ; margin-right : 3% ; } -h3 { - font-size : large ; +h2 { + font-size : x-large ; + background : black ; + color : #5050FF ; + text-align : left ; + margin-left : 3% ; + margin-right : 3% ; +} +h3 { + font-size : large ; + background : black ; + color : #5050FF ; + text-align : left ; + margin-left : 3% ; + margin-right : 3% ; +} +h4 { + font-size : medium ; background : black ; color : #5050FF ; text-align : left ; diff --git a/libs/libsndfile/doc/libsndfile.css.in b/libs/libsndfile/doc/libsndfile.css.in index 3e308b2cc3..40fca0f145 100644 --- a/libs/libsndfile/doc/libsndfile.css.in +++ b/libs/libsndfile/doc/libsndfile.css.in @@ -48,24 +48,32 @@ dl { margin-left : 3% ; margin-right : 3% ; } -h1 { - font-size : xx-large ; - background : @HTML_BGCOLOUR@ ; - color : #5050FF ; - text-align : left ; - margin-left : 3% ; - margin-right : 3% ; -} -h2 { - font-size : x-large ; +h1 { + font-size : xx-large ; background : @HTML_BGCOLOUR@ ; color : #5050FF ; text-align : left ; margin-left : 3% ; margin-right : 3% ; } -h3 { - font-size : large ; +h2 { + font-size : x-large ; + background : @HTML_BGCOLOUR@ ; + color : #5050FF ; + text-align : left ; + margin-left : 3% ; + margin-right : 3% ; +} +h3 { + font-size : large ; + background : @HTML_BGCOLOUR@ ; + color : #5050FF ; + text-align : left ; + margin-left : 3% ; + margin-right : 3% ; +} +h4 { + font-size : medium ; background : @HTML_BGCOLOUR@ ; color : #5050FF ; text-align : left ; @@ -75,6 +83,8 @@ h3 { pre { font-family : courier, monospace ; font-size : medium ; + margin-left : 6% ; + margin-right : 6% ; } a:link { color : #9090FF ; } a:visited { color : #5050FF ; } diff --git a/libs/libsndfile/doc/linux_games_programming.txt b/libs/libsndfile/doc/linux_games_programming.txt new file mode 100644 index 0000000000..747f59db26 --- /dev/null +++ b/libs/libsndfile/doc/linux_games_programming.txt @@ -0,0 +1,434 @@ +# Here are some some emails I exchanged with a guy trying to use +# libsndfile version 1 with code from the book "Linux Games Programming" +# by John Hall. The email addresses have been changed to foil the spam +# bots. + +Date: Tue, 20 Jul 2004 22:49:21 +0100 +From: Paul +To: erikd@fake-domain-name.com +Subject: Can you help with a problem? +Date: Tue, 20 Jul 2004 22:49:21 +0100 + +Hi, + +I'm trying to get the source examples in the "Programming Linux Games" +(NoStarch, Loki Software + John R. Hall) which use sndfile.h/libsndfile. + +While I can guess some of the newer versions of function calls and +enumerations, there are some which I cannot guess. + +Would you be able to translate them to the current version of +enumeration and function calls so that I can update the source? + +These are the three currently failing me: + + sf_open_read(filename, SF_INFO *sfinfo) (guess: sf_open(filename,SFM_READ, &sfinfo)) + SF_FORMAT_PCM (guess: either SF_FORMAT_PCM_U8 or _RAW) + SF_INFO.pcmbitwidth (guess: no idea!) + +There are probably more. I'm happy to send you the source files for +sound calls, scan the pages or anything else. Failing that, is there +somewhere with the changes listed so I can try and fix the code for myself? + +Thanks + +TTFN + +Paul + +================================================================================ + +Date: Wed, 21 Jul 2004 17:38:08 +1000 +From: Erik de Castro Lopo +To: Paul +Subject: Re: Can you help with a problem? + +On Tue, 20 Jul 2004 22:49:21 +0100 +Paul wrote: + +> Hi, +> +> I'm trying to get the source examples in the "Programming Linux Games" +> (NoStarch, Loki Software + John R. Hall) which use sndfile.h/libsndfile. +> +> While I can guess some of the newer versions of function calls and +> enumerations, there are some which I cannot guess. +> +> Would you be able to translate them to the current version of +> enumeration and function calls so that I can update the source? +> +> These are the three currently failing me: +> +> sf_open_read(filename, SF_INFO *sfinfo) (guess: sf_open(filename, +> SFM_READ, &sfinfo)) + +yes. + +> SF_FORMAT_PCM (guess: either SF_FORMAT_PCM_U8 or _RAW) + +Actually this list: + + SF_FORMAT_PCM_U8 + SF_FORMAT_PCM_S8 + SF_FORMAT_PCM_16 + SF_FORMAT_PCM_24 + SF_FORMAT_PCM_32 + +> SF_INFO.pcmbitwidth (guess: no idea!) + +WIth the above change, pcmbitwidth becomes redundant. + +> There are probably more. I'm happy to send you the source files for +> sound calls, scan the pages or anything else. Failing that, is there +> somewhere with the changes listed so I can try and fix the code for +> myself? + +Version 1.0.0 came out some time ago, but I think this: + + http://www.mega-nerd.com/libsndfile/version-1.html + +lists most of the changes. You should also look at the API docs: + + http://www.mega-nerd.com/libsndfile/api.html + +HTH, +Erik +-- ++-----------------------------------------------------------+ + Erik de Castro Lopo nospam@fake-domain-name.com ++-----------------------------------------------------------+ +"There is no reason why anyone would want a computer in their home" +Ken Olson, DEC, 1977 + +================================================================================ + +From: PFJ +To: Erik de Castro Lopo +Subject: Re: Can you help with a problem? +Date: Wed, 21 Jul 2004 09:07:39 +0100 + + +Hi Erik, + +Thanks for getting back to me. + +> > sf_open_read(filename, SF_INFO *sfinfo) (guess: sf_open(filename, SFM_READ, &sfinfo)) +> +> yes. + +Yay! + +> > SF_FORMAT_PCM (guess: either SF_FORMAT_PCM_U8 or _RAW) +> +> Actually this list: +> +> SF_FORMAT_PCM_U8 +> SF_FORMAT_PCM_S8 +> SF_FORMAT_PCM_16 +> SF_FORMAT_PCM_24 +> SF_FORMAT_PCM_32 + +I know, but the source code explicitly has SF_FORMAT_PCM which given the +code afterwards would equate to one of the above, but given that PCM +files can have a varied bitwidth the author probably wanted to cover all +bases. + +> Version 1.0.0 came out some time ago, but I think this: +> +> http://www.mega-nerd.com/libsndfile/version-1.html +> +> lists most of the changes. You should also look at the API docs: +> +> http://www.mega-nerd.com/libsndfile/api.html + +I'll download them and see what I can gleen. + +Thanks again for getting back to me + +TTFN + +Paul + +================================================================================ + +Date: Wed, 21 Jul 2004 18:20:29 +1000 +From: Erik de Castro Lopo +To: PFJ +Subject: Re: Can you help with a problem? + +On Wed, 21 Jul 2004 09:07:39 +0100 +PFJ wrote: + +> I know, but the source code explicitly has SF_FORMAT_PCM which given the +> code afterwards would equate to one of the above, but given that PCM +> files can have a varied bitwidth the author probably wanted to cover all +> bases. + +But surely the existing code does something like: + + sfinfo.format = SF_FORMAT_WAV | SF_FORMAT_PCM; + sfinfo.pcmbitwidth = 16; + +which can be directly translated to: + + sfinfo.format = SF_FORMAT_WAV | SF_FORMAT_PCM_16; + +and the same for pcmbitwitdhs of 24 and 32. For pcmbitwidth of 8 +you need to know that WAV files use SF_FORMAT_PCM_U8 and AIFF +files use SF_FORMAT_PCM_S8. Thats all there is to it. + +Erik +-- ++-----------------------------------------------------------+ + Erik de Castro Lopo nospam@fake-domain-name.com ++-----------------------------------------------------------+ +"Python addresses true pseudocode's two major failings: that it +isn't standardized, and it isn't executable." +- Grant R. Griffin in comp.dsp + +================================================================================ + +Subject: Re: Can you help with a problem? +From: PFJ +To: Erik de Castro Lopo +Date: Wed, 21 Jul 2004 09:50:55 +0100 + +Hi Erik, + +> > I know, but the source code explicitly has SF_FORMAT_PCM which given the +> > code afterwards would equate to one of the above, but given that PCM +> > files can have a varied bitwidth the author probably wanted to cover all +> > bases. +> +> But surely the existing code does something like: +> +> sfinfo.format = SF_FORMAT_WAV | SF_FORMAT_PCM; +> sfinfo.pcmbitwidth = 16; + +If only! + +The actual code is this + +int LoadSoundFile(char *filename, sound_p sound) +{ + SNDFILE *file; + SF_INFO file_info; + short *buffer_short = NULL; + u_int8_t *buffer_8 = NULL; + int16_t *buffer_16 = NULL; + unsigned int i; + + /* Open the file and retrieve sample information. */ + file = sf_open_read(filename, &file_info); + // I've sorted this one already - PFJ + + /* Make sure the format is acceptable. */ + if ((file_info.format & 0x0F) != SF_FORMAT_PCM) { + printf("'%s' is not a PCM-based audio file.\n", filename); + sf_close(file); + return -1; + } + + if ((file_info.pcmbitwidth == 8) && (file_info.channels == 1)) { + sound->format = AL_FORMAT_MONO8; + } else if ((file_info.pcmbitwidth == 8) && (file_info.channels == 2)) { + sound->format = AL_FORMAT_STEREO8; + } else if ((file_info.pcmbitwidth == 16) && (file_info.channels == 1)) { + sound->format = AL_FORMAT_MONO16; + } else if ((file_info.pcmbitwidth == 16) && (file_info.channels == 2)) { + sound->format = AL_FORMAT_STEREO16; + } else { + printf("Unknown sample format in %s.\n", filename); + sf_close(file); + return -1; + } + + /* Allocate buffers. */ + buffer_short = (short *)malloc(file_info.samples * file_info.channels * sizeof (short)); + + buffer_8 = (u_int8_t *)malloc(file_info.samples * file_info.channels * file_info.pcmbitwidth / 8); + + buffer_16 = (int16_t *)buffer_8; + + if (buffer_short == NULL || buffer_8 == NULL) { + printf("Unable to allocate enough memory for '%s'.\n", filename); + goto error_cleanup; + } + + /* Read the entire sound file. */ + if (sf_readf_short(file,buffer_short,file_info.samples) == (size_t)-1) { + printf("Error while reading samples from '%s'.\n", filename); + goto error_cleanup; + } + + + + /* Fill in the sound data structure. */ + sound->freq = file_info.samplerate; + sound->size = file_info.samples * file_info.channels * file_info.pcmbitwidth / 8; + + /* Give our sound data to OpenAL. */ + alGenBuffers(1, &sound->name); + if (alGetError() != AL_NO_ERROR) { + printf("Error creating an AL buffer name for %s.\n", filename); + goto error_cleanup; + } + + alBufferData(sound->name, sound->format, buffer_8, sound->size,sound->freq); + if (alGetError() != AL_NO_ERROR) { + printf("Error sending buffer data to OpenAL for %s.\n", filename); + goto error_cleanup; + } + + /* Close the file and return success. */ + sf_close(file); + free(buffer_short); + free(buffer_8); + + return 0; + + error_cleanup: + if (file != NULL) fclose(file); + free(buffer_short); + free(buffer_8); + return -1; +} + +As you can see, the PCM material in the listing will not currently +compile and for the other sndfile material, it probably won't either. + +Any help would be appreciated. + +TTFN + +Paul + +================================================================================ + +From: Erik de Castro Lopo +To: PFJ +Subject: Re: Can you help with a problem? +Date: Wed, 21 Jul 2004 19:36:46 +1000 + +On Wed, 21 Jul 2004 09:50:55 +0100 +PFJ wrote: + +> Hi Erik, +> +> > > I know, but the source code explicitly has SF_FORMAT_PCM which given the +> > > code afterwards would equate to one of the above, but given that PCM +> > > files can have a varied bitwidth the author probably wanted to cover all +> > > bases. +> > +> > But surely the existing code does something like: +> > +> > sfinfo.format = SF_FORMAT_WAV | SF_FORMAT_PCM; +> > sfinfo.pcmbitwidth = 16; +> +> If only! + +No, really. + +Drop this completely: + +> /* Make sure the format is acceptable. */ +> if ((file_info.format & 0x0F) != SF_FORMAT_PCM) { +> printf("'%s' is not a PCM-based audio file.\n", filename); +> sf_close(file); +> return -1; +> } + +Replace this block: + +> if ((file_info.pcmbitwidth == 8) && (file_info.channels == 1)) { +> sound->format = AL_FORMAT_MONO8; +> } else if ((file_info.pcmbitwidth == 8) && (file_info.channels == 2)) { +> sound->format = AL_FORMAT_STEREO8; +> } else if ((file_info.pcmbitwidth == 16) && (file_info.channels == 1)) { +> sound->format = AL_FORMAT_MONO16; +> } else if ((file_info.pcmbitwidth == 16) && (file_info.channels == 2)) { +> sound->format = AL_FORMAT_STEREO16; +> } else { +> printf("Unknown sample format in %s.\n", filename); +> sf_close(file); +> return -1; +> } + +with: + + int pcmbitwidth = 0; + + if (file_info.format & SF_FORMAT_SUBMASK != SF_FORMAT_PCM_16) + { printf("'%s' is not a PCM-based audio file.\n", filename); + sf_close(file); + return -1; + } + + if (file_info.channels < 1 || file_info.channels > 2) + { printf("'%s' bad channel count.\n", filename); + sf_close(file); + return -1; + } + + switch (file_info.format & SF_FORMAT_SUBMASK + file_info.channels << 16) + { case (SF_FORMAT_PCM_U8 + 1 << 16): + sound->format = AL_FORMAT_MONO8; + pcmbitwidth = 8; + break; + case (SF_FORMAT_PCM_U8 + 2 << 16): + sound->format = AL_FORMAT_STEREO8; + pcmbitwidth = 8; + break; + case (SF_FORMAT_PCM_16 + 1 << 16): + sound->format = AL_FORMAT_MONO16; + pcmbitwidth = 16; + break; + case (SF_FORMAT_PCM_16 + 2 << 16): + sound->format = AL_FORMAT_STEREO16; + pcmbitwidth = 16; + break; + default: + printf("Unknown sample format in %s.\n", filename); + sf_close(file); + return -1; + } + +> /* Allocate buffers. */ +> buffer_short = (short *)malloc(file_info.samples * +> file_info.channels * +> sizeof (short)); +> +> buffer_8 = (u_int8_t *)malloc(file_info.samples * +> file_info.channels * +> file_info.pcmbitwidth / 8); + +Use pcmbitwidth as calculated above. + +> buffer_16 = (int16_t *)buffer_8; +> +> if (buffer_short == NULL || buffer_8 == NULL) { +> printf("Unable to allocate enough memory for '%s'.\n", filename); +> goto error_cleanup; +> } +> +> /* Read the entire sound file. */ +> if (sf_readf_short(file,buffer_short,file_info.samples) == (size_t)- 1) { + +Replace "(size_t) - 1" with " < 0". + +> As you can see, the PCM material in the listing will not currently +> compile and for the other sndfile material, it probably won't either. + +None of the changes above should have been very difficult to figure +out. + +Erik +-- ++-----------------------------------------------------------+ + Erik de Castro Lopo nospam@fake-domain-name.com ++-----------------------------------------------------------+ +Microsoft is finally bringing all of its Windows operating system families +under one roof. It will combine all of the features of CE, stability and +support of ME and the speed of NT. +It will be called Windows CEMENT... + diff --git a/libs/libsndfile/doc/lists.html b/libs/libsndfile/doc/lists.html index 349e494cff..7d95170271 100644 --- a/libs/libsndfile/doc/lists.html +++ b/libs/libsndfile/doc/lists.html @@ -6,7 +6,8 @@ libsndfile Mailing Lists - + + diff --git a/libs/libsndfile/doc/octave.html b/libs/libsndfile/doc/octave.html index 33ef1b6c53..b696e6b81a 100644 --- a/libs/libsndfile/doc/octave.html +++ b/libs/libsndfile/doc/octave.html @@ -6,7 +6,8 @@ libsndfile and GNU Octave - + + @@ -14,21 +15,21 @@

libsndfile and GNU Octave

- GNU Octave is a high-level interactive - language for numerical computations. + GNU Octave is a high-level interactive + language for numerical computations. There are currently two development streams, a stable 2.0.X series and a development 2.1.X series. Octave reads and writes data in binary formats that were originally developed - for + for MATLAB. Version 2.0.X of Octave uses binary data files compatible with MATLAB version 4.2 while Octave 2.1.X uses binary data files compatible - with MATLAB version 5.0 as well as being able to read the older MATLAB 4.2 + with MATLAB version 5.0 as well as being able to read the older MATLAB 4.2 format.

- From version 1.0.1 of libsndfile onwards, libsndfile has the ability of reading - and writing a small subset of the binary data files used by both versions + From version 1.0.1 of libsndfile onwards, libsndfile has the ability of reading + and writing a small subset of the binary data files used by both versions of GNU Octave. This gives people using GNU Octave for audio based work an easy method of moving audio data between GNU Octave and other programs which use libsndfile. @@ -36,22 +37,22 @@

For instance it is now possible to do the following:

- +
    -
  • Load a WAV file into a sound file editor such as +
  • Load a WAV file into a sound file editor such as Sweep.
  • Save it as a MAT4 file.
  • Load the data into Octave for manipulation. -
  • Save the modified data. +
  • Save the modified data.
  • Reload it in Sweep.

Another example would be using the MAT4 or MAT5 file formats as a format which - can be easily loaded into Octave for viewing/analyzing as well as a format + can be easily loaded into Octave for viewing/analyzing as well as a format which can be played with command line players such as the one included with libsndfile.

- +

Details

Octave, like most programming languages, uses variables to store data, and @@ -69,7 +70,7 @@ 

         octave:1 > samplerate = 44100 ;
         octave:2 > wavedata = sin ((0:1023)*2*pi/1024) ;
-        octave:3 > save sine.mat samplerate wavedata 
+        octave:3 > save sine.mat samplerate wavedata

@@ -83,9 +84,9 @@

In addition, libsndfile contains a command line program which which is able to play the correct types of Octave files. - Using this command line player sndfile-play and a third Octave script + Using this command line player sndfile-play and a third Octave script file allows Octave data to be played from within Octave on any of the platforms - which sndfile-play supports (at the moment: Linux, MacOSX, Solaris and + which sndfile-play supports (at the moment: Linux, MacOS X, Solaris and Win32). 

@@ -99,8 +100,8 @@
 

 
 

-	There are some other Octave scripts for audio to be found 
-		here.
+	There are some other Octave scripts for audio to be found
+		here.
 

 
 

@@ -108,7 +109,7 @@
 
 

 

-	The libsndfile home page is here : 
+	The libsndfile home page is here :
 		
 			http://www.mega-nerd.com/libsndfile/.
 

diff --git a/libs/libsndfile/doc/pkgconfig.html b/libs/libsndfile/doc/pkgconfig.html
index 1711de9f70..c89193d1ed 100644
--- a/libs/libsndfile/doc/pkgconfig.html
+++ b/libs/libsndfile/doc/pkgconfig.html
@@ -6,7 +6,8 @@
 	libsndfile : pkg-config
 	
 	
-	
+	
+	
 
 
 
@@ -18,7 +19,7 @@
 	From version 1.0.0 libsndfile has had the ability to read and write files of
 	greater than 2 Gig in size on most OSes even if sizeof (long) == 4. 
 	OSes which support this feature include Linux (2.4 kernel, glibc6) on x86, PPC and
-	probably others, Win32, MacOSX, *BSD, Solaris and probably others.
+	probably others, Win32, MacOS X, *BSD, Solaris and probably others.
 	OSes on 64 bit processors where the default compile environment is LP64 (longs and 
 	pointers are 64 bit ie Linux on DEC/Compaq/HP Alpha processors) automatically 
 	support large file access.
@@ -30,7 +31,7 @@
 	programs which link to the library.
 

 

-	Note : People using Win32, MacOS (both OSX and pre-OSX) or *BSD can disregard the 
+	Note : People using Win32, MacOS (both OS X and pre-OS X) or *BSD can disregard the 
 	rest of this document as it does not apply to either of these OSes.	
 

 

diff --git a/libs/libsndfile/doc/print.css b/libs/libsndfile/doc/print.css
new file mode 100644
index 0000000000..deb5b13da0
--- /dev/null
+++ b/libs/libsndfile/doc/print.css
@@ -0,0 +1,14 @@
+body {
+	background:white;
+	color:black;
+}
+
+h1{
+	background:white;
+	color:black;
+}
+
+h2 {
+	background:white;
+	color:#666;
+}
diff --git a/libs/libsndfile/doc/sndfile_info.html b/libs/libsndfile/doc/sndfile_info.html
index 51e2dd35ad..a84f24150f 100644
--- a/libs/libsndfile/doc/sndfile_info.html
+++ b/libs/libsndfile/doc/sndfile_info.html
@@ -6,7 +6,8 @@
 	sndfile-info
 	
 	
-	
+	
+	
 
 
 
diff --git a/libs/libsndfile/doc/tutorial.html b/libs/libsndfile/doc/tutorial.html
index 77c4f0457e..e3112393ad 100644
--- a/libs/libsndfile/doc/tutorial.html
+++ b/libs/libsndfile/doc/tutorial.html
@@ -6,7 +6,8 @@
 	libsndfile Tutorial
 	
 	
-	
+	
+	
 
 
 
diff --git a/libs/libsndfile/doc/win32.html b/libs/libsndfile/doc/win32.html
index 5da8f18d0e..6ee3153c7d 100644
--- a/libs/libsndfile/doc/win32.html
+++ b/libs/libsndfile/doc/win32.html
@@ -6,7 +6,8 @@
 	Building libsndfile on Win32
 	
 	
-	
+	
+	
 
 
 
diff --git a/libs/libsndfile/echo-install-dirs.in b/libs/libsndfile/echo-install-dirs.in
new file mode 100644
index 0000000000..48d54b4e2d
--- /dev/null
+++ b/libs/libsndfile/echo-install-dirs.in
@@ -0,0 +1,25 @@
+#!/bin/sh
+# @configure_input@
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+bindir=@bindir@
+pkgconfigdir=@pkgconfigdir@
+datadir=@datadir@
+datarootdir=@datarootdir@
+docdir=@docdir@
+htmldir=@htmldir@
+
+echo "
+  Installation directories :
+
+    Library directory : ................... $libdir
+    Program directory : ................... $bindir
+    Pkgconfig directory : ................. $pkgconfigdir
+    HTML docs directory : ................. $htmldir
+"
+echo "Compiling some other packages against libsndfile may require"
+echo "the addition of '$pkgconfigdir' to the"
+echo "PKG_CONFIG_PATH environment variable."
+echo
diff --git a/libs/libsndfile/examples/Makefile.am b/libs/libsndfile/examples/Makefile.am
index 9797a72cdb..da841fa218 100644
--- a/libs/libsndfile/examples/Makefile.am
+++ b/libs/libsndfile/examples/Makefile.am
@@ -2,7 +2,7 @@
 
 noinst_PROGRAMS = make_sine sfprocess list_formats generate sndfilehandle sndfile-to-text
 
-INCLUDES = -I$(top_srcdir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/src
 
 sndfile_to_text_SOURCES = sndfile-to-text.c
 sndfile_to_text_LDADD = $(top_builddir)/src/libsndfile.la
@@ -22,3 +22,4 @@ generate_LDADD = $(top_builddir)/src/libsndfile.la
 sndfilehandle_SOURCES = sndfilehandle.cc
 sndfilehandle_LDADD = $(top_builddir)/src/libsndfile.la
 
+CLEANFILES = *~ *.exe
diff --git a/libs/libsndfile/examples/generate.c b/libs/libsndfile/examples/generate.c
index 8228c12c4b..884e8d79d3 100644
--- a/libs/libsndfile/examples/generate.c
+++ b/libs/libsndfile/examples/generate.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2002-2009 Erik de Castro Lopo 
+** Copyright (C) 2002-2011 Erik de Castro Lopo 
 **
 ** All rights reserved.
 **
@@ -98,6 +98,8 @@ encode_file (const char *infilename, const char *outfilename, int filetype)
 	k = 16 - strlen (outfilename) ;
 	PUT_DOTS (k) ;
 
+	memset (&sfinfo, 0, sizeof (sfinfo)) ;
+
 	if (! (infile = sf_open (infilename, SFM_READ, &sfinfo)))
 	{	printf ("Error : could not open file : %s\n", infilename) ;
 		puts (sf_strerror (NULL)) ;
@@ -119,7 +121,7 @@ encode_file (const char *infilename, const char *outfilename, int filetype)
 		} ;
 
 	while ((readcount = sf_read_float (infile, buffer, BUFFER_LEN)) > 0)
-		sf_write_float (outfile, buffer, BUFFER_LEN) ;
+		sf_write_float (outfile, buffer, readcount) ;
 
 	sf_close (infile) ;
 	sf_close (outfile) ;
diff --git a/libs/libsndfile/examples/generate.cs b/libs/libsndfile/examples/generate.cs
new file mode 100644
index 0000000000..1817856fa7
--- /dev/null
+++ b/libs/libsndfile/examples/generate.cs
@@ -0,0 +1,250 @@
+/* (c) 2004 James Robson, http://www.arbingersys.com
+**
+** 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.
+**
+** ****************************
+**
+** How to use:
+**    - libsndfile.dll must have already been compiled and be in this
+**      application's search path
+**
+**    - You must edit this file to point to the file you want to convert. Set
+**    	the following line of code (found in the Main() function further below)
+**    	to the name of a .WAV file that exists on your system.
+**		186:	string sfn = "input.wav";
+**
+**    - From a command prompt type
+**    		csc generate.cs
+**
+**    - Run the resulting executable 'generate.exe'
+**
+**
+** Note: You will obviously need the csc compiler and the .NET runtime. I think
+** 	 these are freely available for download from Microsoft's website
+** 	 (part of the .NET SDK?).
+*/
+
+
+using System;
+using System.Runtime.InteropServices;
+using sf_count_t = System.Int64;	//alias; see SF_INFO struct
+
+#if PLATFORM_64
+using size_t = System.UInt64;
+#else
+using size_t = System.UInt32;
+#endif
+
+
+class lsndf_example {
+
+
+//sound file formats
+	public enum lsndf_frmts {
+		SF_FORMAT_WAV			= 0x010000,		/* Microsoft WAV format (little endian). */
+		SF_FORMAT_AIFF			= 0x020000,		/* Apple/SGI AIFF format (big endian). */
+		SF_FORMAT_AU			= 0x030000,		/* Sun/NeXT AU format (big endian). */
+		SF_FORMAT_RAW			= 0x040000,		/* RAW PCM data. */
+		SF_FORMAT_PAF			= 0x050000,		/* Ensoniq PARIS file format. */
+		SF_FORMAT_SVX			= 0x060000,		/* Amiga IFF / SVX8 / SV16 format. */
+		SF_FORMAT_NIST			= 0x070000,		/* Sphere NIST format. */
+		SF_FORMAT_VOC			= 0x080000,		/* VOC files. */
+		SF_FORMAT_IRCAM			= 0x0A0000,		/* Berkeley/IRCAM/CARL */
+		SF_FORMAT_W64			= 0x0B0000,		/* Sonic Foundry's 64 bit RIFF/WAV */
+		SF_FORMAT_MAT4			= 0x0C0000,		/* Matlab (tm) V4.2 / GNU Octave 2.0 */
+		SF_FORMAT_MAT5			= 0x0D0000,		/* Matlab (tm) V5.0 / GNU Octave 2.1 */
+		SF_FORMAT_PVF			= 0x0E0000,		/* Portable Voice Format */
+		SF_FORMAT_XI			= 0x0F0000,		/* Fasttracker 2 Extended Instrument */
+		SF_FORMAT_HTK			= 0x100000,		/* HMM Tool Kit format */
+		SF_FORMAT_SDS			= 0x110000,		/* Midi Sample Dump Standard */
+
+		/* Subtypes from here on. */
+
+		SF_FORMAT_PCM_S8		= 0x0001,		/* Signed 8 bit data */
+		SF_FORMAT_PCM_16		= 0x0002,		/* Signed 16 bit data */
+		SF_FORMAT_PCM_24		= 0x0003,		/* Signed 24 bit data */
+		SF_FORMAT_PCM_32		= 0x0004,		/* Signed 32 bit data */
+
+		SF_FORMAT_PCM_U8		= 0x0005,		/* Unsigned 8 bit data (WAV and RAW only) */
+
+		SF_FORMAT_FLOAT			= 0x0006,		/* 32 bit float data */
+		SF_FORMAT_DOUBLE		= 0x0007,		/* 64 bit float data */
+
+		SF_FORMAT_ULAW			= 0x0010,		/* U-Law encoded. */
+		SF_FORMAT_ALAW			= 0x0011,		/* A-Law encoded. */
+		SF_FORMAT_IMA_ADPCM		= 0x0012,		/* IMA ADPCM. */
+		SF_FORMAT_MS_ADPCM		= 0x0013,		/* Microsoft ADPCM. */
+
+		SF_FORMAT_GSM610		= 0x0020,		/* GSM 6.10 encoding. */
+		SF_FORMAT_VOX_ADPCM		= 0x0021,		/* OKI / Dialogix ADPCM */
+
+		SF_FORMAT_G721_32		= 0x0030,		/* 32kbs G721 ADPCM encoding. */
+		SF_FORMAT_G723_24		= 0x0031,		/* 24kbs G723 ADPCM encoding. */
+		SF_FORMAT_G723_40		= 0x0032,		/* 40kbs G723 ADPCM encoding. */
+
+		SF_FORMAT_DWVW_12		= 0x0040, 		/* 12 bit Delta Width Variable Word encoding. */
+		SF_FORMAT_DWVW_16		= 0x0041, 		/* 16 bit Delta Width Variable Word encoding. */
+		SF_FORMAT_DWVW_24		= 0x0042, 		/* 24 bit Delta Width Variable Word encoding. */
+		SF_FORMAT_DWVW_N		= 0x0043, 		/* N bit Delta Width Variable Word encoding. */
+
+		SF_FORMAT_DPCM_8		= 0x0050,		/* 8 bit differential PCM (XI only) */
+		SF_FORMAT_DPCM_16		= 0x0051,		/* 16 bit differential PCM (XI only) */
+
+
+		/* Endian-ness options. */
+
+		SF_ENDIAN_FILE			= 0x00000000,	/* Default file endian-ness. */
+		SF_ENDIAN_LITTLE		= 0x10000000,	/* Force little endian-ness. */
+		SF_ENDIAN_BIG			= 0x20000000,	/* Force big endian-ness. */
+		SF_ENDIAN_CPU			= 0x30000000,	/* Force CPU endian-ness. */
+
+		SF_FORMAT_SUBMASK		= 0x0000FFFF,
+		SF_FORMAT_TYPEMASK		= 0x0FFF0000,
+		SF_FORMAT_ENDMASK		= 0x30000000
+	}
+
+
+//modes and other
+	public enum lsndf_tf
+	{	/* True and false */
+		SF_FALSE	= 0,
+		SF_TRUE		= 1,
+
+		/* Modes for opening files. */
+		SFM_READ	= 0x10,
+		SFM_WRITE	= 0x20,
+		SFM_RDWR	= 0x30
+	}
+
+
+//important SF_INFO structure
+	[StructLayout(LayoutKind.Sequential)]
+	public struct SF_INFO
+	{
+		public sf_count_t	frames ;		// Used to be called samples.  Changed to avoid confusion.
+		public int			samplerate ;
+		public int			channels ;
+		public int			format ;
+		public int			sections ;
+		public int			seekable ;
+	};
+
+
+//function declarations
+//Note: Not all functions have been prototyped here. Only the ones necessary to
+//	make this application work. The below code should give some clues as to
+//	how to add the rest since they have a lot of parameter and return type
+//	similarities.
+	[DllImport("libsndfile.dll")]
+	public static extern IntPtr sf_open ([MarshalAs(UnmanagedType.LPStr)] string path, int mode, ref SF_INFO sfinfo);
+
+	[DllImport("libsndfile.dll")]
+	static extern int sf_error (IntPtr sndfile);
+
+	[DllImport("libsndfile.dll")]
+	static extern IntPtr sf_strerror (IntPtr sndfile);
+
+	[DllImport("libsndfile.dll")]
+	static extern int sf_format_check (ref SF_INFO info);
+
+	[DllImport("libsndfile.dll")]
+	static extern sf_count_t sf_read_float	(IntPtr sndfile, float[] ptr, sf_count_t items);
+
+	[DllImport("libsndfile.dll")]
+	static extern sf_count_t sf_write_float	(IntPtr sndfile, float[] ptr, sf_count_t items);
+
+	[DllImport("libsndfile.dll")]
+    static extern int sf_close (IntPtr sndfile);
+
+
+	public const sf_count_t BUFFER_LEN = 4096;
+
+
+//program entry
+	static void Main(  ) {
+
+
+//declarations
+		SF_INFO sfinfo = new SF_INFO();
+		float[] buffer = new float[BUFFER_LEN];
+		sf_count_t rcnt;
+
+//set the input file
+		string sfn = "input.wav";	//set to a file on YOUR system
+		//string sfn = "noexist.wav"; 	//test with non-existent file
+
+//set the output file
+		string ofn = "output.wav";
+
+//read in sound file to convert
+		IntPtr infile = sf_open (sfn, (int)lsndf_tf.SFM_READ, ref sfinfo);
+
+//exit if error was thrown
+		if ( (int)infile == 0 ) {
+			Console.WriteLine("Error opening " + sfn);
+			Console.WriteLine("Error #" + sf_error(infile));
+			return;
+		}
+
+//set the file type for the output file
+//uncomment one and only one of the statements below to change the output
+//file encoding.
+		//sfinfo.format = (int)(lsndf_frmts.SF_FORMAT_WAV | lsndf_frmts.SF_FORMAT_PCM_U8);
+		//sfinfo.format = (int)(lsndf_frmts.SF_FORMAT_WAV | lsndf_frmts.SF_FORMAT_PCM_16);
+		//sfinfo.format = (int)(lsndf_frmts.SF_FORMAT_WAV | lsndf_frmts.SF_FORMAT_MS_ADPCM);
+		sfinfo.format = (int)(lsndf_frmts.SF_FORMAT_WAV | lsndf_frmts.SF_FORMAT_IMA_ADPCM);
+		//sfinfo.format = (int)(lsndf_frmts.SF_FORMAT_WAV | lsndf_frmts.SF_FORMAT_GSM610);
+		/* Soundforge W64. */
+		//sfinfo.format = (int)(lsndf_frmts.SF_FORMAT_W64 | lsndf_frmts.SF_FORMAT_PCM_U8);
+		//sfinfo.format = (int)(lsndf_frmts.SF_FORMAT_W64 | lsndf_frmts.SF_FORMAT_PCM_16);
+		//sfinfo.format = (int)(lsndf_frmts.SF_FORMAT_W64 | lsndf_frmts.SF_FORMAT_MS_ADPCM);
+		//sfinfo.format = (int)(lsndf_frmts.SF_FORMAT_W64 | lsndf_frmts.SF_FORMAT_IMA_ADPCM);
+		//sfinfo.format = (int)(lsndf_frmts.SF_FORMAT_W64 | lsndf_frmts.SF_FORMAT_GSM610);
+
+
+//check that SF_INFO is valid
+		if ( sf_format_check(ref sfinfo) == 0 ) {
+			Console.WriteLine("sf_format_check failed. Invalid encoding");
+			return;
+		}
+
+//open output file
+		IntPtr outfile = sf_open (ofn, (int)lsndf_tf.SFM_WRITE, ref sfinfo);
+
+//exit if error was thrown
+		if ( (int)outfile == 0 ) {
+			Console.WriteLine("Error opening " + ofn);
+			Console.WriteLine("Error #" + sf_error(outfile));
+			return;
+		}
+
+//infile -> outfile
+		Console.Write(sfn + " -> " + ofn);
+		while ( (rcnt = sf_read_float (infile, buffer, BUFFER_LEN)) > 0) {
+			Console.Write(".");
+			sf_write_float (outfile, buffer, BUFFER_LEN);
+		}
+		Console.WriteLine("done.");
+
+//close up shop
+		sf_close(infile);
+		sf_close(outfile);
+
+
+	} //main()
+
+
+} //class lsndf_example {}
+
diff --git a/libs/libsndfile/examples/list_formats.c b/libs/libsndfile/examples/list_formats.c
index c529247da7..6d462f0790 100644
--- a/libs/libsndfile/examples/list_formats.c
+++ b/libs/libsndfile/examples/list_formats.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2001-2009 Erik de Castro Lopo 
+** Copyright (C) 2001-2011 Erik de Castro Lopo 
 **
 ** All rights reserved.
 **
diff --git a/libs/libsndfile/examples/make_sine.c b/libs/libsndfile/examples/make_sine.c
index 3e760333b7..1db0e00d26 100644
--- a/libs/libsndfile/examples/make_sine.c
+++ b/libs/libsndfile/examples/make_sine.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2012 Erik de Castro Lopo 
 **
 ** All rights reserved.
 **
@@ -91,6 +91,6 @@ main (void)
 		puts (sf_strerror (file)) ;
 
 	sf_close (file) ;
-	return	 0 ;
+	return 0 ;
 } /* main */
 
diff --git a/libs/libsndfile/examples/sfprocess.c b/libs/libsndfile/examples/sfprocess.c
index 42c98bdeb3..1c141a4981 100644
--- a/libs/libsndfile/examples/sfprocess.c
+++ b/libs/libsndfile/examples/sfprocess.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2001-2009 Erik de Castro Lopo 
+** Copyright (C) 2001-2013 Erik de Castro Lopo 
 **
 ** All rights reserved.
 **
@@ -7,15 +7,15 @@
 ** 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 author nor the names of any contributors may be used
-**       to endorse or promote products derived from this software without
-**       specific prior written permission.
+**	 * 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 author nor the names of any 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
@@ -31,12 +31,13 @@
 */
 
 #include	
+#include	
 
 /* Include this header file to use functions from libsndfile. */
 #include	
 
-/*    This will be the length of the buffer used to hold.frames while
-**    we process them.
+/*	This will be the length of the buffer used to hold.frames while
+**	we process them.
 */
 #define		BUFFER_LEN	1024
 
@@ -49,31 +50,35 @@ static void process_data (double *data, int count, int channels) ;
 
 int
 main (void)
-{   /* This is a buffer of double precision floating point values
-    ** which will hold our data while we process it.
-    */
-    static double data [BUFFER_LEN] ;
+{	/* This is a buffer of double precision floating point values
+	** which will hold our data while we process it.
+	*/
+	static double data [BUFFER_LEN] ;
 
-    /* A SNDFILE is very much like a FILE in the Standard C library. The
-    ** sf_open function return an SNDFILE* pointer when they sucessfully
+	/* A SNDFILE is very much like a FILE in the Standard C library. The
+	** sf_open function return an SNDFILE* pointer when they sucessfully
 	** open the specified file.
-    */
-    SNDFILE      *infile, *outfile ;
+	*/
+	SNDFILE	*infile, *outfile ;
 
-    /* A pointer to an SF_INFO stutct is passed to sf_open.
-    ** On read, the library fills this struct with information about the file.
-    ** On write, the struct must be filled in before calling sf_open.
-    */
-    SF_INFO		sfinfo ;
-    int			readcount ;
-    const char	*infilename = "input.wav" ;
-    const char	*outfilename = "output.wav" ;
+	/* A pointer to an SF_INFO struct is passed to sf_open.
+	** On read, the library fills this struct with information about the file.
+	** On write, the struct must be filled in before calling sf_open.
+	*/
+	SF_INFO		sfinfo ;
+	int			readcount ;
+	const char	*infilename = "input.wav" ;
+	const char	*outfilename = "output.wav" ;
 
-    /* Here's where we open the input file. We pass sf_open the file name and
-    ** a pointer to an SF_INFO struct.
-    ** On successful open, sf_open returns a SNDFILE* pointer which is used
-    ** for all subsequent operations on that file.
-    ** If an error occurs during sf_open, the function returns a NULL pointer.
+	/* The SF_INFO struct must be initialized before using it.
+	*/
+	memset (&sfinfo, 0, sizeof (sfinfo)) ;
+
+	/* Here's where we open the input file. We pass sf_open the file name and
+	** a pointer to an SF_INFO struct.
+	** On successful open, sf_open returns a SNDFILE* pointer which is used
+	** for all subsequent operations on that file.
+	** If an error occurs during sf_open, the function returns a NULL pointer.
 	**
 	** If you are trying to open a raw headerless file you will need to set the
 	** format and channels fields of sfinfo before calling sf_open(). For
@@ -82,56 +87,56 @@ main (void)
 	**
 	**		sfinfo.format   = SF_FORMAT_RAW | SF_FORMAT_PCM_16 ;
 	**		sfinfo.channels = 2 ;
-    */
-    if (! (infile = sf_open (infilename, SFM_READ, &sfinfo)))
-    {   /* Open failed so print an error message. */
-        printf ("Not able to open input file %s.\n", infilename) ;
-        /* Print the error message from libsndfile. */
-        puts (sf_strerror (NULL)) ;
-        return  1 ;
-        } ;
+	*/
+	if (! (infile = sf_open (infilename, SFM_READ, &sfinfo)))
+	{	/* Open failed so print an error message. */
+		printf ("Not able to open input file %s.\n", infilename) ;
+		/* Print the error message from libsndfile. */
+		puts (sf_strerror (NULL)) ;
+		return 1 ;
+		} ;
 
-    if (sfinfo.channels > MAX_CHANNELS)
-    {   printf ("Not able to process more than %d channels\n", MAX_CHANNELS) ;
-        return  1 ;
-        } ;
-    /* Open the output file. */
-    if (! (outfile = sf_open (outfilename, SFM_WRITE, &sfinfo)))
-    {   printf ("Not able to open output file %s.\n", outfilename) ;
-        puts (sf_strerror (NULL)) ;
-        return  1 ;
-        } ;
+	if (sfinfo.channels > MAX_CHANNELS)
+	{	printf ("Not able to process more than %d channels\n", MAX_CHANNELS) ;
+		return 1 ;
+		} ;
+	/* Open the output file. */
+	if (! (outfile = sf_open (outfilename, SFM_WRITE, &sfinfo)))
+	{	printf ("Not able to open output file %s.\n", outfilename) ;
+		puts (sf_strerror (NULL)) ;
+		return 1 ;
+		} ;
 
-    /* While there are.frames in the input file, read them, process
-    ** them and write them to the output file.
-    */
-    while ((readcount = sf_read_double (infile, data, BUFFER_LEN)))
-    {   process_data (data, readcount, sfinfo.channels) ;
-        sf_write_double (outfile, data, readcount) ;
-        } ;
+	/* While there are.frames in the input file, read them, process
+	** them and write them to the output file.
+	*/
+	while ((readcount = sf_read_double (infile, data, BUFFER_LEN)))
+	{	process_data (data, readcount, sfinfo.channels) ;
+		sf_write_double (outfile, data, readcount) ;
+		} ;
 
-    /* Close input and output files. */
-    sf_close (infile) ;
-    sf_close (outfile) ;
+	/* Close input and output files. */
+	sf_close (infile) ;
+	sf_close (outfile) ;
 
-    return 0 ;
+	return 0 ;
 } /* main */
 
 static void
 process_data (double *data, int count, int channels)
 {	double channel_gain [MAX_CHANNELS] = { 0.5, 0.8, 0.1, 0.4, 0.4, 0.9 } ;
-    int k, chan ;
+	int k, chan ;
 
-    /* Process the data here.
-    ** If the soundfile contains more then 1 channel you need to take care of
-    ** the data interleaving youself.
-    ** Current we just apply a channel dependant gain.
-    */
+	/* Process the data here.
+	** If the soundfile contains more then 1 channel you need to take care of
+	** the data interleaving youself.
+	** Current we just apply a channel dependant gain.
+	*/
 
-    for (chan = 0 ; chan < channels ; chan ++)
-        for (k = chan ; k < count ; k+= channels)
-            data [k] *= channel_gain [chan] ;
+	for (chan = 0 ; chan < channels ; chan ++)
+		for (k = chan ; k < count ; k+= channels)
+			data [k] *= channel_gain [chan] ;
 
-    return ;
+	return ;
 } /* process_data */
 
diff --git a/libs/libsndfile/examples/sndfile-to-text.c b/libs/libsndfile/examples/sndfile-to-text.c
index d7d6492d3b..466bb860b5 100644
--- a/libs/libsndfile/examples/sndfile-to-text.c
+++ b/libs/libsndfile/examples/sndfile-to-text.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2008-2009 Erik de Castro Lopo 
+** Copyright (C) 2008-2012 Erik de Castro Lopo 
 **
 ** All rights reserved.
 **
@@ -68,9 +68,9 @@ convert_to_text (SNDFILE * infile, FILE * outfile, int channels)
 int
 main (int argc, char * argv [])
 {	char 		*progname, *infilename, *outfilename ;
-	SNDFILE	 	*infile = NULL ;
+	SNDFILE		*infile = NULL ;
 	FILE		*outfile = NULL ;
-	SF_INFO	 	sfinfo ;
+	SF_INFO		sfinfo ;
 
 	progname = strrchr (argv [0], '/') ;
 	progname = progname ? progname + 1 : argv [0] ;
@@ -101,6 +101,8 @@ main (int argc, char * argv [])
 		return 1 ;
 		} ;
 
+	memset (&sfinfo, 0, sizeof (sfinfo)) ;
+
 	if ((infile = sf_open (infilename, SFM_READ, &sfinfo)) == NULL)
 	{	printf ("Not able to open input file %s.\n", infilename) ;
 		puts (sf_strerror (NULL)) ;
diff --git a/libs/libsndfile/examples/sndfilehandle.cc b/libs/libsndfile/examples/sndfilehandle.cc
index 693a4422ed..c9a1931aea 100644
--- a/libs/libsndfile/examples/sndfilehandle.cc
+++ b/libs/libsndfile/examples/sndfilehandle.cc
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2007 Erik de Castro Lopo 
+** Copyright (C) 2007-2011 Erik de Castro Lopo 
 **
 ** 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
diff --git a/libs/libsndfile/libsndfile.spec.in b/libs/libsndfile/libsndfile.spec.in
index ad47a5f3f8..d4427289a2 100644
--- a/libs/libsndfile/libsndfile.spec.in
+++ b/libs/libsndfile/libsndfile.spec.in
@@ -10,7 +10,7 @@ Release: %{release}
 Copyright: LGPL
 Group: Libraries/Sound
 Source: http://www.mega-nerd.com/libsndfile/libsndfile-%{version}.tar.gz
-URL: http://www.mega-nerd.com/libsndfile/
+Url: http://www.mega-nerd.com/libsndfile/
 BuildRoot: /var/tmp/%{name}-%{version}
 
 %description
diff --git a/libs/libsndfile/make_lite.py b/libs/libsndfile/make_lite.py
new file mode 100644
index 0000000000..eee69fc82d
--- /dev/null
+++ b/libs/libsndfile/make_lite.py
@@ -0,0 +1,491 @@
+#!/usr/bin/python
+
+import commands, os, re, string, sys, time
+
+def count_enclosed_functions (source):
+	func_count = 0
+	open_brace = 0
+	close_brace = 0
+	for ch in source:
+		if ch == '{':
+			open_brace += 1
+		elif ch == '}':
+			close_brace += 1
+			if open_brace == close_brace:
+				func_count += 1
+		if open_brace < close_brace:
+			print "count_enclosed_functions : open_brace < close_brace"
+			return -1
+	return func_count
+
+def find_function_prototype (source, proto_name):
+	proto_re = "(^[a-zA-Z_ \t]+\s+%s[^a-zA-Z0-9_]\s*\([^\)]+\)\s+;\n)" % (proto_name)
+	proto_result = re.search (proto_re, source, re.MULTILINE | re.DOTALL)
+	if not proto_result:
+		return None
+	proto_text = proto_result.groups ()[0]
+	return proto_text
+
+def find_function_definition (source, func_name):
+	func_re = "(\n[a-zA-Z_ \t]+\n%s[^a-zA-Z0-9_].* /\* %s \*/\n)" % (func_name, func_name)
+	func_result = re.search (func_re, source, re.MULTILINE | re.DOTALL)
+	if not func_result:
+		sys.exit (1)
+		return None
+	func_text = func_result.groups ()[0]
+
+	# Now to check that we only have one enclosing function.
+	func_count = count_enclosed_functions (func_text)
+	if func_count != 1:
+		return None
+	return func_text
+
+def find_include (source, inc_name):
+	inc_re = "(^#include\s+[\<\"]%s[\"\>]\s*)" % inc_name
+	inc_result = re.search (inc_re, source, re.MULTILINE | re.DOTALL)
+	if not inc_result:
+		return None
+	inc_text = inc_result.groups ()[0]
+	return inc_text
+
+def find_assign_statement (source, var_name):
+	var_re = "(^\s+%s\s*=[^;]+;)" % var_name
+	var_result = re.search (var_re, source, re.MULTILINE | re.DOTALL)
+	if not var_result:
+		return None
+	assign_text = var_result.groups ()[0]
+	return assign_text
+
+#--------------------------------------------------------------------------------
+
+def remove_include (source, inc_name):
+	inc_text = find_include (source, inc_name)
+	if not inc_text:
+		print "remove_include : include '%s' not found. Exiting." % inc_name
+		sys.exit (1)
+
+	source = string.replace (source, inc_text, "")
+	return source
+
+def remove_assign (source, assign_name):
+	assign_text = find_assign (source, inc_name)
+	if not inc_text:
+		print "remove_include : include '%s' not found. Exiting." % inc_name
+		sys.exit (1)
+
+	source = string.replace (source, inc_text, "")
+	return source
+
+def remove_prototype (source, proto_name):
+	proto_text = find_function_prototype (source, proto_name)
+	if not proto_text:
+		print "remove_prototype : prototype '%s' not found. Exiting." % proto_name
+		sys.exit (1)
+
+	source = string.replace (source, proto_text, "")
+	return source
+
+def remove_function (source, func_name):
+	func_text = find_function_definition (source, func_name)
+	if not func_text:
+		print "remove_function : function '%s' not found. Exiting." % func_name
+		sys.exit (1)
+
+	source = string.replace (source, func_text, "/* Function %s() removed here. */\n" % func_name)
+	return source
+
+def remove_all_assignments (source, var):
+	count = 0
+	while 1:
+		assign_text = find_assign_statement (source, var)
+		if not assign_text:
+			if count != 0:
+				break
+			print "remove_all_assignments : variable '%s' not found. Exiting." % var
+			sys.exit (1)
+
+		source = string.replace (source, assign_text, "")
+		count += 1
+	return source
+
+
+
+#----------------------------------------------------------------
+
+def remove_funcs_and_protos_from_file (filename, func_list):
+	source_code = open (filename, 'r').read ()
+
+	for func in func_list:
+		source_code = remove_prototype (source_code, func) ;
+		source_code = remove_function (source_code, func) ;
+	open (filename, 'w').write (source_code)
+
+def remove_funcs_from_file (filename, func_list):
+	source_code = open (filename, 'r').read ()
+
+	for func in func_list:
+		source_code = remove_function (source_code, func) ;
+	open (filename, 'w').write (source_code)
+
+def remove_protos_from_file (filename, func_list):
+	source_code = open (filename, 'r').read ()
+
+	for func in func_list:
+		source_code = remove_prototype (source_code, func) ;
+	open (filename, 'w').write (source_code)
+
+def remove_includes_from_file (filename, inc_list):
+	source_code = open (filename, 'r').read ()
+
+	for inc in inc_list:
+		source_code = remove_include (source_code, inc) ;
+	open (filename, 'w').write (source_code)
+
+def remove_all_assignments_from_file (filename, var_list):
+	source_code = open (filename, 'r').read ()
+
+	for var in var_list:
+		source_code = remove_all_assignments (source_code, var) ;
+	open (filename, 'w').write (source_code)
+
+def remove_comment_start_end (filename, start_comment, end_comment):
+	source_code = open (filename, 'r').read ()
+
+	while 1:
+		start_index = string.find (source_code, start_comment)
+		end_index = string.find (source_code, end_comment)
+		if start_index < 0 or end_index < start_index:
+			break
+		end_index += len (end_comment)
+		source_code = source_code [:start_index-1] + source_code [end_index:] ;
+
+	open (filename, 'w').write (source_code)
+
+def remove_strings_from_file (filename, str_list):
+	file_text = open (filename, 'r').read ()
+	for current_str in str_list:
+		file_text = string.replace (file_text, current_str, '')
+	open (filename, 'w').write (file_text)
+
+def string_replace_in_file (filename, from_str, to_str):
+	file_text = open (filename, 'r').read ()
+	file_text = string.replace (file_text, from_str, to_str)
+	open (filename, 'w').write (file_text)
+
+def remove_regex_from_file (filename, regex_list):
+	file_text = open (filename, 'r').read ()
+	for regex in regex_list:
+		file_text = re.sub (regex, '', file_text, re.MULTILINE | re.DOTALL)
+	open (filename, 'w').write (file_text)
+
+#==========================================================================
+
+def find_configure_version (filename):
+	# AM_INIT_AUTOMAKE(libsndfile,0.0.21pre6)
+	file = open (filename)
+	while 1:
+		line = file.readline ()
+		if re.search ("AC_INIT", line):
+			x = re.sub ("[^\(]+\(", "", line)
+			x = re.sub ("\).*\n", "", x)
+			x = string.split (x, ",")
+			package = x [0]
+			version = x [1]
+			break
+	file.close ()
+	# version = re.escape (version)
+	return package, version
+
+def fix_configure_ac_file (filename):
+	data = open (filename, 'r').read ()
+	data = string.replace (data, "AM_INIT_AUTOMAKE(libsndfile,", "AM_INIT_AUTOMAKE(libsndfile_lite,", 1)
+
+	file = open (filename, 'w')
+	file.write (data)
+	file.close ()
+
+
+def make_dist_file (package, version):
+	print "Making dist file."
+	tar_gz_file = "%s-%s.tar.gz" % (package, version)
+	if os.path.exists (tar_gz_file):
+		return
+	if os.system ("make dist"):
+		sys.exit (1)
+	return
+
+def delete_files (file_list):
+	for file_name in file_list:
+		os.remove (file_name)
+
+#=======================================================================
+
+source_dir = os.getcwd ()
+
+conf_package, conf_version =  find_configure_version ('configure.ac')
+
+package_version = "%s-%s" % (conf_package, conf_version)
+lite_version = "%s_lite-%s" % (conf_package, conf_version)
+
+os.system ("rm -rf %s%s.tar.gz" % (source_dir, package_version))
+
+os.system ("make dist")
+
+make_dist_file (conf_package, conf_version)
+
+os.chdir ("/tmp")
+
+print "Uncompressing .tar.gz file."
+os.system ("rm -rf %s" % package_version)
+if os.system ("tar zxf %s/%s.tar.gz" % (source_dir, package_version)):
+	sys.exit (1)
+
+
+print "Renaming to libsndfile_lite."
+os.system ("rm -rf %s" % lite_version)
+os.rename (package_version, lite_version)
+
+print "Changing into libsndfile_lite directory."
+os.chdir (lite_version)
+
+print "Removing un-neeed directories."
+delete_dirs = [ 'src/G72x' ]
+
+for dir_name in delete_dirs:
+	os.system ("rm -rf %s" % dir_name)
+
+print "Removing un-needed files."
+delete_files ([ 'src/ircam.c', 'src/nist.c',
+	'src/ima_adpcm.c', 'src/ms_adpcm.c', 'src/au_g72x.c',
+	'src/mat4.c', 'src/mat5.c', 'src/dwvw.c', 'src/paf.c',
+	'src/ogg.c', 'src/pvf.c', 'src/xi.c', 'src/htk.c',
+	'src/sd2.c', 'src/rx2.c', 'src/txw.c', 'src/wve.c',
+	'src/dwd.c', 'src/svx.c', 'src/voc.c', 'src/vox_adpcm.c',
+	'src/sds.c'
+	])
+
+
+print "Hacking 'configure.ac' and 'src/Makefile.am'."
+remove_strings_from_file ('configure.ac', [ 'src/G72x/Makefile' ])
+remove_strings_from_file ('src/Makefile.am', [ 'G72x/libg72x.la', 'G72x',
+		'ircam.c', 'nist.c', 'ima_adpcm.c', 'ms_adpcm.c', 'au_g72x.c', 'mat4.c', 
+		'mat5.c', 'dwvw.c',  'paf.c', 'ogg.c', 'pvf.c', 'xi.c', 'htk.c', 
+		'sd2.c', 'rx2.c', 'txw.c', 'wve.c', 'dwd.c', 'svx.c', 'voc.c', 
+		'vox_adpcm.c', 'sds.c'
+		])
+
+#----------------------------------------------------------------------------
+
+print "Hacking header files."
+
+remove_protos_from_file ('src/common.h', [	'xi_open', 'sd2_open', 'ogg_open',
+	'dwvw_init', 'paf_open', 'svx_open', 'nist_open', 'rx2_open', 'mat4_open',
+	'voc_open', 'txw_open', 'dwd_open', 'htk_open', 'wve_open', 'mat5_open',
+	'pvf_open', 'ircam_open', 'sds_open',
+	'float32_init', 'double64_init', 'aiff_ima_init', 'vox_adpcm_init',
+	'wav_w64_ima_init', 'wav_w64_msadpcm_init'
+	])
+
+remove_protos_from_file ('src/au.h',
+		[ 'au_g72x_reader_init', 'au_g72x_writer_init' ])
+
+remove_protos_from_file ('src/wav_w64.h', [ 'msadpcm_write_adapt_coeffs' ])
+
+#----------------------------------------------------------------------------
+
+print "Hacking case statements."
+
+remove_comment_start_end ('src/sndfile.c', '/* Lite remove start */' , '/* Lite remove end */')
+remove_comment_start_end ('src/aiff.c', '/* Lite remove start */' , '/* Lite remove end */')
+remove_comment_start_end ('src/au.c', '/* Lite remove start */' , '/* Lite remove end */')
+remove_comment_start_end ('src/raw.c', '/* Lite remove start */' , '/* Lite remove end */')
+remove_comment_start_end ('src/w64.c', '/* Lite remove start */' , '/* Lite remove end */')
+remove_comment_start_end ('src/wav.c', '/* Lite remove start */' , '/* Lite remove end */')
+remove_comment_start_end ('src/double64.c', '/* Lite remove start */' , '/* Lite remove end */')
+remove_comment_start_end ('src/float32.c', '/* Lite remove start */' , '/* Lite remove end */')
+
+
+#----------------------------------------------------------------------------
+
+print "Hacking src/pcm.c."
+remove_funcs_from_file ('src/pcm.c', [
+	'f2sc_array', 'f2sc_clip_array', 'f2uc_array', 'f2uc_clip_array',
+	'f2bes_array', 'f2bes_clip_array', 'f2les_array', 'f2les_clip_array',
+	'f2let_array', 'f2let_clip_array', 'f2bet_array', 'f2bet_clip_array',
+	'f2bei_array', 'f2bei_clip_array', 'f2lei_array', 'f2lei_clip_array',
+	'd2sc_array', 'd2sc_clip_array', 'd2uc_array', 'd2uc_clip_array',
+	'd2bes_array', 'd2bes_clip_array', 'd2les_array', 'd2les_clip_array',
+	'd2let_array', 'd2let_clip_array', 'd2bet_array', 'd2bet_clip_array',
+	'd2bei_array', 'd2bei_clip_array', 'd2lei_array', 'd2lei_clip_array',
+	])
+
+remove_funcs_and_protos_from_file ('src/pcm.c', [
+	'pcm_read_sc2f', 'pcm_read_uc2f', 'pcm_read_les2f', 'pcm_read_bes2f',
+	'pcm_read_let2f', 'pcm_read_bet2f', 'pcm_read_lei2f', 'pcm_read_bei2f',
+	'pcm_read_sc2d', 'pcm_read_uc2d', 'pcm_read_les2d', 'pcm_read_bes2d',
+	'pcm_read_let2d', 'pcm_read_bet2d', 'pcm_read_lei2d', 'pcm_read_bei2d',
+	'pcm_write_f2sc', 'pcm_write_f2uc', 'pcm_write_f2bes', 'pcm_write_f2les',
+	'pcm_write_f2bet', 'pcm_write_f2let', 'pcm_write_f2bei', 'pcm_write_f2lei',
+	'pcm_write_d2sc', 'pcm_write_d2uc', 'pcm_write_d2bes', 'pcm_write_d2les',
+	'pcm_write_d2bet', 'pcm_write_d2let', 'pcm_write_d2bei', 'pcm_write_d2lei',
+
+	'sc2f_array', 'uc2f_array', 'bes2f_array', 'les2f_array',
+	'bet2f_array', 'let2f_array', 'bei2f_array', 'lei2f_array',
+	'sc2d_array', 'uc2d_array', 'bes2d_array', 'les2d_array',
+	'bet2d_array', 'let2d_array', 'bei2d_array', 'lei2d_array'
+	])
+
+remove_includes_from_file ('src/pcm.c', [ 'float_cast.h' ])
+remove_all_assignments_from_file ('src/pcm.c', [
+	'psf-\>write_float', 'psf\-\>write_double',
+	'psf-\>read_float', 'psf\-\>read_double' ])
+
+#----------------------------------------------------------------------------
+print "Hacking src/ulaw.c."
+remove_funcs_and_protos_from_file ('src/ulaw.c', [
+	'ulaw_read_ulaw2f', 'ulaw_read_ulaw2d',
+	'ulaw_write_f2ulaw', 'ulaw_write_d2ulaw',
+	'ulaw2f_array', 'ulaw2d_array', 'f2ulaw_array', 'd2ulaw_array'
+	])
+
+remove_includes_from_file ('src/ulaw.c', [ 'float_cast.h' ])
+remove_all_assignments_from_file ('src/ulaw.c', [
+	'psf-\>write_float', 'psf\-\>write_double',
+	'psf-\>read_float', 'psf\-\>read_double' ])
+
+#----------------------------------------------------------------------------
+
+print "Hacking src/alaw.c."
+remove_funcs_and_protos_from_file ('src/alaw.c', [
+	'alaw_read_alaw2f', 'alaw_read_alaw2d',
+	'alaw_write_f2alaw', 'alaw_write_d2alaw',
+	'alaw2f_array', 'alaw2d_array', 'f2alaw_array', 'd2alaw_array'
+	])
+
+remove_includes_from_file ('src/alaw.c', [ 'float_cast.h' ])
+remove_all_assignments_from_file ('src/alaw.c', [
+	'psf-\>write_float', 'psf\-\>write_double',
+	'psf-\>read_float', 'psf\-\>read_double' ])
+
+#----------------------------------------------------------------------------
+
+print "Hacking src/gsm610.c."
+remove_funcs_and_protos_from_file ('src/gsm610.c', [
+	'gsm610_read_f', 'gsm610_read_d', 'gsm610_write_f', 'gsm610_write_d'
+	])
+
+remove_includes_from_file ('src/gsm610.c', [ 'float_cast.h' ])
+remove_all_assignments_from_file ('src/gsm610.c', [
+	'psf-\>write_float', 'psf\-\>write_double',
+	'psf-\>read_float', 'psf\-\>read_double' ])
+
+#----------------------------------------------------------------------------
+
+print "Hacking src/float32.c."
+
+# string_replace_in_file ('src/float32.c', '"float_cast.h"', '')
+remove_funcs_from_file ('src/float32.c', [ 'float32_init'	])
+
+remove_funcs_and_protos_from_file ('src/float32.c', [
+	'host_read_f2s', 'host_read_f2i', 'host_read_f', 'host_read_f2d', 
+	'host_write_s2f', 'host_write_i2f', 'host_write_f', 'host_write_d2f', 
+	'f2s_array', 'f2i_array', 'f2d_array', 's2f_array', 'i2f_array', 'd2f_array', 
+	'float32_peak_update', 
+	'replace_read_f2s', 'replace_read_f2i', 'replace_read_f', 'replace_read_f2d', 
+	'replace_write_s2f', 'replace_write_i2f', 'replace_write_f', 'replace_write_d2f', 
+	'bf2f_array', 'f2bf_array', 
+	'float32_get_capability', 
+	])
+
+#----------------------------------------------------------------------------
+
+print "Hacking src/double64.c."
+remove_funcs_from_file ('src/double64.c', [ 'double64_init'	])
+
+remove_funcs_and_protos_from_file ('src/double64.c', [
+	'host_read_d2s', 'host_read_d2i', 'host_read_d2f', 'host_read_d',
+	'host_write_s2d', 'host_write_i2d', 'host_write_f2d', 'host_write_d',
+	'd2s_array', 'd2i_array', 'd2f_array',
+	's2d_array', 'i2d_array', 'f2d_array',
+	'double64_peak_update', 'double64_get_capability',
+	'replace_read_d2s', 'replace_read_d2i', 'replace_read_d2f', 'replace_read_d',
+	'replace_write_s2d', 'replace_write_i2d', 'replace_write_f2d', 'replace_write_d',
+	'd2bd_read', 'bd2d_write'
+	])
+
+#----------------------------------------------------------------------------
+
+print "Hacking test programs."
+delete_files ([ 'tests/dwvw_test.c', 'tests/floating_point_test.c', 
+	'tests/dft_cmp.c', 'tests/peak_chunk_test.c',
+	'tests/scale_clip_test.tpl', 'tests/scale_clip_test.def'
+	])
+
+remove_comment_start_end ('tests/write_read_test.def', '/* Lite remove start */', '/* Lite remove end */')
+remove_comment_start_end ('tests/write_read_test.tpl', '/* Lite remove start */', '/* Lite remove end */')
+
+remove_comment_start_end ('tests/Makefile.am', '# Lite remove start', '# Lite remove end')
+
+remove_strings_from_file ('tests/Makefile.am', [ 
+	'scale_clip_test.tpl', 'scale_clip_test.def',
+	'\n\t./dwvw_test',
+	'\n\t./floating_point_test', '\n\t./scale_clip_test', 
+	'\n\t./peak_chunk_test aiff', '\n\t./peak_chunk_test wav',
+	'\n\t./command_test norm', '\n\t./command_test peak',
+	'\n\t./lossy_comp_test wav_ima', '\n\t./lossy_comp_test wav_msadpcm',
+	'\n\t./lossy_comp_test au_g721', '\n\t./lossy_comp_test au_g723',
+	'\n\t./lossy_comp_test vox_adpcm', 
+	'\n\t./lossy_comp_test w64_ima', '\n\t./lossy_comp_test w64_msadpcm',
+	'peak_chunk_test', 'dwvw_test', 'floating_point_test', 'scale_clip_test',
+	
+	'paf-tests', 'svx-tests', 'nist-tests', 'ircam-tests', 'voc-tests',
+	'mat4-tests', 'mat5-tests', 'pvf-tests', 'xi-tests', 'htk-tests',
+	'sds-tests'
+	])
+
+remove_comment_start_end ('tests/pcm_test.c', '/* Lite remove start */', '/* Lite remove end */')
+remove_funcs_and_protos_from_file ('tests/pcm_test.c', [
+	'pcm_test_float', 'pcm_test_double' 
+	])
+
+remove_comment_start_end ('tests/lossy_comp_test.c', '/* Lite remove start */', '/* Lite remove end */')
+remove_funcs_and_protos_from_file ('tests/lossy_comp_test.c', [
+	'lcomp_test_float', 'lcomp_test_double', 'sdlcomp_test_float', 'sdlcomp_test_double',
+	'smoothed_diff_float', 'smoothed_diff_double'
+	])
+
+remove_comment_start_end ('tests/multi_file_test.c', '/* Lite remove start */', '/* Lite remove end */')
+
+remove_strings_from_file ('tests/stdio_test.c', [ 
+	'"paf",', '"svx",', '"nist",', '"ircam",', '"voc",', '"mat4",', '"mat5",', '"pvf",'
+	])
+
+remove_comment_start_end ('tests/pipe_test.c', '/* Lite remove start */', '/* Lite remove end */')
+
+#----------------------------------------------------------------------------
+
+print "Fixing configure.ac file."
+fix_configure_ac_file ('configure.ac')
+
+print "Building and testing source."
+	# Try --disable-shared --disable-gcc-opt
+if os.system ("./reconfigure.mk && ./configure --disable-shared --disable-gcc-opt && make check"):
+	os.system ('PS1="FIX > " bash --norc')
+	sys.exit (1)
+
+print "Making distcheck"
+if os.system ("make distcheck"):
+	os.system ('PS1="FIX > " bash --norc')
+	sys.exit (1)
+
+print "Copying tarball"
+if os.system ("cp %s.tar.gz %s" % (lite_version, source_dir)):
+	print "??? %s.tar.gz ???" % lite_version
+	os.system ('PS1="FIX > " bash --norc')
+	sys.exit (1)
+
+os.chdir (source_dir)
+
+os.system ("rm -rf /tmp/%s" % lite_version)
+
+print "Done."
diff --git a/libs/libsndfile/man/Makefile.am b/libs/libsndfile/man/Makefile.am
index 574f924841..3f5d9efdc4 100644
--- a/libs/libsndfile/man/Makefile.am
+++ b/libs/libsndfile/man/Makefile.am
@@ -1,6 +1,15 @@
 ## Process this file with automake to produce Makefile.in
 
-man_MANS = sndfile-info.1 sndfile-play.1 sndfile-convert.1
+man_MANS = sndfile-info.1 sndfile-play.1 sndfile-convert.1 sndfile-cmp.1 \
+			sndfile-metadata-get.1 sndfile-metadata-set.1 sndfile-concat.1 \
+			sndfile-interleave.1 sndfile-deinterleave.1
 
-EXTRA_DIST = sndfile-info.1 sndfile-play.1 sndfile-convert.1
+EXTRA_DIST = sndfile-info.1 sndfile-play.1 sndfile-convert.1 sndfile-cmp.1 \
+			sndfile-metadata-get.1 sndfile-concat.1 sndfile-interleave.1
 
+# Same manpage for both programs.
+sndfile-metadata-set.1 : sndfile-metadata-get.1
+	$(LN_S) $(srcdir)/sndfile-metadata-get.1 $@
+
+sndfile-deinterleave.1 : sndfile-interleave.1
+	$(LN_S) $(srcdir)/sndfile-interleave.1 $@
diff --git a/libs/libsndfile/man/sndfile-cmp.1 b/libs/libsndfile/man/sndfile-cmp.1
new file mode 100644
index 0000000000..30870bdfc3
--- /dev/null
+++ b/libs/libsndfile/man/sndfile-cmp.1
@@ -0,0 +1,16 @@
+.TH SNDFILE-CMP 1 "October 5, 2009"
+.SH NAME
+sndfile-cmp \- compares two audio files
+.SH SYNOPSIS
+.B sndfile-cmp
+.RI "file1 file2"
+.SH DESCRIPTION
+sndfile-cmp compares the audio data of two sound files. In particular most
+differences in the audio file header, particularly metadata like string info,
+are completely ignored.
+
+sndfile-cmp does its work using libsndfile
+(http://www.mega-nerd.com/libsndfile/).
+.SH AUTHOR
+This manual page was written by Erik de Castro Lopo .
+
diff --git a/libs/libsndfile/man/sndfile-concat.1 b/libs/libsndfile/man/sndfile-concat.1
new file mode 100644
index 0000000000..1d95765f6c
--- /dev/null
+++ b/libs/libsndfile/man/sndfile-concat.1
@@ -0,0 +1,16 @@
+.TH SNDFILE-CONCAT 1 "December 9, 2009"
+.SH NAME
+sndfile-concat \- concatenates two or more audio files
+.SH SYNOPSIS
+.B sndfile-concat
+.RI "infile1 infile2 .... outfile"
+.SH DESCRIPTION
+sndfile-concat generates a new output file by concatenating two or more input
+files. The format of the output file is the same as the format of the input
+file.
+
+sndfile-concat does its work using libsndfile
+(http://www.mega-nerd.com/libsndfile/).
+.SH AUTHOR
+This manual page was written by Erik de Castro Lopo .
+
diff --git a/libs/libsndfile/man/sndfile-convert.1 b/libs/libsndfile/man/sndfile-convert.1
index 7847173656..583c9562c9 100644
--- a/libs/libsndfile/man/sndfile-convert.1
+++ b/libs/libsndfile/man/sndfile-convert.1
@@ -16,7 +16,7 @@ The format of the output file is determined by the filename extension
 of the output file.
 .LP
 The optional encoding parameter allows setting of the data encoding for
-the output file. Run "sndfile-convert --help" for more information.
+the output file. Run "sndfile\-convert \-\-help" for more information.
 .SH AUTHOR
 This manual page was written by Erik de Castro Lopo .
 
diff --git a/libs/libsndfile/man/sndfile-interleave.1 b/libs/libsndfile/man/sndfile-interleave.1
new file mode 100644
index 0000000000..26ca345205
--- /dev/null
+++ b/libs/libsndfile/man/sndfile-interleave.1
@@ -0,0 +1,23 @@
+.TH SNDFILE-INTERLEAVE 1 "December 14, 2009"
+.SH NAME
+sndfile-interleave \- convert multiple single channel files into a multi-channel file
+.br
+sndfile-deinterleave \- split a multi-channel into multiple single channel files
+.SH SYNOPSIS
+.B sndfile-interleave
+.RI "  ... -o "
+.br
+.B sndfile-deinterleave
+.RI "filename"
+
+.SH DESCRIPTION
+sndfile-interleave and sndfile-deinterleave use libsndfile
+(http://www.mega-nerd.com/libsndfile/) to convert back and forth between multiple
+single channel files and a single multi-channel sound file.
+
+Run "sndfile\-interleave \-\-help" or "sndfile\-deinterleave \-\-help" for
+more information
+
+.SH AUTHOR
+This manual page was written by Erik de Castro Lopo .
+
diff --git a/libs/libsndfile/man/sndfile-metadata-get.1 b/libs/libsndfile/man/sndfile-metadata-get.1
new file mode 100644
index 0000000000..b97560ea39
--- /dev/null
+++ b/libs/libsndfile/man/sndfile-metadata-get.1
@@ -0,0 +1,26 @@
+.TH SNDFILE-METADATA-GET 1 "October 6, 2009"
+.SH NAME
+sndfile-metadata-get \- retrieve metadata from a sound file
+.br
+sndfile-metadata-set \- set metadata in a sound file
+.SH SYNOPSIS
+.B sndfile-metadata-get
+.RI "[options] file"
+.br
+.B sndfile-metadata-set
+.RI "[options] file"
+.br
+.B sndfile-metadata-set
+.RI "[options] input-file output-file"
+
+.SH DESCRIPTION
+sndfile-metadata-get and sndfile-metadata-set use libsndfile
+(http://www.mega-nerd.com/libsndfile/) to retrieve metadata from or set metadata
+in a sound file.
+
+Run "sndfile\-metadata\-get \-\-help" or "sndfile\-metadata\-set \-\-help" for
+more information
+
+.SH AUTHOR
+This manual page was written by Erik de Castro Lopo .
+
diff --git a/libs/libsndfile/programs/Makefile.am b/libs/libsndfile/programs/Makefile.am
index 5a3f9ee32b..81495539b3 100644
--- a/libs/libsndfile/programs/Makefile.am
+++ b/libs/libsndfile/programs/Makefile.am
@@ -1,36 +1,47 @@
 ## Process this file with automake to produce Makefile.in
 
-bin_PROGRAMS = sndfile-info sndfile-play sndfile-convert sndfile-jackplay sndfile-cmp \
-				sndfile-metadata-set sndfile-metadata-get
+bin_PROGRAMS = sndfile-info sndfile-play sndfile-convert sndfile-cmp \
+				sndfile-metadata-set sndfile-metadata-get sndfile-interleave \
+				sndfile-deinterleave sndfile-concat sndfile-salvage
 
 OS_SPECIFIC_CFLAGS = @OS_SPECIFIC_CFLAGS@
 OS_SPECIFIC_LINKS = @OS_SPECIFIC_LINKS@
 
-INCLUDES = -I$(top_srcdir)/src $(OS_SPECIFIC_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/src $(OS_SPECIFIC_CFLAGS)
+
+CLEANFILES = *~ sndfile-*.exe
 
 # This is the BeOS version of sndfile-play. It needs to be compiled with the C++
 # compiler.
 EXTRA_DIST = sndfile-play-beos.cpp test-sndfile-metadata-set.py
 
-sndfile_info_SOURCES = sndfile-info.c
+sndfile_info_SOURCES = sndfile-info.c common.c common.h
 sndfile_info_LDADD = $(top_builddir)/src/libsndfile.la
 
-sndfile_play_SOURCES = sndfile-play.c
-sndfile_play_LDADD = $(top_builddir)/src/libsndfile.la $(OS_SPECIFIC_LINKS) $(ALSA_LIBS)
-
-sndfile_jackplay_SOURCES = sndfile-jackplay.c
-sndfile_jackplay_CFLAGS = $(JACK_CFLAGS)
-sndfile_jackplay_LDADD = $(top_builddir)/src/libsndfile.la $(JACK_LIBS)
+sndfile_play_SOURCES = sndfile-play.c common.c common.h
+sndfile_play_LDADD = $(top_builddir)/src/libsndfile.la $(OS_SPECIFIC_LINKS) $(ALSA_LIBS) $(SNDIO_LIBS)
 
 sndfile_convert_SOURCES = sndfile-convert.c common.c common.h
 sndfile_convert_LDADD = $(top_builddir)/src/libsndfile.la
 
-sndfile_cmp_SOURCES = sndfile-cmp.c
+sndfile_cmp_SOURCES = sndfile-cmp.c common.c common.h
 sndfile_cmp_LDADD = $(top_builddir)/src/libsndfile.la
 
 sndfile_metadata_set_SOURCES = sndfile-metadata-set.c common.c common.h
 sndfile_metadata_set_LDADD = $(top_builddir)/src/libsndfile.la
 
-sndfile_metadata_get_SOURCES = sndfile-metadata-get.c
+sndfile_metadata_get_SOURCES = sndfile-metadata-get.c common.c common.h
 sndfile_metadata_get_LDADD = $(top_builddir)/src/libsndfile.la
 
+sndfile_interleave_SOURCES = sndfile-interleave.c common.c common.h
+sndfile_interleave_LDADD = $(top_builddir)/src/libsndfile.la
+
+sndfile_deinterleave_SOURCES = sndfile-deinterleave.c common.c common.h
+sndfile_deinterleave_LDADD = $(top_builddir)/src/libsndfile.la
+
+sndfile_concat_SOURCES = sndfile-concat.c common.c common.h
+sndfile_concat_LDADD = $(top_builddir)/src/libsndfile.la
+
+sndfile_salvage_SOURCES = sndfile-salvage.c common.c common.h
+sndfile_salvage_LDADD = $(top_builddir)/src/libsndfile.la
+
diff --git a/libs/libsndfile/programs/common.c b/libs/libsndfile/programs/common.c
index d38d7472ad..2811536f3f 100644
--- a/libs/libsndfile/programs/common.c
+++ b/libs/libsndfile/programs/common.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2013 Erik de Castro Lopo 
 ** Copyright (C) 2008 George Blood Audio
 **
 ** All rights reserved.
@@ -35,17 +35,18 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
 #include "common.h"
 
-#define	 BUFFER_LEN	4096
+#define	BUFFER_LEN	4096
 
-#define	MIN(x,y)	((x) < (y) ? (x) : (y))
+#define	MIN(x, y)	((x) < (y) ? (x) : (y))
 
 void
-sfe_copy_data_fp (SNDFILE *outfile, SNDFILE *infile, int channels)
+sfe_copy_data_fp (SNDFILE *outfile, SNDFILE *infile, int channels, int normalize)
 {	static double	data [BUFFER_LEN], max ;
 	int		frames, readcount, k ;
 
@@ -54,7 +55,7 @@ sfe_copy_data_fp (SNDFILE *outfile, SNDFILE *infile, int channels)
 
 	sf_command (infile, SFC_CALC_SIGNAL_MAX, &max, sizeof (max)) ;
 
-	if (max < 1.0)
+	if (!normalize && max < 1.0)
 	{	while (readcount > 0)
 		{	readcount = sf_readf_double (infile, data, frames) ;
 			sf_writef_double (outfile, data, readcount) ;
@@ -146,6 +147,14 @@ merge_broadcast_info (SNDFILE * infile, SNDFILE * outfile, int format, const MET
 	REPLACE_IF_NEW (origination_time) ;
 	REPLACE_IF_NEW (umid) ;
 
+	/* Special case for Time Ref. */
+	if (info->time_ref != NULL)
+	{	uint64_t ts = atoll (info->time_ref) ;
+
+		binfo.time_reference_high = (ts >> 32) ;
+		binfo.time_reference_low = (ts & 0xffffffff) ;
+		} ;
+
 	/* Special case for coding_history because we may want to append. */
 	if (info->coding_history != NULL)
 	{	if (info->coding_hist_append)
@@ -180,22 +189,22 @@ update_strings (SNDFILE * outfile, const METADATA_INFO * info)
 		sf_set_string (outfile, SF_STR_TITLE, info->title) ;
 
 	if (info->copyright != NULL)
-		sf_set_string (outfile, SF_STR_TITLE, info->copyright) ;
+		sf_set_string (outfile, SF_STR_COPYRIGHT, info->copyright) ;
 
 	if (info->artist != NULL)
 		sf_set_string (outfile, SF_STR_ARTIST, info->artist) ;
 
 	if (info->comment != NULL)
-		sf_set_string (outfile, SF_STR_TITLE, info->comment) ;
+		sf_set_string (outfile, SF_STR_COMMENT, info->comment) ;
 
 	if (info->date != NULL)
 		sf_set_string (outfile, SF_STR_DATE, info->date) ;
 
 	if (info->album != NULL)
-		sf_set_string (outfile, SF_STR_TITLE, info->album) ;
+		sf_set_string (outfile, SF_STR_ALBUM, info->album) ;
 
 	if (info->license != NULL)
-		sf_set_string (outfile, SF_STR_TITLE, info->license) ;
+		sf_set_string (outfile, SF_STR_LICENSE, info->license) ;
 
 } /* update_strings */
 
@@ -238,18 +247,18 @@ sfe_apply_metadata_changes (const char * filenames [2], const METADATA_INFO * in
 		goto cleanup_exit ;
 		} ;
 
-	update_strings (outfile, info) ;
-
 	if (infile != outfile)
 	{	int infileminor = SF_FORMAT_SUBMASK & sfinfo.format ;
 
 		/* If the input file is not the same as the output file, copy the data. */
 		if ((infileminor == SF_FORMAT_DOUBLE) || (infileminor == SF_FORMAT_FLOAT))
-			sfe_copy_data_fp (outfile, infile, sfinfo.channels) ;
+			sfe_copy_data_fp (outfile, infile, sfinfo.channels, SF_FALSE) ;
 		else
 			sfe_copy_data_int (outfile, infile, sfinfo.channels) ;
 		} ;
 
+	update_strings (outfile, info) ;
+
 cleanup_exit :
 
 	if (outfile != NULL && outfile != infile)
@@ -264,3 +273,194 @@ cleanup_exit :
 	return ;
 } /* sfe_apply_metadata_changes */
 
+/*==============================================================================
+*/
+
+typedef struct
+{	const char	*ext ;
+	int			len ;
+	int			format ;
+} OUTPUT_FORMAT_MAP ;
+
+static OUTPUT_FORMAT_MAP format_map [] =
+{
+	{	"aif",		3,	SF_FORMAT_AIFF	},
+	{	"wav", 		0,	SF_FORMAT_WAV	},
+	{	"au",		0,	SF_FORMAT_AU	},
+	{	"caf",		0,	SF_FORMAT_CAF	},
+	{	"flac",		0,	SF_FORMAT_FLAC	},
+	{	"snd",		0,	SF_FORMAT_AU	},
+	{	"svx",		0,	SF_FORMAT_SVX	},
+	{	"paf",		0,	SF_ENDIAN_BIG | SF_FORMAT_PAF	},
+	{	"fap",		0,	SF_ENDIAN_LITTLE | SF_FORMAT_PAF	},
+	{	"gsm",		0,	SF_FORMAT_RAW	},
+	{	"nist", 	0,	SF_FORMAT_NIST	},
+	{	"htk",		0,	SF_FORMAT_HTK	},
+	{	"ircam",	0,	SF_FORMAT_IRCAM	},
+	{	"sf",		0, 	SF_FORMAT_IRCAM	},
+	{	"voc",		0, 	SF_FORMAT_VOC	},
+	{	"w64", 		0, 	SF_FORMAT_W64	},
+	{	"raw",		0,	SF_FORMAT_RAW	},
+	{	"mat4", 	0,	SF_FORMAT_MAT4	},
+	{	"mat5", 	0, 	SF_FORMAT_MAT5 	},
+	{	"mat",		0, 	SF_FORMAT_MAT4 	},
+	{	"pvf",		0, 	SF_FORMAT_PVF 	},
+	{	"sds",		0, 	SF_FORMAT_SDS 	},
+	{	"sd2",		0, 	SF_FORMAT_SD2 	},
+	{	"vox",		0, 	SF_FORMAT_RAW 	},
+	{	"xi",		0, 	SF_FORMAT_XI 	},
+	{	"wve",		0,	SF_FORMAT_WVE	},
+	{	"oga",		0,	SF_FORMAT_OGG	},
+	{	"ogg",		0,	SF_FORMAT_OGG	},
+	{	"mpc",		0,	SF_FORMAT_MPC2K	},
+	{	"rf64",		0,	SF_FORMAT_RF64	},
+} ; /* format_map */
+
+int
+sfe_file_type_of_ext (const char *str, int format)
+{	char	buffer [16], *cptr ;
+	int		k ;
+
+	format &= SF_FORMAT_SUBMASK ;
+
+	if ((cptr = strrchr (str, '.')) == NULL)
+		return 0 ;
+
+	strncpy (buffer, cptr + 1, 15) ;
+	buffer [15] = 0 ;
+
+	for (k = 0 ; buffer [k] ; k++)
+		buffer [k] = tolower ((buffer [k])) ;
+
+	if (strcmp (buffer, "gsm") == 0)
+		return SF_FORMAT_RAW | SF_FORMAT_GSM610 ;
+
+	if (strcmp (buffer, "vox") == 0)
+		return SF_FORMAT_RAW | SF_FORMAT_VOX_ADPCM ;
+
+	for (k = 0 ; k < (int) (sizeof (format_map) / sizeof (format_map [0])) ; k++)
+	{	if (format_map [k].len > 0 && strncmp (buffer, format_map [k].ext, format_map [k].len) == 0)
+			return format_map [k].format | format ;
+		else if (strcmp (buffer, format_map [k].ext) == 0)
+			return format_map [k].format | format ;
+		} ;
+
+	/* Default if all the above fails. */
+	return (SF_FORMAT_WAV | SF_FORMAT_PCM_24) ;
+} /* sfe_file_type_of_ext */
+
+void
+sfe_dump_format_map (void)
+{	SF_FORMAT_INFO	info ;
+	int k ;
+
+	for (k = 0 ; k < ARRAY_LEN (format_map) ; k++)
+	{	info.format = format_map [k].format ;
+		sf_command (NULL, SFC_GET_FORMAT_INFO, &info, sizeof (info)) ;
+		printf ("        %-10s : %s\n", format_map [k].ext, info.name == NULL ? "????" : info.name) ;
+		} ;
+
+} /* sfe_dump_format_map */
+
+const char *
+program_name (const char * argv0)
+{	const char * tmp ;
+
+	tmp = strrchr (argv0, '/') ;
+	argv0 = tmp ? tmp + 1 : argv0 ;
+
+	tmp = strrchr (argv0, '/') ;
+	argv0 = tmp ? tmp + 1 : argv0 ;
+
+	/* Remove leading libtool name mangling. */
+	if (strstr (argv0, "lt-") == argv0)
+		return argv0 + 3 ;
+
+	return argv0 ;
+} /* program_name */
+
+const char *
+sfe_endian_name (int format)
+{
+	switch (format & SF_FORMAT_ENDMASK)
+	{	case SF_ENDIAN_FILE : return "file" ;
+		case SF_ENDIAN_LITTLE : return "little" ;
+		case SF_ENDIAN_BIG : return "big" ;
+		case SF_ENDIAN_CPU : return "cpu" ;
+		default : break ;
+		} ;
+
+	return "unknown" ;
+} /* sfe_endian_name */
+
+const char *
+sfe_container_name (int format)
+{
+	switch (format & SF_FORMAT_TYPEMASK)
+	{	case SF_FORMAT_WAV : return "WAV" ;
+		case SF_FORMAT_AIFF : return "AIFF" ;
+		case SF_FORMAT_AU : return "AU" ;
+		case SF_FORMAT_RAW : return "RAW" ;
+		case SF_FORMAT_PAF : return "PAF" ;
+		case SF_FORMAT_SVX : return "SVX" ;
+		case SF_FORMAT_NIST : return "NIST" ;
+		case SF_FORMAT_VOC : return "VOC" ;
+		case SF_FORMAT_IRCAM : return "IRCAM" ;
+		case SF_FORMAT_W64 : return "W64" ;
+		case SF_FORMAT_MAT4 : return "MAT4" ;
+		case SF_FORMAT_MAT5 : return "MAT5" ;
+		case SF_FORMAT_PVF : return "PVF" ;
+		case SF_FORMAT_XI : return "XI" ;
+		case SF_FORMAT_HTK : return "HTK" ;
+		case SF_FORMAT_SDS : return "SDS" ;
+		case SF_FORMAT_AVR : return "AVR" ;
+		case SF_FORMAT_WAVEX : return "WAVEX" ;
+		case SF_FORMAT_SD2 : return "SD2" ;
+		case SF_FORMAT_FLAC : return "FLAC" ;
+		case SF_FORMAT_CAF : return "CAF" ;
+		case SF_FORMAT_WVE : return "WVE" ;
+		case SF_FORMAT_OGG : return "OGG" ;
+		case SF_FORMAT_MPC2K : return "MPC2K" ;
+		case SF_FORMAT_RF64 : return "RF64" ;
+		default : break ;
+		} ;
+
+	return "unknown" ;
+} /* sfe_container_name */
+
+const char *
+sfe_codec_name (int format)
+{
+	switch (format & SF_FORMAT_SUBMASK)
+	{	case SF_FORMAT_PCM_S8 : return "signed 8 bit PCM" ;
+		case SF_FORMAT_PCM_16 : return "16 bit PCM" ;
+		case SF_FORMAT_PCM_24 : return "24 bit PCM" ;
+		case SF_FORMAT_PCM_32 : return "32 bit PCM" ;
+		case SF_FORMAT_PCM_U8 : return "unsigned 8 bit PCM" ;
+		case SF_FORMAT_FLOAT : return "32 bit float" ;
+		case SF_FORMAT_DOUBLE : return "64 bit double" ;
+		case SF_FORMAT_ULAW : return "u-law" ;
+		case SF_FORMAT_ALAW : return "a-law" ;
+		case SF_FORMAT_IMA_ADPCM : return "IMA ADPCM" ;
+		case SF_FORMAT_MS_ADPCM : return "MS ADPCM" ;
+		case SF_FORMAT_GSM610 : return "gsm610" ;
+		case SF_FORMAT_VOX_ADPCM : return "Vox ADPCM" ;
+		case SF_FORMAT_G721_32 : return "g721 32kbps" ;
+		case SF_FORMAT_G723_24 : return "g723 24kbps" ;
+		case SF_FORMAT_G723_40 : return "g723 40kbps" ;
+		case SF_FORMAT_DWVW_12 : return "12 bit DWVW" ;
+		case SF_FORMAT_DWVW_16 : return "16 bit DWVW" ;
+		case SF_FORMAT_DWVW_24 : return "14 bit DWVW" ;
+		case SF_FORMAT_DWVW_N : return "DWVW" ;
+		case SF_FORMAT_DPCM_8 : return "8 bit DPCM" ;
+		case SF_FORMAT_DPCM_16 : return "16 bit DPCM" ;
+		case SF_FORMAT_VORBIS : return "Vorbis" ;
+		case SF_FORMAT_ALAC_16 : return "16 bit ALAC" ;
+		case SF_FORMAT_ALAC_20 : return "20 bit ALAC" ;
+		case SF_FORMAT_ALAC_24 : return "24 bit ALAC" ;
+		case SF_FORMAT_ALAC_32 : return "32 bit ALAC" ;
+		default : break ;
+		} ;
+	return "unknown" ;
+} /* sfe_codec_name */
+
diff --git a/libs/libsndfile/programs/common.h b/libs/libsndfile/programs/common.h
index dd4d54dd87..eda2d7d743 100644
--- a/libs/libsndfile/programs/common.h
+++ b/libs/libsndfile/programs/common.h
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2013 Erik de Castro Lopo 
 **
 ** All rights reserved.
 **
@@ -30,7 +30,9 @@
 ** ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include 
+
+#define	ARRAY_LEN(x)	((int) (sizeof (x) / sizeof (x [0])))
+#define	MAX(a, b)		((a) > (b) ? (a) : (b))
 
 typedef struct
 {	const char * title ;
@@ -53,12 +55,24 @@ typedef struct
 	const char * origination_time ;
 	const char * umid ;
 	const char * coding_history ;
+	const char * time_ref ;
 } METADATA_INFO ;
 
 typedef SF_BROADCAST_INFO_VAR (2048) SF_BROADCAST_INFO_2K ;
 
 void sfe_apply_metadata_changes (const char * filenames [2], const METADATA_INFO * info) ;
 
-void sfe_copy_data_fp (SNDFILE *outfile, SNDFILE *infile, int channels) ;
+void sfe_copy_data_fp (SNDFILE *outfile, SNDFILE *infile, int channels, int normalize) ;
 
 void sfe_copy_data_int (SNDFILE *outfile, SNDFILE *infile, int channels) ;
+
+int sfe_file_type_of_ext (const char *filename, int format) ;
+
+void sfe_dump_format_map (void) ;
+
+const char * program_name (const char * argv0) ;
+
+const char * sfe_endian_name (int format) ;
+const char * sfe_container_name (int format) ;
+const char * sfe_codec_name (int format) ;
+
diff --git a/libs/libsndfile/programs/sndfile-cmp.c b/libs/libsndfile/programs/sndfile-cmp.c
index 59cfbb12b1..121d25a629 100644
--- a/libs/libsndfile/programs/sndfile-cmp.c
+++ b/libs/libsndfile/programs/sndfile-cmp.c
@@ -1,5 +1,6 @@
 /*
-** Copyright (C) 2008-2009 Erik de Castro Lopo 
+** Copyright (C) 2008-2012 Erik de Castro Lopo 
+** Copyright (C) 2008 Conrad Parker 
 **
 ** All rights reserved.
 **
@@ -30,27 +31,31 @@
 ** ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-/* sndfile-cmp.c
- * Conrad Parker 2008
- */
-
-
 #include "sfconfig.h"
 
 #include 
+#include 
 #include 
+#include 
 
 #include 
 
+#include "common.h"
+
 /* Length of comparison data buffers in units of items */
 #define BUFLEN 65536
 
-static char * progname ;
-static char * filename1, * filename2 ;
+static const char * progname = NULL ;
+static char * filename1 = NULL, * filename2 = NULL ;
 
 static int
-comparison_error (const char * what)
-{	printf ("%s: %s of files %s and %s differ\n", progname, what, filename1, filename2) ;
+comparison_error (const char * what, sf_count_t frame_offset)
+{	char buffer [128] = "" ;
+
+	if (frame_offset >= 0)
+		snprintf (buffer, sizeof (buffer), " (at frame offset %" PRId64 ")", frame_offset) ;
+
+	printf ("%s: %s of files %s and %s differ%s.\n", progname, what, filename1, filename2, buffer) ;
 	return 1 ;
 } /* comparison_error */
 
@@ -60,7 +65,7 @@ compare (void)
 	double buf1 [BUFLEN], buf2 [BUFLEN] ;
 	SF_INFO sfinfo1, sfinfo2 ;
 	SNDFILE * sf1 = NULL, * sf2 = NULL ;
-	sf_count_t len, i, nread1, nread2 ;
+	sf_count_t items, i, nread1, nread2, offset = 0 ;
 	int retval = 0 ;
 
 	memset (&sfinfo1, 0, sizeof (SF_INFO)) ;
@@ -80,34 +85,35 @@ compare (void)
 		} ;
 
 	if (sfinfo1.samplerate != sfinfo2.samplerate)
-	{	retval = comparison_error ("Samplerates") ;
+	{	retval = comparison_error ("Samplerates", -1) ;
 		goto out ;
 		} ;
 
 	if (sfinfo1.channels != sfinfo2.channels)
-	{	retval = comparison_error ("Number of channels") ;
+	{	retval = comparison_error ("Number of channels", -1) ;
 		goto out ;
 		} ;
 
 	/* Calculate the framecount that will fit in our data buffers */
-	len = BUFLEN / sfinfo1.channels ;
+	items = BUFLEN / sfinfo1.channels ;
 
-	while ( (nread1 = sf_readf_double (sf1, buf1, len)) > 0)
+	while ((nread1 = sf_readf_double (sf1, buf1, items)) > 0)
 	{	nread2 = sf_readf_double (sf2, buf2, nread1) ;
 		if (nread2 != nread1)
-		{	retval = comparison_error ("PCM data lengths") ;
+		{	retval = comparison_error ("PCM data lengths", -1) ;
 			goto out ;
 			} ;
-		for (i = 0 ; i < nread1 ; i++)
+		for (i = 0 ; i < nread1 * sfinfo1.channels ; i++)
 		{	if (buf1 [i] != buf2 [i])
-			{	retval = comparison_error ("PCM data") ;
+			{	retval = comparison_error ("PCM data", offset + i / sfinfo1.channels) ;
 				goto out ;
 				} ;
 			} ;
+		offset += nread1 ;
 		} ;
 
-	if ( (nread2 = sf_readf_double (sf2, buf2, nread1)) != 0)
-	{	retval = comparison_error ("PCM data lengths") ;
+	if ((nread2 = sf_readf_double (sf2, buf2, items)) != 0)
+	{	retval = comparison_error ("PCM data lengths", -1) ;
 		goto out ;
 		} ;
 
@@ -127,22 +133,22 @@ print_version (void)
 } /* print_version */
 
 static void
-print_usage (void)
+usage_exit (void)
 {
 	print_version () ;
 
 	printf ("Usage : %s  \n", progname) ;
 	printf ("	Compare the PCM data of two sound files.\n\n") ;
-} /* print_usage */
+	exit (0) ;
+} /* usage_exit */
 
 int
 main (int argc, char *argv [])
 {
-	progname = strrchr (argv [0], '/') ;
-	progname = progname ? progname + 1 : argv [0] ;
+	progname = program_name (argv [0]) ;
 
 	if (argc != 3)
-	{	print_usage () ;
+	{	usage_exit () ;
 		return 1 ;
 		} ;
 
@@ -151,7 +157,7 @@ main (int argc, char *argv [])
 
 	if (strcmp (filename1, filename2) == 0)
 	{	printf ("Error : Input filenames are the same.\n\n") ;
-		print_usage () ;
+		usage_exit () ;
 		return 1 ;
 		} ;
 
diff --git a/libs/libsndfile/programs/sndfile-concat.c b/libs/libsndfile/programs/sndfile-concat.c
new file mode 100644
index 0000000000..ef5312b693
--- /dev/null
+++ b/libs/libsndfile/programs/sndfile-concat.c
@@ -0,0 +1,169 @@
+/*
+** Copyright (C) 1999-2012 Erik de Castro Lopo 
+**
+** All rights reserved.
+**
+** 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 author nor the names of any 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 COPYRIGHT OWNER 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	
+#include	
+#include	
+#include	
+
+#include	
+
+#include	"common.h"
+
+#define		BUFFER_LEN	(1 << 16)
+
+
+static void concat_data_fp (SNDFILE *wfile, SNDFILE *rofile, int channels) ;
+static void concat_data_int (SNDFILE *wfile, SNDFILE *rofile, int channels) ;
+
+static void
+usage_exit (const char *progname)
+{
+	printf ("\nUsage : %s    ... \n\n", progname) ;
+	puts (
+		"    Create a new output file  containing the concatenated\n"
+		"    audio data from froms   ....\n"
+		"\n"
+		"    The joined file will be encoded in the same format as the data\n"
+		"    in infile1, with all the data in subsequent files automatically\n"
+		"    converted to the correct encoding.\n"
+		"\n"
+		"    The only restriction is that the two files must have the same\n"
+		"    number of channels.\n"
+		) ;
+
+	exit (0) ;
+} /* usage_exit */
+
+int
+main (int argc, char *argv [])
+{	const char	*progname, *outfilename ;
+	SNDFILE		*outfile, **infiles ;
+	SF_INFO		sfinfo_out, sfinfo_in ;
+	void 		(*func) (SNDFILE*, SNDFILE*, int) ;
+	int			k ;
+
+	progname = program_name (argv [0]) ;
+
+	if (argc < 4)
+		usage_exit (progname) ;
+
+	argv ++ ;
+	argc -- ;
+
+	argc -- ;
+	outfilename = argv [argc] ;
+
+	if ((infiles = calloc (argc, sizeof (SNDFILE*))) == NULL)
+	{	printf ("\nError : Malloc failed.\n\n") ;
+		exit (1) ;
+		} ;
+
+	memset (&sfinfo_in, 0, sizeof (sfinfo_in)) ;
+
+	if ((infiles [0] = sf_open (argv [0], SFM_READ, &sfinfo_in)) == NULL)
+	{	printf ("\nError : failed to open file '%s'.\n\n", argv [0]) ;
+		exit (1) ;
+		} ;
+
+	sfinfo_out = sfinfo_in ;
+
+	for (k = 1 ; k < argc ; k++)
+	{	if ((infiles [k] = sf_open (argv [k], SFM_READ, &sfinfo_in)) == NULL)
+		{	printf ("\nError : failed to open file '%s'.\n\n", argv [k]) ;
+			exit (1) ;
+			} ;
+
+		if (sfinfo_in.channels != sfinfo_out.channels)
+		{	printf ("\nError : File '%s' has %d channels (should have %d).\n\n", argv [k], sfinfo_in.channels, sfinfo_out.channels) ;
+			exit (1) ;
+			} ;
+		} ;
+
+	if ((outfile = sf_open (outfilename, SFM_WRITE, &sfinfo_out)) == NULL)
+	{	printf ("\nError : Not able to open input file %s.\n", outfilename) ;
+		puts (sf_strerror (NULL)) ;
+		exit (1) ;
+		} ;
+
+	if ((sfinfo_out.format & SF_FORMAT_SUBMASK) == SF_FORMAT_DOUBLE ||
+			(sfinfo_out.format & SF_FORMAT_SUBMASK) == SF_FORMAT_FLOAT)
+		func = concat_data_fp ;
+	else
+		func = concat_data_int ;
+
+	for (k = 0 ; k < argc ; k++)
+	{	func (outfile, infiles [k], sfinfo_out.channels) ;
+		sf_close (infiles [k]) ;
+		} ;
+
+	sf_close (outfile) ;
+
+	return 0 ;
+} /* main */
+
+static void
+concat_data_fp (SNDFILE *wfile, SNDFILE *rofile, int channels)
+{	static double	data [BUFFER_LEN] ;
+	int		frames, readcount ;
+
+	frames = BUFFER_LEN / channels ;
+	readcount = frames ;
+
+	sf_seek (wfile, 0, SEEK_END) ;
+
+	while (readcount > 0)
+	{	readcount = sf_readf_double (rofile, data, frames) ;
+		sf_writef_double (wfile, data, readcount) ;
+		} ;
+
+	return ;
+} /* concat_data_fp */
+
+static void
+concat_data_int (SNDFILE *wfile, SNDFILE *rofile, int channels)
+{	static int	data [BUFFER_LEN] ;
+	int		frames, readcount ;
+
+	frames = BUFFER_LEN / channels ;
+	readcount = frames ;
+
+	sf_seek (wfile, 0, SEEK_END) ;
+
+	while (readcount > 0)
+	{	readcount = sf_readf_int (rofile, data, frames) ;
+		sf_writef_int (wfile, data, readcount) ;
+		} ;
+
+	return ;
+} /* concat_data_int */
+
diff --git a/libs/libsndfile/programs/sndfile-convert.c b/libs/libsndfile/programs/sndfile-convert.c
index f1aa58ebd0..c22cc9b16a 100644
--- a/libs/libsndfile/programs/sndfile-convert.c
+++ b/libs/libsndfile/programs/sndfile-convert.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2013 Erik de Castro Lopo 
 **
 ** All rights reserved.
 **
@@ -45,93 +45,22 @@ typedef	struct
 	SF_INFO	infileinfo, outfileinfo ;
 } OptionData ;
 
-typedef struct
-{	const char	*ext ;
-	int			len ;
-	int			format ;
-} OUTPUT_FORMAT_MAP ;
-
-static void copy_metadata (SNDFILE *outfile, SNDFILE *infile) ;
-
-static OUTPUT_FORMAT_MAP format_map [] =
-{
-	{	"aif",		3,	SF_FORMAT_AIFF	},
-	{	"wav", 		0,	SF_FORMAT_WAV	},
-	{	"au",		0,	SF_FORMAT_AU	},
-	{	"caf",		0,	SF_FORMAT_CAF	},
-	{	"flac",		0,	SF_FORMAT_FLAC	},
-	{	"snd",		0,	SF_FORMAT_AU	},
-	{	"svx",		0,	SF_FORMAT_SVX	},
-	{	"paf",		0,	SF_ENDIAN_BIG | SF_FORMAT_PAF	},
-	{	"fap",		0,	SF_ENDIAN_LITTLE | SF_FORMAT_PAF	},
-	{	"gsm",		0,	SF_FORMAT_RAW	},
-	{	"nist", 	0,	SF_FORMAT_NIST	},
-	{	"htk",		0,	SF_FORMAT_HTK	},
-	{	"ircam",	0,	SF_FORMAT_IRCAM	},
-	{	"sf",		0, 	SF_FORMAT_IRCAM	},
-	{	"voc",		0, 	SF_FORMAT_VOC	},
-	{	"w64", 		0, 	SF_FORMAT_W64	},
-	{	"raw",		0,	SF_FORMAT_RAW	},
-	{	"mat4", 	0,	SF_FORMAT_MAT4	},
-	{	"mat5", 	0, 	SF_FORMAT_MAT5 	},
-	{	"mat",		0, 	SF_FORMAT_MAT4 	},
-	{	"pvf",		0, 	SF_FORMAT_PVF 	},
-	{	"sds",		0, 	SF_FORMAT_SDS 	},
-	{	"sd2",		0, 	SF_FORMAT_SD2 	},
-	{	"vox",		0, 	SF_FORMAT_RAW 	},
-	{	"xi",		0, 	SF_FORMAT_XI 	},
-	{	"wve",		0,	SF_FORMAT_WVE	},
-	{	"oga",		0,	SF_FORMAT_OGG	},
-	{	"mpc",		0,	SF_FORMAT_MPC2K	},
-	{	"rf64",		0,	SF_FORMAT_RF64	},
-} ; /* format_map */
-
-static int
-guess_output_file_type (char *str, int format)
-{	char	buffer [16], *cptr ;
-	int		k ;
-
-	format &= SF_FORMAT_SUBMASK ;
-
-	if ((cptr = strrchr (str, '.')) == NULL)
-		return 0 ;
-
-	strncpy (buffer, cptr + 1, 15) ;
-	buffer [15] = 0 ;
-
-	for (k = 0 ; buffer [k] ; k++)
-		buffer [k] = tolower ((buffer [k])) ;
-
-	if (strcmp (buffer, "gsm") == 0)
-		return SF_FORMAT_RAW | SF_FORMAT_GSM610 ;
-
-	if (strcmp (buffer, "vox") == 0)
-		return SF_FORMAT_RAW | SF_FORMAT_VOX_ADPCM ;
-
-	for (k = 0 ; k < (int) (sizeof (format_map) / sizeof (format_map [0])) ; k++)
-	{	if (format_map [k].len > 0 && strncmp (buffer, format_map [k].ext, format_map [k].len) == 0)
-			return format_map [k].format | format ;
-		else if (strcmp (buffer, format_map [k].ext) == 0)
-			return format_map [k].format | format ;
-		} ;
-
-	return	0 ;
-} /* guess_output_file_type */
-
+static void copy_metadata (SNDFILE *outfile, SNDFILE *infile, int channels) ;
 
 static void
-print_usage (char *progname)
-{	SF_FORMAT_INFO	info ;
-
-	int k ;
-
+usage_exit (const char *progname)
+{
 	printf ("\nUsage : %s [options] [encoding]  \n", progname) ;
 	puts ("\n"
 		"    where [option] may be:\n\n"
-		"        -override-sample-rate=X  : force sample rate of input to X\n\n"
+		"        -override-sample-rate=X  : force sample rate of input to X\n"
+		"        -endian=little           : force output file to little endian data\n"
+		"        -endian=big              : force output file to big endian data\n"
+		"        -endian=cpu              : force output file same endian-ness as the CPU\n"
+		"        -normalize               : normalize the data in the output file\n"
 		) ;
 
-	puts ("\n"
+	puts (
 		"    where [encoding] may be one of the following:\n\n"
 		"        -pcms8     : force the output to signed 8 bit pcm\n"
 		"        -pcmu8     : force the output to unsigned 8 bit pcm\n"
@@ -143,6 +72,10 @@ print_usage (char *progname)
 	puts (
 		"        -ulaw      : force the output ULAW\n"
 		"        -alaw      : force the output ALAW\n"
+		"        -alac16    : force the output 16 bit ALAC (CAF only)\n"
+		"        -alac20    : force the output 20 bit ALAC (CAF only)\n"
+		"        -alac24    : force the output 24 bit ALAC (CAF only)\n"
+		"        -alac32    : force the output 32 bit ALAC (CAF only)\n"
 		"        -ima-adpcm : force the output to IMA ADPCM (WAV only)\n"
 		"        -ms-adpcm  : force the output to MS ADPCM (WAV only)\n"
 		"        -gsm610    : force the GSM6.10 (WAV only)\n"
@@ -152,33 +85,57 @@ print_usage (char *progname)
 		"        -vorbis    : force the output to Vorbis (OGG only)\n"
 		) ;
 
+	puts (
+		"    If no encoding is specified, the program will try to use the encoding\n"
+		"    of the input file in the output file. This will not always work as\n"
+		"    most container formats (eg WAV, AIFF etc) only support a small subset\n"
+		"    of codec formats (eg 16 bit PCM, a-law, Vorbis etc).\n"
+		) ;
+
 	puts (
 		"    The format of the output file is determined by the file extension of the\n"
 		"    output file name. The following extensions are currently understood:\n"
 		) ;
 
-	for (k = 0 ; k < (int) (sizeof (format_map) / sizeof (format_map [0])) ; k++)
-	{	info.format = format_map [k].format ;
-		sf_command (NULL, SFC_GET_FORMAT_INFO, &info, sizeof (info)) ;
-		printf ("        %-10s : %s\n", format_map [k].ext, info.name) ;
-		} ;
+	sfe_dump_format_map () ;
 
 	puts ("") ;
-} /* print_usage */
+	exit (0) ;
+} /* usage_exit */
+
+static void
+report_format_error_exit (const char * argv0, SF_INFO * sfinfo)
+{	int old_format = sfinfo->format ;
+	int endian = sfinfo->format & SF_FORMAT_ENDMASK ;
+
+	sfinfo->format = old_format & (SF_FORMAT_TYPEMASK | SF_FORMAT_SUBMASK) ;
+
+	if (endian && sf_format_check (sfinfo))
+	{	printf ("Error : output file format does not support %s endian-ness.\n", sfe_endian_name (endian)) ;
+		exit (1) ;
+		} ;
+
+	printf ("\n"
+			"Error : output file format is invalid.\n"
+			"The '%s' container does not support '%s' codec data.\n"
+			"Run '%s --help' for clues.\n\n",
+			sfe_container_name (sfinfo->format), sfe_codec_name (sfinfo->format), program_name (argv0)) ;
+	exit (1) ;
+} /* report_format_error_exit */
 
 int
 main (int argc, char * argv [])
-{	char 		*progname, *infilename, *outfilename ;
-	SNDFILE	 	*infile = NULL, *outfile = NULL ;
-	SF_INFO	 	sfinfo ;
+{	const char	*progname, *infilename, *outfilename ;
+	SNDFILE		*infile = NULL, *outfile = NULL ;
+	SF_INFO		sfinfo ;
 	int			k, outfilemajor, outfileminor = 0, infileminor ;
 	int			override_sample_rate = 0 ; /* assume no sample rate override. */
+	int			endian = SF_ENDIAN_FILE, normalize = SF_FALSE ;
 
-	progname = strrchr (argv [0], '/') ;
-	progname = progname ? progname + 1 : argv [0] ;
+	progname = program_name (argv [0]) ;
 
 	if (argc < 3 || argc > 5)
-	{	print_usage (progname) ;
+	{	usage_exit (progname) ;
 		return 1 ;
 		} ;
 
@@ -187,19 +144,19 @@ main (int argc, char * argv [])
 
 	if (strcmp (infilename, outfilename) == 0)
 	{	printf ("Error : Input and output filenames are the same.\n\n") ;
-		print_usage (progname) ;
+		usage_exit (progname) ;
 		return 1 ;
 		} ;
 
-	if (infilename [0] == '-')
+	if (strlen (infilename) > 1 && infilename [0] == '-')
 	{	printf ("Error : Input filename (%s) looks like an option.\n\n", infilename) ;
-		print_usage (progname) ;
+		usage_exit (progname) ;
 		return 1 ;
 		} ;
 
 	if (outfilename [0] == '-')
 	{	printf ("Error : Output filename (%s) looks like an option.\n\n", outfilename) ;
-		print_usage (progname) ;
+		usage_exit (progname) ;
 		return 1 ;
 		} ;
 
@@ -236,6 +193,22 @@ main (int argc, char * argv [])
 		{	outfileminor = SF_FORMAT_ALAW ;
 			continue ;
 			} ;
+		if (! strcmp (argv [k], "-alac16"))
+		{	outfileminor = SF_FORMAT_ALAC_16 ;
+			continue ;
+			} ;
+		if (! strcmp (argv [k], "-alac20"))
+		{	outfileminor = SF_FORMAT_ALAC_20 ;
+			continue ;
+			} ;
+		if (! strcmp (argv [k], "-alac24"))
+		{	outfileminor = SF_FORMAT_ALAC_24 ;
+			continue ;
+			} ;
+		if (! strcmp (argv [k], "-alac32"))
+		{	outfileminor = SF_FORMAT_ALAC_32 ;
+			continue ;
+			} ;
 		if (! strcmp (argv [k], "-ima-adpcm"))
 		{	outfileminor = SF_FORMAT_IMA_ADPCM ;
 			continue ;
@@ -273,10 +246,37 @@ main (int argc, char * argv [])
 			continue ;
 			} ;
 
+		if (! strcmp (argv [k], "-endian=little"))
+		{	endian = SF_ENDIAN_LITTLE ;
+			continue ;
+			} ;
+
+		if (! strcmp (argv [k], "-endian=big"))
+		{	endian = SF_ENDIAN_BIG ;
+			continue ;
+			} ;
+
+		if (! strcmp (argv [k], "-endian=cpu"))
+		{	endian = SF_ENDIAN_CPU ;
+			continue ;
+			} ;
+
+		if (! strcmp (argv [k], "-endian=file"))
+		{	endian = SF_ENDIAN_FILE ;
+			continue ;
+			} ;
+
+		if (! strcmp (argv [k], "-normalize"))
+		{	normalize = SF_TRUE ;
+			continue ;
+			} ;
+
 		printf ("Error : Not able to decode argunment '%s'.\n", argv [k]) ;
 		exit (1) ;
 		} ;
 
+	memset (&sfinfo, 0, sizeof (sfinfo)) ;
+
 	if ((infile = sf_open (infilename, SFM_READ, &sfinfo)) == NULL)
 	{	printf ("Not able to open input file %s.\n", infilename) ;
 		puts (sf_strerror (NULL)) ;
@@ -289,7 +289,7 @@ main (int argc, char * argv [])
 
 	infileminor = sfinfo.format & SF_FORMAT_SUBMASK ;
 
-	if ((sfinfo.format = guess_output_file_type (outfilename, sfinfo.format)) == 0)
+	if ((sfinfo.format = sfe_file_type_of_ext (outfilename, sfinfo.format)) == 0)
 	{	printf ("Error : Not able to determine output file type for %s.\n", outfilename) ;
 		return 1 ;
 		} ;
@@ -304,6 +304,8 @@ main (int argc, char * argv [])
 	else
 		sfinfo.format = outfilemajor | (sfinfo.format & SF_FORMAT_SUBMASK) ;
 
+	sfinfo.format |= endian ;
+
 	if ((sfinfo.format & SF_FORMAT_TYPEMASK) == SF_FORMAT_XI)
 		switch (sfinfo.format & SF_FORMAT_SUBMASK)
 		{	case SF_FORMAT_PCM_16 :
@@ -317,9 +319,7 @@ main (int argc, char * argv [])
 			} ;
 
 	if (sf_format_check (&sfinfo) == 0)
-	{	printf ("Error : output file format is invalid (0x%08X).\n", sfinfo.format) ;
-		return 1 ;
-		} ;
+		report_format_error_exit (argv [0], &sfinfo) ;
 
 	/* Open the output file. */
 	if ((outfile = sf_open (outfilename, SFM_WRITE, &sfinfo)) == NULL)
@@ -328,12 +328,13 @@ main (int argc, char * argv [])
 		} ;
 
 	/* Copy the metadata */
-	copy_metadata (outfile, infile) ;
+	copy_metadata (outfile, infile, sfinfo.channels) ;
 
-	if ((outfileminor == SF_FORMAT_DOUBLE) || (outfileminor == SF_FORMAT_FLOAT)
+	if (normalize
+			|| (outfileminor == SF_FORMAT_DOUBLE) || (outfileminor == SF_FORMAT_FLOAT)
 			|| (infileminor == SF_FORMAT_DOUBLE) || (infileminor == SF_FORMAT_FLOAT)
 			|| (infileminor == SF_FORMAT_VORBIS) || (outfileminor == SF_FORMAT_VORBIS))
-		sfe_copy_data_fp (outfile, infile, sfinfo.channels) ;
+		sfe_copy_data_fp (outfile, infile, sfinfo.channels, normalize) ;
 	else
 		sfe_copy_data_int (outfile, infile, sfinfo.channels) ;
 
@@ -344,21 +345,28 @@ main (int argc, char * argv [])
 } /* main */
 
 static void
-copy_metadata (SNDFILE *outfile, SNDFILE *infile)
+copy_metadata (SNDFILE *outfile, SNDFILE *infile, int channels)
 {	SF_INSTRUMENT inst ;
 	SF_BROADCAST_INFO_2K binfo ;
 	const char *str ;
-	int k, err = 0 ;
+	int k, chanmap [256] ;
 
 	for (k = SF_STR_FIRST ; k <= SF_STR_LAST ; k++)
 	{	str = sf_get_string (infile, k) ;
 		if (str != NULL)
-			err = sf_set_string (outfile, k, str) ;
+			sf_set_string (outfile, k, str) ;
 		} ;
 
 	memset (&inst, 0, sizeof (inst)) ;
 	memset (&binfo, 0, sizeof (binfo)) ;
 
+	if (channels < ARRAY_LEN (chanmap))
+	{	size_t size = channels * sizeof (chanmap [0]) ;
+
+		if (sf_command (infile, SFC_GET_CHANNEL_MAP_INFO, chanmap, size) == SF_TRUE)
+			sf_command (outfile, SFC_SET_CHANNEL_MAP_INFO, chanmap, size) ;
+		} ;
+
 	if (sf_command (infile, SFC_GET_INSTRUMENT, &inst, sizeof (inst)) == SF_TRUE)
 		sf_command (outfile, SFC_SET_INSTRUMENT, &inst, sizeof (inst)) ;
 
diff --git a/libs/libsndfile/programs/sndfile-deinterleave.c b/libs/libsndfile/programs/sndfile-deinterleave.c
new file mode 100644
index 0000000000..df80b04222
--- /dev/null
+++ b/libs/libsndfile/programs/sndfile-deinterleave.c
@@ -0,0 +1,194 @@
+/*
+** Copyright (C) 2009-2011 Erik de Castro Lopo 
+**
+** All rights reserved.
+**
+** 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 author nor the names of any 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 COPYRIGHT OWNER 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 
+#include 
+#include 
+#include 
+
+#include "common.h"
+
+#define	BUFFER_LEN	4096
+#define	MAX_CHANNELS	16
+
+
+typedef struct
+{	SNDFILE * infile ;
+	SNDFILE * outfile [MAX_CHANNELS] ;
+
+	union
+	{	double	d [MAX_CHANNELS * BUFFER_LEN] ;
+		int		i [MAX_CHANNELS * BUFFER_LEN] ;
+	} din ;
+
+	union
+	{	double	d [BUFFER_LEN] ;
+		int		i [BUFFER_LEN] ;
+	} dout ;
+
+	int channels ;
+} STATE ;
+
+static void usage_exit (void) ;
+
+static void deinterleave_int (STATE * state) ;
+static void deinterleave_double (STATE * state) ;
+
+int
+main (int argc, char **argv)
+{	STATE state ;
+	SF_INFO sfinfo ;
+	char pathname [512], ext [32], *cptr ;
+	int ch, double_split ;
+
+	if (argc != 2)
+	{	if (argc != 1)
+			puts ("\nError : need a single input file.\n") ;
+		usage_exit () ;
+		} ;
+
+	memset (&state, 0, sizeof (state)) ;
+	memset (&sfinfo, 0, sizeof (sfinfo)) ;
+
+	if ((state.infile = sf_open (argv [1], SFM_READ, &sfinfo)) == NULL)
+	{	printf ("\nError : Not able to open input file '%s'\n%s\n", argv [1], sf_strerror (NULL)) ;
+		exit (1) ;
+		} ;
+
+	if (sfinfo.channels < 2)
+	{	printf ("\nError : Input file '%s' only has one channel.\n", argv [1]) ;
+		exit (1) ;
+		} ;
+
+	state.channels = sfinfo.channels ;
+	sfinfo.channels = 1 ;
+
+	snprintf (pathname, sizeof (pathname), "%s", argv [1]) ;
+	if ((cptr = strrchr (pathname, '.')) == NULL)
+		ext [0] = 0 ;
+	else
+	{	snprintf (ext, sizeof (ext), "%s", cptr) ;
+		cptr [0] = 0 ;
+		} ;
+
+	printf ("Input file : %s\n", pathname) ;
+	puts ("Output files :") ;
+
+	for (ch = 0 ; ch < state.channels ; ch++)
+	{	char filename [520] ;
+
+		snprintf (filename, sizeof (filename), "%s_%02d%s", pathname, ch, ext) ;
+
+		if ((state.outfile [ch] = sf_open (filename, SFM_WRITE, &sfinfo)) == NULL)
+		{	printf ("Not able to open output file '%s'\n%s\n", filename, sf_strerror (NULL)) ;
+			exit (1) ;
+			} ;
+
+		printf ("    %s\n", filename) ;
+		} ;
+
+	switch (sfinfo.format & SF_FORMAT_SUBMASK)
+	{	case SF_FORMAT_FLOAT :
+		case SF_FORMAT_DOUBLE :
+		case SF_FORMAT_VORBIS :
+			double_split = 1 ;
+			break ;
+
+		default :
+			double_split = 0 ;
+			break ;
+		} ;
+
+	if (double_split)
+		deinterleave_double (&state) ;
+	else
+		deinterleave_int (&state) ;
+
+	sf_close (state.infile) ;
+	for (ch = 0 ; ch < MAX_CHANNELS ; ch++)
+		if (state.outfile [ch] != NULL)
+			sf_close (state.outfile [ch]) ;
+
+	return 0 ;
+} /* main */
+
+/*------------------------------------------------------------------------------
+*/
+
+static void
+usage_exit (void)
+{	puts ("\nUsage : sndfile-deinterleave \n") ;
+	puts (
+		"Split a mutli-channel file into a set of mono files.\n"
+		"\n"
+		"If the input file is named 'a.wav', the output files will be named\n"
+		"a_00.wav, a_01.wav and so on.\n"
+		) ;
+	printf ("Using %s.\n\n", sf_version_string ()) ;
+	exit (0) ;
+} /* usage_exit */
+
+static void
+deinterleave_int (STATE * state)
+{	int read_len ;
+	int ch, k ;
+
+	do
+	{	read_len = sf_readf_int (state->infile, state->din.i, BUFFER_LEN) ;
+
+		for (ch = 0 ; ch < state->channels ; ch ++)
+		{	for (k = 0 ; k < read_len ; k++)
+				state->dout.i [k] = state->din.i [k * state->channels + ch] ;
+			sf_write_int (state->outfile [ch], state->dout.i, read_len) ;
+			} ;
+		}
+	while (read_len > 0) ;
+
+} /* deinterleave_int */
+
+static void
+deinterleave_double (STATE * state)
+{	int read_len ;
+	int ch, k ;
+
+	do
+	{	read_len = sf_readf_double (state->infile, state->din.d, BUFFER_LEN) ;
+
+		for (ch = 0 ; ch < state->channels ; ch ++)
+		{	for (k = 0 ; k < read_len ; k++)
+				state->dout.d [k] = state->din.d [k * state->channels + ch] ;
+			sf_write_double (state->outfile [ch], state->dout.d, read_len) ;
+			} ;
+		}
+	while (read_len > 0) ;
+
+} /* deinterleave_double */
diff --git a/libs/libsndfile/programs/sndfile-info.c b/libs/libsndfile/programs/sndfile-info.c
index 3ac12a8f04..06982fd2c2 100644
--- a/libs/libsndfile/programs/sndfile-info.c
+++ b/libs/libsndfile/programs/sndfile-info.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2013 Erik de Castro Lopo 
 **
 ** All rights reserved.
 **
@@ -45,15 +45,16 @@
 
 #if (defined (WIN32) || defined (_WIN32))
 #include 
-#define	snprintf	_snprintf
 #endif
 
 static void print_version (void) ;
-static void print_usage (const char *progname) ;
+static void usage_exit (const char *progname) ;
 
 static void info_dump (const char *filename) ;
 static int	instrument_dump (const char *filename) ;
 static int	broadcast_dump (const char *filename) ;
+static int	chanmap_dump (const char *filename) ;
+static int	cart_dump (const char *filename) ;
 static void total_dump (void) ;
 
 static double total_seconds = 0.0 ;
@@ -65,16 +66,11 @@ main (int argc, char *argv [])
 	print_version () ;
 
 	if (argc < 2 || strcmp (argv [1], "--help") == 0 || strcmp (argv [1], "-h") == 0)
-	{	char *progname ;
-
-		progname = strrchr (argv [0], '/') ;
-		progname = progname ? progname + 1 : argv [0] ;
-
-		print_usage (progname) ;
+	{	usage_exit (program_name (argv [0])) ;
 		return 1 ;
 		} ;
 
-	if (strcmp (argv [1], "-i") == 0)
+	if (strcmp (argv [1], "--instrument") == 0)
 	{	int error = 0 ;
 
 		for (k = 2 ; k < argc ; k++)
@@ -82,7 +78,7 @@ main (int argc, char *argv [])
 		return error ;
 		} ;
 
-	if (strcmp (argv [1], "-b") == 0)
+	if (strcmp (argv [1], "--broadcast") == 0)
 	{	int error = 0 ;
 
 		for (k = 2 ; k < argc ; k++)
@@ -90,6 +86,22 @@ main (int argc, char *argv [])
 		return error ;
 		} ;
 
+	if (strcmp (argv [1], "--channel-map") == 0)
+	{	int error = 0 ;
+
+		for (k = 2 ; k < argc ; k++)
+			error += chanmap_dump (argv [k]) ;
+		return error ;
+		} ;
+
+	if (strcmp (argv [1], "--cart") == 0)
+	{	int error = 0 ;
+
+		for (k = 2 ; k < argc ; k++)
+			error += cart_dump (argv [k]) ;
+		return error ;
+		} ;
+
 	for (k = 1 ; k < argc ; k++)
 		info_dump (argv [k]) ;
 
@@ -115,13 +127,17 @@ print_version (void)
 
 
 static void
-print_usage (const char *progname)
+usage_exit (const char *progname)
 {	printf ("Usage :\n  %s  ...\n", progname) ;
 	printf ("    Prints out information about one or more sound files.\n\n") ;
-	printf ("  %s -i \n", progname) ;
+	printf ("  %s --instrument \n", progname) ;
 	printf ("    Prints out the instrument data for the given file.\n\n") ;
-	printf ("  %s -b \n", progname) ;
+	printf ("  %s --broadcast \n", progname) ;
 	printf ("    Prints out the broadcast WAV info for the given file.\n\n") ;
+	printf ("  %s --channel-map \n", progname) ;
+	printf ("    Prints out the channel map for the given file.\n\n") ;
+	printf ("  %s --cart \n", progname) ;
+	printf ("    Prints out the cart chunk WAV info for the given file.\n\n") ;
 #if (defined (_WIN32) || defined (WIN32))
 		printf ("This is a Unix style command line application which\n"
 				"should be run in a MSDOS box or Command Shell window.\n\n") ;
@@ -135,7 +151,8 @@ print_usage (const char *progname)
 		*/
 		Sleep (5 * 1000) ;
 #endif
-} /* print_usage */
+	exit (0) ;
+} /* usage_exit */
 
 /*==============================================================================
 **	Dumping of sndfile info.
@@ -143,15 +160,6 @@ print_usage (const char *progname)
 
 static double	data [BUFFER_LEN] ;
 
-static double
-get_signal_max (SNDFILE *file)
-{	double	max ;
-
-	sf_command (file, SFC_CALC_SIGNAL_MAX, &max, sizeof (max)) ;
-
-	return max ;
-} /* get_signal_max */
-
 static double
 calc_decibels (SF_INFO * sfinfo, double max)
 {	double decibels ;
@@ -226,8 +234,8 @@ generate_duration_str (SF_INFO *sfinfo)
 static void
 info_dump (const char *filename)
 {	static	char	strbuffer [BUFFER_LEN] ;
-	SNDFILE	 	*file ;
-	SF_INFO	 	sfinfo ;
+	SNDFILE		*file ;
+	SF_INFO		sfinfo ;
 	double		signal_max, decibels ;
 
 	memset (&sfinfo, 0, sizeof (sfinfo)) ;
@@ -248,7 +256,12 @@ info_dump (const char *filename)
 	printf ("----------------------------------------\n") ;
 
 	printf ("Sample Rate : %d\n", sfinfo.samplerate) ;
-	printf ("Frames      : %" PRId64 "\n", sfinfo.frames) ;
+
+	if (sfinfo.frames == SF_COUNT_MAX)
+		printf ("Frames      : unknown\n") ;
+	else
+		printf ("Frames      : %" PRId64 "\n", sfinfo.frames) ;
+
 	printf ("Channels    : %d\n", sfinfo.channels) ;
 	printf ("Format      : 0x%08X\n", sfinfo.format) ;
 	printf ("Sections    : %d\n", sfinfo.sections) ;
@@ -257,7 +270,7 @@ info_dump (const char *filename)
 
 	if (sfinfo.frames < 100 * 1024 * 1024)
 	{	/* Do not use sf_signal_max because it doesn't work for non-seekable files . */
-		signal_max = get_signal_max (file) ;
+		sf_command (file, SFC_CALC_SIGNAL_MAX, &signal_max, sizeof (signal_max)) ;
 		decibels = calc_decibels (&sfinfo, signal_max) ;
 		printf ("Signal Max  : %g (%4.2f dB)\n", signal_max, decibels) ;
 		} ;
@@ -286,8 +299,8 @@ str_of_type (int mode)
 
 static int
 instrument_dump (const char *filename)
-{	SNDFILE	 *file ;
-	SF_INFO	 sfinfo ;
+{	SNDFILE	*file ;
+	SF_INFO	sfinfo ;
 	SF_INSTRUMENT inst ;
 	int got_inst, k ;
 
@@ -325,8 +338,8 @@ instrument_dump (const char *filename)
 
 static int
 broadcast_dump (const char *filename)
-{	SNDFILE	 *file ;
-	SF_INFO	 sfinfo ;
+{	SNDFILE	*file ;
+	SF_INFO	sfinfo ;
 	SF_BROADCAST_INFO_2K bext ;
 	double time_ref_sec ;
 	int got_bext ;
@@ -379,6 +392,136 @@ broadcast_dump (const char *filename)
 	return 0 ;
 } /* broadcast_dump */
 
+static int
+chanmap_dump (const char *filename)
+{	SNDFILE	*file ;
+	SF_INFO	sfinfo ;
+	int * channel_map ;
+	int got_chanmap, k ;
+
+	memset (&sfinfo, 0, sizeof (sfinfo)) ;
+
+	if ((file = sf_open (filename, SFM_READ, &sfinfo)) == NULL)
+	{	printf ("Error : Not able to open input file %s.\n", filename) ;
+		fflush (stdout) ;
+		memset (data, 0, sizeof (data)) ;
+		puts (sf_strerror (NULL)) ;
+		return 1 ;
+		} ;
+
+	if ((channel_map = calloc (sfinfo.channels, sizeof (int))) == NULL)
+	{	printf ("Error : malloc failed.\n\n") ;
+		return 1 ;
+		} ;
+
+	got_chanmap = sf_command (file, SFC_GET_CHANNEL_MAP_INFO, channel_map, sfinfo.channels * sizeof (int)) ;
+	sf_close (file) ;
+
+	if (got_chanmap == SF_FALSE)
+	{	printf ("Error : File '%s' does not contain channel map information.\n\n", filename) ;
+		free (channel_map) ;
+		return 1 ;
+		} ;
+
+	printf ("File : %s\n\n", filename) ;
+
+	puts ("    Chan    Position") ;
+	for (k = 0 ; k < sfinfo.channels ; k ++)
+	{	const char * name ;
+
+#define CASE_NAME(x)	case x : name = #x ; break ;
+		switch (channel_map [k])
+		{	CASE_NAME (SF_CHANNEL_MAP_INVALID) ;
+			CASE_NAME (SF_CHANNEL_MAP_MONO) ;
+			CASE_NAME (SF_CHANNEL_MAP_LEFT) ;
+			CASE_NAME (SF_CHANNEL_MAP_RIGHT) ;
+			CASE_NAME (SF_CHANNEL_MAP_CENTER) ;
+			CASE_NAME (SF_CHANNEL_MAP_FRONT_LEFT) ;
+			CASE_NAME (SF_CHANNEL_MAP_FRONT_RIGHT) ;
+			CASE_NAME (SF_CHANNEL_MAP_FRONT_CENTER) ;
+			CASE_NAME (SF_CHANNEL_MAP_REAR_CENTER) ;
+			CASE_NAME (SF_CHANNEL_MAP_REAR_LEFT) ;
+			CASE_NAME (SF_CHANNEL_MAP_REAR_RIGHT) ;
+			CASE_NAME (SF_CHANNEL_MAP_LFE) ;
+			CASE_NAME (SF_CHANNEL_MAP_FRONT_LEFT_OF_CENTER) ;
+			CASE_NAME (SF_CHANNEL_MAP_FRONT_RIGHT_OF_CENTER) ;
+			CASE_NAME (SF_CHANNEL_MAP_SIDE_LEFT) ;
+			CASE_NAME (SF_CHANNEL_MAP_SIDE_RIGHT) ;
+			CASE_NAME (SF_CHANNEL_MAP_TOP_CENTER) ;
+			CASE_NAME (SF_CHANNEL_MAP_TOP_FRONT_LEFT) ;
+			CASE_NAME (SF_CHANNEL_MAP_TOP_FRONT_RIGHT) ;
+			CASE_NAME (SF_CHANNEL_MAP_TOP_FRONT_CENTER) ;
+			CASE_NAME (SF_CHANNEL_MAP_TOP_REAR_LEFT) ;
+			CASE_NAME (SF_CHANNEL_MAP_TOP_REAR_RIGHT) ;
+			CASE_NAME (SF_CHANNEL_MAP_TOP_REAR_CENTER) ;
+			CASE_NAME (SF_CHANNEL_MAP_MAX) ;
+			default : name = "default" ;
+				break ;
+			} ;
+
+		printf ("    %3d     %s\n", k, name) ;
+		} ;
+
+	putchar ('\n') ;
+	free (channel_map) ;
+
+	return 0 ;
+} /* chanmap_dump */
+
+static int
+cart_dump (const char *filename)
+{	SNDFILE	*file ;
+	SF_INFO	sfinfo ;
+	SF_CART_INFO_VAR (1024) cart ;
+	int got_cart, k ;
+
+	memset (&sfinfo, 0, sizeof (sfinfo)) ;
+	memset (&cart, 0, sizeof (cart)) ;
+
+	if ((file = sf_open (filename, SFM_READ, &sfinfo)) == NULL)
+	{	printf ("Error : Not able to open input file %s.\n", filename) ;
+		fflush (stdout) ;
+		memset (data, 0, sizeof (data)) ;
+		puts (sf_strerror (NULL)) ;
+		return 1 ;
+		} ;
+
+	got_cart = sf_command (file, SFC_GET_CART_INFO, &cart, sizeof (cart)) ;
+	sf_close (file) ;
+
+	if (got_cart == SF_FALSE)
+	{	printf ("Error : File '%s' does not contain cart information.\n\n", filename) ;
+		return 1 ;
+		} ;
+
+	printf ("Version        : %.*s\n", (int) sizeof (cart.version), cart.version) ;
+	printf ("Title          : %.*s\n", (int) sizeof (cart.title), cart.title) ;
+	printf ("Artist         : %.*s\n", (int) sizeof (cart.artist), cart.artist) ;
+	printf ("Cut id         : %.*s\n", (int) sizeof (cart.cut_id), cart.cut_id) ;
+	printf ("Category       : %.*s\n", (int) sizeof (cart.category), cart.category) ;
+	printf ("Classification : %.*s\n", (int) sizeof (cart.classification), cart.classification) ;
+	printf ("Out cue        : %.*s\n", (int) sizeof (cart.out_cue), cart.out_cue) ;
+	printf ("Start date     : %.*s\n", (int) sizeof (cart.start_date), cart.start_date) ;
+	printf ("Start time     : %.*s\n", (int) sizeof (cart.start_time), cart.start_time) ;
+	printf ("End date       : %.*s\n", (int) sizeof (cart.end_date), cart.end_date) ;
+	printf ("End time       : %.*s\n", (int) sizeof (cart.end_time), cart.end_time) ;
+	printf ("App id         : %.*s\n", (int) sizeof (cart.producer_app_id), cart.producer_app_id) ;
+	printf ("App version    : %.*s\n", (int) sizeof (cart.producer_app_version), cart.producer_app_version) ;
+	printf ("User defined   : %.*s\n", (int) sizeof (cart.user_def), cart.user_def) ;
+	printf ("Level ref.     : %d\n", cart.level_reference) ;
+	printf ("Post timers    :\n") ;
+
+	for (k = 0 ; k < ARRAY_LEN (cart.post_timers) ; k++)
+		if (cart.post_timers [k].usage [0])
+			printf ("  %d   %.*s    %d\n", k, (int) sizeof (cart.post_timers [k].usage), cart.post_timers [k].usage, cart.post_timers [k].value) ;
+
+	printf ("Reserved       : %.*s\n", (int) sizeof (cart.reserved), cart.reserved) ;
+	printf ("Url            : %.*s\n", (int) sizeof (cart.url), cart.url) ;
+	printf ("Tag text       : %.*s\n", cart.tag_text_size, cart.tag_text) ;
+
+	return 0 ;
+} /* cart_dump */
+
 static void
 total_dump (void)
 {	printf ("========================================\n") ;
diff --git a/libs/libsndfile/programs/sndfile-interleave.c b/libs/libsndfile/programs/sndfile-interleave.c
new file mode 100644
index 0000000000..24d6b9d874
--- /dev/null
+++ b/libs/libsndfile/programs/sndfile-interleave.c
@@ -0,0 +1,202 @@
+/*
+** Copyright (C) 2009-2011 Erik de Castro Lopo 
+**
+** All rights reserved.
+**
+** 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 author nor the names of any 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 COPYRIGHT OWNER 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 
+#include 
+#include 
+#include 
+
+#include "common.h"
+
+#define	BUFFER_LEN	4096
+#define	MAX_INPUTS	16
+
+
+typedef struct
+{	SNDFILE * infile [MAX_INPUTS] ;
+	SNDFILE * outfile ;
+
+	union
+	{	double	d [BUFFER_LEN] ;
+		int		i [BUFFER_LEN] ;
+	} din ;
+
+	union
+
+	{	double	d [MAX_INPUTS * BUFFER_LEN] ;
+		int		i [MAX_INPUTS * BUFFER_LEN] ;
+	} dout ;
+
+	int channels ;
+} STATE ;
+
+
+static void usage_exit (void) ;
+static void interleave_int (STATE * state) ;
+static void interleave_double (STATE * state) ;
+
+
+int
+main (int argc, char **argv)
+{	STATE state ;
+	SF_INFO sfinfo ;
+	int k, double_merge = 0 ;
+
+	if (argc < 5)
+	{	if (argc > 1)
+			puts ("\nError : need at least 2 input files.") ;
+		usage_exit () ;
+		} ;
+
+	if (strcmp (argv [argc - 2], "-o") != 0)
+	{	puts ("\nError : second last command line parameter should be '-o'.\n") ;
+		usage_exit () ;
+		} ;
+
+	if (argc - 3 > MAX_INPUTS)
+	{	printf ("\nError : Cannot handle more than %d input channels.\n\n", MAX_INPUTS) ;
+		exit (1) ;
+		} ;
+
+	memset (&state, 0, sizeof (state)) ;
+	memset (&sfinfo, 0, sizeof (sfinfo)) ;
+
+	for (k = 1 ; k < argc - 2 ; k++)
+	{
+		if ((state.infile [k - 1] = sf_open (argv [k], SFM_READ, &sfinfo)) == NULL)
+		{	printf ("\nError : Not able to open input file '%s'\n%s\n", argv [k], sf_strerror (NULL)) ;
+			exit (1) ;
+			} ;
+
+		if (sfinfo.channels != 1)
+		{	printf ("\bError : Input file '%s' should be mono (has %d channels).\n", argv [k], sfinfo.channels) ;
+			exit (1) ;
+			} ;
+
+		switch (sfinfo.format & SF_FORMAT_SUBMASK)
+		{	case SF_FORMAT_FLOAT :
+			case SF_FORMAT_DOUBLE :
+			case SF_FORMAT_VORBIS :
+				double_merge = 1 ;
+				break ;
+
+			default :
+				break ;
+			} ;
+
+		state.channels ++ ;
+		} ;
+
+	sfinfo.channels = state.channels ;
+	sfinfo.format = sfe_file_type_of_ext (argv [argc - 1], sfinfo.format) ;
+
+	if ((state.outfile = sf_open (argv [argc - 1], SFM_WRITE, &sfinfo)) == NULL)
+	{	printf ("Not able to open output file '%s'\n%s\n", argv [argc - 1], sf_strerror (NULL)) ;
+		exit (1) ;
+		} ;
+
+	if (double_merge)
+		interleave_double (&state) ;
+	else
+		interleave_int (&state) ;
+
+	for (k = 0 ; k < MAX_INPUTS ; k++)
+		if (state.infile [k] != NULL)
+			sf_close (state.infile [k]) ;
+	sf_close (state.outfile) ;
+
+	return 0 ;
+} /* main */
+
+/*------------------------------------------------------------------------------
+*/
+
+
+static void
+usage_exit (void)
+{	puts ("\nUsage : sndfile-interleave   ... -o \n") ;
+	puts ("Merge two or more mono files into a single multi-channel file.\n") ;
+	printf ("Using %s.\n\n", sf_version_string ()) ;
+	exit (0) ;
+} /* usage_exit */
+
+
+static void
+interleave_int (STATE * state)
+{	int max_read_len, read_len ;
+	int ch, k ;
+
+	do
+	{	max_read_len = 0 ;
+
+		for (ch = 0 ; ch < state->channels ; ch ++)
+		{	read_len = sf_read_int (state->infile [ch], state->din.i, BUFFER_LEN) ;
+			if (read_len < BUFFER_LEN)
+				memset (state->din.i + read_len, 0, sizeof (state->din.i [0]) * (BUFFER_LEN - read_len)) ;
+
+			for (k = 0 ; k < read_len ; k++)
+				state->dout.i [k * state->channels + ch] = state->din.i [k] ;
+
+			max_read_len = MAX (max_read_len, read_len) ;
+			} ;
+
+		sf_writef_int (state->outfile, state->dout.i, max_read_len) ;
+		}
+	while (max_read_len > 0) ;
+
+} /* interleave_int */
+
+
+static void
+interleave_double (STATE * state)
+{	int max_read_len, read_len ;
+	int ch, k ;
+
+	do
+	{	max_read_len = 0 ;
+
+		for (ch = 0 ; ch < state->channels ; ch ++)
+		{	read_len = sf_read_double (state->infile [ch], state->din.d, BUFFER_LEN) ;
+			if (read_len < BUFFER_LEN)
+				memset (state->din.d + read_len, 0, sizeof (state->din.d [0]) * (BUFFER_LEN - read_len)) ;
+
+			for (k = 0 ; k < read_len ; k++)
+				state->dout.d [k * state->channels + ch] = state->din.d [k] ;
+
+			max_read_len = MAX (max_read_len, read_len) ;
+			} ;
+
+		sf_writef_double (state->outfile, state->dout.d, max_read_len) ;
+		}
+	while (max_read_len > 0) ;
+
+} /* interleave_double */
diff --git a/libs/libsndfile/programs/sndfile-metadata-get.c b/libs/libsndfile/programs/sndfile-metadata-get.c
index 1d370b38e5..b4aa9b60f0 100644
--- a/libs/libsndfile/programs/sndfile-metadata-get.c
+++ b/libs/libsndfile/programs/sndfile-metadata-get.c
@@ -1,6 +1,6 @@
 /*
-** Copyright (C) 2008 George Blood Audio
-** Written by Erik de Castro Lopo 
+** Copyright (C) 2008-2012 Erik de Castro Lopo 
+** Copyright (C) 2008-2010 George Blood Audio
 **
 ** All rights reserved.
 **
@@ -58,8 +58,7 @@ main (int argc, char *argv [])
 	int	start ;
 
 	/* Store the program name. */
-	progname = strrchr (argv [0], '/') ;
-	progname = progname ? progname + 1 : argv [0] ;
+	progname = program_name (argv [0]) ;
 
 	/* Check if we've been asked for help. */
 	if (argc <= 2 || strcmp (argv [1], "--help") == 0 || strcmp (argv [1], "-h") == 0)
@@ -123,6 +122,7 @@ usage_exit (const char *progname, int exit_code)
 		"    --str-license         Print the license metadata.\n"
 		) ;
 
+	printf ("Using %s.\n\n", sf_version_string ()) ;
 	exit (exit_code) ;
 } /* usage_exit */
 
@@ -131,14 +131,14 @@ process_args (SNDFILE * file, const SF_BROADCAST_INFO_2K * binfo, int argc, char
 {	const char * str ;
 	int k, do_all = 0 ;
 
-#define HANDLE_BEXT_ARG(cmd,name,field) \
+#define HANDLE_BEXT_ARG(cmd, name, field) \
 		if (do_all || strcmp (argv [k], cmd) == 0) \
 		{	printf ("%-20s : %.*s\n", name, (int) sizeof (binfo->field), binfo->field) ; \
 			if (! do_all) \
 				continue ; \
 			} ;
 
-#define HANDLE_STR_ARG(cmd,name,id) \
+#define HANDLE_STR_ARG(cmd, name, id) \
 		if (do_all || strcmp (argv [k], cmd) == 0) \
 		{	str = sf_get_string (file, id) ; \
 			printf ("%-20s : %s\n", name, str ? str : "") ; \
diff --git a/libs/libsndfile/programs/sndfile-metadata-set.c b/libs/libsndfile/programs/sndfile-metadata-set.c
index 58e1922fa9..b1d021a888 100644
--- a/libs/libsndfile/programs/sndfile-metadata-set.c
+++ b/libs/libsndfile/programs/sndfile-metadata-set.c
@@ -1,6 +1,6 @@
 /*
-** Copyright (C) 2008 George Blood Audio
-** Written by Erik de Castro Lopo 
+** Copyright (C) 2008-2012 Erik de Castro Lopo 
+** Copyright (C) 2008-2010 George Blood Audio
 **
 ** All rights reserved.
 **
@@ -60,8 +60,7 @@ main (int argc, char *argv [])
 	int	k ;
 
 	/* Store the program name. */
-	progname = strrchr (argv [0], '/') ;
-	progname = progname ? progname + 1 : argv [0] ;
+	progname = program_name (argv [0]) ;
 
 	/* Check if we've been asked for help. */
 	if (argc < 3 || strcmp (argv [1], "--help") == 0 || strcmp (argv [1], "-h") == 0)
@@ -88,7 +87,7 @@ main (int argc, char *argv [])
 			continue ;
 			} ;
 
-#define HANDLE_BEXT_ARG(cmd,field) \
+#define HANDLE_BEXT_ARG(cmd, field) \
 		if (strcmp (argv [k], cmd) == 0) \
 		{	k ++ ; \
 			if (k == argc) missing_param (argv [k - 1]) ; \
@@ -103,8 +102,9 @@ main (int argc, char *argv [])
 		HANDLE_BEXT_ARG ("--bext-orig-date", origination_date) ;
 		HANDLE_BEXT_ARG ("--bext-orig-time", origination_time) ;
 		HANDLE_BEXT_ARG ("--bext-coding-hist", coding_history) ;
+		HANDLE_BEXT_ARG ("--bext-time-ref", time_ref) ;
 
-#define HANDLE_STR_ARG(cmd,field) \
+#define HANDLE_STR_ARG(cmd, field) \
 	if (strcmp (argv [k], cmd) == 0) \
 	{	k ++ ; \
 		if (k == argc) missing_param (argv [k - 1]) ; \
@@ -112,6 +112,7 @@ main (int argc, char *argv [])
 		continue ; \
 		} ;
 
+		HANDLE_STR_ARG ("--str-comment", comment) ;
 		HANDLE_STR_ARG ("--str-title", title) ;
 		HANDLE_STR_ARG ("--str-copyright", copyright) ;
 		HANDLE_STR_ARG ("--str-artist", artist) ;
@@ -206,8 +207,10 @@ usage_exit (const char *progname, int exit_code)
 		"    --bext-umid              Set the 'bext' UMID.\n"
 		"    --bext-orig-date         Set the 'bext' origination date.\n"
 		"    --bext-orig-time         Set the 'bext' origination time.\n"
-		"    --bext-coding-hist       Set the 'bext' coding history\n"
+		"    --bext-coding-hist       Set the 'bext' coding history.\n"
+		"    --bext-time-raf          Set the 'bext' Time ref.\n"
 		"\n"
+		"    --str-comment            Set the metadata comment.\n"
 		"    --str-title              Set the metadata title.\n"
 		"    --str-copyright          Set the metadata copyright.\n"
 		"    --str-artist             Set the metadata artist.\n"
@@ -231,6 +234,7 @@ usage_exit (const char *progname, int exit_code)
 		"exit with an appropriate error message.\n"
 		) ;
 
+	printf ("Using %s.\n\n", sf_version_string ()) ;
 	exit (exit_code) ;
 } /* usage_exit */
 
@@ -250,7 +254,7 @@ has_bext_fields_set (const METADATA_INFO * info)
 	if (info->description || info->originator || info->originator_reference)
 		return 1 ;
 
-	if (info->origination_date || info->origination_time || info->umid || info->coding_history)
+	if (info->origination_date || info->origination_time || info->umid || info->coding_history || info->time_ref)
 		return 1 ;
 
 	return 0 ;
diff --git a/libs/libsndfile/programs/sndfile-play.c b/libs/libsndfile/programs/sndfile-play.c
index 56d1a7b06c..f779f11a86 100644
--- a/libs/libsndfile/programs/sndfile-play.c
+++ b/libs/libsndfile/programs/sndfile-play.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2013 Erik de Castro Lopo 
 **
 ** All rights reserved.
 **
@@ -41,6 +41,10 @@
 #include 
 #endif
 
+#include 
+
+#include "common.h"
+
 #if HAVE_ALSA_ASOUNDLIB_H
 	#define ALSA_PCM_NEW_HW_PARAMS_API
 	#define ALSA_PCM_NEW_SW_PARAMS_API
@@ -48,14 +52,28 @@
 	#include 
 #endif
 
-#if defined (__linux__)
+#if defined (__ANDROID__)
+
+#elif defined (__linux__) || defined (__FreeBSD_kernel__) || defined (__FreeBSD__)
 	#include 	
 	#include 	
 	#include 	
 
 #elif (defined (__MACH__) && defined (__APPLE__))
-	#include 
-	#include 
+	#include 
+	#include 
+
+	#if (OSX_DARWIN_VERSION > 11)
+		/* Includes go here. */
+	#elif (OSX_DARWIN_VERSION == 11)
+		#include 
+	#elif (OSX_DARWIN_VERSION > 0 && OSX_DARWIN_VERSION <= 10)
+		#include 
+		#include 
+	#endif
+
+#elif defined (HAVE_SNDIO_H)
+	#include 
 
 #elif (defined (sun) && defined (unix))
 	#include 
@@ -68,8 +86,6 @@
 
 #endif
 
-#include	
-
 #define	SIGNED_SIZEOF(x)	((int) sizeof (x))
 #define	BUFFER_LEN			(2048)
 
@@ -348,12 +364,12 @@ alsa_write_float (snd_pcm_t *alsa_dev, float *data, int frames, int channels)
 **	Linux/OSS functions for playing a sound.
 */
 
-#if defined (__linux__)
+#if !defined (__ANDROID__) && (defined (__linux__) || defined (__FreeBSD_kernel__) || defined (__FreeBSD__))
 
-static	int	linux_open_dsp_device (int channels, int srate) ;
+static	int	opensoundsys_open_device (int channels, int srate) ;
 
-static void
-linux_play (int argc, char *argv [])
+static int
+opensoundsys_play (int argc, char *argv [])
 {	static short buffer [BUFFER_LEN] ;
 	SNDFILE *sndfile ;
 	SF_INFO sfinfo ;
@@ -373,7 +389,7 @@ linux_play (int argc, char *argv [])
 			continue ;
 			} ;
 
-		audio_device = linux_open_dsp_device (sfinfo.channels, sfinfo.samplerate) ;
+		audio_device = opensoundsys_open_device (sfinfo.channels, sfinfo.samplerate) ;
 
 		subformat = sfinfo.format & SF_FORMAT_SUBMASK ;
 
@@ -410,54 +426,54 @@ linux_play (int argc, char *argv [])
 		sf_close (sndfile) ;
 		} ;
 
-	return ;
-} /* linux_play */
+	return writecount ;
+} /* opensoundsys_play */
 
 static int
-linux_open_dsp_device (int channels, int srate)
+opensoundsys_open_device (int channels, int srate)
 {	int fd, stereo, fmt ;
 
 	if ((fd = open ("/dev/dsp", O_WRONLY, 0)) == -1 &&
 		(fd = open ("/dev/sound/dsp", O_WRONLY, 0)) == -1)
-	{	perror ("linux_open_dsp_device : open ") ;
+	{	perror ("opensoundsys_open_device : open ") ;
 		exit (1) ;
 		} ;
 
 	stereo = 0 ;
 	if (ioctl (fd, SNDCTL_DSP_STEREO, &stereo) == -1)
 	{ 	/* Fatal error */
-		perror ("linux_open_dsp_device : stereo ") ;
+		perror ("opensoundsys_open_device : stereo ") ;
 		exit (1) ;
 		} ;
 
 	if (ioctl (fd, SNDCTL_DSP_RESET, 0))
-	{	perror ("linux_open_dsp_device : reset ") ;
+	{	perror ("opensoundsys_open_device : reset ") ;
 		exit (1) ;
 		} ;
 
 	fmt = CPU_IS_BIG_ENDIAN ? AFMT_S16_BE : AFMT_S16_LE ;
 	if (ioctl (fd, SNDCTL_DSP_SETFMT, &fmt) != 0)
-	{	perror ("linux_open_dsp_device : set format ") ;
+	{	perror ("opensoundsys_open_device : set format ") ;
 		exit (1) ;
-  		} ;
+		} ;
 
 	if (ioctl (fd, SNDCTL_DSP_CHANNELS, &channels) != 0)
-	{	perror ("linux_open_dsp_device : channels ") ;
+	{	perror ("opensoundsys_open_device : channels ") ;
 		exit (1) ;
 		} ;
 
 	if (ioctl (fd, SNDCTL_DSP_SPEED, &srate) != 0)
-	{	perror ("linux_open_dsp_device : sample rate ") ;
+	{	perror ("opensoundsys_open_device : sample rate ") ;
 		exit (1) ;
 		} ;
 
 	if (ioctl (fd, SNDCTL_DSP_SYNC, 0) != 0)
-	{	perror ("linux_open_dsp_device : sync ") ;
+	{	perror ("opensoundsys_open_device : sync ") ;
 		exit (1) ;
 		} ;
 
 	return 	fd ;
-} /* linux_open_dsp_device */
+} /* opensoundsys_open_device */
 
 #endif /* __linux__ */
 
@@ -465,7 +481,174 @@ linux_open_dsp_device (int channels, int srate)
 **	Mac OS X functions for playing a sound.
 */
 
-#if (defined (__MACH__) && defined (__APPLE__)) /* MacOSX */
+#if (OSX_DARWIN_VERSION > 11)
+/* MacOSX 10.8 use a new Audio API. Someone needs to write some code for it. */
+#endif /* OSX_DARWIN_VERSION > 11 */
+
+#if (OSX_DARWIN_VERSION == 11)
+/* MacOSX 10.7 use AudioQueue API */
+
+#define kBytesPerAudioBuffer	(1024 * 8)
+#define kNumberOfAudioBuffers	4
+
+typedef struct
+{	AudioStreamBasicDescription		format ;
+
+	AudioQueueRef		queue ;
+	AudioQueueBufferRef	queueBuffer [kNumberOfAudioBuffers] ;
+
+	UInt32 			buf_size ;
+
+	SNDFILE 		*sndfile ;
+	SF_INFO 		sfinfo ;
+
+	int				done_playing ;
+} MacOSXAudioData ;
+
+
+static void
+macosx_fill_buffer (MacOSXAudioData *audio_data, AudioQueueBufferRef audio_buffer)
+{	int		size, sample_count, read_count ;
+	short	*buffer ;
+
+	size = audio_buffer->mAudioDataBytesCapacity ;
+	sample_count = size / sizeof (short) ;
+
+	buffer = (short*) audio_buffer->mAudioData ;
+
+	read_count = sf_read_short (audio_data->sndfile, buffer, sample_count) ;
+
+	if (read_count > 0)
+	{	audio_buffer->mAudioDataByteSize = read_count * sizeof (short) ;
+		AudioQueueEnqueueBuffer (audio_data->queue, audio_buffer, 0, NULL) ;
+		}
+	else
+		AudioQueueStop (audio_data->queue, false) ;
+
+} /* macosx_fill_buffer */
+
+
+static void
+macosx_audio_out_callback (void *user_data, AudioQueueRef audio_queue, AudioQueueBufferRef audio_buffer)
+{	MacOSXAudioData *audio_data = (MacOSXAudioData *) user_data ;
+
+	if (audio_data->queue == audio_queue)
+		macosx_fill_buffer (audio_data, audio_buffer) ;
+
+} /* macosx_audio_out_callback */
+
+
+static void
+macosx_audio_out_property_callback (void *user_data, AudioQueueRef audio_queue, AudioQueuePropertyID prop)
+{	MacOSXAudioData *audio_data = (MacOSXAudioData *) user_data ;
+
+	if (prop == kAudioQueueProperty_IsRunning)
+	{	UInt32 is_running = 0 ;
+		UInt32 is_running_size = sizeof (is_running) ;
+
+		AudioQueueGetProperty (audio_queue, kAudioQueueProperty_IsRunning, &is_running, &is_running_size) ;
+
+		if (!is_running)
+		{	audio_data->done_playing = SF_TRUE ;
+			CFRunLoopStop (CFRunLoopGetCurrent ()) ;
+			} ;
+		} ;
+} /* macosx_audio_out_property_callback */
+
+
+
+static void
+macosx_play (int argc, char *argv [])
+{	MacOSXAudioData 	audio_data ;
+	OSStatus	err ;
+	int 		i ;
+	int 		k ;
+
+	memset (&audio_data, 0x55, sizeof (audio_data)) ;
+
+	for (k = 1 ; k < argc ; k++)
+	{	memset (&(audio_data.sfinfo), 0, sizeof (audio_data.sfinfo)) ;
+
+		printf ("Playing %s\n", argv [k]) ;
+		if (! (audio_data.sndfile = sf_open (argv [k], SFM_READ, &(audio_data.sfinfo))))
+		{	puts (sf_strerror (NULL)) ;
+			continue ;
+			} ;
+
+		if (audio_data.sfinfo.channels < 1 || audio_data.sfinfo.channels > 2)
+		{	printf ("Error : channels = %d.\n", audio_data.sfinfo.channels) ;
+			continue ;
+			} ;
+
+		/*  fill ASBD */
+		audio_data.format.mSampleRate = audio_data.sfinfo.samplerate ;
+		audio_data.format.mChannelsPerFrame	= audio_data.sfinfo.channels ;
+		audio_data.format.mFormatID			= kAudioFormatLinearPCM ;
+		audio_data.format.mFormatFlags		= kAudioFormatFlagIsSignedInteger | kAudioFormatFlagsNativeEndian | kAudioFormatFlagIsPacked ;
+		audio_data.format.mBytesPerPacket	= audio_data.format.mChannelsPerFrame * 2 ;
+		audio_data.format.mFramesPerPacket	= 1 ;
+		audio_data.format.mBytesPerFrame	= audio_data.format.mBytesPerPacket ;
+		audio_data.format.mBitsPerChannel	= 16 ;
+		audio_data.format.mReserved			= 0 ;
+
+		/* create the queue */
+		if ((err = AudioQueueNewOutput (&(audio_data.format), macosx_audio_out_callback, &audio_data,
+					CFRunLoopGetCurrent (), kCFRunLoopCommonModes, 0, &(audio_data.queue))) != noErr)
+		{	printf ("AudioQueueNewOutput failed\n") ;
+			return ;
+			} ;
+
+		/*  add property listener */
+		if ((err = AudioQueueAddPropertyListener (audio_data.queue, kAudioQueueProperty_IsRunning, macosx_audio_out_property_callback, &audio_data)) != noErr)
+		{	printf ("AudioQueueAddPropertyListener failed\n") ;
+			return ;
+			} ;
+
+		/*  create the buffers */
+		for (i = 0 ; i < kNumberOfAudioBuffers ; i++)
+		{	if ((err = AudioQueueAllocateBuffer (audio_data.queue, kBytesPerAudioBuffer, &audio_data.queueBuffer [i])) != noErr)
+			{	printf ("AudioQueueAllocateBuffer failed\n") ;
+				return ;
+				} ;
+
+			macosx_fill_buffer (&audio_data, audio_data.queueBuffer [i]) ;
+			} ;
+
+		audio_data.done_playing = SF_FALSE ;
+
+		/* start queue */
+		if ((err = AudioQueueStart (audio_data.queue, NULL)) != noErr)
+		{	printf ("AudioQueueStart failed\n") ;
+			return ;
+		} ;
+
+		while (audio_data.done_playing == SF_FALSE)
+			CFRunLoopRun () ;
+
+		/*  free the buffers */
+		for (i = 0 ; i < kNumberOfAudioBuffers ; i++)
+		{	if ((err = AudioQueueFreeBuffer (audio_data.queue, audio_data.queueBuffer [i])) != noErr)
+			{	printf ("AudioQueueFreeBuffer failed\n") ;
+				return ;
+				} ;
+			} ;
+
+		/*  free the queue */
+		if ((err = AudioQueueDispose (audio_data.queue, true)) != noErr)
+		{	printf ("AudioQueueDispose failed\n") ;
+			return ;
+			} ;
+
+		sf_close (audio_data.sndfile) ;
+		} ;
+
+	return ;
+} /* macosx_play, AudioQueue implementation */
+
+#endif /* OSX_DARWIN_VERSION == 11 */
+
+#if (OSX_DARWIN_VERSION > 0 && OSX_DARWIN_VERSION <= 10)
+/* MacOSX 10.6 or earlier, use Carbon and AudioHardware API */
 
 typedef struct
 {	AudioStreamBasicDescription		format ;
@@ -564,7 +747,9 @@ macosx_play (int argc, char *argv [])
 
 	/* Base setup completed. Now play files. */
 	for (k = 1 ; k < argc ; k++)
-	{	printf ("Playing %s\n", argv [k]) ;
+	{	memset (&(audio_data.sfinfo), 0, sizeof (audio_data.sfinfo)) ;
+
+		printf ("Playing %s\n", argv [k]) ;
 		if (! (audio_data.sndfile = sf_open (argv [k], SFM_READ, &(audio_data.sfinfo))))
 		{	puts (sf_strerror (NULL)) ;
 			continue ;
@@ -625,10 +810,9 @@ macosx_play (int argc, char *argv [])
 		} ;
 
 	return ;
-} /* macosx_play */
-
-#endif /* MacOSX */
+} /* macosx_play, AudioHardware implementation */
 
+#endif /* OSX_DARWIN_VERSION > 0 && OSX_DARWIN_VERSION <= 10 */
 
 /*------------------------------------------------------------------------------
 **	Win32 functions for playing a sound.
@@ -640,7 +824,7 @@ macosx_play (int argc, char *argv [])
 
 #if (OS_IS_WIN32 == 1)
 
-#define	WIN32_BUFFER_LEN	(1<<15)
+#define	WIN32_BUFFER_LEN	(1 << 15)
 
 typedef struct
 {	HWAVEOUT	hwave ;
@@ -696,8 +880,9 @@ win32_audio_out_callback (HWAVEOUT hwave, UINT msg, DWORD_PTR data, DWORD param1
 {	Win32_Audio_Data	*audio_data ;
 
 	/* Prevent compiler warnings. */
-	hwave = hwave ;
-	param1 = param2 ;
+	(void) hwave ;
+	(void) param1 ;
+	(void) param2 ;
 
 	if (data == 0)
 		return ;
@@ -819,6 +1004,66 @@ win32_play (int argc, char *argv [])
 
 #endif /* Win32 */
 
+/*------------------------------------------------------------------------------
+**	OpenBDS's sndio.
+*/
+
+#if defined (HAVE_SNDIO_H)
+
+static void
+sndio_play (int argc, char *argv [])
+{	struct sio_hdl	*hdl ;
+	struct sio_par	par ;
+	short buffer [BUFFER_LEN] ;
+	SNDFILE	*sndfile ;
+	SF_INFO	sfinfo ;
+	int		k, readcount ;
+
+	for (k = 1 ; k < argc ; k++)
+	{	printf ("Playing %s\n", argv [k]) ;
+		if (! (sndfile = sf_open (argv [k], SFM_READ, &sfinfo)))
+		{	puts (sf_strerror (NULL)) ;
+			continue ;
+			} ;
+
+		if (sfinfo.channels < 1 || sfinfo.channels > 2)
+		{	printf ("Error : channels = %d.\n", sfinfo.channels) ;
+			continue ;
+			} ;
+
+		if ((hdl = sio_open (NULL, SIO_PLAY, 0)) == NULL)
+		{	fprintf (stderr, "open sndio device failed") ;
+			return ;
+			} ;
+
+		sio_initpar (&par) ;
+		par.rate = sfinfo.samplerate ;
+		par.pchan = sfinfo.channels ;
+		par.bits = 16 ;
+		par.sig = 1 ;
+		par.le = SIO_LE_NATIVE ;
+
+		if (! sio_setpar (hdl, &par) || ! sio_getpar (hdl, &par))
+		{	fprintf (stderr, "set sndio params failed") ;
+			return ;
+			} ;
+
+		if (! sio_start (hdl))
+		{	fprintf (stderr, "sndio start failed") ;
+			return ;
+			} ;
+
+		while ((readcount = sf_read_short (sndfile, buffer, BUFFER_LEN)))
+			sio_write (hdl, buffer, readcount * sizeof (short)) ;
+
+		sio_close (hdl) ;
+		} ;
+
+	return ;
+} /* sndio_play */
+
+#endif /* sndio */
+
 /*------------------------------------------------------------------------------
 **	Solaris.
 */
@@ -914,35 +1159,43 @@ main (int argc, char *argv [])
 {
 	if (argc < 2)
 	{
-		printf ("\nUsage : %s \n\n", argv [0]) ;
+		printf ("\nUsage : %s \n\n", program_name (argv [0])) ;
+		printf ("  Using %s.\n\n", sf_version_string ()) ;
 #if (OS_IS_WIN32 == 1)
 		printf ("This is a Unix style command line application which\n"
 				"should be run in a MSDOS box or Command Shell window.\n\n") ;
 		printf ("Sleeping for 5 seconds before exiting.\n\n") ;
 
-		/* This is the officially blessed by microsoft way but I can't get
-		** it to link.
-		**     Sleep (15) ;
-		** Instead, use this:
-		*/
 		Sleep (5 * 1000) ;
 #endif
 		return 1 ;
 		} ;
 
-#if defined (__linux__)
+#if defined (__ANDROID__)
+	puts ("*** Playing sound not yet supported on Android.") ;
+	puts ("*** Please feel free to submit a patch.") ;
+	return 1 ;
+#elif defined (__linux__)
 	#if HAVE_ALSA_ASOUNDLIB_H
 		if (access ("/proc/asound/cards", R_OK) == 0)
 			alsa_play (argc, argv) ;
 		else
 	#endif
-		linux_play (argc, argv) ;
-#elif (defined (__MACH__) && defined (__APPLE__))
+		opensoundsys_play (argc, argv) ;
+#elif defined (__FreeBSD_kernel__) || defined (__FreeBSD__)
+	opensoundsys_play (argc, argv) ;
+#elif (defined (__MACH__) && defined (__APPLE__) && OSX_DARWIN_VERSION <= 11)
 	macosx_play (argc, argv) ;
+#elif defined HAVE_SNDIO_H
+	sndio_play (argc, argv) ;
 #elif (defined (sun) && defined (unix))
 	solaris_play (argc, argv) ;
 #elif (OS_IS_WIN32 == 1)
 	win32_play (argc, argv) ;
+#elif (defined (__MACH__) && defined (__APPLE__) && OSX_DARWIN_VERSION > 11)
+	printf ("OS X 10.8 and later have a new Audio API.\n") ;
+	printf ("Someone needs to write code to use that API.\n") ;
+	return 1 ;
 #elif defined (__BEOS__)
 	printf ("This program cannot be compiled on BeOS.\n") ;
 	printf ("Instead, compile the file sfplay_beos.cpp.\n") ;
diff --git a/libs/libsndfile/programs/sndfile-salvage.c b/libs/libsndfile/programs/sndfile-salvage.c
new file mode 100644
index 0000000000..db55e60edd
--- /dev/null
+++ b/libs/libsndfile/programs/sndfile-salvage.c
@@ -0,0 +1,277 @@
+/*
+** Copyright (C) 2010-2012 Erik de Castro Lopo 
+**
+** All rights reserved.
+**
+** 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 author nor the names of any 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 COPYRIGHT OWNER 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	
+#include	
+#include	
+#include	
+#include	
+#include	
+#include	
+#include	
+#include	
+#include	
+#include	
+
+#include	
+
+#include	"common.h"
+
+#define	BUFFER_LEN		(1 << 16)
+
+#define	NOT(x)			(! (x))
+
+
+static void usage_exit (const char *progname) ;
+static void salvage_file (const char * broken_wav, const char * fixed_w64) ;
+
+int
+main (int argc, char *argv [])
+{
+	if (argc != 3)
+		usage_exit (program_name (argv [0])) ;
+
+	salvage_file (argv [1], argv [2]) ;
+
+	return 0 ;
+} /* main */
+
+/*==============================================================================
+*/
+
+static void lseek_or_die (int fd, off_t offset, int whence) ;
+static sf_count_t get_file_length (int fd, const char * name) ;
+static sf_count_t find_data_offset (int fd, int format) ;
+static void copy_data (int fd, SNDFILE * sndfile, int readsize) ;
+
+
+static void
+usage_exit (const char *progname)
+{	printf ("Usage :\n\n  %s  \n\n", progname) ;
+	puts ("Salvages the audio data from WAV files which are more than 4G in length.\n") ;
+	printf ("Using %s.\n\n", sf_version_string ()) ;
+	exit (0) ;
+} /* usage_exit */
+
+static void
+salvage_file (const char * broken_wav, const char * fixed_w64)
+{	SNDFILE * sndfile ;
+	SF_INFO sfinfo ;
+	sf_count_t broken_len, data_offset ;
+	int fd, read_size ;
+
+	if (strcmp (broken_wav, fixed_w64) == 0)
+	{	printf ("Error : Input and output files must be different.\n\n") ;
+		exit (1) ;
+		} ;
+
+	if ((fd = open (broken_wav, O_RDONLY)) < 0)
+	{	printf ("Error : Not able to open file '%s' : %s\n", broken_wav, strerror (errno)) ;
+		exit (1) ;
+		} ;
+
+	broken_len = get_file_length (fd, broken_wav) ;
+	if (broken_len <= 0xffffffff)
+		printf ("File is not greater than 4Gig but salvaging anyway.\n") ;
+
+	/* Grab the format info from the broken file. */
+	memset (&sfinfo, 0, sizeof (sfinfo)) ;
+	if ((sndfile = sf_open (broken_wav, SFM_READ, &sfinfo)) == NULL)
+	{	printf ("sf_open ('%s') failed : %s\n", broken_wav, sf_strerror (NULL)) ;
+		exit (1) ;
+		} ;
+	sf_close (sndfile) ;
+
+	data_offset = find_data_offset (fd, sfinfo.format & SF_FORMAT_TYPEMASK) ;
+
+	printf ("Offset to audio data : %" PRId64 "\n", data_offset) ;
+
+	switch (sfinfo.format & SF_FORMAT_TYPEMASK)
+	{	case SF_FORMAT_WAV :
+		case SF_FORMAT_WAVEX :
+			sfinfo.format = SF_FORMAT_W64 | (sfinfo.format & SF_FORMAT_SUBMASK) ;
+			break ;
+
+		default :
+			printf ("Don't currently support this file type.\n") ;
+			exit (1) ;
+		} ;
+
+	switch (sfinfo.format & SF_FORMAT_SUBMASK)
+	{	case SF_FORMAT_PCM_U8 :
+		case SF_FORMAT_PCM_S8 :
+				read_size = 1 ;
+				break ;
+
+		case SF_FORMAT_PCM_16 :
+				read_size = 2 ;
+				break ;
+
+		case SF_FORMAT_PCM_24 :
+				read_size = 3 ;
+				break ;
+
+		case SF_FORMAT_PCM_32 :
+		case SF_FORMAT_FLOAT :
+				read_size = 4 ;
+				break ;
+
+		case SF_FORMAT_DOUBLE :
+				read_size = 8 ;
+				break ;
+
+		default :
+			printf ("Sorry, don't currently support this file encoding type.\n") ;
+			exit (1) ;
+		} ;
+
+	read_size *= sfinfo.channels ;
+
+	if ((sndfile = sf_open (fixed_w64, SFM_WRITE, &sfinfo)) == NULL)
+	{	printf ("sf_open ('%s') failed : %s\n", broken_wav, sf_strerror (NULL)) ;
+		exit (1) ;
+		} ;
+
+	lseek_or_die (fd, data_offset, SEEK_SET) ;
+
+	copy_data (fd, sndfile, read_size) ;
+
+	sf_close (sndfile) ;
+
+	puts ("Done!") ;
+} /* salvage_file */
+
+/*------------------------------------------------------------------------------
+*/
+
+static void
+lseek_or_die (int fd, off_t offset, int whence)
+{
+	if (lseek (fd, offset, whence) < 0)
+	{	printf ("lseek failed : %s\n", strerror (errno)) ;
+		exit (1) ;
+		} ;
+
+	return ;
+} /* lseek_or_die */
+
+
+static sf_count_t
+get_file_length (int fd, const char * name)
+{	struct stat sbuf ;
+
+	if (sizeof (sbuf.st_size) != 8)
+	{	puts ("Error : sizeof (sbuf.st_size) != 8. Was program compiled with\n"
+				"        64 bit file offsets?\n") ;
+		exit (1) ;
+		} ;
+
+	if (fstat (fd, &sbuf) != 0)
+	{	printf ("Error : fstat ('%s') failed : %s\n", name, strerror (errno)) ;
+		exit (1) ;
+		} ;
+
+	return sbuf.st_size ;
+} /* get_file_length */
+
+static sf_count_t
+find_data_offset (int fd, int format)
+{	char buffer [8192], *cptr ;
+	const char * target = "XXXX" ;
+	sf_count_t offset = -1, extra ;
+	int rlen, slen ;
+
+	switch (format)
+	{	case SF_FORMAT_WAV :
+		case SF_FORMAT_WAVEX :
+			target = "data" ;
+			extra = 8 ;
+			break ;
+
+		case SF_FORMAT_AIFF :
+			target = "SSND" ;
+			extra = 16 ;
+			break ;
+
+		default :
+			puts ("Error : Sorry, don't handle this input file format.\n") ;
+			exit (1) ;
+		} ;
+
+	slen = strlen (target) ;
+
+	lseek_or_die (fd, 0, SEEK_SET) ;
+
+	printf ("Searching for '%s' maker.\n", target) ;
+
+	if ((rlen = read (fd, buffer, sizeof (buffer))) < 0)
+	{	printf ("Error : failed read : %s\n", strerror (errno)) ;
+		exit (1) ;
+		} ;
+
+	cptr = memchr (buffer, target [0], rlen - slen) ;
+	if (cptr && memcmp (cptr, target, slen) == 0)
+		offset = cptr - buffer ;
+	else
+	{	printf ("Error : Could not find data offset.\n") ;
+		exit (1) ;
+		} ;
+
+	return offset + extra ;
+} /* find_data_offset */
+
+static void
+copy_data (int fd, SNDFILE * sndfile, int readsize)
+{	static char * buffer ;
+	sf_count_t readlen, count ;
+	int bufferlen, done = 0 ;
+
+	bufferlen = readsize * 1024 ;
+	buffer = malloc (bufferlen) ;
+
+	while (NOT (done) && (readlen = read (fd, buffer, bufferlen)) >= 0)
+	{	if (readlen < bufferlen)
+		{	readlen -= readlen % readsize ;
+			done = 1 ;
+			} ;
+
+		if ((count = sf_write_raw (sndfile, buffer, readlen)) != readlen)
+		{	printf ("Error : sf_write_raw returned %" PRId64 " : %s\n", count, sf_strerror (sndfile)) ;
+			return ;
+			} ;
+		} ;
+
+	free (buffer) ;
+
+	return ;
+} /* copy_data */
+
diff --git a/libs/libsndfile/programs/test-sndfile-metadata-set.py b/libs/libsndfile/programs/test-sndfile-metadata-set.py
index 248cb70cd1..a21a36b3d1 100644
--- a/libs/libsndfile/programs/test-sndfile-metadata-set.py
+++ b/libs/libsndfile/programs/test-sndfile-metadata-set.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (C) 2008 Erik de Castro Lopo 
+# Copyright (C) 2008-2011 Erik de Castro Lopo 
 #
 # All rights reserved.
 #
@@ -176,7 +176,8 @@ test_post_mod (tests)
 
 test_update ([ ("--str-artist", "Fox") ])
 
-test_coding_history ()
+# This never worked.
+# test_coding_history ()
 
 test_rewrite ()
 
diff --git a/libs/libsndfile/regtest/Makefile.am b/libs/libsndfile/regtest/Makefile.am
index 4d1ed4c0ce..a87d0c4f83 100644
--- a/libs/libsndfile/regtest/Makefile.am
+++ b/libs/libsndfile/regtest/Makefile.am
@@ -4,8 +4,9 @@ bin_PROGRAMS = sndfile-regtest
 
 noinst_HEADERS = regtest.h
 
-INCLUDES = -I$(top_srcdir)/src $(SQLITE3_CFLAGS) $(OS_SPECIFIC_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/src $(SQLITE3_CFLAGS) $(OS_SPECIFIC_CFLAGS)
 
 sndfile_regtest_SOURCES = sndfile-regtest.c database.c checksum.c
 sndfile_regtest_LDADD = $(top_builddir)/src/libsndfile.la $(SQLITE3_LIBS)
 
+CLEANFILES = *~ *.exe
diff --git a/libs/libsndfile/regtest/Readme.txt b/libs/libsndfile/regtest/Readme.txt
new file mode 100644
index 0000000000..bc038d6429
--- /dev/null
+++ b/libs/libsndfile/regtest/Readme.txt
@@ -0,0 +1,108 @@
+sndfile-regtest
+===============
+
+The 'sndfile-regtest' program is a regression test-suite for libsndile.
+
+This program is intended to allow anyone who has an interest in the
+reliability and correctness of libsndfile to do their own regression
+testing. From the point of view of the libsndfile developers, this
+program now allows for distributed regression testing of libsndfile
+which will make libsndfile better.
+
+
+How Does it Work
+----------------
+Anyone who wishes to take part in the distributed regression testing of
+libsndfile can download the regression test program and install it.
+
+Once installed the user can start collecting files and adding them to
+their own personal database. Then, as new versions of libsndfile come
+out, the user should test the new library version against their database
+of files (instructions below).
+
+Any files which were successfully added to the database in the past but
+now fail the check with the new library version represent a regression.
+The user should then contact the libsndfile developers so that a copy
+of the test file can be made available to the developers.
+
+
+Requirements
+------------
+The regression test program uses sqlite3 as the database engine. On
+Debian, the required packages are :
+
+    sqlite3
+	libsqlite3-0
+	libsqlite3-dev
+
+but similar packages should be available on any other Linux style
+system.
+
+The regression test currently only compiles under Unix-like systems.
+At some time in the future the regression test will distributed along
+with the libsndfile source code distribution.
+
+
+Organization of Files
+---------------------
+The regession test program keeps its database file in the directory it
+is run from. In addition, the database only contains information about
+the files, not the files themselves.
+
+This means that database file should probably be kept in the same
+directory (or a directory above) the test files.
+
+
+Setting it Up for the First Time
+--------------------------------
+The sndfile-regtest program should be on your PATH. You can then cd into
+the directory where you intend to keep you test files and
+run the command:
+
+        sndfile-regtest --create-db
+
+which creates a file named '.sndfile-regtest.db' in the current directory.
+
+Files can then be added to the database using the command:
+
+        sndfile-regtest --add-file file1.wav
+
+The --add-file option allows more than one file to be added at a time
+using:
+
+        sndfile-regtest --add-file file1.wav file2.aif .....
+
+
+Checking Files
+--------------
+One or more files that have already been added to the database can be
+checked using:
+
+        sndfile-regtest --check-file file1.wav file2.aif .....
+
+It is also possible to check all files in the database using:
+
+        sndfile-regtest --check-all
+
+
+Running a Regression Test
+-------------------------
+Once you have a collection of files and a database it is possible to test
+new versions of libsndfile before you install them. If for instance you
+have just compiled a new version of libsndfile in the directory
+/usr/src/libsndfile-X.Y.Z, then you can use an existing sndfile-regtest
+binary with the new libsndfile using something like:
+
+    LD_PRELOAD=/usr/src/libsndfile-X.Y.Z/src/.libs/libsndfile.so.X.Y.Z \
+	sndfile-regtest --check-all
+
+
+Reporting Regressions
+---------------------
+Any user who finds a file which was added to the regression database with
+an earlier version of libsndfile and then fails the check with a later
+version of the library should contact the author (erikd at mega dash nerd
+dot com). If possible place the file on a web server and email the author
+a link to it.
+
+
diff --git a/libs/libsndfile/regtest/checksum.c b/libs/libsndfile/regtest/checksum.c
index 863fbed708..7f433a41c8 100644
--- a/libs/libsndfile/regtest/checksum.c
+++ b/libs/libsndfile/regtest/checksum.c
@@ -1,5 +1,5 @@
 /*
-**	Copyright (C) 2005-2009 Erik de Castro Lopo
+**	Copyright (C) 2005-2011 Erik de Castro Lopo
 **
 **	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
diff --git a/libs/libsndfile/regtest/database.c b/libs/libsndfile/regtest/database.c
index f439f685df..f800a2c873 100644
--- a/libs/libsndfile/regtest/database.c
+++ b/libs/libsndfile/regtest/database.c
@@ -1,5 +1,5 @@
 /*
-**	Copyright (C) 2005-2009 Erik de Castro Lopo
+**	Copyright (C) 2005-2011 Erik de Castro Lopo
 **
 **	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
@@ -146,7 +146,7 @@ db_file_exists (REG_DB * db_handle, const char * filename)
 
 	db->count = 0 ;
 	err = sqlite3_exec (db->sql, db->cmdbuf, (sqlite3_callback) count_callback, db, &errmsg) ;
-	if (db->count == 1)
+	if (err == 0 && db->count == 1)
 		return 1 ;
 
 	return 0 ;
diff --git a/libs/libsndfile/regtest/regtest.h b/libs/libsndfile/regtest/regtest.h
index 589f386de8..567d97be28 100644
--- a/libs/libsndfile/regtest/regtest.h
+++ b/libs/libsndfile/regtest/regtest.h
@@ -1,5 +1,5 @@
 /*
-**	Copyright (C) 2005 Erik de Castro Lopo
+**	Copyright (C) 2005-2011 Erik de Castro Lopo
 **
 **	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
diff --git a/libs/libsndfile/regtest/sndfile-regtest.c b/libs/libsndfile/regtest/sndfile-regtest.c
index f7db490bd0..a28caa2d84 100644
--- a/libs/libsndfile/regtest/sndfile-regtest.c
+++ b/libs/libsndfile/regtest/sndfile-regtest.c
@@ -1,5 +1,5 @@
 /*
-**	Copyright (C) 2005-2009 Erik de Castro Lopo
+**	Copyright (C) 2005-2011 Erik de Castro Lopo
 **
 **	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
diff --git a/libs/libsndfile/sndfile.pc.in b/libs/libsndfile/sndfile.pc.in
index f2a833bddb..28269c19eb 100644
--- a/libs/libsndfile/sndfile.pc.in
+++ b/libs/libsndfile/sndfile.pc.in
@@ -8,4 +8,5 @@ Description: A library for reading and writing audio files
 Requires: 
 Version: @VERSION@
 Libs: -L${libdir} -lsndfile
+Libs.private: @EXTERNAL_LIBS@
 Cflags: -I${includedir} 
diff --git a/libs/libsndfile/src/ALAC/ALACAudioTypes.h b/libs/libsndfile/src/ALAC/ALACAudioTypes.h
new file mode 100644
index 0000000000..4d120fa5e4
--- /dev/null
+++ b/libs/libsndfile/src/ALAC/ALACAudioTypes.h
@@ -0,0 +1,200 @@
+/*
+ * Copyright (c) 2011 Apple Inc. All rights reserved.
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_START@
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_END@
+ */
+
+/*
+	File:		ALACAudioTypes.h
+*/
+
+#ifndef ALACAUDIOTYPES_H
+#define ALACAUDIOTYPES_H
+
+/* Force these Mac OS specific things to zero. */
+#define PRAGMA_STRUCT_ALIGN 0
+#define PRAGMA_STRUCT_PACKPUSH 0
+#define PRAGMA_STRUCT_PACK 0
+#define PRAGMA_ONCE 0
+#define PRAGMA_MARK 0
+
+
+#if PRAGMA_ONCE
+#pragma once
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include 
+
+#include "sfendian.h"
+
+#if CPU_IS_BIG_ENDIAN == 1
+#define TARGET_RT_BIG_ENDIAN 1
+#else
+#define TARGET_RT_BIG_ENDIAN 0
+#endif
+
+#define kChannelAtomSize 12
+
+enum
+{
+    kALAC_UnimplementedError   = -4,
+    kALAC_FileNotFoundError    = -43,
+    kALAC_ParamError           = -50,
+    kALAC_MemFullError         = -108,
+    fALAC_FrameLengthError     = -666,
+};
+
+enum
+{
+    kALACFormatAppleLossless = MAKE_MARKER ('a', 'l', 'a', 'c'),
+    kALACFormatLinearPCM = MAKE_MARKER ('l', 'p', 'c', 'm')
+};
+
+enum
+{
+    kALACMaxChannels	= 8,
+    kALACMaxEscapeHeaderBytes = 8,
+    kALACMaxSearches	= 16,
+    kALACMaxCoefs		= 16,
+    kALACDefaultFramesPerPacket = 4096
+};
+
+typedef uint32_t ALACChannelLayoutTag;
+
+enum
+{
+    kALACFormatFlagIsFloat                     = (1 << 0),     // 0x1
+    kALACFormatFlagIsBigEndian                 = (1 << 1),     // 0x2
+    kALACFormatFlagIsSignedInteger             = (1 << 2),     // 0x4
+    kALACFormatFlagIsPacked                    = (1 << 3),     // 0x8
+    kALACFormatFlagIsAlignedHigh               = (1 << 4),     // 0x10
+};
+
+enum
+{
+#if TARGET_RT_BIG_ENDIAN
+    kALACFormatFlagsNativeEndian       = kALACFormatFlagIsBigEndian
+#else
+    kALACFormatFlagsNativeEndian       = 0
+#endif
+};
+
+// this is required to be an IEEE 64bit float
+typedef double alac_float64_t;
+
+// These are the Channel Layout Tags used in the Channel Layout Info portion of the ALAC magic cookie
+enum
+{
+    kALACChannelLayoutTag_Mono          = (100<<16) | 1,    // C
+    kALACChannelLayoutTag_Stereo        = (101<<16) | 2,	// L R
+    kALACChannelLayoutTag_MPEG_3_0_B    = (113<<16) | 3,	// C L R
+    kALACChannelLayoutTag_MPEG_4_0_B    = (116<<16) | 4,	// C L R Cs
+    kALACChannelLayoutTag_MPEG_5_0_D    = (120<<16) | 5,    // C L R Ls Rs
+    kALACChannelLayoutTag_MPEG_5_1_D    = (124<<16) | 6,	// C L R Ls Rs LFE
+    kALACChannelLayoutTag_AAC_6_1       = (142<<16) | 7,	// C L R Ls Rs Cs LFE
+    kALACChannelLayoutTag_MPEG_7_1_B	= (127<<16) | 8     // C Lc Rc L R Ls Rs LFE    (doc: IS-13818-7 MPEG2-AAC)
+};
+
+// ALAC currently only utilizes these channels layouts. There is a one for one correspondance between a
+// given number of channels and one of these layout tags
+static const ALACChannelLayoutTag	ALACChannelLayoutTags[kALACMaxChannels] =
+{
+    kALACChannelLayoutTag_Mono,         // C
+    kALACChannelLayoutTag_Stereo,		// L R
+    kALACChannelLayoutTag_MPEG_3_0_B,	// C L R
+    kALACChannelLayoutTag_MPEG_4_0_B,	// C L R Cs
+    kALACChannelLayoutTag_MPEG_5_0_D,	// C L R Ls Rs
+    kALACChannelLayoutTag_MPEG_5_1_D,	// C L R Ls Rs LFE
+    kALACChannelLayoutTag_AAC_6_1,		// C L R Ls Rs Cs LFE
+    kALACChannelLayoutTag_MPEG_7_1_B	// C Lc Rc L R Ls Rs LFE    (doc: IS-13818-7 MPEG2-AAC)
+};
+
+// AudioChannelLayout from CoreAudioTypes.h. We never need the AudioChannelDescription so we remove it
+struct ALACAudioChannelLayout
+{
+    ALACChannelLayoutTag          mChannelLayoutTag;
+    uint32_t                      mChannelBitmap;
+    uint32_t                      mNumberChannelDescriptions;
+};
+typedef struct ALACAudioChannelLayout ALACAudioChannelLayout;
+
+struct AudioFormatDescription
+{
+    alac_float64_t mSampleRate;
+    uint32_t  mFormatID;
+    uint32_t  mFormatFlags;
+    uint32_t  mBytesPerPacket;
+    uint32_t  mFramesPerPacket;
+    uint32_t  mBytesPerFrame;
+    uint32_t  mChannelsPerFrame;
+    uint32_t  mBitsPerChannel;
+    uint32_t  mReserved;
+};
+typedef struct AudioFormatDescription  AudioFormatDescription;
+
+/* Lossless Definitions */
+
+enum
+{
+	kALACCodecFormat		= MAKE_MARKER ('a', 'l', 'a', 'c'),
+	kALACVersion			= 0,
+	kALACCompatibleVersion	= kALACVersion,
+	kALACDefaultFrameSize	= 4096
+};
+
+// note: this struct is wrapped in an 'alac' atom in the sample description extension area
+// note: in QT movies, it will be further wrapped in a 'wave' atom surrounded by 'frma' and 'term' atoms
+typedef struct ALACSpecificConfig
+{
+	uint32_t				frameLength;
+	uint8_t					compatibleVersion;
+	uint8_t					bitDepth;							// max 32
+	uint8_t					pb;									// 0 <= pb <= 255
+	uint8_t					mb;
+	uint8_t					kb;
+	uint8_t					numChannels;
+	uint16_t				maxRun;
+	uint32_t				maxFrameBytes;
+	uint32_t				avgBitRate;
+	uint32_t				sampleRate;
+
+} ALACSpecificConfig;
+
+
+// The AudioChannelLayout atom type is not exposed yet so define it here
+enum
+{
+	AudioChannelLayoutAID = MAKE_MARKER ('c', 'h', 'a', 'n')
+};
+
+#if PRAGMA_STRUCT_ALIGN
+    #pragma options align=reset
+#elif PRAGMA_STRUCT_PACKPUSH
+    #pragma pack(pop)
+#elif PRAGMA_STRUCT_PACK
+    #pragma pack()
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* ALACAUDIOTYPES_H */
diff --git a/libs/libsndfile/src/ALAC/ALACBitUtilities.c b/libs/libsndfile/src/ALAC/ALACBitUtilities.c
new file mode 100644
index 0000000000..f385daff0c
--- /dev/null
+++ b/libs/libsndfile/src/ALAC/ALACBitUtilities.c
@@ -0,0 +1,262 @@
+/*
+ * Copyright (c) 2011 Apple Inc. All rights reserved.
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_START@
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_END@
+ */
+
+/*=============================================================================
+    File:		ALACBitUtilities.c
+
+	$NoKeywords: $
+=============================================================================*/
+
+#include 
+#include "ALACBitUtilities.h"
+
+#define PRAGMA_MARK 0
+
+// BitBufferInit
+//
+void BitBufferInit( BitBuffer * bits, uint8_t * buffer, uint32_t byteSize )
+{
+	bits->cur		= buffer;
+	bits->end		= bits->cur + byteSize;
+	bits->bitIndex	= 0;
+	bits->byteSize	= byteSize;
+}
+
+// BitBufferRead
+//
+uint32_t BitBufferRead( BitBuffer * bits, uint8_t numBits )
+{
+	uint32_t		returnBits;
+
+	//Assert( numBits <= 16 );
+
+	returnBits = ((uint32_t)bits->cur[0] << 16) | ((uint32_t)bits->cur[1] << 8) | ((uint32_t)bits->cur[2]);
+	returnBits = returnBits << bits->bitIndex;
+	returnBits &= 0x00FFFFFF;
+
+	bits->bitIndex += numBits;
+
+	returnBits = returnBits >> (24 - numBits);
+
+	bits->cur		+= (bits->bitIndex >> 3);
+	bits->bitIndex	&= 7;
+
+	//Assert( bits->cur <= bits->end );
+
+	return returnBits;
+}
+
+// BitBufferReadSmall
+//
+// Reads up to 8 bits
+uint8_t BitBufferReadSmall( BitBuffer * bits, uint8_t numBits )
+{
+	uint16_t		returnBits;
+
+	//Assert( numBits <= 8 );
+
+	returnBits = (bits->cur[0] << 8) | bits->cur[1];
+	returnBits = returnBits << bits->bitIndex;
+
+	bits->bitIndex += numBits;
+
+	returnBits = returnBits >> (16 - numBits);
+
+	bits->cur		+= (bits->bitIndex >> 3);
+	bits->bitIndex	&= 7;
+
+	//Assert( bits->cur <= bits->end );
+
+	return (uint8_t)returnBits;
+}
+
+// BitBufferReadOne
+//
+// Reads one byte
+uint8_t BitBufferReadOne( BitBuffer * bits )
+{
+	uint8_t		returnBits;
+
+	returnBits = (bits->cur[0] >> (7 - bits->bitIndex)) & 1;
+
+	bits->bitIndex++;
+
+	bits->cur		+= (bits->bitIndex >> 3);
+	bits->bitIndex	&= 7;
+
+	//Assert( bits->cur <= bits->end );
+
+	return returnBits;
+}
+
+// BitBufferPeek
+//
+uint32_t BitBufferPeek( BitBuffer * bits, uint8_t numBits )
+{
+	return ((((((uint32_t) bits->cur[0] << 16) | ((uint32_t) bits->cur[1] << 8) |
+			((uint32_t) bits->cur[2])) << bits->bitIndex) & 0x00FFFFFF) >> (24 - numBits));
+}
+
+// BitBufferPeekOne
+//
+uint32_t BitBufferPeekOne( BitBuffer * bits )
+{
+	return ((bits->cur[0] >> (7 - bits->bitIndex)) & 1);
+}
+
+// BitBufferUnpackBERSize
+//
+uint32_t BitBufferUnpackBERSize( BitBuffer * bits )
+{
+	uint32_t		size;
+	uint8_t		tmp;
+
+	for ( size = 0, tmp = 0x80u; tmp &= 0x80u; size = (size << 7u) | (tmp & 0x7fu) )
+		tmp = (uint8_t) BitBufferReadSmall( bits, 8 );
+
+	return size;
+}
+
+// BitBufferGetPosition
+//
+uint32_t BitBufferGetPosition( BitBuffer * bits )
+{
+	uint8_t *		begin;
+
+	begin = bits->end - bits->byteSize;
+
+	return ((uint32_t)(bits->cur - begin) * 8) + bits->bitIndex;
+}
+
+// BitBufferByteAlign
+//
+void BitBufferByteAlign( BitBuffer * bits, int32_t addZeros )
+{
+	// align bit buffer to next byte boundary, writing zeros if requested
+	if ( bits->bitIndex == 0 )
+		return;
+
+	if ( addZeros )
+		BitBufferWrite( bits, 0, 8 - bits->bitIndex );
+	else
+		BitBufferAdvance( bits, 8 - bits->bitIndex );
+}
+
+// BitBufferAdvance
+//
+void BitBufferAdvance( BitBuffer * bits, uint32_t numBits )
+{
+	if ( numBits )
+	{
+		bits->bitIndex += numBits;
+		bits->cur += (bits->bitIndex >> 3);
+		bits->bitIndex &= 7;
+	}
+}
+
+// BitBufferRewind
+//
+void BitBufferRewind( BitBuffer * bits, uint32_t numBits )
+{
+	uint32_t	numBytes;
+
+	if ( numBits == 0 )
+		return;
+
+	if ( bits->bitIndex >= numBits )
+	{
+		bits->bitIndex -= numBits;
+		return;
+	}
+
+	numBits -= bits->bitIndex;
+	bits->bitIndex = 0;
+
+	numBytes	= numBits / 8;
+	numBits		= numBits % 8;
+
+	bits->cur -= numBytes;
+
+	if ( numBits > 0 )
+	{
+		bits->bitIndex = 8 - numBits;
+		bits->cur--;
+	}
+
+	if ( bits->cur < (bits->end - bits->byteSize) )
+	{
+		//DebugCMsg("BitBufferRewind: Rewound too far.");
+
+		bits->cur		= (bits->end - bits->byteSize);
+		bits->bitIndex	= 0;
+	}
+}
+
+// BitBufferWrite
+//
+void BitBufferWrite( BitBuffer * bits, uint32_t bitValues, uint32_t numBits )
+{
+	uint32_t				invBitIndex;
+
+	RequireAction( bits != NULL, return; );
+	RequireActionSilent( numBits > 0, return; );
+
+	invBitIndex = 8 - bits->bitIndex;
+
+	while ( numBits > 0 )
+	{
+		uint32_t		tmp;
+		uint8_t		shift;
+		uint8_t		mask;
+		uint32_t		curNum;
+
+		curNum = MIN( invBitIndex, numBits );
+
+		tmp = bitValues >> (numBits - curNum);
+
+		shift  = (uint8_t)(invBitIndex - curNum);
+		mask   = 0xffu >> (8 - curNum);		// must be done in two steps to avoid compiler sequencing ambiguity
+		mask <<= shift;
+
+		bits->cur[0] = (bits->cur[0] & ~mask) | (((uint8_t) tmp << shift)  & mask);
+		numBits -= curNum;
+
+		// increment to next byte if need be
+		invBitIndex -= curNum;
+		if ( invBitIndex == 0 )
+		{
+			invBitIndex = 8;
+			bits->cur++;
+		}
+	}
+
+	bits->bitIndex = 8 - invBitIndex;
+}
+
+void	BitBufferReset( BitBuffer * bits )
+//void BitBufferInit( BitBuffer * bits, uint8_t * buffer, uint32_t byteSize )
+{
+	bits->cur		= bits->end - bits->byteSize;
+    bits->bitIndex	= 0;
+}
+
+#if PRAGMA_MARK
+#pragma mark -
+#endif
diff --git a/libs/libsndfile/src/ALAC/ALACBitUtilities.h b/libs/libsndfile/src/ALAC/ALACBitUtilities.h
new file mode 100644
index 0000000000..5d3a4c1433
--- /dev/null
+++ b/libs/libsndfile/src/ALAC/ALACBitUtilities.h
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2011 Apple Inc. All rights reserved.
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_START@
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_END@
+ */
+
+/*=============================================================================
+    File:		ALACBitUtilities.h
+
+	$NoKeywords: $
+=============================================================================*/
+
+#ifndef __ALACBITUTILITIES_H
+#define __ALACBITUTILITIES_H
+
+#include 
+
+#ifndef MIN
+#define MIN(x, y) 			( (x)<(y) ?(x) :(y) )
+#endif //MIN
+#ifndef MAX
+#define MAX(x, y) 			( (x)>(y) ?(x): (y) )
+#endif //MAX
+
+#define RequireAction(condition, action)			if (!(condition)) { action }
+#define RequireActionSilent(condition, action)			if (!(condition)) { action }
+#define RequireNoErr(condition, action)			if ((condition)) { action }
+
+enum
+{
+    ALAC_noErr = 0
+};
+
+
+typedef enum
+{
+
+    ID_SCE = 0,						/* Single Channel Element   */
+    ID_CPE = 1,						/* Channel Pair Element     */
+    ID_CCE = 2,						/* Coupling Channel Element */
+    ID_LFE = 3,						/* LFE Channel Element      */
+    ID_DSE = 4,						/* not yet supported        */
+    ID_PCE = 5,
+    ID_FIL = 6,
+    ID_END = 7
+} ELEMENT_TYPE;
+
+// types
+typedef struct BitBuffer
+{
+	uint8_t *		cur;
+	uint8_t *		end;
+	uint32_t		bitIndex;
+	uint32_t		byteSize;
+
+} BitBuffer;
+
+/*
+	BitBuffer routines
+	- these routines take a fixed size buffer and read/write to it
+	- bounds checking must be done by the client
+*/
+void	BitBufferInit( BitBuffer * bits, uint8_t * buffer, uint32_t byteSize );
+uint32_t	BitBufferRead( BitBuffer * bits, uint8_t numBits );   // note: cannot read more than 16 bits at a time
+uint8_t	BitBufferReadSmall( BitBuffer * bits, uint8_t numBits );
+uint8_t	BitBufferReadOne( BitBuffer * bits );
+uint32_t	BitBufferPeek( BitBuffer * bits, uint8_t numBits );   // note: cannot read more than 16 bits at a time
+uint32_t	BitBufferPeekOne( BitBuffer * bits );
+uint32_t	BitBufferUnpackBERSize( BitBuffer * bits );
+uint32_t	BitBufferGetPosition( BitBuffer * bits );
+void	BitBufferByteAlign( BitBuffer * bits, int32_t addZeros );
+void	BitBufferAdvance( BitBuffer * bits, uint32_t numBits );
+void	BitBufferRewind( BitBuffer * bits, uint32_t numBits );
+void	BitBufferWrite( BitBuffer * bits, uint32_t value, uint32_t numBits );
+void	BitBufferReset( BitBuffer * bits);
+
+#endif	/* __BITUTILITIES_H */
diff --git a/libs/libsndfile/src/ALAC/ALACDecoder.h b/libs/libsndfile/src/ALAC/ALACDecoder.h
new file mode 100644
index 0000000000..baebd4fac4
--- /dev/null
+++ b/libs/libsndfile/src/ALAC/ALACDecoder.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2011 Apple Inc. All rights reserved.
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_START@
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_END@
+ */
+
+/*
+	File:		ALACDecoder.h
+*/
+
+#ifndef _ALACDECODER_H
+#define _ALACDECODER_H
+
+#include 
+
+#include "ALACAudioTypes.h"
+
+struct BitBuffer;
+
+class ALACDecoder
+{
+	public:
+		ALACDecoder();
+		~ALACDecoder();
+
+		int32_t	Init( void * inMagicCookie, uint32_t inMagicCookieSize );
+		int32_t	Decode( struct BitBuffer * bits, uint8_t * sampleBuffer, uint32_t numSamples, uint32_t numChannels, uint32_t * outNumSamples );
+
+	public:
+		// decoding parameters (public for use in the analyzer)
+		ALACSpecificConfig		mConfig;
+
+	protected:
+		int32_t	FillElement( struct BitBuffer * bits );
+		int32_t	DataStreamElement( struct BitBuffer * bits );
+
+		uint16_t					mActiveElements;
+
+		// decoding buffers
+		int32_t *				mMixBufferU;
+		int32_t *				mMixBufferV;
+		int32_t *				mPredictor;
+		uint16_t *				mShiftBuffer;	// note: this points to mPredictor's memory but different
+												//		 variable for clarity and type difference
+};
+
+#endif	/* _ALACDECODER_H */
diff --git a/libs/libsndfile/src/ALAC/ALACEncoder.h b/libs/libsndfile/src/ALAC/ALACEncoder.h
new file mode 100644
index 0000000000..75a0a43721
--- /dev/null
+++ b/libs/libsndfile/src/ALAC/ALACEncoder.h
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2011 Apple Inc. All rights reserved.
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_START@
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_END@
+ */
+
+/*
+	File:		ALACEncoder.h
+*/
+
+#pragma once
+
+#include 
+
+#include "ALACAudioTypes.h"
+
+
+struct BitBuffer;
+
+class ALACEncoder
+{
+	public:
+		ALACEncoder();
+		virtual ~ALACEncoder();
+
+		virtual int32_t	Encode(AudioFormatDescription theInputFormat, AudioFormatDescription theOutputFormat,
+                                   unsigned char * theReadBuffer, unsigned char * theWriteBuffer, int32_t * ioNumBytes);
+		virtual int32_t	Finish( );
+
+		void				SetFastMode( bool fast ) { mFastMode = fast; };
+
+		// this must be called *before* InitializeEncoder()
+		void				SetFrameSize( uint32_t frameSize ) { mFrameSize = frameSize; };
+
+		void				GetConfig( ALACSpecificConfig & config );
+        uint32_t            GetMagicCookieSize(uint32_t inNumChannels);
+        void				GetMagicCookie( void * config, uint32_t * ioSize );
+
+        virtual int32_t	InitializeEncoder(AudioFormatDescription theOutputFormat);
+
+    protected:
+		virtual void		GetSourceFormat( const AudioFormatDescription * source, AudioFormatDescription * output );
+
+		int32_t			EncodeStereo( struct BitBuffer * bitstream, void * input, uint32_t stride, uint32_t channelIndex, uint32_t numSamples );
+		int32_t			EncodeStereoFast( struct BitBuffer * bitstream, void * input, uint32_t stride, uint32_t channelIndex, uint32_t numSamples );
+		int32_t			EncodeStereoEscape( struct BitBuffer * bitstream, void * input, uint32_t stride, uint32_t numSamples );
+		int32_t			EncodeMono( struct BitBuffer * bitstream, void * input, uint32_t stride, uint32_t channelIndex, uint32_t numSamples );
+
+
+		// ALAC encoder parameters
+		int16_t					mBitDepth;
+		bool					mFastMode;
+
+		// encoding state
+		int16_t					mLastMixRes[kALACMaxChannels];
+
+		// encoding buffers
+		int32_t *				mMixBufferU;
+		int32_t *				mMixBufferV;
+		int32_t *				mPredictorU;
+		int32_t *				mPredictorV;
+		uint16_t *				mShiftBufferUV;
+
+		uint8_t *					mWorkBuffer;
+
+		// per-channel coefficients buffers
+		int16_t					mCoefsU[kALACMaxChannels][kALACMaxSearches][kALACMaxCoefs];
+		int16_t					mCoefsV[kALACMaxChannels][kALACMaxSearches][kALACMaxCoefs];
+
+		// encoding statistics
+		uint32_t					mTotalBytesGenerated;
+		uint32_t					mAvgBitRate;
+		uint32_t					mMaxFrameBytes;
+        uint32_t                  mFrameSize;
+        uint32_t                  mMaxOutputBytes;
+        uint32_t                  mNumChannels;
+        uint32_t                  mOutputSampleRate;
+};
diff --git a/libs/libsndfile/src/ALAC/EndianPortable.h b/libs/libsndfile/src/ALAC/EndianPortable.h
new file mode 100644
index 0000000000..d0b132761f
--- /dev/null
+++ b/libs/libsndfile/src/ALAC/EndianPortable.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2011 Apple Inc. All rights reserved.
+** Copyright (C) 2013 Erik de Castro Lopo 
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_START@
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_END@
+ */
+
+//
+//  EndianPortable.h
+//
+//  Copyright 2011 Apple Inc. All rights reserved.
+//
+
+#ifndef _EndianPortable_h
+#define _EndianPortable_h
+
+#include 
+
+#define Swap16NtoB(x)	H2BE_16(x)
+#define Swap16BtoN(x)	BE2H_16(x)
+
+#define Swap32NtoB(x)	H2BE_32(x)
+#define Swap32BtoN(x)	BE2H_32(x)
+
+#endif
diff --git a/libs/libsndfile/src/ALAC/LICENSE b/libs/libsndfile/src/ALAC/LICENSE
new file mode 100644
index 0000000000..7d8595490d
--- /dev/null
+++ b/libs/libsndfile/src/ALAC/LICENSE
@@ -0,0 +1,170 @@
+Apache License
+
+Version 2.0, January 2004
+
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the
+copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other
+entities that control, are controlled by, or are under common control
+with that entity. For the purposes of this definition, "control" means
+(i) the power, direct or indirect, to cause the direction or management
+of such entity, whether by contract or otherwise, or (ii) ownership
+of fifty percent (50%) or more of the outstanding shares, or (iii)
+beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications,
+including but not limited to software source code, documentation source,
+and configuration files.
+
+"Object" form shall mean any form resulting from mechanical
+transformation or translation of a Source form, including but not
+limited to compiled object code, generated documentation, and
+conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object
+form, made available under the License, as indicated by a copyright
+notice that is included in or attached to the work (an example is
+provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object
+form, that is based on (or derived from) the Work and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship. For the purposes
+of this License, Derivative Works shall not include works that remain
+separable from, or merely link (or bind by name) to the interfaces of,
+the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original
+version of the Work and any modifications or additions to that Work or
+Derivative Works thereof, that is intentionally submitted to Licensor
+for inclusion in the Work by the copyright owner or by an individual
+or Legal Entity authorized to submit on behalf of the copyright owner.
+For the purposes of this definition, "submitted" means any form of
+electronic, verbal, or written communication sent to the Licensor
+or its representatives, including but not limited to communication
+on electronic mailing lists, source code control systems, and issue
+tracking systems that are managed by, or on behalf of, the Licensor
+for the purpose of discussing and improving the Work, but excluding
+communication that is conspicuously marked or otherwise designated in
+writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity
+on behalf of whom a Contribution has been received by Licensor and
+subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions
+of this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+copyright license to reproduce, prepare Derivative Works of, publicly
+display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except
+as stated in this section) patent license to make, have made, use,
+offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such
+Contributor that are necessarily infringed by their Contribution(s)
+alone or by combination of their Contribution(s) with the Work to which
+such Contribution(s) was submitted. If You institute patent litigation
+against any entity (including a cross-claim or counterclaim in a
+lawsuit) alleging that the Work or a Contribution incorporated within
+the Work constitutes direct or contributory patent infringement, then
+any patent licenses granted to You under this License for that Work
+shall terminate as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+Work or Derivative Works thereof in any medium, with or without
+modifications, and in Source or Object form, provided that You meet the
+following conditions:
+
+You must give any other recipients of the Work or Derivative Works a
+copy of this License; and
+
+You must cause any modified files to carry prominent notices stating
+that You changed the files; and
+
+You must retain, in the Source form of any Derivative Works that You
+distribute, all copyright, patent, trademark, and attribution notices
+from the Source form of the Work, excluding those notices that do not
+pertain to any part of the Derivative Works; and
+
+If the Work includes a "NOTICE" text file as part of its distribution,
+then any Derivative Works that You distribute must include a readable
+copy of the attribution notices contained within such NOTICE file,
+excluding those notices that do not pertain to any part of the
+Derivative Works, in at least one of the following places: within a
+NOTICE text file distributed as part of the Derivative Works; within
+the Source form or documentation, if provided along with the Derivative
+Works; or, within a display generated by the Derivative Works, if and
+wherever such third-party notices normally appear. The contents of the
+NOTICE file are for informational purposes only and do not modify the
+License. You may add Your own attribution notices within Derivative
+Works that You distribute, alongside or as an addendum to the NOTICE
+text from the Work, provided that such additional attribution notices
+cannot be construed as modifying the License. You may add Your own
+copyright statement to Your modifications and may provide additional
+or different license terms and conditions for use, reproduction, or
+distribution of Your modifications, or for any such Derivative Works as
+a whole, provided Your use, reproduction, and distribution of the Work
+otherwise complies with the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+any Contribution intentionally submitted for inclusion in the Work by
+You to the Licensor shall be under the terms and conditions of this
+License, without any additional terms or conditions. Notwithstanding
+the above, nothing herein shall supersede or modify the terms of any
+separate license agreement you may have executed with Licensor regarding
+such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+names, trademarks, service marks, or product names of the Licensor,
+except as required for reasonable and customary use in describing the
+origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed
+to in writing, Licensor provides the Work (and each Contributor
+provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied, including, without
+limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT,
+MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
+solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your
+exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+whether in tort (including negligence), contract, or otherwise, unless
+required by applicable law (such as deliberate and grossly negligent
+acts) or agreed to in writing, shall any Contributor be liable to You
+for damages, including any direct, indirect, special, incidental, or
+consequential damages of any character arising as a result of this
+License or out of the use or inability to use the Work (including but
+not limited to damages for loss of goodwill, work stoppage, computer
+failure or malfunction, or any and all other commercial damages or
+losses), even if such Contributor has been advised of the possibility of
+such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing the
+Work or Derivative Works thereof, You may choose to offer, and charge a
+fee for, acceptance of support, warranty, indemnity, or other liability
+obligations and/or rights consistent with this License. However, in
+accepting such obligations, You may act only on Your own behalf and
+on Your sole responsibility, not on behalf of any other Contributor,
+and only if You agree to indemnify, defend, and hold each Contributor
+harmless for any liability incurred by, or claims asserted against, such
+Contributor by reason of your accepting any such warranty or additional
+liability.
diff --git a/libs/libsndfile/src/ALAC/ag_dec.c b/libs/libsndfile/src/ALAC/ag_dec.c
new file mode 100644
index 0000000000..81c18dc920
--- /dev/null
+++ b/libs/libsndfile/src/ALAC/ag_dec.c
@@ -0,0 +1,355 @@
+/*
+ * Copyright (c) 2011 Apple Inc. All rights reserved.
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_START@
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_END@
+ */
+
+/*
+	File:		ag_dec.c
+
+	Contains:   Adaptive Golomb decode routines.
+
+	Copyright:	(c) 2001-2011 Apple, Inc.
+*/
+
+#include "aglib.h"
+#include "ALACBitUtilities.h"
+#include "ALACAudioTypes.h"
+
+#include 
+#include 
+#include 
+#include 
+
+#define CODE_TO_LONG_MAXBITS	32
+#define N_MAX_MEAN_CLAMP		0xffff
+#define N_MEAN_CLAMP_VAL		0xffff
+#define REPORT_VAL  40
+
+#if __GNUC__
+#define ALWAYS_INLINE		__attribute__((always_inline))
+#else
+#define ALWAYS_INLINE
+#endif
+
+/*	And on the subject of the CodeWarrior x86 compiler and inlining, I reworked a lot of this
+	to help the compiler out.   In many cases this required manual inlining or a macro.  Sorry
+	if it is ugly but the performance gains are well worth it.
+	- WSK 5/19/04
+*/
+
+void set_standard_ag_params(AGParamRecPtr params, uint32_t fullwidth, uint32_t sectorwidth)
+{
+	/* Use
+		fullwidth = sectorwidth = numOfSamples, for analog 1-dimensional type-short data,
+		but use
+		fullwidth = full image width, sectorwidth = sector (patch) width
+		for such as image (2-dim.) data.
+	*/
+	set_ag_params( params, MB0, PB0, KB0, fullwidth, sectorwidth, MAX_RUN_DEFAULT );
+}
+
+void set_ag_params(AGParamRecPtr params, uint32_t m, uint32_t p, uint32_t k, uint32_t f, uint32_t s, uint32_t maxrun)
+{
+	params->mb = params->mb0 = m;
+	params->pb = p;
+	params->kb = k;
+	params->wb = (1u<kb)-1;
+	params->qb = QB-params->pb;
+	params->fw = f;
+	params->sw = s;
+	params->maxrun = maxrun;
+}
+
+#if PRAGMA_MARK
+#pragma mark -
+#endif
+
+
+// note: implementing this with some kind of "count leading zeros" assembly is a big performance win
+static inline int32_t lead( int32_t m )
+{
+	long j;
+	unsigned long c = (1ul << 31);
+
+	for(j=0; j < 32; j++)
+	{
+		if((c & m) != 0)
+			break;
+		c >>= 1;
+	}
+	return (j);
+}
+
+#define arithmin(a, b) ((a) < (b) ? (a) : (b))
+
+static inline int32_t ALWAYS_INLINE lg3a( int32_t x)
+{
+    int32_t result;
+
+    x += 3;
+    result = lead(x);
+
+    return 31 - result;
+}
+
+static inline uint32_t ALWAYS_INLINE read32bit( uint8_t * buffer )
+{
+	// embedded CPUs typically can't read unaligned 32-bit words so just read the bytes
+	uint32_t		value;
+
+	value = ((uint32_t)buffer[0] << 24) | ((uint32_t)buffer[1] << 16) |
+			 ((uint32_t)buffer[2] << 8) | (uint32_t)buffer[3];
+	return value;
+
+}
+
+#if PRAGMA_MARK
+#pragma mark -
+#endif
+
+#define get_next_fromlong(inlong, suff)		((inlong) >> (32 - (suff)))
+
+
+static inline uint32_t ALWAYS_INLINE
+getstreambits( uint8_t *in, int32_t bitoffset, int32_t numbits )
+{
+	uint32_t	load1, load2;
+	uint32_t	byteoffset = bitoffset / 8;
+	uint32_t	result;
+
+	//Assert( numbits <= 32 );
+
+	load1 = read32bit( in + byteoffset );
+
+	if ( (numbits + (bitoffset & 0x7)) > 32)
+	{
+		int32_t load2shift;
+
+		result = load1 << (bitoffset & 0x7);
+		load2 = (uint32_t) in[byteoffset+4];
+		load2shift = (8-(numbits + (bitoffset & 0x7)-32));
+		load2 >>= load2shift;
+		result >>= (32-numbits);
+		result |= load2;
+	}
+	else
+	{
+		result = load1 >> (32-numbits-(bitoffset & 7));
+	}
+
+	// a shift of >= "the number of bits in the type of the value being shifted" results in undefined
+	// behavior so don't try to shift by 32
+	if ( numbits != (sizeof(result) * 8) )
+		result &= ~(0xfffffffful << numbits);
+
+	return result;
+}
+
+
+static inline int32_t dyn_get(unsigned char *in, uint32_t *bitPos, uint32_t m, uint32_t k)
+{
+    uint32_t	tempbits = *bitPos;
+    uint32_t		result;
+    uint32_t		pre = 0, v;
+    uint32_t		streamlong;
+
+	streamlong = read32bit( in + (tempbits >> 3) );
+    streamlong <<= (tempbits & 7);
+
+    /* find the number of bits in the prefix */
+    {
+        uint32_t	notI = ~streamlong;
+    	pre = lead( notI);
+    }
+
+    if(pre >= MAX_PREFIX_16)
+    {
+        pre = MAX_PREFIX_16;
+        tempbits += pre;
+        streamlong <<= pre;
+        result = get_next_fromlong(streamlong,MAX_DATATYPE_BITS_16);
+        tempbits += MAX_DATATYPE_BITS_16;
+
+    }
+    else
+    {
+        // all of the bits must fit within the long we have loaded
+        //Assert(pre+1+k <= 32);
+
+        tempbits += pre;
+        tempbits += 1;
+        streamlong <<= pre+1;
+        v = get_next_fromlong(streamlong, k);
+        tempbits += k;
+
+        result = pre*m + v-1;
+
+        if(v<2) {
+            result -= (v-1);
+            tempbits -= 1;
+        }
+    }
+
+    *bitPos = tempbits;
+    return result;
+}
+
+
+static inline int32_t dyn_get_32bit( uint8_t * in, uint32_t * bitPos, int32_t m, int32_t k, int32_t maxbits )
+{
+	uint32_t	tempbits = *bitPos;
+	uint32_t		v;
+	uint32_t		streamlong;
+	uint32_t		result;
+
+	streamlong = read32bit( in + (tempbits >> 3) );
+	streamlong <<= (tempbits & 7);
+
+	/* find the number of bits in the prefix */
+	{
+		uint32_t notI = ~streamlong;
+		result = lead( notI);
+	}
+
+	if(result >= MAX_PREFIX_32)
+	{
+		result = getstreambits(in, tempbits+MAX_PREFIX_32, maxbits);
+		tempbits += MAX_PREFIX_32 + maxbits;
+	}
+	else
+	{
+		/* all of the bits must fit within the long we have loaded*/
+		//Assert(k<=14);
+		//Assert(result=2)
+			{
+				result += (v-1);
+				tempbits += 1;
+			}
+		}
+	}
+
+	*bitPos = tempbits;
+
+	return result;
+}
+
+int32_t dyn_decomp( AGParamRecPtr params, BitBuffer * bitstream, int32_t * pc, int32_t numSamples, int32_t maxSize, uint32_t * outNumBits )
+{
+    uint8_t 		*in;
+    int32_t			*outPtr = pc;
+    uint32_t 	bitPos, startPos, maxPos;
+    uint32_t		j, m, k, n, c, mz;
+    int32_t			del, zmode;
+    uint32_t 	mb;
+    uint32_t	pb_local = params->pb;
+    uint32_t	kb_local = params->kb;
+    uint32_t	wb_local = params->wb;
+    int32_t				status;
+
+	RequireAction( (bitstream != NULL) && (pc != NULL) && (outNumBits != NULL), return kALAC_ParamError; );
+	*outNumBits = 0;
+
+	in = bitstream->cur;
+	startPos = bitstream->bitIndex;
+	maxPos = bitstream->byteSize * 8;
+	bitPos = startPos;
+
+    mb = params->mb0;
+    zmode = 0;
+
+    c = 0;
+	status = ALAC_noErr;
+
+    while (c < (uint32_t) numSamples)
+    {
+		// bail if we've run off the end of the buffer
+    	RequireAction( bitPos < maxPos, status = kALAC_ParamError; goto Exit; );
+
+        m = (mb)>>QBSHIFT;
+        k = lg3a(m);
+
+        k = arithmin(k, kb_local);
+        m = (1<> 1) * (multiplier);
+        }
+
+        *outPtr++ = del;
+
+        c++;
+
+        mb = pb_local*(n+zmode) + mb - ((pb_local*mb)>>QBSHIFT);
+
+		// update mean tracking
+		if (n > N_MAX_MEAN_CLAMP)
+			mb = N_MEAN_CLAMP_VAL;
+
+        zmode = 0;
+
+        if (((mb << MMULSHIFT) < QB) && (c < (uint32_t) numSamples))
+        {
+            zmode = 1;
+            k = lead(mb) - BITOFF+((mb+MOFF)>>MDENSHIFT);
+            mz = ((1<= 65535)
+            	zmode = 0;
+
+            mb = 0;
+        }
+    }
+
+Exit:
+	*outNumBits = (bitPos - startPos);
+	BitBufferAdvance( bitstream, *outNumBits );
+	RequireAction( bitstream->cur <= bitstream->end, status = kALAC_ParamError; );
+
+    return status;
+}
diff --git a/libs/libsndfile/src/ALAC/ag_enc.c b/libs/libsndfile/src/ALAC/ag_enc.c
new file mode 100644
index 0000000000..0916cc0852
--- /dev/null
+++ b/libs/libsndfile/src/ALAC/ag_enc.c
@@ -0,0 +1,360 @@
+/*
+ * Copyright (c) 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2013 Erik de Castro Lopo 
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_START@
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_END@
+ */
+
+/*
+	File:		ag_enc.c
+
+	Contains:   Adaptive Golomb encode routines.
+
+	Copyright:	(c) 2001-2011 Apple, Inc.
+*/
+
+#include "aglib.h"
+#include "ALACBitUtilities.h"
+#include "EndianPortable.h"
+#include "ALACAudioTypes.h"
+
+#include 
+#include 
+#include 
+#include 
+
+#define CODE_TO_LONG_MAXBITS	32
+#define N_MAX_MEAN_CLAMP		0xffff
+#define N_MEAN_CLAMP_VAL		0xffff
+#define REPORT_VAL  40
+
+#if __GNUC__
+#define ALWAYS_INLINE		__attribute__((always_inline))
+#else
+#define ALWAYS_INLINE
+#endif
+
+
+/*	And on the subject of the CodeWarrior x86 compiler and inlining, I reworked a lot of this
+	to help the compiler out.   In many cases this required manual inlining or a macro.  Sorry
+	if it is ugly but the performance gains are well worth it.
+	- WSK 5/19/04
+*/
+
+// note: implementing this with some kind of "count leading zeros" assembly is a big performance win
+static inline int32_t lead( int32_t m )
+{
+	long j;
+	unsigned long c = (1ul << 31);
+
+	for(j=0; j < 32; j++)
+	{
+		if((c & m) != 0)
+			break;
+		c >>= 1;
+	}
+	return (j);
+}
+
+#define arithmin(a, b) ((a) < (b) ? (a) : (b))
+
+static inline int32_t ALWAYS_INLINE lg3a( int32_t x)
+{
+    int32_t result;
+
+    x += 3;
+    result = lead(x);
+
+    return 31 - result;
+}
+
+static inline int32_t ALWAYS_INLINE abs_func( int32_t a )
+{
+	// note: the CW PPC intrinsic __abs() turns into these instructions so no need to try and use it
+	int32_t isneg  = a >> 31;
+	int32_t xorval = a ^ isneg;
+	int32_t result = xorval-isneg;
+
+	return result;
+}
+
+static inline uint32_t ALWAYS_INLINE read32bit( uint8_t * buffer )
+{
+	// embedded CPUs typically can't read unaligned 32-bit words so just read the bytes
+	uint32_t		value;
+
+	value = ((uint32_t)buffer[0] << 24) | ((uint32_t)buffer[1] << 16) |
+			 ((uint32_t)buffer[2] << 8) | (uint32_t)buffer[3];
+	return value;
+}
+
+#if PRAGMA_MARK
+#pragma mark -
+#endif
+
+static inline int32_t dyn_code(int32_t m, int32_t k, int32_t n, uint32_t *outNumBits)
+{
+	uint32_t 	divx, mod, de;
+	uint32_t	numBits;
+	uint32_t	value;
+
+	//Assert( n >= 0 );
+
+	divx = n/m;
+
+	if(divx >= MAX_PREFIX_16)
+	{
+		numBits = MAX_PREFIX_16 + MAX_DATATYPE_BITS_16;
+		value = (((1< MAX_PREFIX_16 + MAX_DATATYPE_BITS_16)
+		{
+		    numBits = MAX_PREFIX_16 + MAX_DATATYPE_BITS_16;
+		    value = (((1< 25)
+			goto codeasescape;
+	}
+	else
+	{
+codeasescape:
+		numBits = MAX_PREFIX_32;
+		value = (((1<> 3);
+
+	shift = 32 - (bitPos & 7) - numBits;
+
+	mask = ~0u >> (32 - numBits);		// mask must be created in two steps to avoid compiler sequencing ambiguity
+	mask <<= shift;
+
+	value  = (value << shift) & mask;
+	value |= curr & ~mask;
+
+	psf_put_be32 (out, bitPos >> 3, value) ;
+}
+
+
+static inline void ALWAYS_INLINE dyn_jam_noDeref_large(unsigned char *out, uint32_t bitPos, uint32_t numBits, uint32_t value)
+{
+	uint32_t	w;
+	uint32_t	curr;
+	uint32_t	mask;
+	int32_t		shiftvalue = (32 - (bitPos&7) - numBits);
+
+	//Assert(numBits <= 32);
+
+	curr = psf_get_be32 (out, bitPos >> 3);
+
+	if (shiftvalue < 0)
+	{
+		uint8_t 	tailbyte;
+		uint8_t 	*tailptr;
+
+		w = value >> -shiftvalue;
+		mask = ~0u >> -shiftvalue;
+		w |= (curr & ~mask);
+
+		tailptr = out + (bitPos>>3) + 4;
+		tailbyte = (value << ((8+shiftvalue))) & 0xff;
+		*tailptr = (uint8_t)tailbyte;
+	}
+	else
+	{
+		mask = ~0u >> (32 - numBits);
+		mask <<= shiftvalue;			// mask must be created in two steps to avoid compiler sequencing ambiguity
+
+		w  = (value << shiftvalue) & mask;
+		w |= curr & ~mask;
+	}
+
+	psf_put_be32 (out, bitPos >> 3, w) ;
+}
+
+
+int32_t dyn_comp( AGParamRecPtr params, int32_t * pc, BitBuffer * bitstream, int32_t numSamples, int32_t bitSize, uint32_t * outNumBits )
+{
+    unsigned char *		out;
+    uint32_t		bitPos, startPos;
+    uint32_t			m, k, n, c, mz, nz;
+    uint32_t		numBits;
+    uint32_t			value;
+    int32_t				del, zmode;
+	uint32_t		overflow, overflowbits;
+    int32_t					status;
+
+    // shadow the variables in params so there's not the dereferencing overhead
+    uint32_t		mb, pb, kb, wb;
+    int32_t					rowPos = 0;
+    int32_t					rowSize = params->sw;
+    int32_t					rowJump = (params->fw) - rowSize;
+    int32_t *			inPtr = pc;
+
+	*outNumBits = 0;
+	RequireAction( (bitSize >= 1) && (bitSize <= 32), return kALAC_ParamError; );
+
+	out = bitstream->cur;
+	startPos = bitstream->bitIndex;
+    bitPos = startPos;
+
+    mb = params->mb = params->mb0;
+    pb = params->pb;
+    kb = params->kb;
+    wb = params->wb;
+    zmode = 0;
+
+    c=0;
+	status = ALAC_noErr;
+
+    while (c < (uint32_t) numSamples)
+    {
+        m  = mb >> QBSHIFT;
+        k = lg3a(m);
+        if ( k > kb)
+        {
+        	k = kb;
+        }
+        m = (1<> 31) & 1) - zmode;
+		//Assert( 32-lead(n) <= bitSize );
+
+		if ( dyn_code_32bit(bitSize, m, k, n, &numBits, &value, &overflow, &overflowbits) )
+		{
+			dyn_jam_noDeref(out, bitPos, numBits, value);
+			bitPos += numBits;
+			dyn_jam_noDeref_large(out, bitPos, overflowbits, overflow);
+			bitPos += overflowbits;
+		}
+		else
+		{
+			dyn_jam_noDeref(out, bitPos, numBits, value);
+			bitPos += numBits;
+		}
+
+        c++;
+        if ( rowPos >= rowSize)
+        {
+        	rowPos = 0;
+        	inPtr += rowJump;
+        }
+
+        mb = pb * (n + zmode) + mb - ((pb *mb)>>QBSHIFT);
+
+		// update mean tracking if it's overflowed
+		if (n > N_MAX_MEAN_CLAMP)
+			mb = N_MEAN_CLAMP_VAL;
+
+        zmode = 0;
+
+        RequireAction(c <= (uint32_t) numSamples, status = kALAC_ParamError; goto Exit; );
+
+        if (((mb << MMULSHIFT) < QB) && (c < (uint32_t) numSamples))
+        {
+            zmode = 1;
+            nz = 0;
+
+            while(c<(uint32_t) numSamples && *inPtr == 0)
+            {
+            	/* Take care of wrap-around globals. */
+                ++inPtr;
+                ++nz;
+                ++c;
+                if ( ++rowPos >= rowSize)
+                {
+                	rowPos = 0;
+                	inPtr += rowJump;
+                }
+
+                if(nz >= 65535)
+                {
+                	zmode = 0;
+                	break;
+                }
+            }
+
+            k = lead(mb) - BITOFF+((mb+MOFF)>>MDENSHIFT);
+            mz = ((1<
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define QBSHIFT 9
+#define QB (1<
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_START@
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_END@
+ */
+
+/*
+	File:		alac_codec.h
+*/
+
+#ifndef ALAC_CODEC_H
+#define ALAC_CODEC_H
+
+#include 
+
+#include "ALACAudioTypes.h"
+
+#define		ALAC_FRAME_LENGTH	4096
+
+struct BitBuffer;
+
+typedef struct alac_decoder_s
+{
+	// decoding parameters (public for use in the analyzer)
+	ALACSpecificConfig		mConfig;
+
+	uint16_t				mActiveElements;
+
+	// decoding buffers
+	int32_t				mMixBufferU [ALAC_FRAME_LENGTH];
+	int32_t				mMixBufferV [ALAC_FRAME_LENGTH];
+	union
+	{
+		int32_t			mPredictor [ALAC_FRAME_LENGTH];
+		uint16_t		mShiftBuffer [ALAC_FRAME_LENGTH];
+	} ;
+} ALAC_DECODER ;
+
+typedef struct alac_encoder_s
+{
+	// ALAC encoder parameters
+	int16_t			mBitDepth;
+
+	// encoding state
+	int16_t			mLastMixRes [kALACMaxChannels];
+
+	int32_t			mFastMode;
+
+	// encoding buffers
+	int32_t			mMixBufferU [ALAC_FRAME_LENGTH] ;
+	int32_t			mMixBufferV [ALAC_FRAME_LENGTH] ;
+	int32_t			mPredictorU [ALAC_FRAME_LENGTH] ;
+	int32_t			mPredictorV [ALAC_FRAME_LENGTH] ;
+	uint16_t		mShiftBufferUV [2 * ALAC_FRAME_LENGTH] ;
+	uint8_t			mWorkBuffer [4 * ALAC_FRAME_LENGTH];
+
+	// per-channel coefficients buffers
+	int16_t			mCoefsU [kALACMaxChannels][kALACMaxSearches][kALACMaxCoefs];
+	int16_t			mCoefsV [kALACMaxChannels][kALACMaxSearches][kALACMaxCoefs];
+
+	// encoding statistics
+	uint32_t		mTotalBytesGenerated;
+	uint32_t		mAvgBitRate;
+	uint32_t		mMaxFrameBytes;
+	uint32_t		mFrameSize;
+	uint32_t		mMaxOutputBytes;
+	uint32_t		mNumChannels;
+	uint32_t		mOutputSampleRate;
+} ALAC_ENCODER ;
+
+
+int32_t	alac_decoder_init (ALAC_DECODER *p, void * inMagicCookie, uint32_t inMagicCookieSize) ;
+int32_t alac_encoder_init (ALAC_ENCODER *p, uint32_t samplerate, uint32_t channels, uint32_t format_flags, uint32_t frameSize) ;
+
+int32_t	alac_decode (ALAC_DECODER *, struct BitBuffer * bits, int32_t * sampleBuffer,
+					uint32_t numSamples, uint32_t numChannels, uint32_t * outNumSamples) ;
+
+int32_t	alac_encode (ALAC_ENCODER *p, uint32_t numChannels, uint32_t numSamples,
+					int32_t * theReadBuffer, unsigned char * theWriteBuffer,
+					uint32_t * ioNumBytes) ;
+
+void alac_set_fastmode(ALAC_ENCODER * p, int32_t fast) ;
+
+uint32_t alac_get_magic_cookie_size(uint32_t inNumChannels) ;
+void	alac_get_magic_cookie(ALAC_ENCODER *p, void * config, uint32_t * ioSize) ;
+void	alac_get_source_format(ALAC_ENCODER *p, const AudioFormatDescription * source, AudioFormatDescription * output) ;
+
+#endif
diff --git a/libs/libsndfile/src/ALAC/alac_decoder.c b/libs/libsndfile/src/ALAC/alac_decoder.c
new file mode 100644
index 0000000000..2681ef6275
--- /dev/null
+++ b/libs/libsndfile/src/ALAC/alac_decoder.c
@@ -0,0 +1,646 @@
+/*
+ * Copyright (c) 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-2013 Erik de Castro Lopo 
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_START@
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_END@
+ */
+
+/*
+	File:		ALACDecoder.cpp
+*/
+
+#include 
+#include 
+#include 
+
+#include "alac_codec.h"
+
+#include "dplib.h"
+#include "aglib.h"
+#include "matrixlib.h"
+
+#include "ALACBitUtilities.h"
+#include "EndianPortable.h"
+
+typedef enum
+{	false = 0,
+	true = 1
+} bool ;
+
+// constants/data
+const uint32_t kMaxBitDepth = 32;			// max allowed bit depth is 32
+
+
+// prototypes
+static int32_t	alac_fill_element (struct BitBuffer * bits) ;
+static int32_t	alac_data_stream_element (struct BitBuffer * bits) ;
+
+static void Zero32( int32_t * buffer, uint32_t numItems, uint32_t stride );
+
+
+/*
+	Init()
+	- initialize the decoder with the given configuration
+*/
+int32_t
+alac_decoder_init (ALAC_DECODER *p, void * inMagicCookie, uint32_t inMagicCookieSize)
+{
+	int32_t		status = ALAC_noErr;
+    ALACSpecificConfig theConfig;
+    uint8_t * theActualCookie = (uint8_t *)inMagicCookie;
+    uint32_t theCookieBytesRemaining = inMagicCookieSize;
+
+    // For historical reasons the decoder needs to be resilient to magic cookies vended by older encoders.
+    // As specified in the ALACMagicCookieDescription.txt document, there may be additional data encapsulating
+    // the ALACSpecificConfig. This would consist of format ('frma') and 'alac' atoms which precede the
+    // ALACSpecificConfig.
+    // See ALACMagicCookieDescription.txt for additional documentation concerning the 'magic cookie'
+
+    // skip format ('frma') atom if present
+    if (theActualCookie[4] == 'f' && theActualCookie[5] == 'r' && theActualCookie[6] == 'm' && theActualCookie[7] == 'a')
+    {
+        theActualCookie += 12;
+        theCookieBytesRemaining -= 12;
+    }
+
+    // skip 'alac' atom header if present
+    if (theActualCookie[4] == 'a' && theActualCookie[5] == 'l' && theActualCookie[6] == 'a' && theActualCookie[7] == 'c')
+    {
+        theActualCookie += 12;
+        theCookieBytesRemaining -= 12;
+    }
+
+    // read the ALACSpecificConfig
+    if (theCookieBytesRemaining >= sizeof(ALACSpecificConfig))
+    {
+        theConfig.frameLength = psf_get_be32 (theActualCookie, offsetof (ALACSpecificConfig, frameLength)) ;
+
+		if (theConfig.frameLength > ALAC_FRAME_LENGTH)
+			return fALAC_FrameLengthError ;
+
+        theConfig.compatibleVersion = theActualCookie [offsetof (ALACSpecificConfig, compatibleVersion)] ;
+        theConfig.bitDepth = theActualCookie [offsetof (ALACSpecificConfig, bitDepth)] ;
+        theConfig.pb = theActualCookie [offsetof (ALACSpecificConfig, pb)] ;
+        theConfig.mb = theActualCookie [offsetof (ALACSpecificConfig, mb)] ;
+        theConfig.kb = theActualCookie [offsetof (ALACSpecificConfig, kb)] ;
+        theConfig.numChannels = theActualCookie [offsetof (ALACSpecificConfig, numChannels)] ;
+        theConfig.maxRun = psf_get_be16 (theActualCookie, offsetof (ALACSpecificConfig, maxRun)) ;
+        theConfig.maxFrameBytes = psf_get_be32 (theActualCookie, offsetof (ALACSpecificConfig, maxFrameBytes)) ;
+        theConfig.avgBitRate = psf_get_be32 (theActualCookie, offsetof (ALACSpecificConfig, avgBitRate)) ;
+        theConfig.sampleRate = psf_get_be32 (theActualCookie, offsetof (ALACSpecificConfig, sampleRate)) ;
+
+        p->mConfig = theConfig;
+
+        RequireAction( p->mConfig.compatibleVersion <= kALACVersion, return kALAC_ParamError; );
+
+        RequireAction( (p->mMixBufferU != NULL) && (p->mMixBufferV != NULL) && (p->mPredictor != NULL),
+                        status = kALAC_MemFullError; goto Exit; );
+     }
+    else
+    {
+        status = kALAC_ParamError;
+    }
+
+    // skip to Channel Layout Info
+    // theActualCookie += sizeof(ALACSpecificConfig);
+
+    // Currently, the Channel Layout Info portion of the magic cookie (as defined in the
+    // ALACMagicCookieDescription.txt document) is unused by the decoder.
+
+Exit:
+	return status;
+}
+
+/*
+	Decode()
+	- the decoded samples are interleaved into the output buffer in the order they arrive in
+	  the bitstream
+*/
+int32_t
+alac_decode (ALAC_DECODER *p, struct BitBuffer * bits, int32_t * sampleBuffer, uint32_t numSamples, uint32_t numChannels, uint32_t * outNumSamples)
+{
+	BitBuffer			shiftBits;
+	uint32_t            bits1, bits2;
+	uint8_t				tag;
+	uint8_t				elementInstanceTag;
+	AGParamRec			agParams;
+	uint32_t				channelIndex;
+	int16_t				coefsU[32];		// max possible size is 32 although NUMCOEPAIRS is the current limit
+	int16_t				coefsV[32];
+	uint8_t				numU, numV;
+	uint8_t				mixBits;
+	int8_t				mixRes;
+	uint16_t			unusedHeader;
+	uint8_t				escapeFlag;
+	uint32_t			chanBits;
+	uint8_t				bytesShifted;
+	uint32_t			shift;
+	uint8_t				modeU, modeV;
+	uint32_t			denShiftU, denShiftV;
+	uint16_t			pbFactorU, pbFactorV;
+	uint16_t			pb;
+	int32_t *			out32;
+	uint8_t				headerByte;
+	uint8_t				partialFrame;
+	uint32_t			extraBits;
+	int32_t				val;
+	uint32_t			i, j;
+	int32_t             status;
+
+	RequireAction( (bits != NULL) && (sampleBuffer != NULL) && (outNumSamples != NULL), return kALAC_ParamError; );
+	RequireAction( numChannels > 0, return kALAC_ParamError; );
+
+	p->mActiveElements = 0;
+	channelIndex	= 0;
+
+	status = ALAC_noErr;
+	*outNumSamples = numSamples;
+
+	while ( status == ALAC_noErr )
+	{
+		// bail if we ran off the end of the buffer
+    	RequireAction( bits->cur < bits->end, status = kALAC_ParamError; goto Exit; );
+
+		// copy global decode params for this element
+		pb = p->mConfig.pb;
+
+		// read element tag
+		tag = BitBufferReadSmall( bits, 3 );
+		switch ( tag )
+		{
+			case ID_SCE:
+			case ID_LFE:
+			{
+				// mono/LFE channel
+				elementInstanceTag = BitBufferReadSmall( bits, 4 );
+				p->mActiveElements |= (1u << elementInstanceTag);
+
+				// read the 12 unused header bits
+				unusedHeader = (uint16_t) BitBufferRead( bits, 12 );
+				RequireAction( unusedHeader == 0, status = kALAC_ParamError; goto Exit; );
+
+				// read the 1-bit "partial frame" flag, 2-bit "shift-off" flag & 1-bit "escape" flag
+				headerByte = (uint8_t) BitBufferRead( bits, 4 );
+
+				partialFrame = headerByte >> 3;
+
+				bytesShifted = (headerByte >> 1) & 0x3u;
+				RequireAction( bytesShifted != 3, status = kALAC_ParamError; goto Exit; );
+
+				shift = bytesShifted * 8;
+
+				escapeFlag = headerByte & 0x1;
+
+				chanBits = p->mConfig.bitDepth - (bytesShifted * 8);
+
+				// check for partial frame to override requested numSamples
+				if ( partialFrame != 0 )
+				{
+					numSamples  = BitBufferRead( bits, 16 ) << 16;
+					numSamples |= BitBufferRead( bits, 16 );
+				}
+
+				if ( escapeFlag == 0 )
+				{
+					// compressed frame, read rest of parameters
+					mixBits	= (uint8_t) BitBufferRead( bits, 8 );
+					mixRes	= (int8_t) BitBufferRead( bits, 8 );
+					//Assert( (mixBits == 0) && (mixRes == 0) );		// no mixing for mono
+
+					headerByte	= (uint8_t) BitBufferRead( bits, 8 );
+					modeU		= headerByte >> 4;
+					denShiftU	= headerByte & 0xfu;
+
+					headerByte	= (uint8_t) BitBufferRead( bits, 8 );
+					pbFactorU	= headerByte >> 5;
+					numU		= headerByte & 0x1fu;
+
+					for ( i = 0; i < numU; i++ )
+						coefsU[i] = (int16_t) BitBufferRead( bits, 16 );
+
+					// if shift active, skip the the shift buffer but remember where it starts
+					if ( bytesShifted != 0 )
+					{
+						shiftBits = *bits;
+						BitBufferAdvance( bits, (bytesShifted * 8) * numSamples );
+					}
+
+					// decompress
+					set_ag_params( &agParams, p->mConfig.mb, (pb * pbFactorU) / 4, p->mConfig.kb, numSamples, numSamples, p->mConfig.maxRun );
+					status = dyn_decomp( &agParams, bits, p->mPredictor, numSamples, chanBits, &bits1 );
+					RequireNoErr( status, goto Exit; );
+
+					if ( modeU == 0 )
+					{
+						unpc_block( p->mPredictor, p->mMixBufferU, numSamples, &coefsU[0], numU, chanBits, denShiftU );
+					}
+					else
+					{
+						// the special "numActive == 31" mode can be done in-place
+						unpc_block( p->mPredictor, p->mPredictor, numSamples, NULL, 31, chanBits, 0 );
+						unpc_block( p->mPredictor, p->mMixBufferU, numSamples, &coefsU[0], numU, chanBits, denShiftU );
+					}
+				}
+				else
+				{
+					//Assert( bytesShifted == 0 );
+
+					// uncompressed frame, copy data into the mix buffer to use common output code
+					shift = 32 - chanBits;
+					if ( chanBits <= 16 )
+					{
+						for ( i = 0; i < numSamples; i++ )
+						{
+							val = (int32_t) BitBufferRead( bits, (uint8_t) chanBits );
+							val = (val << shift) >> shift;
+							p->mMixBufferU[i] = val;
+						}
+					}
+					else
+					{
+						// BitBufferRead() can't read more than 16 bits at a time so break up the reads
+						extraBits = chanBits - 16;
+						for ( i = 0; i < numSamples; i++ )
+						{
+							val = (int32_t) BitBufferRead( bits, 16 );
+							val = (val << 16) >> shift;
+							p->mMixBufferU[i] = val | BitBufferRead( bits, (uint8_t) extraBits );
+						}
+					}
+
+					mixBits = mixRes = 0;
+					bits1 = chanBits * numSamples;
+					bytesShifted = 0;
+				}
+
+				// now read the shifted values into the shift buffer
+				if ( bytesShifted != 0 )
+				{
+					shift = bytesShifted * 8;
+					//Assert( shift <= 16 );
+
+					for ( i = 0; i < numSamples; i++ )
+						p->mShiftBuffer[i] = (uint16_t) BitBufferRead( &shiftBits, (uint8_t) shift );
+				}
+
+				// convert 32-bit integers into output buffer
+				switch ( p->mConfig.bitDepth )
+				{
+					case 16:
+						out32 = sampleBuffer + channelIndex;
+						for ( i = 0, j = 0; i < numSamples; i++, j += numChannels )
+							out32[j] = p->mMixBufferU[i] << 16;
+						break;
+					case 20:
+						out32 = sampleBuffer + channelIndex;
+						copyPredictorTo20( p->mMixBufferU, out32, numChannels, numSamples );
+						break;
+					case 24:
+						out32 = sampleBuffer + channelIndex;
+						if ( bytesShifted != 0 )
+							copyPredictorTo24Shift( p->mMixBufferU, p->mShiftBuffer, out32, numChannels, numSamples, bytesShifted );
+						else
+							copyPredictorTo24( p->mMixBufferU, out32, numChannels, numSamples );
+						break;
+					case 32:
+						out32 = sampleBuffer + channelIndex;
+						if ( bytesShifted != 0 )
+							copyPredictorTo32Shift( p->mMixBufferU, p->mShiftBuffer, out32, numChannels, numSamples, bytesShifted );
+						else
+							copyPredictorTo32( p->mMixBufferU, out32, numChannels, numSamples);
+						break;
+				}
+
+				channelIndex += 1;
+				*outNumSamples = numSamples;
+				break;
+			}
+
+			case ID_CPE:
+			{
+				// if decoding this pair would take us over the max channels limit, bail
+				if ( (channelIndex + 2) > numChannels )
+					goto NoMoreChannels;
+
+				// stereo channel pair
+				elementInstanceTag = BitBufferReadSmall( bits, 4 );
+				p->mActiveElements |= (1u << elementInstanceTag);
+
+				// read the 12 unused header bits
+				unusedHeader = (uint16_t) BitBufferRead( bits, 12 );
+				RequireAction( unusedHeader == 0, status = kALAC_ParamError; goto Exit; );
+
+				// read the 1-bit "partial frame" flag, 2-bit "shift-off" flag & 1-bit "escape" flag
+				headerByte = (uint8_t) BitBufferRead( bits, 4 );
+
+				partialFrame = headerByte >> 3;
+
+				bytesShifted = (headerByte >> 1) & 0x3u;
+				RequireAction( bytesShifted != 3, status = kALAC_ParamError; goto Exit; );
+
+				shift = bytesShifted * 8;
+
+				escapeFlag = headerByte & 0x1;
+
+				chanBits = p->mConfig.bitDepth - (bytesShifted * 8) + 1;
+
+				// check for partial frame length to override requested numSamples
+				if ( partialFrame != 0 )
+				{
+					numSamples  = BitBufferRead( bits, 16 ) << 16;
+					numSamples |= BitBufferRead( bits, 16 );
+				}
+
+				if ( escapeFlag == 0 )
+				{
+					// compressed frame, read rest of parameters
+					mixBits		= (uint8_t) BitBufferRead( bits, 8 );
+					mixRes		= (int8_t) BitBufferRead( bits, 8 );
+
+					headerByte	= (uint8_t) BitBufferRead( bits, 8 );
+					modeU		= headerByte >> 4;
+					denShiftU	= headerByte & 0xfu;
+
+					headerByte	= (uint8_t) BitBufferRead( bits, 8 );
+					pbFactorU	= headerByte >> 5;
+					numU		= headerByte & 0x1fu;
+					for ( i = 0; i < numU; i++ )
+						coefsU[i] = (int16_t) BitBufferRead( bits, 16 );
+
+					headerByte	= (uint8_t) BitBufferRead( bits, 8 );
+					modeV		= headerByte >> 4;
+					denShiftV	= headerByte & 0xfu;
+
+					headerByte	= (uint8_t) BitBufferRead( bits, 8 );
+					pbFactorV	= headerByte >> 5;
+					numV		= headerByte & 0x1fu;
+					for ( i = 0; i < numV; i++ )
+						coefsV[i] = (int16_t) BitBufferRead( bits, 16 );
+
+					// if shift active, skip the interleaved shifted values but remember where they start
+					if ( bytesShifted != 0 )
+					{
+						shiftBits = *bits;
+						BitBufferAdvance( bits, (bytesShifted * 8) * 2 * numSamples );
+					}
+
+					// decompress and run predictor for "left" channel
+					set_ag_params( &agParams, p->mConfig.mb, (pb * pbFactorU) / 4, p->mConfig.kb, numSamples, numSamples, p->mConfig.maxRun );
+					status = dyn_decomp( &agParams, bits, p->mPredictor, numSamples, chanBits, &bits1 );
+					RequireNoErr( status, goto Exit; );
+
+					if ( modeU == 0 )
+					{
+						unpc_block( p->mPredictor, p->mMixBufferU, numSamples, &coefsU[0], numU, chanBits, denShiftU );
+					}
+					else
+					{
+						// the special "numActive == 31" mode can be done in-place
+						unpc_block( p->mPredictor, p->mPredictor, numSamples, NULL, 31, chanBits, 0 );
+						unpc_block( p->mPredictor, p->mMixBufferU, numSamples, &coefsU[0], numU, chanBits, denShiftU );
+					}
+
+					// decompress and run predictor for "right" channel
+					set_ag_params( &agParams, p->mConfig.mb, (pb * pbFactorV) / 4, p->mConfig.kb, numSamples, numSamples, p->mConfig.maxRun );
+					status = dyn_decomp( &agParams, bits, p->mPredictor, numSamples, chanBits, &bits2 );
+					RequireNoErr( status, goto Exit; );
+
+					if ( modeV == 0 )
+					{
+						unpc_block( p->mPredictor, p->mMixBufferV, numSamples, &coefsV[0], numV, chanBits, denShiftV );
+					}
+					else
+					{
+						// the special "numActive == 31" mode can be done in-place
+						unpc_block( p->mPredictor, p->mPredictor, numSamples, NULL, 31, chanBits, 0 );
+						unpc_block( p->mPredictor, p->mMixBufferV, numSamples, &coefsV[0], numV, chanBits, denShiftV );
+					}
+				}
+				else
+				{
+					//Assert( bytesShifted == 0 );
+
+					// uncompressed frame, copy data into the mix buffers to use common output code
+					chanBits = p->mConfig.bitDepth;
+					shift = 32 - chanBits;
+					if ( chanBits <= 16 )
+					{
+						for ( i = 0; i < numSamples; i++ )
+						{
+							val = (int32_t) BitBufferRead( bits, (uint8_t) chanBits );
+							val = (val << shift) >> shift;
+							p->mMixBufferU[i] = val;
+
+							val = (int32_t) BitBufferRead( bits, (uint8_t) chanBits );
+							val = (val << shift) >> shift;
+							p->mMixBufferV[i] = val;
+						}
+					}
+					else
+					{
+						// BitBufferRead() can't read more than 16 bits at a time so break up the reads
+						extraBits = chanBits - 16;
+						for ( i = 0; i < numSamples; i++ )
+						{
+							val = (int32_t) BitBufferRead( bits, 16 );
+							val = (val << 16) >> shift;
+							p->mMixBufferU[i] = val | BitBufferRead( bits, (uint8_t)extraBits );
+
+							val = (int32_t) BitBufferRead( bits, 16 );
+							val = (val << 16) >> shift;
+							p->mMixBufferV[i] = val | BitBufferRead( bits, (uint8_t)extraBits );
+						}
+					}
+
+					bits1 = chanBits * numSamples;
+					bits2 = chanBits * numSamples;
+					mixBits = mixRes = 0;
+					bytesShifted = 0;
+				}
+
+				// now read the shifted values into the shift buffer
+				if ( bytesShifted != 0 )
+				{
+					shift = bytesShifted * 8;
+					//Assert( shift <= 16 );
+
+					for ( i = 0; i < (numSamples * 2); i += 2 )
+					{
+						p->mShiftBuffer[i + 0] = (uint16_t) BitBufferRead( &shiftBits, (uint8_t) shift );
+						p->mShiftBuffer[i + 1] = (uint16_t) BitBufferRead( &shiftBits, (uint8_t) shift );
+					}
+				}
+
+				// un-mix the data and convert to output format
+				// - note that mixRes = 0 means just interleave so we use that path for uncompressed frames
+				switch ( p->mConfig.bitDepth )
+				{
+					case 16:
+						out32 = sampleBuffer + channelIndex;
+						unmix16( p->mMixBufferU, p->mMixBufferV, out32, numChannels, numSamples, mixBits, mixRes );
+						break;
+					case 20:
+						out32 = sampleBuffer + channelIndex;
+						unmix20( p->mMixBufferU, p->mMixBufferV, out32, numChannels, numSamples, mixBits, mixRes );
+						break;
+					case 24:
+						out32 = sampleBuffer + channelIndex;
+						unmix24( p->mMixBufferU, p->mMixBufferV, out32, numChannels, numSamples,
+									mixBits, mixRes, p->mShiftBuffer, bytesShifted );
+						break;
+					case 32:
+						out32 = sampleBuffer + channelIndex;
+						unmix32( p->mMixBufferU, p->mMixBufferV, out32, numChannels, numSamples,
+									mixBits, mixRes, p->mShiftBuffer, bytesShifted );
+						break;
+				}
+
+				channelIndex += 2;
+				*outNumSamples = numSamples;
+				break;
+			}
+
+			case ID_CCE:
+			case ID_PCE:
+			{
+				// unsupported element, bail
+				//AssertNoErr( tag );
+				status = kALAC_ParamError;
+				break;
+			}
+
+			case ID_DSE:
+			{
+				// data stream element -- parse but ignore
+				status = alac_data_stream_element (bits) ;
+				break;
+			}
+
+			case ID_FIL:
+			{
+				// fill element -- parse but ignore
+				status = alac_fill_element (bits) ;
+				break;
+			}
+
+			case ID_END:
+			{
+				// frame end, all done so byte align the frame and check for overruns
+				BitBufferByteAlign( bits, false );
+				//Assert( bits->cur == bits->end );
+				goto Exit;
+			}
+		}
+
+#if 0 // ! DEBUG
+		// if we've decoded all of our channels, bail (but not in debug b/c we want to know if we're seeing bad bits)
+		// - this also protects us if the config does not match the bitstream or crap data bits follow the audio bits
+		if ( channelIndex >= numChannels )
+			break;
+#endif
+	}
+
+NoMoreChannels:
+
+	// if we get here and haven't decoded all of the requested channels, fill the remaining channels with zeros
+	for ( ; channelIndex < numChannels; channelIndex++ )
+	{
+		int32_t *	fill32 = sampleBuffer + channelIndex;
+		Zero32( fill32, numSamples, numChannels );
+	}
+
+Exit:
+	return status;
+}
+
+#if PRAGMA_MARK
+#pragma mark -
+#endif
+
+/*
+	FillElement()
+	- they're just filler so we don't need 'em
+*/
+static int32_t
+alac_fill_element (struct BitBuffer * bits)
+{
+	int16_t		count;
+
+	// 4-bit count or (4-bit + 8-bit count) if 4-bit count == 15
+	// - plus this weird -1 thing I still don't fully understand
+	count = BitBufferReadSmall( bits, 4 );
+	if ( count == 15 )
+		count += (int16_t) BitBufferReadSmall( bits, 8 ) - 1;
+
+	BitBufferAdvance( bits, count * 8 );
+
+	RequireAction( bits->cur <= bits->end, return kALAC_ParamError; );
+
+	return ALAC_noErr;
+}
+
+/*
+	DataStreamElement()
+	- we don't care about data stream elements so just skip them
+*/
+static int32_t
+alac_data_stream_element (struct BitBuffer * bits)
+{
+	int32_t		data_byte_align_flag;
+	uint16_t		count;
+
+	// the tag associates this data stream element with a given audio element
+
+	/* element_instance_tag = */ BitBufferReadSmall( bits, 4 );
+
+	data_byte_align_flag = BitBufferReadOne( bits );
+
+	// 8-bit count or (8-bit + 8-bit count) if 8-bit count == 255
+	count = BitBufferReadSmall( bits, 8 );
+	if ( count == 255 )
+		count += BitBufferReadSmall( bits, 8 );
+
+	// the align flag means the bitstream should be byte-aligned before reading the following data bytes
+	if ( data_byte_align_flag )
+		BitBufferByteAlign( bits, false );
+
+	// skip the data bytes
+	BitBufferAdvance( bits, count * 8 );
+
+	RequireAction( bits->cur <= bits->end, return kALAC_ParamError; );
+
+	return ALAC_noErr;
+}
+
+/*
+	ZeroN()
+	- helper routines to clear out output channel buffers when decoding fewer channels than requested
+*/
+static void Zero32( int32_t * buffer, uint32_t numItems, uint32_t stride )
+{
+	uint32_t indx;
+
+	if ( stride == 1 )
+	{
+		memset( buffer, 0, numItems * sizeof(int32_t) );
+	}
+	else
+	{
+		for ( indx = 0; indx < (numItems * stride); indx += stride )
+			buffer[indx] = 0;
+	}
+}
diff --git a/libs/libsndfile/src/ALAC/alac_decoder.h b/libs/libsndfile/src/ALAC/alac_decoder.h
new file mode 100644
index 0000000000..78f3cb29ca
--- /dev/null
+++ b/libs/libsndfile/src/ALAC/alac_decoder.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2011 Apple Inc. All rights reserved.
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_START@
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_END@
+ */
+
+/*
+	File:		alac_decoder.h
+*/
+
+#ifndef ALAC_DECODER_H
+#define ALAC_DECODER_H
+
+#include 
+
+#include "ALACAudioTypes.h"
+
+typedef enum
+{
+	false = 0,
+	ALAC_TRUE = 1
+} bool ;
+
+struct BitBuffer;
+
+typedef struct alac_decoder
+{
+		// decoding parameters (public for use in the analyzer)
+		ALACSpecificConfig		mConfig;
+
+		uint16_t					mActiveElements;
+
+		// decoding buffers
+		int32_t *				mMixBufferU;
+		int32_t *				mMixBufferV;
+		int32_t *				mPredictor;
+		uint16_t *				mShiftBuffer;	// note: this points to mPredictor's memory but different
+												//		 variable for clarity and type difference
+} alac_decoder ;
+
+alac_decoder * alac_decoder_new (void) ;
+void alac_decoder_delete (alac_decoder *) ;
+
+int32_t	alac_init (alac_decoder *p, void * inMagicCookie, uint32_t inMagicCookieSize) ;
+int32_t	alac_decode (alac_decoder *, struct BitBuffer * bits, uint8_t * sampleBuffer, uint32_t numSamples, uint32_t numChannels, uint32_t * outNumSamples) ;
+
+#endif	/* ALAC_DECODER_H */
diff --git a/libs/libsndfile/src/ALAC/alac_encoder.c b/libs/libsndfile/src/ALAC/alac_encoder.c
new file mode 100644
index 0000000000..02210ee51b
--- /dev/null
+++ b/libs/libsndfile/src/ALAC/alac_encoder.c
@@ -0,0 +1,1342 @@
+/*
+ * Copyright (c) 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-2013 Erik de Castro Lopo 
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_START@
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_END@
+ */
+
+/*
+	File:		ALACEncoder.cpp
+*/
+
+// build stuff
+#define VERBOSE_DEBUG		0
+#define DebugMsg			printf
+
+// headers
+#include 
+#include 
+#include 
+
+#include "sfendian.h"
+
+#include "alac_codec.h"
+
+#include "aglib.h"
+#include "dplib.h"
+#include "matrixlib.h"
+
+#include "ALACBitUtilities.h"
+#include "ALACAudioTypes.h"
+#include "EndianPortable.h"
+
+typedef enum
+{
+	false = 0,
+	true = 1
+} bool ;
+
+static void	GetConfig(ALAC_ENCODER *p, ALACSpecificConfig * config );
+
+static int32_t	EncodeStereo(ALAC_ENCODER *p, struct BitBuffer * bitstream, int32_t * input, uint32_t stride, uint32_t channelIndex, uint32_t numSamples );
+static int32_t	EncodeStereoFast(ALAC_ENCODER *p, struct BitBuffer * bitstream, int32_t * input, uint32_t stride, uint32_t channelIndex, uint32_t numSamples );
+static int32_t	EncodeStereoEscape(ALAC_ENCODER *p, struct BitBuffer * bitstream, int32_t * input, uint32_t stride, uint32_t numSamples );
+static int32_t	EncodeMono(ALAC_ENCODER *p, struct BitBuffer * bitstream, int32_t * input, uint32_t stride, uint32_t channelIndex, uint32_t numSamples );
+
+
+
+// Note: in C you can't typecast to a 2-dimensional array pointer but that's what we need when
+// picking which coefs to use so we declare this typedef b/c we *can* typecast to this type
+typedef int16_t (*SearchCoefs)[kALACMaxCoefs];
+
+// defines/constants
+const uint32_t kALACEncoderMagic	= MAKE_MARKER ('d', 'p', 'g', 'e');
+const uint32_t kMaxSampleSize		= 32;			// max allowed bit width is 32
+const uint32_t kDefaultMixBits		= 2;
+const uint32_t kDefaultMixRes		= 0;
+const uint32_t kMaxRes				= 4;
+const uint32_t kDefaultNumUV		= 8;
+const uint32_t kMinUV				= 4;
+const uint32_t kMaxUV				= 8;
+
+// static functions
+#if VERBOSE_DEBUG
+static void AddFiller( BitBuffer * bits, int32_t numBytes );
+#endif
+
+
+/*
+	Map Format: 3-bit field per channel which is the same as the "element tag" that should be placed
+				at the beginning of the frame for that channel.  Indicates whether SCE, CPE, or LFE.
+				Each particular field is accessed via the current channel indx.  Note that the channel
+				indx increments by two for channel pairs.
+
+	For example:
+
+			C L R 3-channel input		= (ID_CPE << 3) | (ID_SCE)
+				indx 0 value = (map & (0x7ul << (0 * 3))) >> (0 * 3)
+				indx 1 value = (map & (0x7ul << (1 * 3))) >> (1 * 3)
+
+			C L R Ls Rs LFE 5.1-channel input = (ID_LFE << 15) | (ID_CPE << 9) | (ID_CPE << 3) | (ID_SCE)
+				indx 0 value = (map & (0x7ul << (0 * 3))) >> (0 * 3)
+				indx 1 value = (map & (0x7ul << (1 * 3))) >> (1 * 3)
+				indx 3 value = (map & (0x7ul << (3 * 3))) >> (3 * 3)
+				indx 5 value = (map & (0x7ul << (5 * 3))) >> (5 * 3)
+				indx 7 value = (map & (0x7ul << (7 * 3))) >> (7 * 3)
+*/
+static const uint32_t	sChannelMaps[kALACMaxChannels] =
+{
+	ID_SCE,
+	ID_CPE,
+	(ID_CPE << 3) | (ID_SCE),
+	(ID_SCE << 9) | (ID_CPE << 3) | (ID_SCE),
+	(ID_CPE << 9) | (ID_CPE << 3) | (ID_SCE),
+	(ID_SCE << 15) | (ID_CPE << 9) | (ID_CPE << 3) | (ID_SCE),
+	(ID_SCE << 18) | (ID_SCE << 15) | (ID_CPE << 9) | (ID_CPE << 3) | (ID_SCE),
+	(ID_SCE << 21) | (ID_CPE << 15) | (ID_CPE << 9) | (ID_CPE << 3) | (ID_SCE)
+};
+
+static const uint32_t sSupportediPodSampleRates[] =
+{
+	8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000
+};
+
+
+#if PRAGMA_MARK
+#pragma mark -
+#endif
+
+void
+alac_set_fastmode (ALAC_ENCODER * p, int32_t fast )
+{
+	p->mFastMode = fast;
+}
+
+
+/*
+	HEADER SPECIFICATION
+
+        For every segment we adopt the following header:
+
+			1 byte reserved			(always 0)
+			1 byte flags			(see below)
+			[4 byte frame length]	(optional, see below)
+			     ---Next, the per-segment ALAC parameters---
+			1 byte mixBits			(middle-side parameter)
+			1 byte mixRes			(middle-side parameter, interpreted as signed char)
+
+			1 byte shiftU			(4 bits modeU, 4 bits denShiftU)
+			1 byte filterU			(3 bits pbFactorU, 5 bits numU)
+			(numU) shorts			(signed DP coefficients for V channel)
+			     ---Next, 2nd-channel ALAC parameters in case of stereo mode---
+			1 byte shiftV			(4 bits modeV, 4 bits denShiftV)
+			1 byte filterV			(3 bits pbFactorV, 5 bits numV)
+			(numV) shorts			(signed DP coefficients for V channel)
+			     ---After this come the shift-off bytes for (>= 24)-bit data (n-byte shift) if indicated---
+			     ---Then comes the AG-compressor bitstream---
+
+
+        FLAGS
+        -----
+
+		The presence of certain flag bits changes the header format such that the parameters might
+		not even be sent.  The currently defined flags format is:
+
+			0000psse
+
+			where		0 	= reserved, must be 0
+						p	= 1-bit field "partial frame" flag indicating 32-bit frame length follows this byte
+						ss	= 2-bit field indicating "number of shift-off bytes ignored by compression"
+						e	= 1-bit field indicating "escape"
+
+		The "partial frame" flag means that the following segment is not equal to the frame length specified
+		in the out-of-band decoder configuration.  This allows the decoder to deal with end-of-file partial
+		segments without incurring the 32-bit overhead for each segment.
+
+		The "shift-off" field indicates the number of bytes at the bottom of the word that were passed through
+		uncompressed.  The reason for this is that the entropy inherent in the LS bytes of >= 24-bit words
+		quite often means that the frame would have to be "escaped" b/c the compressed size would be >= the
+		uncompressed size.  However, by shifting the input values down and running the remaining bits through
+		the normal compression algorithm, a net win can be achieved.  If this field is non-zero, it means that
+		the shifted-off bytes follow after the parameter section of the header and before the compressed
+		bitstream.  Note that doing this also allows us to use matrixing on 32-bit inputs after one or more
+		bytes are shifted off the bottom which helps the eventual compression ratio.  For stereo channels,
+		the shifted off bytes are interleaved.
+
+        The "escape" flag means that this segment was not compressed b/c the compressed size would be
+        >= uncompressed size.  In that case, the audio data was passed through uncompressed after the header.
+        The other header parameter bytes will not be sent.
+
+
+		PARAMETERS
+		----------
+
+		If the segment is not a partial or escape segment, the total header size (in bytes) is given exactly by:
+
+			4 + (2 + 2 * numU)                   (mono mode)
+			4 + (2 + 2 * numV) + (2 + 2 * numV)  (stereo mode)
+
+        where the ALAC filter-lengths numU, numV are bounded by a
+        constant (in the current source, numU, numV <= NUMCOEPAIRS), and
+        this forces an absolute upper bound on header size.
+
+        Each segment-decode process loads up these bytes from the front of the
+        local stream, in the above order, then follows with the entropy-encoded
+        bits for the given segment.
+
+        To generalize middle-side, there are various mixing modes including middle-side, each lossless,
+        as embodied in the mix() and unmix() functions.  These functions exploit a generalized middle-side
+        transformation:
+
+        u := [(rL + (m-r)R)/m];
+        v := L - R;
+
+        where [ ] denotes integer floor.  The (lossless) inverse is
+
+        L = u + v - [rV/m];
+        R = L - v;
+
+        In the segment header, m and r are encoded in mixBits and mixRes.
+        Classical "middle-side" is obtained with m = 2, r = 1, but now
+        we have more generalized mixes.
+
+        NOTES
+        -----
+        The relevance of the ALAC coefficients is explained in detail
+        in patent documents.
+*/
+
+/*
+	EncodeStereo()
+	- encode a channel pair
+*/
+static int32_t
+EncodeStereo(ALAC_ENCODER *p, struct BitBuffer * bitstream, int32_t * inputBuffer, uint32_t stride, uint32_t channelIndex, uint32_t numSamples )
+{
+	BitBuffer		workBits;
+	BitBuffer		startBits = *bitstream;			// squirrel away copy of current state in case we need to go back and do an escape packet
+	AGParamRec		agParams;
+	uint32_t        bits1, bits2;
+	uint32_t		dilate;
+	int32_t			mixBits, mixRes, maxRes;
+	uint32_t		minBits, minBits1, minBits2;
+	uint32_t		numU, numV;
+	uint32_t		mode;
+	uint32_t		pbFactor;
+	uint32_t		chanBits;
+	uint8_t			bytesShifted;
+	SearchCoefs		coefsU;
+	SearchCoefs		coefsV;
+	uint32_t		indx;
+	uint8_t			partialFrame;
+	uint32_t		escapeBits;
+	bool			doEscape;
+	int32_t			status = ALAC_noErr;
+	int32_t			bestRes;
+	uint32_t numUV, converge;
+
+	// make sure we handle this bit-depth before we get going
+	RequireAction( (p->mBitDepth == 16) || (p->mBitDepth == 20) || (p->mBitDepth == 24) || (p->mBitDepth == 32), return kALAC_ParamError; );
+
+	// reload coefs pointers for this channel pair
+	// - note that, while you might think they should be re-initialized per block, retaining state across blocks
+	//	 actually results in better overall compression
+	// - strangely, re-using the same coefs for the different passes of the "mixRes" search loop instead of using
+	//	 different coefs for the different passes of "mixRes" results in even better compression
+	coefsU = (SearchCoefs) p->mCoefsU[channelIndex];
+	coefsV = (SearchCoefs) p->mCoefsV[channelIndex];
+
+	// matrix encoding adds an extra bit but 32-bit inputs cannot be matrixed b/c 33 is too many
+	// so enable 16-bit "shift off" and encode in 17-bit mode
+	// - in addition, 24-bit mode really improves with one byte shifted off
+	if ( p->mBitDepth == 32 )
+		bytesShifted = 2;
+	else if ( p->mBitDepth >= 24 )
+		bytesShifted = 1;
+	else
+		bytesShifted = 0;
+
+	chanBits = p->mBitDepth - (bytesShifted * 8) + 1;
+
+	// flag whether or not this is a partial frame
+	partialFrame = (numSamples == p->mFrameSize) ? 0 : 1;
+
+	// brute-force encode optimization loop
+	// - run over variations of the encoding params to find the best choice
+	mixBits		= kDefaultMixBits;
+	maxRes		= kMaxRes;
+	numU = numV = kDefaultNumUV;
+	mode		= 0;
+	pbFactor	= 4;
+	dilate		= 8;
+
+	minBits	= minBits1 = minBits2 = 1ul << 31;
+
+    bestRes = p->mLastMixRes[channelIndex];
+
+    for ( mixRes = 0; mixRes <= maxRes; mixRes++ )
+    {
+        // mix the stereo inputs
+        switch ( p->mBitDepth )
+        {
+            case 16:
+                mix16( inputBuffer, stride, p->mMixBufferU, p->mMixBufferV, numSamples/dilate, mixBits, mixRes );
+                break;
+            case 20:
+                mix20( inputBuffer, stride, p->mMixBufferU, p->mMixBufferV, numSamples/dilate, mixBits, mixRes );
+                break;
+            case 24:
+                // includes extraction of shifted-off bytes
+                mix24( inputBuffer, stride, p->mMixBufferU, p->mMixBufferV, numSamples/dilate,
+                        mixBits, mixRes, p->mShiftBufferUV, bytesShifted );
+                break;
+            case 32:
+                // includes extraction of shifted-off bytes
+                mix32( inputBuffer, stride, p->mMixBufferU, p->mMixBufferV, numSamples/dilate,
+                        mixBits, mixRes, p->mShiftBufferUV, bytesShifted );
+                break;
+        }
+
+        BitBufferInit( &workBits, p->mWorkBuffer, p->mMaxOutputBytes );
+
+        // run the dynamic predictors
+        pc_block( p->mMixBufferU, p->mPredictorU, numSamples/dilate, coefsU[numU - 1], numU, chanBits, DENSHIFT_DEFAULT );
+        pc_block( p->mMixBufferV, p->mPredictorV, numSamples/dilate, coefsV[numV - 1], numV, chanBits, DENSHIFT_DEFAULT );
+
+        // run the lossless compressor on each channel
+        set_ag_params( &agParams, MB0, (pbFactor * PB0) / 4, KB0, numSamples/dilate, numSamples/dilate, MAX_RUN_DEFAULT );
+        status = dyn_comp( &agParams, p->mPredictorU, &workBits, numSamples/dilate, chanBits, &bits1 );
+        RequireNoErr( status, goto Exit; );
+
+        set_ag_params( &agParams, MB0, (pbFactor * PB0) / 4, KB0, numSamples/dilate, numSamples/dilate, MAX_RUN_DEFAULT );
+        status = dyn_comp( &agParams, p->mPredictorV, &workBits, numSamples/dilate, chanBits, &bits2 );
+        RequireNoErr( status, goto Exit; );
+
+        // look for best match
+        if ( (bits1 + bits2) < minBits1 )
+        {
+            minBits1 = bits1 + bits2;
+            bestRes = mixRes;
+        }
+    }
+
+    p->mLastMixRes[channelIndex] = (int16_t)bestRes;
+
+	// mix the stereo inputs with the current best mixRes
+	mixRes = p->mLastMixRes[channelIndex];
+	switch ( p->mBitDepth )
+	{
+		case 16:
+			mix16( inputBuffer, stride, p->mMixBufferU, p->mMixBufferV, numSamples, mixBits, mixRes );
+			break;
+		case 20:
+			mix20( inputBuffer, stride, p->mMixBufferU, p->mMixBufferV, numSamples, mixBits, mixRes );
+			break;
+		case 24:
+			// also extracts the shifted off bytes into the shift buffers
+			mix24( inputBuffer, stride, p->mMixBufferU, p->mMixBufferV, numSamples,
+					mixBits, mixRes, p->mShiftBufferUV, bytesShifted );
+			break;
+		case 32:
+			// also extracts the shifted off bytes into the shift buffers
+			mix32( inputBuffer, stride, p->mMixBufferU, p->mMixBufferV, numSamples,
+					mixBits, mixRes, p->mShiftBufferUV, bytesShifted );
+			break;
+	}
+
+	// now it's time for the predictor coefficient search loop
+	numU = numV = kMinUV;
+	minBits1 = minBits2 = 1ul << 31;
+
+	for ( numUV = kMinUV; numUV <= kMaxUV; numUV += 4 )
+	{
+		BitBufferInit( &workBits, p->mWorkBuffer, p->mMaxOutputBytes );
+
+		dilate = 32;
+
+		// run the predictor over the same data multiple times to help it converge
+		for ( converge = 0; converge < 8; converge++ )
+		{
+		    pc_block( p->mMixBufferU, p->mPredictorU, numSamples/dilate, coefsU[numUV-1], numUV, chanBits, DENSHIFT_DEFAULT );
+		    pc_block( p->mMixBufferV, p->mPredictorV, numSamples/dilate, coefsV[numUV-1], numUV, chanBits, DENSHIFT_DEFAULT );
+		}
+
+		dilate = 8;
+
+		set_ag_params( &agParams, MB0, (pbFactor * PB0)/4, KB0, numSamples/dilate, numSamples/dilate, MAX_RUN_DEFAULT );
+		status = dyn_comp( &agParams, p->mPredictorU, &workBits, numSamples/dilate, chanBits, &bits1 );
+
+		if ( (bits1 * dilate + 16 * numUV) < minBits1 )
+		{
+			minBits1 = bits1 * dilate + 16 * numUV;
+			numU = numUV;
+		}
+
+		set_ag_params( &agParams, MB0, (pbFactor * PB0)/4, KB0, numSamples/dilate, numSamples/dilate, MAX_RUN_DEFAULT );
+		status = dyn_comp( &agParams, p->mPredictorV, &workBits, numSamples/dilate, chanBits, &bits2 );
+
+		if ( (bits2 * dilate + 16 * numUV) < minBits2 )
+		{
+			minBits2 = bits2 * dilate + 16 * numUV;
+			numV = numUV;
+		}
+	}
+
+	// test for escape hatch if best calculated compressed size turns out to be more than the input size
+	minBits = minBits1 + minBits2 + (8 /* mixRes/maxRes/etc. */ * 8) + ((partialFrame == true) ? 32 : 0);
+	if ( bytesShifted != 0 )
+		minBits += (numSamples * (bytesShifted * 8) * 2);
+
+	escapeBits = (numSamples * p->mBitDepth * 2) + ((partialFrame == true) ? 32 : 0) + (2 * 8);	/* 2 common header bytes */
+
+	doEscape = (minBits >= escapeBits) ? true : false;
+
+	if ( doEscape == false )
+	{
+		// write bitstream header and coefs
+		BitBufferWrite( bitstream, 0, 12 );
+		BitBufferWrite( bitstream, (partialFrame << 3) | (bytesShifted << 1), 4 );
+		if ( partialFrame )
+			BitBufferWrite( bitstream, numSamples, 32 );
+		BitBufferWrite( bitstream, mixBits, 8 );
+		BitBufferWrite( bitstream, mixRes, 8 );
+
+		//Assert( (mode < 16) && (DENSHIFT_DEFAULT < 16) );
+		//Assert( (pbFactor < 8) && (numU < 32) );
+		//Assert( (pbFactor < 8) && (numV < 32) );
+
+		BitBufferWrite( bitstream, (mode << 4) | DENSHIFT_DEFAULT, 8 );
+		BitBufferWrite( bitstream, (pbFactor << 5) | numU, 8 );
+		for ( indx = 0; indx < numU; indx++ )
+			BitBufferWrite( bitstream, coefsU[numU - 1][indx], 16 );
+
+		BitBufferWrite( bitstream, (mode << 4) | DENSHIFT_DEFAULT, 8 );
+		BitBufferWrite( bitstream, (pbFactor << 5) | numV, 8 );
+		for ( indx = 0; indx < numV; indx++ )
+			BitBufferWrite( bitstream, coefsV[numV - 1][indx], 16 );
+
+		// if shift active, write the interleaved shift buffers
+		if ( bytesShifted != 0 )
+		{
+			uint32_t		bitShift = bytesShifted * 8;
+
+			//Assert( bitShift <= 16 );
+
+			for ( indx = 0; indx < (numSamples * 2); indx += 2 )
+			{
+				uint32_t			shiftedVal;
+
+				shiftedVal = ((uint32_t) p->mShiftBufferUV[indx + 0] << bitShift) | (uint32_t) p->mShiftBufferUV[indx + 1];
+				BitBufferWrite( bitstream, shiftedVal, bitShift * 2 );
+			}
+		}
+
+		// run the dynamic predictor and lossless compression for the "left" channel
+		// - note: to avoid allocating more buffers, we're mixing and matching between the available buffers instead
+		//		   of only using "U" buffers for the U-channel and "V" buffers for the V-channel
+		if ( mode == 0 )
+		{
+			pc_block( p->mMixBufferU, p->mPredictorU, numSamples, coefsU[numU - 1], numU, chanBits, DENSHIFT_DEFAULT );
+		}
+		else
+		{
+			pc_block( p->mMixBufferU, p->mPredictorV, numSamples, coefsU[numU - 1], numU, chanBits, DENSHIFT_DEFAULT );
+			pc_block( p->mPredictorV, p->mPredictorU, numSamples, NULL, 31, chanBits, 0 );
+		}
+
+		set_ag_params( &agParams, MB0, (pbFactor * PB0) / 4, KB0, numSamples, numSamples, MAX_RUN_DEFAULT );
+		status = dyn_comp( &agParams, p->mPredictorU, bitstream, numSamples, chanBits, &bits1 );
+		RequireNoErr( status, goto Exit; );
+
+		// run the dynamic predictor and lossless compression for the "right" channel
+		if ( mode == 0 )
+		{
+			pc_block( p->mMixBufferV, p->mPredictorV, numSamples, coefsV[numV - 1], numV, chanBits, DENSHIFT_DEFAULT );
+		}
+		else
+		{
+			pc_block( p->mMixBufferV, p->mPredictorU, numSamples, coefsV[numV - 1], numV, chanBits, DENSHIFT_DEFAULT );
+			pc_block( p->mPredictorU, p->mPredictorV, numSamples, NULL, 31, chanBits, 0 );
+		}
+
+		set_ag_params( &agParams, MB0, (pbFactor * PB0) / 4, KB0, numSamples, numSamples, MAX_RUN_DEFAULT );
+		status = dyn_comp( &agParams, p->mPredictorV, bitstream, numSamples, chanBits, &bits2 );
+		RequireNoErr( status, goto Exit; );
+
+		/*	if we happened to create a compressed packet that was actually bigger than an escape packet would be,
+			chuck it and do an escape packet
+		*/
+		minBits = BitBufferGetPosition( bitstream ) - BitBufferGetPosition( &startBits );
+		if ( minBits >= escapeBits )
+		{
+			*bitstream = startBits;		// reset bitstream state
+			doEscape = true;
+			printf( "compressed frame too big: %u vs. %u \n", minBits, escapeBits );
+		}
+	}
+
+	if ( doEscape == true )
+	{
+		/* escape */
+		status = EncodeStereoEscape(p, bitstream, inputBuffer, stride, numSamples );
+
+#if VERBOSE_DEBUG
+		DebugMsg( "escape!: %u vs %u\n", minBits, escapeBits );
+#endif
+	}
+
+Exit:
+	return status;
+}
+
+/*
+	EncodeStereoFast()
+	- encode a channel pair without the search loop for maximum possible speed
+*/
+static int32_t
+EncodeStereoFast(ALAC_ENCODER *p, struct BitBuffer * bitstream, int32_t * inputBuffer, uint32_t stride, uint32_t channelIndex, uint32_t numSamples )
+{
+	BitBuffer		startBits = *bitstream;			// squirrel away current bit position in case we decide to use escape hatch
+	AGParamRec		agParams;
+	uint32_t		bits1, bits2;
+	int32_t			mixBits, mixRes;
+	uint32_t		minBits, minBits1, minBits2;
+	uint32_t		numU, numV;
+	uint32_t		mode;
+	uint32_t		pbFactor;
+	uint32_t		chanBits;
+	uint8_t			bytesShifted;
+	SearchCoefs		coefsU;
+	SearchCoefs		coefsV;
+	uint32_t		indx;
+	uint8_t			partialFrame;
+	uint32_t		escapeBits;
+	bool			doEscape;
+	int32_t			status;
+
+	// make sure we handle this bit-depth before we get going
+	RequireAction( (p->mBitDepth == 16) || (p->mBitDepth == 20) || (p->mBitDepth == 24) || (p->mBitDepth == 32), return kALAC_ParamError; );
+
+	// reload coefs pointers for this channel pair
+	// - note that, while you might think they should be re-initialized per block, retaining state across blocks
+	//	 actually results in better overall compression
+	// - strangely, re-using the same coefs for the different passes of the "mixRes" search loop instead of using
+	//	 different coefs for the different passes of "mixRes" results in even better compression
+	coefsU = (SearchCoefs) p->mCoefsU[channelIndex];
+	coefsV = (SearchCoefs) p->mCoefsV[channelIndex];
+
+	// matrix encoding adds an extra bit but 32-bit inputs cannot be matrixed b/c 33 is too many
+	// so enable 16-bit "shift off" and encode in 17-bit mode
+	// - in addition, 24-bit mode really improves with one byte shifted off
+	if ( p->mBitDepth == 32 )
+		bytesShifted = 2;
+	else if ( p->mBitDepth >= 24 )
+		bytesShifted = 1;
+	else
+		bytesShifted = 0;
+
+	chanBits = p->mBitDepth - (bytesShifted * 8) + 1;
+
+	// flag whether or not this is a partial frame
+	partialFrame = (numSamples == p->mFrameSize) ? 0 : 1;
+
+	// set up default encoding parameters for "fast" mode
+	mixBits		= kDefaultMixBits;
+	mixRes		= kDefaultMixRes;
+	numU = numV = kDefaultNumUV;
+	mode		= 0;
+	pbFactor	= 4;
+
+	minBits	= minBits1 = minBits2 = 1ul << 31;
+
+	// mix the stereo inputs with default mixBits/mixRes
+	switch ( p->mBitDepth )
+	{
+		case 16:
+			mix16( inputBuffer, stride, p->mMixBufferU, p->mMixBufferV, numSamples, mixBits, mixRes );
+			break;
+		case 20:
+			mix20( inputBuffer, stride, p->mMixBufferU, p->mMixBufferV, numSamples, mixBits, mixRes );
+			break;
+		case 24:
+			// also extracts the shifted off bytes into the shift buffers
+			mix24( inputBuffer, stride, p->mMixBufferU, p->mMixBufferV, numSamples,
+					mixBits, mixRes, p->mShiftBufferUV, bytesShifted );
+			break;
+		case 32:
+			// also extracts the shifted off bytes into the shift buffers
+			mix32( inputBuffer, stride, p->mMixBufferU, p->mMixBufferV, numSamples,
+					mixBits, mixRes, p->mShiftBufferUV, bytesShifted );
+			break;
+	}
+
+	/* speculatively write the bitstream assuming the compressed version will be smaller */
+
+	// write bitstream header and coefs
+	BitBufferWrite( bitstream, 0, 12 );
+	BitBufferWrite( bitstream, (partialFrame << 3) | (bytesShifted << 1), 4 );
+	if ( partialFrame )
+		BitBufferWrite( bitstream, numSamples, 32 );
+	BitBufferWrite( bitstream, mixBits, 8 );
+	BitBufferWrite( bitstream, mixRes, 8 );
+
+	//Assert( (mode < 16) && (DENSHIFT_DEFAULT < 16) );
+	//Assert( (pbFactor < 8) && (numU < 32) );
+	//Assert( (pbFactor < 8) && (numV < 32) );
+
+	BitBufferWrite( bitstream, (mode << 4) | DENSHIFT_DEFAULT, 8 );
+	BitBufferWrite( bitstream, (pbFactor << 5) | numU, 8 );
+	for ( indx = 0; indx < numU; indx++ )
+		BitBufferWrite( bitstream, coefsU[numU - 1][indx], 16 );
+
+	BitBufferWrite( bitstream, (mode << 4) | DENSHIFT_DEFAULT, 8 );
+	BitBufferWrite( bitstream, (pbFactor << 5) | numV, 8 );
+	for ( indx = 0; indx < numV; indx++ )
+		BitBufferWrite( bitstream, coefsV[numV - 1][indx], 16 );
+
+	// if shift active, write the interleaved shift buffers
+	if ( bytesShifted != 0 )
+	{
+		uint32_t		bitShift = bytesShifted * 8;
+
+		//Assert( bitShift <= 16 );
+
+		for ( indx = 0; indx < (numSamples * 2); indx += 2 )
+		{
+			uint32_t			shiftedVal;
+
+			shiftedVal = ((uint32_t) p->mShiftBufferUV[indx + 0] << bitShift) | (uint32_t) p->mShiftBufferUV[indx + 1];
+			BitBufferWrite( bitstream, shiftedVal, bitShift * 2 );
+		}
+	}
+
+	// run the dynamic predictor and lossless compression for the "left" channel
+	// - note: we always use mode 0 in the "fast" path so we don't need the code for mode != 0
+	pc_block( p->mMixBufferU, p->mPredictorU, numSamples, coefsU[numU - 1], numU, chanBits, DENSHIFT_DEFAULT );
+
+	set_ag_params( &agParams, MB0, (pbFactor * PB0) / 4, KB0, numSamples, numSamples, MAX_RUN_DEFAULT );
+	status = dyn_comp( &agParams, p->mPredictorU, bitstream, numSamples, chanBits, &bits1 );
+	RequireNoErr( status, goto Exit; );
+
+	// run the dynamic predictor and lossless compression for the "right" channel
+	pc_block( p->mMixBufferV, p->mPredictorV, numSamples, coefsV[numV - 1], numV, chanBits, DENSHIFT_DEFAULT );
+
+	set_ag_params( &agParams, MB0, (pbFactor * PB0) / 4, KB0, numSamples, numSamples, MAX_RUN_DEFAULT );
+	status = dyn_comp( &agParams, p->mPredictorV, bitstream, numSamples, chanBits, &bits2 );
+	RequireNoErr( status, goto Exit; );
+
+	// do bit requirement calculations
+	minBits1 = bits1 + (numU * sizeof(int16_t) * 8);
+	minBits2 = bits2 + (numV * sizeof(int16_t) * 8);
+
+	// test for escape hatch if best calculated compressed size turns out to be more than the input size
+	minBits = minBits1 + minBits2 + (8 /* mixRes/maxRes/etc. */ * 8) + ((partialFrame == true) ? 32 : 0);
+	if ( bytesShifted != 0 )
+		minBits += (numSamples * (bytesShifted * 8) * 2);
+
+	escapeBits = (numSamples * p->mBitDepth * 2) + ((partialFrame == true) ? 32 : 0) + (2 * 8);	/* 2 common header bytes */
+
+	doEscape = (minBits >= escapeBits) ? true : false;
+
+	if ( doEscape == false )
+	{
+		/*	if we happened to create a compressed packet that was actually bigger than an escape packet would be,
+			chuck it and do an escape packet
+		*/
+		minBits = BitBufferGetPosition( bitstream ) - BitBufferGetPosition( &startBits );
+		if ( minBits >= escapeBits )
+		{
+			doEscape = true;
+			printf( "compressed frame too big: %u vs. %u\n", minBits, escapeBits );
+		}
+
+	}
+
+	if ( doEscape == true )
+	{
+		/* escape */
+
+		// reset bitstream position since we speculatively wrote the compressed version
+		*bitstream = startBits;
+
+		// write escape frame
+		status = EncodeStereoEscape(p, bitstream, inputBuffer, stride, numSamples );
+
+#if VERBOSE_DEBUG
+		DebugMsg( "escape!: %u vs %u\n", minBits, (numSamples * p->mBitDepth * 2) );
+#endif
+	}
+
+Exit:
+	return status;
+}
+
+/*
+	EncodeStereoEscape()
+	- encode stereo escape frame
+*/
+static int32_t
+EncodeStereoEscape(ALAC_ENCODER *p, struct BitBuffer * bitstream, int32_t * inputBuffer, uint32_t stride, uint32_t numSamples )
+{
+	uint8_t			partialFrame;
+	uint32_t		indx;
+
+	// flag whether or not this is a partial frame
+	partialFrame = (numSamples == p->mFrameSize) ? 0 : 1;
+
+	// write bitstream header
+	BitBufferWrite( bitstream, 0, 12 );
+	BitBufferWrite( bitstream, (partialFrame << 3) | 1, 4 );	// LSB = 1 means "frame not compressed"
+	if ( partialFrame )
+		BitBufferWrite( bitstream, numSamples, 32 );
+
+	// just copy the input data to the output buffer
+	switch ( p->mBitDepth )
+	{
+		case 16:
+			for ( indx = 0; indx < (numSamples * stride); indx += stride )
+			{
+				BitBufferWrite( bitstream, inputBuffer[indx + 0] >> 16, 16 );
+				BitBufferWrite( bitstream, inputBuffer[indx + 1] >> 16, 16 );
+			}
+			break;
+		case 20:
+			for ( indx = 0; indx < (numSamples * stride); indx += stride )
+			{
+				BitBufferWrite( bitstream, inputBuffer[indx + 0] >> 12, 16 );
+				BitBufferWrite( bitstream, inputBuffer[indx + 1] >> 12, 16 );
+			}
+			break;
+		case 24:
+			// mix24() with mixres param = 0 means de-interleave so use it to simplify things
+			mix24( inputBuffer, stride, p->mMixBufferU, p->mMixBufferV, numSamples, 0, 0, p->mShiftBufferUV, 0 );
+			for ( indx = 0; indx < numSamples; indx++ )
+			{
+				BitBufferWrite( bitstream, p->mMixBufferU[indx] >> 8, 24 );
+				BitBufferWrite( bitstream, p->mMixBufferV[indx] >> 8, 24 );
+			}
+			break;
+		case 32:
+			for ( indx = 0; indx < (numSamples * stride); indx += stride )
+			{
+				BitBufferWrite( bitstream, inputBuffer[indx + 0], 32 );
+				BitBufferWrite( bitstream, inputBuffer[indx + 1], 32 );
+			}
+			break;
+	}
+
+	return ALAC_noErr;
+}
+
+/*
+	EncodeMono()
+	- encode a mono input buffer
+*/
+static int32_t
+EncodeMono(ALAC_ENCODER *p, struct BitBuffer * bitstream, int32_t * inputBuffer, uint32_t stride, uint32_t channelIndex, uint32_t numSamples )
+{
+	BitBuffer		startBits = *bitstream;			// squirrel away copy of current state in case we need to go back and do an escape packet
+	AGParamRec		agParams;
+	uint32_t		bits1;
+	uint32_t		numU;
+	SearchCoefs		coefsU;
+	uint32_t		dilate;
+	uint32_t		minBits, bestU;
+	uint32_t		minU, maxU;
+	uint32_t		indx, indx2;
+	uint8_t			bytesShifted;
+	uint32_t		shift;
+	uint32_t		mask;
+	uint32_t		chanBits;
+	uint8_t			pbFactor;
+	uint8_t			partialFrame;
+	uint32_t		escapeBits;
+	bool			doEscape;
+	int32_t			status = ALAC_noErr;
+	uint32_t converge;
+
+
+	// make sure we handle this bit-depth before we get going
+	RequireAction( (p->mBitDepth == 16) || (p->mBitDepth == 20) || (p->mBitDepth == 24) || (p->mBitDepth == 32), return kALAC_ParamError; );
+
+	// reload coefs array from previous frame
+	coefsU = (SearchCoefs) p->mCoefsU[channelIndex];
+
+	// pick bit depth for actual encoding
+	// - we lop off the lower byte(s) for 24-/32-bit encodings
+	if ( p->mBitDepth == 32 )
+		bytesShifted = 2;
+	else if ( p->mBitDepth >= 24 )
+		bytesShifted = 1;
+	else
+		bytesShifted = 0;
+
+	shift = bytesShifted * 8;
+	mask = (1ul << shift) - 1;
+	chanBits = p->mBitDepth - (bytesShifted * 8);
+
+	// flag whether or not this is a partial frame
+	partialFrame = (numSamples == p->mFrameSize) ? 0 : 1;
+
+	// convert N-bit data to 32-bit for predictor
+	switch ( p->mBitDepth )
+	{
+		case 16:
+			// convert 16-bit data to 32-bit for predictor
+			for ( indx = 0, indx2 = 0; indx < numSamples; indx++, indx2 += stride )
+				p->mMixBufferU[indx] = inputBuffer[indx2] >> 16;
+			break;
+
+		case 20:
+			// convert 20-bit data to 32-bit for predictor
+			for ( indx = 0, indx2 = 0; indx < numSamples; indx++, indx2 += stride )
+				p->mMixBufferU[indx] = inputBuffer[indx2] >> 12;
+			break;
+		case 24:
+			// convert 24-bit data to 32-bit for the predictor and extract the shifted off byte(s)
+			for ( indx = 0, indx2 = 0; indx < numSamples; indx++, indx2 += stride )
+			{
+				p->mMixBufferU[indx] = inputBuffer[indx2] >> 8;
+				p->mShiftBufferUV[indx] = (uint16_t)(p->mMixBufferU[indx] & mask);
+				p->mMixBufferU[indx] >>= shift;
+			}
+
+			break;
+		case 32:
+			// just copy the 32-bit input data for the predictor and extract the shifted off byte(s)
+			for ( indx = 0, indx2 = 0; indx < numSamples; indx++, indx2 += stride )
+			{
+				p->mShiftBufferUV[indx] = (uint16_t)(inputBuffer[indx2] & mask);
+				p->mMixBufferU[indx] = inputBuffer[indx2] >> shift;
+			}
+			break;
+	}
+
+	// brute-force encode optimization loop (implied "encode depth" of 0 if comparing to cmd line tool)
+	// - run over variations of the encoding params to find the best choice
+	minU		= 4;
+	maxU		= 8;
+	minBits		= 1ul << 31;
+	pbFactor	= 4;
+
+	bestU	= minU;
+
+	for ( numU = minU; numU <= maxU; numU += 4 )
+	{
+		BitBuffer		workBits;
+		uint32_t		numBits;
+
+		BitBufferInit( &workBits, p->mWorkBuffer, p->mMaxOutputBytes );
+
+		dilate = 32;
+		for ( converge = 0; converge < 7; converge++ )
+			pc_block( p->mMixBufferU, p->mPredictorU, numSamples/dilate, coefsU[numU-1], numU, chanBits, DENSHIFT_DEFAULT );
+
+		dilate = 8;
+		pc_block( p->mMixBufferU, p->mPredictorU, numSamples/dilate, coefsU[numU-1], numU, chanBits, DENSHIFT_DEFAULT );
+
+		set_ag_params( &agParams, MB0, (pbFactor * PB0) / 4, KB0, numSamples/dilate, numSamples/dilate, MAX_RUN_DEFAULT );
+		status = dyn_comp( &agParams, p->mPredictorU, &workBits, numSamples/dilate, chanBits, &bits1 );
+		RequireNoErr( status, goto Exit; );
+
+		numBits = (dilate * bits1) + (16 * numU);
+		if ( numBits < minBits )
+		{
+			bestU	= numU;
+			minBits = numBits;
+		}
+	}
+
+	// test for escape hatch if best calculated compressed size turns out to be more than the input size
+	// - first, add bits for the header bytes mixRes/maxRes/shiftU/filterU
+	minBits += (4 /* mixRes/maxRes/etc. */ * 8) + ((partialFrame == true) ? 32 : 0);
+	if ( bytesShifted != 0 )
+		minBits += (numSamples * (bytesShifted * 8));
+
+	escapeBits = (numSamples * p->mBitDepth) + ((partialFrame == true) ? 32 : 0) + (2 * 8);	/* 2 common header bytes */
+
+	doEscape = (minBits >= escapeBits) ? true : false;
+
+	if ( doEscape == false )
+	{
+		// write bitstream header
+		BitBufferWrite( bitstream, 0, 12 );
+		BitBufferWrite( bitstream, (partialFrame << 3) | (bytesShifted << 1), 4 );
+		if ( partialFrame )
+			BitBufferWrite( bitstream, numSamples, 32 );
+		BitBufferWrite( bitstream, 0, 16 );								// mixBits = mixRes = 0
+
+		// write the params and predictor coefs
+		numU = bestU;
+		BitBufferWrite( bitstream, (0 << 4) | DENSHIFT_DEFAULT, 8 );	// modeU = 0
+		BitBufferWrite( bitstream, (pbFactor << 5) | numU, 8 );
+		for ( indx = 0; indx < numU; indx++ )
+			BitBufferWrite( bitstream, coefsU[numU-1][indx], 16 );
+
+		// if shift active, write the interleaved shift buffers
+		if ( bytesShifted != 0 )
+		{
+			for ( indx = 0; indx < numSamples; indx++ )
+				BitBufferWrite( bitstream, p->mShiftBufferUV[indx], shift );
+		}
+
+		// run the dynamic predictor with the best result
+		pc_block( p->mMixBufferU, p->mPredictorU, numSamples, coefsU[numU-1], numU, chanBits, DENSHIFT_DEFAULT );
+
+		// do lossless compression
+		set_standard_ag_params( &agParams, numSamples, numSamples );
+		status = dyn_comp( &agParams, p->mPredictorU, bitstream, numSamples, chanBits, &bits1 );
+		//AssertNoErr( status );
+
+
+		/*	if we happened to create a compressed packet that was actually bigger than an escape packet would be,
+			chuck it and do an escape packet
+		*/
+		minBits = BitBufferGetPosition( bitstream ) - BitBufferGetPosition( &startBits );
+		if ( minBits >= escapeBits )
+		{
+			*bitstream = startBits;		// reset bitstream state
+			doEscape = true;
+			printf( "compressed frame too big: %u vs. %u\n", minBits, escapeBits );
+		}
+	}
+
+	if ( doEscape == true )
+	{
+		// write bitstream header and coefs
+		BitBufferWrite( bitstream, 0, 12 );
+		BitBufferWrite( bitstream, (partialFrame << 3) | 1, 4 );	// LSB = 1 means "frame not compressed"
+		if ( partialFrame )
+			BitBufferWrite( bitstream, numSamples, 32 );
+
+		// just copy the input data to the output buffer
+		switch ( p->mBitDepth )
+		{
+			case 16:
+				for ( indx = 0; indx < (numSamples * stride); indx += stride )
+					BitBufferWrite( bitstream, inputBuffer[indx] >> 16, 16 );
+				break;
+			case 20:
+				// convert 20-bit data to 32-bit for simplicity
+				for ( indx = 0; indx < (numSamples * stride); indx += stride )
+					BitBufferWrite( bitstream, inputBuffer[indx] >> 12, 20 );
+				break;
+			case 24:
+				// convert 24-bit data to 32-bit for simplicity
+				for ( indx = 0, indx2 = 0; indx < numSamples; indx++, indx2 += stride )
+				{
+					p->mMixBufferU[indx] = inputBuffer[indx2] >> 8;
+					BitBufferWrite( bitstream, p->mMixBufferU[indx], 24 );
+				}
+				break;
+			case 32:
+				for ( indx = 0; indx < (numSamples * stride); indx += stride )
+					BitBufferWrite( bitstream, inputBuffer[indx], 32 );
+				break;
+		}
+#if VERBOSE_DEBUG
+		DebugMsg( "escape!: %u vs %u\n", minBits, (numSamples * p->mBitDepth) );
+#endif
+	}
+
+Exit:
+	return status;
+}
+
+#if PRAGMA_MARK
+#pragma mark -
+#endif
+
+/*
+	Encode()
+	- encode the next block of samples
+*/
+int32_t
+alac_encode(ALAC_ENCODER *p, uint32_t numChannels, uint32_t		numSamples,
+								   int32_t * theReadBuffer, unsigned char * theWriteBuffer, uint32_t * ioNumBytes)
+{
+	uint32_t		outputSize;
+	BitBuffer		bitstream;
+	int32_t			status;
+
+	// create a bit buffer structure pointing to our output buffer
+	BitBufferInit( &bitstream, theWriteBuffer, p->mMaxOutputBytes );
+
+	if ( numChannels == 2 )
+	{
+		// add 3-bit frame start tag ID_CPE = channel pair & 4-bit element instance tag = 0
+		BitBufferWrite( &bitstream, ID_CPE, 3 );
+		BitBufferWrite( &bitstream, 0, 4 );
+
+		// encode stereo input buffer
+		if ( p->mFastMode == false )
+			status = EncodeStereo(p, &bitstream, theReadBuffer, 2, 0, numSamples );
+		else
+			status = EncodeStereoFast(p, &bitstream, theReadBuffer, 2, 0, numSamples );
+		RequireNoErr( status, goto Exit; );
+	}
+	else if ( numChannels == 1 )
+	{
+		// add 3-bit frame start tag ID_SCE = mono channel & 4-bit element instance tag = 0
+		BitBufferWrite( &bitstream, ID_SCE, 3 );
+		BitBufferWrite( &bitstream, 0, 4 );
+
+		// encode mono input buffer
+		status = EncodeMono(p, &bitstream, theReadBuffer, 1, 0, numSamples );
+		RequireNoErr( status, goto Exit; );
+	}
+	else
+	{
+		int32_t *			inputBuffer;
+		uint32_t			tag;
+		uint32_t			channelIndex;
+		uint32_t			inputIncrement;
+		uint8_t				stereoElementTag;
+		uint8_t				monoElementTag;
+		uint8_t				lfeElementTag;
+
+		inputBuffer		= theReadBuffer;
+		inputIncrement	= ((p->mBitDepth + 7) / 8);
+
+		stereoElementTag	= 0;
+		monoElementTag		= 0;
+		lfeElementTag		= 0;
+
+		for ( channelIndex = 0; channelIndex < numChannels; )
+		{
+			tag = (sChannelMaps[numChannels - 1] & (0x7ul << (channelIndex * 3))) >> (channelIndex * 3);
+
+			BitBufferWrite( &bitstream, tag, 3 );
+			switch ( tag )
+			{
+				case ID_SCE:
+					// mono
+					BitBufferWrite( &bitstream, monoElementTag, 4 );
+
+					status = EncodeMono(p, &bitstream, inputBuffer, numChannels, channelIndex, numSamples );
+
+					inputBuffer += inputIncrement;
+					channelIndex++;
+					monoElementTag++;
+					break;
+
+				case ID_CPE:
+					// stereo
+					BitBufferWrite( &bitstream, stereoElementTag, 4 );
+
+					status = EncodeStereo(p,&bitstream, inputBuffer, numChannels, channelIndex, numSamples );
+
+					inputBuffer += (inputIncrement * 2);
+					channelIndex += 2;
+					stereoElementTag++;
+					break;
+
+				case ID_LFE:
+					// LFE channel (subwoofer)
+					BitBufferWrite( &bitstream, lfeElementTag, 4 );
+
+					status = EncodeMono(p, &bitstream, inputBuffer, numChannels, channelIndex, numSamples );
+
+					inputBuffer += inputIncrement;
+					channelIndex++;
+					lfeElementTag++;
+					break;
+
+				default:
+					printf( "That ain't right! (%u)\n", tag );
+					status = kALAC_ParamError;
+					goto Exit;
+			}
+
+			RequireNoErr( status, goto Exit; );
+		}
+	}
+
+#if VERBOSE_DEBUG
+{
+	// if there is room left in the output buffer, add some random fill data to test decoder
+	int32_t			bitsLeft;
+	int32_t			bytesLeft;
+
+	bitsLeft = BitBufferGetPosition( &bitstream ) - 3;	// - 3 for ID_END tag
+	bytesLeft = bitstream.byteSize - ((bitsLeft + 7) / 8);
+
+	if ( (bytesLeft > 20) && ((bytesLeft & 0x4u) != 0) )
+		AddFiller( &bitstream, bytesLeft );
+}
+#endif
+
+	// add 3-bit frame end tag: ID_END
+	BitBufferWrite( &bitstream, ID_END, 3 );
+
+	// byte-align the output data
+	BitBufferByteAlign( &bitstream, true );
+
+	outputSize = BitBufferGetPosition( &bitstream ) / 8;
+	//Assert( outputSize <= mMaxOutputBytes );
+
+
+	// all good, let iTunes know what happened and remember the total number of input sample frames
+	*ioNumBytes = outputSize;
+	//mEncodedFrames		   	   += encodeMsg->numInputSamples;
+
+	// gather encoding stats
+	p->mTotalBytesGenerated += outputSize;
+	p->mMaxFrameBytes = MAX( p->mMaxFrameBytes, outputSize );
+
+	status = ALAC_noErr;
+
+Exit:
+	return status;
+}
+
+
+#if PRAGMA_MARK
+#pragma mark -
+#endif
+
+/*
+	GetConfig()
+*/
+void
+GetConfig(ALAC_ENCODER *p, ALACSpecificConfig * config )
+{
+	config->frameLength			= Swap32NtoB(p->mFrameSize);
+	config->compatibleVersion	= (uint8_t) kALACCompatibleVersion;
+	config->bitDepth			= (uint8_t) p->mBitDepth;
+	config->pb					= (uint8_t) PB0;
+	config->kb					= (uint8_t) KB0;
+	config->mb					= (uint8_t) MB0;
+	config->numChannels			= (uint8_t) p->mNumChannels;
+	config->maxRun				= Swap16NtoB((uint16_t) MAX_RUN_DEFAULT);
+	config->maxFrameBytes		= Swap32NtoB(p->mMaxFrameBytes);
+	config->avgBitRate			= Swap32NtoB(p->mAvgBitRate);
+	config->sampleRate			= Swap32NtoB(p->mOutputSampleRate);
+}
+
+uint32_t
+alac_get_magic_cookie_size(uint32_t inNumChannels)
+{
+    if (inNumChannels > 2)
+    {
+        return sizeof(ALACSpecificConfig) + kChannelAtomSize + sizeof(ALACAudioChannelLayout);
+    }
+    else
+    {
+        return sizeof(ALACSpecificConfig);
+    }
+}
+
+void
+alac_get_magic_cookie(ALAC_ENCODER *p, void * outCookie, uint32_t * ioSize )
+{
+    ALACSpecificConfig theConfig = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+    ALACAudioChannelLayout theChannelLayout = {0, 0, 0};
+    uint8_t theChannelAtom[kChannelAtomSize] = {0, 0, 0, 0, 'c', 'h', 'a', 'n', 0, 0, 0, 0};
+    uint32_t theCookieSize = sizeof(ALACSpecificConfig);
+    uint8_t * theCookiePointer = (uint8_t *)outCookie;
+
+    GetConfig(p, &theConfig);
+    if (theConfig.numChannels > 2)
+    {
+        theChannelLayout.mChannelLayoutTag = Swap32NtoB(ALACChannelLayoutTags[theConfig.numChannels - 1]);
+        theCookieSize += (sizeof(ALACAudioChannelLayout) + kChannelAtomSize);
+    }
+     if (*ioSize >= theCookieSize)
+    {
+        memcpy(theCookiePointer, &theConfig, sizeof(ALACSpecificConfig));
+        theChannelAtom[3] = (sizeof(ALACAudioChannelLayout) + kChannelAtomSize);
+        if (theConfig.numChannels > 2)
+        {
+            theCookiePointer += sizeof(ALACSpecificConfig);
+            memcpy(theCookiePointer, theChannelAtom, kChannelAtomSize);
+            theCookiePointer += kChannelAtomSize;
+            memcpy(theCookiePointer, &theChannelLayout, sizeof(ALACAudioChannelLayout));
+        }
+        *ioSize = theCookieSize;
+    }
+    else
+    {
+        *ioSize = 0; // no incomplete cookies
+    }
+}
+
+/*
+	alac_encoder_init()
+	- initialize the encoder component with the current config
+*/
+int32_t
+alac_encoder_init (ALAC_ENCODER *p, uint32_t samplerate, uint32_t channels, uint32_t format_flags, uint32_t frameSize)
+{
+	int32_t			status;
+	uint32_t indx;
+	int32_t channel, search;
+
+	p->mFrameSize = (frameSize > 0 && frameSize <= ALAC_FRAME_LENGTH) ? frameSize : ALAC_FRAME_LENGTH ;
+
+    p->mOutputSampleRate = samplerate;
+    p->mNumChannels = channels;
+    switch (format_flags)
+    {
+        case 1:
+            p->mBitDepth = 16;
+            break;
+        case 2:
+            p->mBitDepth = 20;
+            break;
+        case 3:
+            p->mBitDepth = 24;
+            break;
+        case 4:
+            p->mBitDepth = 32;
+            break;
+        default:
+            break;
+    }
+
+	// set up default encoding parameters and state
+	// - note: mFrameSize is set in the constructor or via alac_set_frame_size() which must be called before this routine
+	for ( indx = 0; indx < kALACMaxChannels; indx++ )
+		p->mLastMixRes[indx] = kDefaultMixRes;
+
+	// the maximum output frame size can be no bigger than (samplesPerBlock * numChannels * ((10 + sampleSize)/8) + 1)
+	// but note that this can be bigger than the input size!
+	// - since we don't yet know what our input format will be, use our max allowed sample size in the calculation
+	p->mMaxOutputBytes = p->mFrameSize * p->mNumChannels * ((10 + kMaxSampleSize) / 8)  + 1;
+
+	status = ALAC_noErr;
+
+	// initialize coefs arrays once b/c retaining state across blocks actually improves the encode ratio
+	for ( channel = 0; channel < (int32_t) p->mNumChannels; channel++ )
+	{
+		for ( search = 0; search < kALACMaxSearches; search++ )
+		{
+			init_coefs( p->mCoefsU[channel][search], DENSHIFT_DEFAULT, kALACMaxCoefs );
+			init_coefs( p->mCoefsV[channel][search], DENSHIFT_DEFAULT, kALACMaxCoefs );
+		}
+	}
+
+	return status;
+}
+
+/*
+	alac_get_source_format()
+	- given the input format, return one of our supported formats
+*/
+void
+alac_get_source_format(ALAC_ENCODER *p, const AudioFormatDescription * source, AudioFormatDescription * output )
+{
+	(void) output ;
+	// default is 16-bit native endian
+	// - note: for float input we assume that's coming from one of our decoders (mp3, aac) so it only makes sense
+	//		   to encode to 16-bit since the source was lossy in the first place
+	// - note: if not a supported bit depth, find the closest supported bit depth to the input one
+	if ( (source->mFormatID != kALACFormatLinearPCM) || ((source->mFormatFlags & kALACFormatFlagIsFloat) != 0) ||
+		( source->mBitsPerChannel <= 16 ) )
+		p->mBitDepth = 16;
+	else if ( source->mBitsPerChannel <= 20 )
+		p->mBitDepth = 20;
+	else if ( source->mBitsPerChannel <= 24 )
+		p->mBitDepth = 24;
+	else
+		p->mBitDepth = 32;
+
+	// we support 16/20/24/32-bit integer data at any sample rate and our target number of channels
+	// and sample rate were specified when we were configured
+	/*
+    MakeUncompressedAudioFormat( mNumChannels, (float) mOutputSampleRate, mBitDepth, kAudioFormatFlagsNativeIntegerPacked, output );
+     */
+}
+
+
+
+#if VERBOSE_DEBUG
+
+#if PRAGMA_MARK
+#pragma mark -
+#endif
+
+/*
+	AddFiller()
+	- add fill and data stream elements to the bitstream to test the decoder
+*/
+static void AddFiller( BitBuffer * bits, int32_t numBytes )
+{
+	uint8_t		tag;
+	int32_t		indx;
+
+	// out of lameness, subtract 6 bytes to deal with header + alignment as required for fill/data elements
+	numBytes -= 6;
+	if ( numBytes <= 0 )
+		return;
+
+	// randomly pick Fill or Data Stream Element based on numBytes requested
+	tag = (numBytes & 0x8) ? ID_FIL : ID_DSE;
+
+	BitBufferWrite( bits, tag, 3 );
+	if ( tag == ID_FIL )
+	{
+		// can't write more than 269 bytes in a fill element
+		numBytes = (numBytes > 269) ? 269 : numBytes;
+
+		// fill element = 4-bit size unless >= 15 then 4-bit size + 8-bit extension size
+		if ( numBytes >= 15 )
+		{
+			uint16_t			extensionSize;
+
+			BitBufferWrite( bits, 15, 4 );
+
+			// 8-bit extension count field is "extra + 1" which is weird but I didn't define the syntax
+			// - otherwise, there's no way to represent 15
+			// - for example, to really mean 15 bytes you must encode extensionSize = 1
+			// - why it's not like data stream elements I have no idea
+			extensionSize = (numBytes - 15) + 1;
+			//Assert( extensionSize <= 255 );
+			BitBufferWrite( bits, extensionSize, 8 );
+		}
+		else
+			BitBufferWrite( bits, numBytes, 4 );
+
+		BitBufferWrite( bits, 0x10, 8 );		// extension_type = FILL_DATA = b0001 or'ed with fill_nibble = b0000
+		for ( indx = 0; indx < (numBytes - 1); indx++ )
+			BitBufferWrite( bits, 0xa5, 8 );	// fill_byte = b10100101 = 0xa5
+	}
+	else
+	{
+		// can't write more than 510 bytes in a data stream element
+		numBytes = (numBytes > 510) ? 510 : numBytes;
+
+		BitBufferWrite( bits, 0, 4 );			// element instance tag
+		BitBufferWrite( bits, 1, 1 );			// byte-align flag = true
+
+		// data stream element = 8-bit size unless >= 255 then 8-bit size + 8-bit size
+		if ( numBytes >= 255 )
+		{
+			BitBufferWrite( bits, 255, 8 );
+			BitBufferWrite( bits, numBytes - 255, 8 );
+		}
+		else
+			BitBufferWrite( bits, numBytes, 8 );
+
+		BitBufferByteAlign( bits, true );		// byte-align with zeros
+
+		for ( indx = 0; indx < numBytes; indx++ )
+			BitBufferWrite( bits, 0x5a, 8 );
+	}
+}
+
+#endif	/* VERBOSE_DEBUG */
diff --git a/libs/libsndfile/src/ALAC/dp_dec.c b/libs/libsndfile/src/ALAC/dp_dec.c
new file mode 100644
index 0000000000..45aae7a9e1
--- /dev/null
+++ b/libs/libsndfile/src/ALAC/dp_dec.c
@@ -0,0 +1,375 @@
+/*
+ * Copyright (c) 2011 Apple Inc. All rights reserved.
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_START@
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_END@
+ */
+
+/*
+	File:		dp_dec.c
+
+	Contains:	Dynamic Predictor decode routines
+
+	Copyright:	(c) 2001-2011 Apple, Inc.
+*/
+
+
+#include "dplib.h"
+#include 
+
+#if __GNUC__
+#define ALWAYS_INLINE		__attribute__((always_inline))
+#else
+#define ALWAYS_INLINE
+#endif
+
+#define LOOP_ALIGN
+
+static inline int32_t ALWAYS_INLINE sign_of_int( int32_t i )
+{
+    int32_t negishift;
+
+    negishift = ((uint32_t)-i) >> 31;
+    return negishift | (i >> 31);
+}
+
+void unpc_block( int32_t * pc1, int32_t * out, int32_t num, int16_t * coefs, int32_t numactive, uint32_t chanbits, uint32_t denshift )
+{
+	register int16_t	a0, a1, a2, a3;
+	register int32_t	b0, b1, b2, b3;
+	int32_t					j, k, lim;
+	int32_t				sum1, sg, sgn, top, dd;
+	int32_t *			pout;
+	int32_t				del, del0;
+	uint32_t			chanshift = 32 - chanbits;
+	int32_t				denhalf = 1<<(denshift-1);
+
+	out[0] = pc1[0];
+	if ( numactive == 0 )
+	{
+		// just copy if numactive == 0 (but don't bother if in/out pointers the same)
+		if ( (num > 1)  && (pc1 != out) )
+			memcpy( &out[1], &pc1[1], (num - 1) * sizeof(int32_t) );
+		return;
+	}
+	if ( numactive == 31 )
+	{
+		// short-circuit if numactive == 31
+		int32_t		prev;
+
+		/*	this code is written such that the in/out buffers can be the same
+			to conserve buffer space on embedded devices like the iPod
+
+			(original code)
+			for ( j = 1; j < num; j++ )
+				del = pc1[j] + out[j-1];
+				out[j] = (del << chanshift) >> chanshift;
+		*/
+		prev = out[0];
+		for ( j = 1; j < num; j++ )
+		{
+			del = pc1[j] + prev;
+			prev = (del << chanshift) >> chanshift;
+			out[j] = prev;
+		}
+		return;
+	}
+
+	for ( j = 1; j <= numactive; j++ )
+	{
+		del = pc1[j] + out[j-1];
+		out[j] = (del << chanshift) >> chanshift;
+	}
+
+	lim = numactive + 1;
+
+	if ( numactive == 4 )
+	{
+		// optimization for numactive == 4
+		register int16_t	ia0, ia1, ia2, ia3;
+		register int32_t	ib0, ib1, ib2, ib3;
+
+		ia0 = coefs[0];
+		ia1 = coefs[1];
+		ia2 = coefs[2];
+		ia3 = coefs[3];
+
+		for ( j = lim; j < num; j++ )
+		{
+			LOOP_ALIGN
+
+			top = out[j - lim];
+			pout = out + j - 1;
+
+			ib0 = top - pout[0];
+			ib1 = top - pout[-1];
+			ib2 = top - pout[-2];
+			ib3 = top - pout[-3];
+
+			sum1 = (denhalf - ia0 * ib0 - ia1 * ib1 - ia2 * ib2 - ia3 * ib3) >> denshift;
+
+			del = pc1[j];
+			del0 = del;
+			sg = sign_of_int(del);
+			del += top + sum1;
+
+			out[j] = (del << chanshift) >> chanshift;
+
+			if ( sg > 0 )
+			{
+				sgn = sign_of_int( ib3 );
+				ia3 -= sgn;
+				del0 -= (4 - 3) * ((sgn * ib3) >> denshift);
+				if ( del0 <= 0 )
+					continue;
+
+				sgn = sign_of_int( ib2 );
+				ia2 -= sgn;
+				del0 -= (4 - 2) * ((sgn * ib2) >> denshift);
+				if ( del0 <= 0 )
+					continue;
+
+				sgn = sign_of_int( ib1 );
+				ia1 -= sgn;
+				del0 -= (4 - 1) * ((sgn * ib1) >> denshift);
+				if ( del0 <= 0 )
+					continue;
+
+				ia0 -= sign_of_int( ib0 );
+			}
+			else if ( sg < 0 )
+			{
+				// note: to avoid unnecessary negations, we flip the value of "sgn"
+				sgn = -sign_of_int( ib3 );
+				ia3 -= sgn;
+				del0 -= (4 - 3) * ((sgn * ib3) >> denshift);
+				if ( del0 >= 0 )
+					continue;
+
+				sgn = -sign_of_int( ib2 );
+				ia2 -= sgn;
+				del0 -= (4 - 2) * ((sgn * ib2) >> denshift);
+				if ( del0 >= 0 )
+					continue;
+
+				sgn = -sign_of_int( ib1 );
+				ia1 -= sgn;
+				del0 -= (4 - 1) * ((sgn * ib1) >> denshift);
+				if ( del0 >= 0 )
+					continue;
+
+				ia0 += sign_of_int( ib0 );
+			}
+		}
+
+		coefs[0] = ia0;
+		coefs[1] = ia1;
+		coefs[2] = ia2;
+		coefs[3] = ia3;
+	}
+	else if ( numactive == 8 )
+	{
+		register int16_t	a4, a5, a6, a7;
+		register int32_t	b4, b5, b6, b7;
+
+		// optimization for numactive == 8
+		a0 = coefs[0];
+		a1 = coefs[1];
+		a2 = coefs[2];
+		a3 = coefs[3];
+		a4 = coefs[4];
+		a5 = coefs[5];
+		a6 = coefs[6];
+		a7 = coefs[7];
+
+		for ( j = lim; j < num; j++ )
+		{
+			LOOP_ALIGN
+
+			top = out[j - lim];
+			pout = out + j - 1;
+
+			b0 = top - (*pout--);
+			b1 = top - (*pout--);
+			b2 = top - (*pout--);
+			b3 = top - (*pout--);
+			b4 = top - (*pout--);
+			b5 = top - (*pout--);
+			b6 = top - (*pout--);
+			b7 = top - (*pout);
+			pout += 8;
+
+			sum1 = (denhalf - a0 * b0 - a1 * b1 - a2 * b2 - a3 * b3
+					- a4 * b4 - a5 * b5 - a6 * b6 - a7 * b7) >> denshift;
+
+			del = pc1[j];
+			del0 = del;
+			sg = sign_of_int(del);
+			del += top + sum1;
+
+			out[j] = (del << chanshift) >> chanshift;
+
+			if ( sg > 0 )
+			{
+				sgn = sign_of_int( b7 );
+				a7 -= sgn;
+				del0 -= 1 * ((sgn * b7) >> denshift);
+				if ( del0 <= 0 )
+					continue;
+
+				sgn = sign_of_int( b6 );
+				a6 -= sgn;
+				del0 -= 2 * ((sgn * b6) >> denshift);
+				if ( del0 <= 0 )
+					continue;
+
+				sgn = sign_of_int( b5 );
+				a5 -= sgn;
+				del0 -= 3 * ((sgn * b5) >> denshift);
+				if ( del0 <= 0 )
+					continue;
+
+				sgn = sign_of_int( b4 );
+				a4 -= sgn;
+				del0 -= 4 * ((sgn * b4) >> denshift);
+				if ( del0 <= 0 )
+					continue;
+
+				sgn = sign_of_int( b3 );
+				a3 -= sgn;
+				del0 -= 5 * ((sgn * b3) >> denshift);
+				if ( del0 <= 0 )
+					continue;
+
+				sgn = sign_of_int( b2 );
+				a2 -= sgn;
+				del0 -= 6 * ((sgn * b2) >> denshift);
+				if ( del0 <= 0 )
+					continue;
+
+				sgn = sign_of_int( b1 );
+				a1 -= sgn;
+				del0 -= 7 * ((sgn * b1) >> denshift);
+				if ( del0 <= 0 )
+					continue;
+
+				a0 -= sign_of_int( b0 );
+			}
+			else if ( sg < 0 )
+			{
+				// note: to avoid unnecessary negations, we flip the value of "sgn"
+				sgn = -sign_of_int( b7 );
+				a7 -= sgn;
+				del0 -= 1 * ((sgn * b7) >> denshift);
+				if ( del0 >= 0 )
+					continue;
+
+				sgn = -sign_of_int( b6 );
+				a6 -= sgn;
+				del0 -= 2 * ((sgn * b6) >> denshift);
+				if ( del0 >= 0 )
+					continue;
+
+				sgn = -sign_of_int( b5 );
+				a5 -= sgn;
+				del0 -= 3 * ((sgn * b5) >> denshift);
+				if ( del0 >= 0 )
+					continue;
+
+				sgn = -sign_of_int( b4 );
+				a4 -= sgn;
+				del0 -= 4 * ((sgn * b4) >> denshift);
+				if ( del0 >= 0 )
+					continue;
+
+				sgn = -sign_of_int( b3 );
+				a3 -= sgn;
+				del0 -= 5 * ((sgn * b3) >> denshift);
+				if ( del0 >= 0 )
+					continue;
+
+				sgn = -sign_of_int( b2 );
+				a2 -= sgn;
+				del0 -= 6 * ((sgn * b2) >> denshift);
+				if ( del0 >= 0 )
+					continue;
+
+				sgn = -sign_of_int( b1 );
+				a1 -= sgn;
+				del0 -= 7 * ((sgn * b1) >> denshift);
+				if ( del0 >= 0 )
+					continue;
+
+				a0 += sign_of_int( b0 );
+			}
+		}
+
+		coefs[0] = a0;
+		coefs[1] = a1;
+		coefs[2] = a2;
+		coefs[3] = a3;
+		coefs[4] = a4;
+		coefs[5] = a5;
+		coefs[6] = a6;
+		coefs[7] = a7;
+	}
+	else
+	{
+		// general case
+		for ( j = lim; j < num; j++ )
+		{
+			LOOP_ALIGN
+
+			sum1 = 0;
+			pout = out + j - 1;
+			top = out[j-lim];
+
+			for ( k = 0; k < numactive; k++ )
+				sum1 += coefs[k] * (pout[-k] - top);
+
+			del = pc1[j];
+			del0 = del;
+			sg = sign_of_int( del );
+			del += top + ((sum1 + denhalf) >> denshift);
+			out[j] = (del << chanshift) >> chanshift;
+
+			if ( sg > 0 )
+			{
+				for ( k = (numactive - 1); k >= 0; k-- )
+				{
+					dd = top - pout[-k];
+					sgn = sign_of_int( dd );
+					coefs[k] -= sgn;
+					del0 -= (numactive - k) * ((sgn * dd) >> denshift);
+					if ( del0 <= 0 )
+						break;
+				}
+			}
+			else if ( sg < 0 )
+			{
+				for ( k = (numactive - 1); k >= 0; k-- )
+				{
+					dd = top - pout[-k];
+					sgn = sign_of_int( dd );
+					coefs[k] += sgn;
+					del0 -= (numactive - k) * ((-sgn * dd) >> denshift);
+					if ( del0 >= 0 )
+						break;
+				}
+			}
+		}
+	}
+}
diff --git a/libs/libsndfile/src/ALAC/dp_enc.c b/libs/libsndfile/src/ALAC/dp_enc.c
new file mode 100644
index 0000000000..f81cdba520
--- /dev/null
+++ b/libs/libsndfile/src/ALAC/dp_enc.c
@@ -0,0 +1,380 @@
+/*
+ * Copyright (c) 2011 Apple Inc. All rights reserved.
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_START@
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_END@
+ */
+
+/*
+	File:		dp_enc.c
+
+	Contains:	Dynamic Predictor encode routines
+
+	Copyright:	(c) 2001-2011 Apple, Inc.
+*/
+
+#include "dplib.h"
+#include 
+
+#if __GNUC__
+#define ALWAYS_INLINE		__attribute__((always_inline))
+#else
+#define ALWAYS_INLINE
+#endif
+
+#define LOOP_ALIGN
+
+void init_coefs( int16_t * coefs, uint32_t denshift, int32_t numPairs )
+{
+	int32_t		k;
+	int32_t		den = 1 << denshift;
+
+	coefs[0] = (AINIT * den) >> 4;
+	coefs[1] = (BINIT * den) >> 4;
+	coefs[2] = (CINIT * den) >> 4;
+	for ( k = 3; k < numPairs; k++ )
+		coefs[k]  = 0;
+}
+
+void copy_coefs( int16_t * srcCoefs, int16_t * dstCoefs, int32_t numPairs )
+{
+	int32_t k;
+
+	for ( k = 0; k < numPairs; k++ )
+		dstCoefs[k] = srcCoefs[k];
+}
+
+static inline int32_t ALWAYS_INLINE sign_of_int( int32_t i )
+{
+    int32_t negishift;
+
+    negishift = ((uint32_t)-i) >> 31;
+    return negishift | (i >> 31);
+}
+
+void pc_block( int32_t * in, int32_t * pc1, int32_t num, int16_t * coefs, int32_t numactive, uint32_t chanbits, uint32_t denshift )
+{
+	register int16_t	a0, a1, a2, a3;
+	register int32_t	b0, b1, b2, b3;
+	int32_t					j, k, lim;
+	int32_t *			pin;
+	int32_t				sum1, dd;
+	int32_t				sg, sgn;
+	int32_t				top;
+	int32_t				del, del0;
+	uint32_t			chanshift = 32 - chanbits;
+	int32_t				denhalf = 1 << (denshift - 1);
+
+	pc1[0] = in[0];
+	if ( numactive == 0 )
+	{
+		// just copy if numactive == 0 (but don't bother if in/out pointers the same)
+		if ( (num > 1) && (in != pc1) )
+			memcpy( &pc1[1], &in[1], (num - 1) * sizeof(int32_t) );
+		return;
+	}
+	if ( numactive == 31 )
+	{
+		// short-circuit if numactive == 31
+		for( j = 1; j < num; j++ )
+		{
+			del = in[j] - in[j-1];
+			pc1[j] = (del << chanshift) >> chanshift;
+		}
+		return;
+	}
+
+	for ( j = 1; j <= numactive; j++ )
+	{
+		del = in[j] - in[j-1];
+		pc1[j] = (del << chanshift) >> chanshift;
+	}
+
+	lim = numactive + 1;
+
+	if ( numactive == 4 )
+	{
+		// optimization for numactive == 4
+		a0 = coefs[0];
+		a1 = coefs[1];
+		a2 = coefs[2];
+		a3 = coefs[3];
+
+		for ( j = lim; j < num; j++ )
+		{
+			LOOP_ALIGN
+
+			top = in[j - lim];
+			pin = in + j - 1;
+
+			b0 = top - pin[0];
+			b1 = top - pin[-1];
+			b2 = top - pin[-2];
+			b3 = top - pin[-3];
+
+			sum1 = (denhalf - a0 * b0 - a1 * b1 - a2 * b2 - a3 * b3) >> denshift;
+
+			del = in[j] - top - sum1;
+			del = (del << chanshift) >> chanshift;
+			pc1[j] = del;
+			del0 = del;
+
+			sg = sign_of_int(del);
+			if ( sg > 0 )
+			{
+				sgn = sign_of_int( b3 );
+				a3 -= sgn;
+				del0 -= (4 - 3) * ((sgn * b3) >> denshift);
+				if ( del0 <= 0 )
+					continue;
+
+				sgn = sign_of_int( b2 );
+				a2 -= sgn;
+				del0 -= (4 - 2) * ((sgn * b2) >> denshift);
+				if ( del0 <= 0 )
+					continue;
+
+				sgn = sign_of_int( b1 );
+				a1 -= sgn;
+				del0 -= (4 - 1) * ((sgn * b1) >> denshift);
+				if ( del0 <= 0 )
+					continue;
+
+				a0 -= sign_of_int( b0 );
+			}
+			else if ( sg < 0 )
+			{
+				// note: to avoid unnecessary negations, we flip the value of "sgn"
+				sgn = -sign_of_int( b3 );
+				a3 -= sgn;
+				del0 -= (4 - 3) * ((sgn * b3) >> denshift);
+				if ( del0 >= 0 )
+					continue;
+
+				sgn = -sign_of_int( b2 );
+				a2 -= sgn;
+				del0 -= (4 - 2) * ((sgn * b2) >> denshift);
+				if ( del0 >= 0 )
+					continue;
+
+				sgn = -sign_of_int( b1 );
+				a1 -= sgn;
+				del0 -= (4 - 1) * ((sgn * b1) >> denshift);
+				if ( del0 >= 0 )
+					continue;
+
+				a0 += sign_of_int( b0 );
+			}
+		}
+
+		coefs[0] = a0;
+		coefs[1] = a1;
+		coefs[2] = a2;
+		coefs[3] = a3;
+	}
+	else if ( numactive == 8 )
+	{
+		// optimization for numactive == 8
+		register int16_t	a4, a5, a6, a7;
+		register int32_t	b4, b5, b6, b7;
+
+		a0 = coefs[0];
+		a1 = coefs[1];
+		a2 = coefs[2];
+		a3 = coefs[3];
+		a4 = coefs[4];
+		a5 = coefs[5];
+		a6 = coefs[6];
+		a7 = coefs[7];
+
+		for ( j = lim; j < num; j++ )
+		{
+			LOOP_ALIGN
+
+			top = in[j - lim];
+			pin = in + j - 1;
+
+			b0 = top - (*pin--);
+			b1 = top - (*pin--);
+			b2 = top - (*pin--);
+			b3 = top - (*pin--);
+			b4 = top - (*pin--);
+			b5 = top - (*pin--);
+			b6 = top - (*pin--);
+			b7 = top - (*pin);
+			pin += 8;
+
+			sum1 = (denhalf - a0 * b0 - a1 * b1 - a2 * b2 - a3 * b3
+					- a4 * b4 - a5 * b5 - a6 * b6 - a7 * b7) >> denshift;
+
+			del = in[j] - top - sum1;
+			del = (del << chanshift) >> chanshift;
+			pc1[j] = del;
+			del0 = del;
+
+			sg = sign_of_int(del);
+			if ( sg > 0 )
+			{
+				sgn = sign_of_int( b7 );
+				a7 -= sgn;
+				del0 -= 1 * ((sgn * b7) >> denshift);
+				if ( del0 <= 0 )
+					continue;
+
+				sgn = sign_of_int( b6 );
+				a6 -= sgn;
+				del0 -= 2 * ((sgn * b6) >> denshift);
+				if ( del0 <= 0 )
+					continue;
+
+				sgn = sign_of_int( b5 );
+				a5 -= sgn;
+				del0 -= 3 * ((sgn * b5) >> denshift);
+				if ( del0 <= 0 )
+					continue;
+
+				sgn = sign_of_int( b4 );
+				a4 -= sgn;
+				del0 -= 4 * ((sgn * b4) >> denshift);
+				if ( del0 <= 0 )
+					continue;
+
+				sgn = sign_of_int( b3 );
+				a3 -= sgn;
+				del0 -= 5 * ((sgn * b3) >> denshift);
+				if ( del0 <= 0 )
+					continue;
+
+				sgn = sign_of_int( b2 );
+				a2 -= sgn;
+				del0 -= 6 * ((sgn * b2) >> denshift);
+				if ( del0 <= 0 )
+					continue;
+
+				sgn = sign_of_int( b1 );
+				a1 -= sgn;
+				del0 -= 7 * ((sgn * b1) >> denshift);
+				if ( del0 <= 0 )
+					continue;
+
+				a0 -= sign_of_int( b0 );
+			}
+			else if ( sg < 0 )
+			{
+				// note: to avoid unnecessary negations, we flip the value of "sgn"
+				sgn = -sign_of_int( b7 );
+				a7 -= sgn;
+				del0 -= 1 * ((sgn * b7) >> denshift);
+				if ( del0 >= 0 )
+					continue;
+
+				sgn = -sign_of_int( b6 );
+				a6 -= sgn;
+				del0 -= 2 * ((sgn * b6) >> denshift);
+				if ( del0 >= 0 )
+					continue;
+
+				sgn = -sign_of_int( b5 );
+				a5 -= sgn;
+				del0 -= 3 * ((sgn * b5) >> denshift);
+				if ( del0 >= 0 )
+					continue;
+
+				sgn = -sign_of_int( b4 );
+				a4 -= sgn;
+				del0 -= 4 * ((sgn * b4) >> denshift);
+				if ( del0 >= 0 )
+					continue;
+
+				sgn = -sign_of_int( b3 );
+				a3 -= sgn;
+				del0 -= 5 * ((sgn * b3) >> denshift);
+				if ( del0 >= 0 )
+					continue;
+
+				sgn = -sign_of_int( b2 );
+				a2 -= sgn;
+				del0 -= 6 * ((sgn * b2) >> denshift);
+				if ( del0 >= 0 )
+					continue;
+
+				sgn = -sign_of_int( b1 );
+				a1 -= sgn;
+				del0 -= 7 * ((sgn * b1) >> denshift);
+				if ( del0 >= 0 )
+					continue;
+
+				a0 += sign_of_int( b0 );
+			}
+		}
+
+		coefs[0] = a0;
+		coefs[1] = a1;
+		coefs[2] = a2;
+		coefs[3] = a3;
+		coefs[4] = a4;
+		coefs[5] = a5;
+		coefs[6] = a6;
+		coefs[7] = a7;
+	}
+	else
+	{
+//pc_block_general:
+		// general case
+		for ( j = lim; j < num; j++ )
+		{
+			LOOP_ALIGN
+
+			top = in[j - lim];
+			pin = in + j - 1;
+
+			sum1 = 0;
+			for ( k = 0; k < numactive; k++ )
+				sum1 -= coefs[k] * (top - pin[-k]);
+
+			del = in[j] - top - ((sum1 + denhalf) >> denshift);
+			del = (del << chanshift) >> chanshift;
+			pc1[j] = del;
+			del0 = del;
+
+			sg = sign_of_int( del );
+			if ( sg > 0 )
+			{
+				for ( k = (numactive - 1); k >= 0; k-- )
+				{
+					dd = top - pin[-k];
+					sgn = sign_of_int( dd );
+					coefs[k] -= sgn;
+					del0 -= (numactive - k) * ((sgn * dd) >> denshift);
+					if ( del0 <= 0 )
+						break;
+				}
+			}
+			else if ( sg < 0 )
+			{
+				for ( k = (numactive - 1); k >= 0; k-- )
+				{
+					dd = top - pin[-k];
+					sgn = sign_of_int( dd );
+					coefs[k] += sgn;
+					del0 -= (numactive - k) * ((-sgn * dd) >> denshift);
+					if ( del0 >= 0 )
+						break;
+				}
+			}
+		}
+	}
+}
diff --git a/libs/libsndfile/src/ALAC/dplib.h b/libs/libsndfile/src/ALAC/dplib.h
new file mode 100644
index 0000000000..37d3353313
--- /dev/null
+++ b/libs/libsndfile/src/ALAC/dplib.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2011 Apple Inc. All rights reserved.
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_START@
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_END@
+ */
+
+/*
+	File:		dplib.h
+
+	Contains:	Dynamic Predictor routines
+
+	Copyright:	Copyright (C) 2001-2011 Apple, Inc.
+*/
+
+#ifndef __DPLIB_H__
+#define __DPLIB_H__
+
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// defines
+
+#define DENSHIFT_MAX  15
+#define DENSHIFT_DEFAULT 9
+#define AINIT 38
+#define BINIT (-29)
+#define CINIT (-2)
+#define NUMCOEPAIRS 16
+
+// prototypes
+
+void init_coefs( int16_t * coefs, uint32_t denshift, int32_t numPairs );
+void copy_coefs( int16_t * srcCoefs, int16_t * dstCoefs, int32_t numPairs );
+
+// NOTE: these routines read at least "numactive" samples so the i/o buffers must be at least that big
+
+void pc_block( int32_t * in, int32_t * pc, int32_t num, int16_t * coefs, int32_t numactive, uint32_t chanbits, uint32_t denshift );
+void unpc_block( int32_t * pc, int32_t * out, int32_t num, int16_t * coefs, int32_t numactive, uint32_t chanbits, uint32_t denshift );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* __DPLIB_H__ */
diff --git a/libs/libsndfile/src/ALAC/matrix_dec.c b/libs/libsndfile/src/ALAC/matrix_dec.c
new file mode 100644
index 0000000000..cb812d1d4d
--- /dev/null
+++ b/libs/libsndfile/src/ALAC/matrix_dec.c
@@ -0,0 +1,320 @@
+/*
+ * Copyright (c) 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2012 Erik de Castro Lopo 
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_START@
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_END@
+ */
+
+/*
+	File:		matrix_dec.c
+
+	Contains:	ALAC mixing/matrixing decode routines.
+
+	Copyright:	(c) 2004-2011 Apple, Inc.
+*/
+
+#include "matrixlib.h"
+#include "ALACAudioTypes.h"
+
+// up to 24-bit "offset" macros for the individual bytes of a 20/24-bit word
+#if TARGET_RT_BIG_ENDIAN
+	#define LBYTE	2
+	#define MBYTE	1
+	#define HBYTE	0
+#else
+	#define LBYTE	0
+	#define MBYTE	1
+	#define HBYTE	2
+#endif
+
+/*
+    There is no plain middle-side option; instead there are various mixing
+    modes including middle-side, each lossless, as embodied in the mix()
+    and unmix() functions.  These functions exploit a generalized middle-side
+    transformation:
+
+    u := [(rL + (m-r)R)/m];
+    v := L - R;
+
+    where [ ] denotes integer floor.  The (lossless) inverse is
+
+    L = u + v - [rV/m];
+    R = L - v;
+*/
+
+// 16-bit routines
+
+void unmix16( int32_t * u, int32_t * v, int32_t * out, uint32_t stride, int32_t numSamples, int32_t mixbits, int32_t mixres )
+{
+	int32_t 	j;
+
+	if ( mixres != 0 )
+	{
+		/* matrixed stereo */
+		for ( j = 0; j < numSamples; j++ )
+		{
+			int32_t		l, r;
+
+			l = u[j] + v[j] - ((mixres * v[j]) >> mixbits);
+			r = l - v[j];
+
+			out[0] = l << 16;
+			out[1] = r << 16;
+			out += stride;
+		}
+	}
+	else
+	{
+		/* Conventional separated stereo. */
+		for ( j = 0; j < numSamples; j++ )
+		{
+			out[0] = u[j] << 16;
+			out[1] = v[j] << 16;
+			out += stride;
+		}
+	}
+}
+
+// 20-bit routines
+// - the 20 bits of data are left-justified in 3 bytes of storage but right-aligned for input/output predictor buffers
+
+void unmix20( int32_t * u, int32_t * v, int32_t * out, uint32_t stride, int32_t numSamples, int32_t mixbits, int32_t mixres )
+{
+	int32_t 	j;
+
+	if ( mixres != 0 )
+	{
+		/* matrixed stereo */
+		for ( j = 0; j < numSamples; j++ )
+		{
+			int32_t		l, r;
+
+			l = u[j] + v[j] - ((mixres * v[j]) >> mixbits);
+			r = l - v[j];
+
+			out[0] = l << 12;
+			out[1] = r << 12;
+			out += stride;
+		}
+	}
+	else
+	{
+		/* Conventional separated stereo. */
+		for ( j = 0; j < numSamples; j++ )
+		{
+			out[0] = u[j] << 12;
+			out[1] = v[j] << 12;
+			out += stride;
+		}
+	}
+}
+
+// 24-bit routines
+// - the 24 bits of data are right-justified in the input/output predictor buffers
+
+void unmix24( int32_t * u, int32_t * v, int32_t * out, uint32_t stride, int32_t numSamples,
+				int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted )
+{
+	int32_t		shift = bytesShifted * 8;
+	int32_t		l, r;
+	int32_t 		j, k;
+
+	if ( mixres != 0 )
+	{
+		/* matrixed stereo */
+		if ( bytesShifted != 0 )
+		{
+			for ( j = 0, k = 0; j < numSamples; j++, k += 2 )
+			{
+				l = u[j] + v[j] - ((mixres * v[j]) >> mixbits);
+				r = l - v[j];
+
+				l = (l << shift) | (uint32_t) shiftUV[k + 0];
+				r = (r << shift) | (uint32_t) shiftUV[k + 1];
+
+				out[0] = l << 8;
+				out[1] = r << 8;
+				out += stride;
+			}
+		}
+		else
+		{
+			for ( j = 0; j < numSamples; j++ )
+			{
+				l = u[j] + v[j] - ((mixres * v[j]) >> mixbits);
+				r = l - v[j];
+
+				out[0] = l << 8;
+				out[1] = r << 8;
+				out += stride;
+			}
+		}
+	}
+	else
+	{
+		/* Conventional separated stereo. */
+		if ( bytesShifted != 0 )
+		{
+			for ( j = 0, k = 0; j < numSamples; j++, k += 2 )
+			{
+				l = u[j];
+				r = v[j];
+
+				l = (l << shift) | (uint32_t) shiftUV[k + 0];
+				r = (r << shift) | (uint32_t) shiftUV[k + 1];
+
+				out[0] = l << 8;
+				out[1] = r << 8;
+				out += stride;
+			}
+		}
+		else
+		{
+			for ( j = 0; j < numSamples; j++ )
+			{
+				out[0] = u[j] << 8;
+				out[1] = v[j] << 8;
+				out += stride;
+			}
+		}
+	}
+}
+
+// 32-bit routines
+// - note that these really expect the internal data width to be < 32 but the arrays are 32-bit
+// - otherwise, the calculations might overflow into the 33rd bit and be lost
+// - therefore, these routines deal with the specified "unused lower" bytes in the "shift" buffers
+
+void unmix32( int32_t * u, int32_t * v, int32_t * out, uint32_t stride, int32_t numSamples,
+				int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted )
+{
+	int32_t		shift = bytesShifted * 8;
+	int32_t		l, r;
+	int32_t 	j, k;
+
+	if ( mixres != 0 )
+	{
+		//Assert( bytesShifted != 0 );
+
+		/* matrixed stereo with shift */
+		for ( j = 0, k = 0; j < numSamples; j++, k += 2 )
+		{
+			int32_t		lt, rt;
+
+			lt = u[j];
+			rt = v[j];
+
+			l = lt + rt - ((mixres * rt) >> mixbits);
+			r = l - rt;
+
+			out[0] = (l << shift) | (uint32_t) shiftUV[k + 0];
+			out[1] = (r << shift) | (uint32_t) shiftUV[k + 1];
+			out += stride;
+		}
+	}
+	else
+	{
+		if ( bytesShifted == 0 )
+		{
+			/* interleaving w/o shift */
+			for ( j = 0; j < numSamples; j++ )
+			{
+				out[0] = u[j];
+				out[1] = v[j];
+				out += stride;
+			}
+		}
+		else
+		{
+			/* interleaving with shift */
+			for ( j = 0, k = 0; j < numSamples; j++, k += 2 )
+			{
+				out[0] = (u[j] << shift) | (uint32_t) shiftUV[k + 0];
+				out[1] = (v[j] << shift) | (uint32_t) shiftUV[k + 1];
+				out += stride;
+			}
+		}
+	}
+}
+
+// 20/24-bit <-> 32-bit helper routines (not really matrixing but convenient to put here)
+
+void copyPredictorTo24( int32_t * in, int32_t * out, uint32_t stride, int32_t numSamples )
+{
+	int32_t		j;
+
+	for ( j = 0; j < numSamples; j++ )
+	{
+		out[0] = in[j] << 8;
+		out += stride;
+	}
+}
+
+void copyPredictorTo24Shift( int32_t * in, uint16_t * shift, int32_t * out, uint32_t stride, int32_t numSamples, int32_t bytesShifted )
+{
+	int32_t		shiftVal = bytesShifted * 8;
+	int32_t		j;
+
+	//Assert( bytesShifted != 0 );
+
+	for ( j = 0; j < numSamples; j++ )
+	{
+		int32_t		val = in[j];
+
+		val = (val << shiftVal) | (uint32_t) shift[j];
+		out[0] = val << 8;
+		out += stride;
+	}
+}
+
+void copyPredictorTo20( int32_t * in, int32_t * out, uint32_t stride, int32_t numSamples )
+{
+	int32_t		j;
+
+	// 32-bit predictor values are right-aligned but 20-bit output values should be left-aligned
+	// in the 24-bit output buffer
+	for ( j = 0; j < numSamples; j++ )
+	{
+		out[0] = in[j] << 12;
+		out += stride;
+	}
+}
+
+void copyPredictorTo32( int32_t * in, int32_t * out, uint32_t stride, int32_t numSamples )
+{
+	int32_t			i, j;
+
+	// this is only a subroutine to abstract the "iPod can only output 16-bit data" problem
+	for ( i = 0, j = 0; i < numSamples; i++, j += stride )
+		out[j] = in[i] << 8;
+}
+
+void copyPredictorTo32Shift( int32_t * in, uint16_t * shift, int32_t * out, uint32_t stride, int32_t numSamples, int32_t bytesShifted )
+{
+	int32_t *		op = out;
+	uint32_t		shiftVal = bytesShifted * 8;
+	int32_t			j;
+
+	//Assert( bytesShifted != 0 );
+
+	// this is only a subroutine to abstract the "iPod can only output 16-bit data" problem
+	for ( j = 0; j < numSamples; j++ )
+	{
+		op[0] = (in[j] << shiftVal) | (uint32_t) shift[j];
+		op += stride;
+	}
+}
diff --git a/libs/libsndfile/src/ALAC/matrix_enc.c b/libs/libsndfile/src/ALAC/matrix_enc.c
new file mode 100644
index 0000000000..5b4d1589eb
--- /dev/null
+++ b/libs/libsndfile/src/ALAC/matrix_enc.c
@@ -0,0 +1,272 @@
+/*
+ * Copyright (c) 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2012 Erik de Castro Lopo 
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_START@
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_END@
+ */
+
+/*
+	File:		matrix_enc.c
+
+	Contains:	ALAC mixing/matrixing encode routines.
+
+	Copyright:	(c) 2004-2011 Apple, Inc.
+*/
+
+#include "matrixlib.h"
+#include "ALACAudioTypes.h"
+
+/*
+    There is no plain middle-side option; instead there are various mixing
+    modes including middle-side, each lossless, as embodied in the mix()
+    and unmix() functions.  These functions exploit a generalized middle-side
+    transformation:
+
+    u := [(rL + (m-r)R)/m];
+    v := L - R;
+
+    where [ ] denotes integer floor.  The (lossless) inverse is
+
+    L = u + v - [rV/m];
+    R = L - v;
+*/
+
+// 16-bit routines
+
+void mix16( int32_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, int32_t mixbits, int32_t mixres )
+{
+	int32_t		j;
+
+	if ( mixres != 0 )
+	{
+		int32_t		mod = 1 << mixbits;
+		int32_t		m2;
+
+		/* matrixed stereo */
+		m2 = mod - mixres;
+		for ( j = 0; j < numSamples; j++ )
+		{
+			int32_t		l, r;
+
+			l = in[0] >> 16;
+			r = in[1] >> 16;
+			in += stride;
+			u[j] = (mixres * l + m2 * r) >> mixbits;
+			v[j] = l - r;
+		}
+	}
+	else
+	{
+		/* Conventional separated stereo. */
+		for ( j = 0; j < numSamples; j++ )
+		{
+			u[j] = in[0] >> 16;
+			v[j] = in[1] >> 16;
+			in += stride;
+		}
+	}
+}
+
+// 20-bit routines
+// - the 20 bits of data are left-justified in 3 bytes of storage but right-aligned for input/output predictor buffers
+
+void mix20( int32_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, int32_t mixbits, int32_t mixres )
+{
+	int32_t		l, r;
+	int32_t		j;
+
+	if ( mixres != 0 )
+	{
+		/* matrixed stereo */
+		int32_t		mod = 1 << mixbits;
+		int32_t		m2 = mod - mixres;
+
+		for ( j = 0; j < numSamples; j++ )
+		{
+			l = in[0] >> 12;
+			r = in[1] >> 12;
+			in += stride;
+
+			u[j] = (mixres * l + m2 * r) >> mixbits;
+			v[j] = l - r;
+		}
+	}
+	else
+	{
+		/* Conventional separated stereo. */
+		for ( j = 0; j < numSamples; j++ )
+		{
+			u[j] = in[0] >> 12;
+			v[j] = in[1] >> 12;
+			in += stride;
+		}
+	}
+}
+
+// 24-bit routines
+// - the 24 bits of data are right-justified in the input/output predictor buffers
+
+void mix24( int32_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples,
+			int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted )
+{
+	int32_t		l, r;
+	int32_t		shift = bytesShifted * 8;
+	uint32_t	mask  = (1ul << shift) - 1;
+	int32_t		j, k;
+
+	if ( mixres != 0 )
+	{
+		/* matrixed stereo */
+		int32_t		mod = 1 << mixbits;
+		int32_t		m2 = mod - mixres;
+
+		if ( bytesShifted != 0 )
+		{
+			for ( j = 0, k = 0; j < numSamples; j++, k += 2 )
+			{
+				l = in[0] >> 8;
+				r = in[1] >> 8;
+				in += stride;
+
+				shiftUV[k + 0] = (uint16_t)(l & mask);
+				shiftUV[k + 1] = (uint16_t)(r & mask);
+
+				l >>= shift;
+				r >>= shift;
+
+				u[j] = (mixres * l + m2 * r) >> mixbits;
+				v[j] = l - r;
+			}
+		}
+		else
+		{
+			for ( j = 0; j < numSamples; j++ )
+			{
+				l = in[0] >> 8;
+				r = in[1] >> 8;
+				in += stride;
+
+				u[j] = (mixres * l + m2 * r) >> mixbits;
+				v[j] = l - r;
+			}
+		}
+	}
+	else
+	{
+		/* Conventional separated stereo. */
+		if ( bytesShifted != 0 )
+		{
+			for ( j = 0, k = 0; j < numSamples; j++, k += 2 )
+			{
+				l = in[0] >> 8;
+				r = in[1] >> 8;
+				in += stride;
+
+				shiftUV[k + 0] = (uint16_t)(l & mask);
+				shiftUV[k + 1] = (uint16_t)(r & mask);
+
+				l >>= shift;
+				r >>= shift;
+
+				u[j] = l;
+				v[j] = r;
+			}
+		}
+		else
+		{
+			for ( j = 0; j < numSamples; j++ )
+			{
+				l = in[0] >> 8;
+				r = in[1] >> 8;
+				in += stride;
+			}
+		}
+	}
+}
+
+// 32-bit routines
+// - note that these really expect the internal data width to be < 32 but the arrays are 32-bit
+// - otherwise, the calculations might overflow into the 33rd bit and be lost
+// - therefore, these routines deal with the specified "unused lower" bytes in the "shift" buffers
+
+void mix32( int32_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples,
+			int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted )
+{
+	int32_t		shift = bytesShifted * 8;
+	uint32_t	mask  = (1ul << shift) - 1;
+	int32_t		l, r;
+	int32_t		j, k;
+
+	if ( mixres != 0 )
+	{
+		int32_t		mod = 1 << mixbits;
+		int32_t		m2;
+
+		//Assert( bytesShifted != 0 );
+
+		/* matrixed stereo with shift */
+		m2 = mod - mixres;
+		for ( j = 0, k = 0; j < numSamples; j++, k += 2 )
+		{
+			l = in[0];
+			r = in[1];
+			in += stride;
+
+			shiftUV[k + 0] = (uint16_t)(l & mask);
+			shiftUV[k + 1] = (uint16_t)(r & mask);
+
+			l >>= shift;
+			r >>= shift;
+
+			u[j] = (mixres * l + m2 * r) >> mixbits;
+			v[j] = l - r;
+		}
+	}
+	else
+	{
+		if ( bytesShifted == 0 )
+		{
+			/* de-interleaving w/o shift */
+			for ( j = 0; j < numSamples; j++ )
+			{
+				u[j] = in[0];
+				v[j] = in[1];
+				in += stride;
+			}
+		}
+		else
+		{
+			/* de-interleaving with shift */
+			for ( j = 0, k = 0; j < numSamples; j++, k += 2 )
+			{
+				l = in[0];
+				r = in[1];
+				in += stride;
+
+				shiftUV[k + 0] = (uint16_t)(l & mask);
+				shiftUV[k + 1] = (uint16_t)(r & mask);
+
+				l >>= shift;
+				r >>= shift;
+
+				u[j] = l;
+				v[j] = r;
+			}
+		}
+	}
+}
+
diff --git a/libs/libsndfile/src/ALAC/matrixlib.h b/libs/libsndfile/src/ALAC/matrixlib.h
new file mode 100644
index 0000000000..d405cbcd20
--- /dev/null
+++ b/libs/libsndfile/src/ALAC/matrixlib.h
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2012 Erik de Castro Lopo 
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_START@
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @APPLE_APACHE_LICENSE_HEADER_END@
+ */
+
+/*
+	File:		matrixlib.h
+
+	Contains:	ALAC mixing/matrixing routines to/from 32-bit predictor buffers.
+
+	Copyright:	Copyright (C) 2004 to 2011 Apple, Inc.
+*/
+
+#ifndef __MATRIXLIB_H
+#define __MATRIXLIB_H
+
+#pragma once
+
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// 16-bit routines
+void	mix16( int32_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, int32_t mixbits, int32_t mixres );
+void	unmix16( int32_t * u, int32_t * v, int32_t * out, uint32_t stride, int32_t numSamples, int32_t mixbits, int32_t mixres );
+
+// 20-bit routines
+void	mix20( int32_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, int32_t mixbits, int32_t mixres );
+void	unmix20( int32_t * u, int32_t * v, int32_t * out, uint32_t stride, int32_t numSamples, int32_t mixbits, int32_t mixres );
+
+// 24-bit routines
+// - 24-bit data sometimes compresses better by shifting off the bottom byte so these routines deal with
+//	 the specified "unused lower bytes" in the combined "shift" buffer
+void	mix24( int32_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples,
+				int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted );
+void	unmix24( int32_t * u, int32_t * v, int32_t * out, uint32_t stride, int32_t numSamples,
+				 int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted );
+
+// 32-bit routines
+// - note that these really expect the internal data width to be < 32-bit but the arrays are 32-bit
+// - otherwise, the calculations might overflow into the 33rd bit and be lost
+// - therefore, these routines deal with the specified "unused lower" bytes in the combined "shift" buffer
+void	mix32( int32_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples,
+				int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted );
+void	unmix32( int32_t * u, int32_t * v, int32_t * out, uint32_t stride, int32_t numSamples,
+				 int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted );
+
+// 20/24/32-bit <-> 32-bit helper routines (not really matrixing but convenient to put here)
+void	copy20ToPredictor( int32_t * in, uint32_t stride, int32_t * out, int32_t numSamples );
+void	copy24ToPredictor( int32_t * in, uint32_t stride, int32_t * out, int32_t numSamples );
+
+void	copyPredictorTo24( int32_t * in, int32_t * out, uint32_t stride, int32_t numSamples );
+void	copyPredictorTo24Shift( int32_t * in, uint16_t * shift, int32_t * out, uint32_t stride, int32_t numSamples, int32_t bytesShifted );
+void	copyPredictorTo20( int32_t * in, int32_t * out, uint32_t stride, int32_t numSamples );
+
+void	copyPredictorTo32( int32_t * in, int32_t * out, uint32_t stride, int32_t numSamples );
+void	copyPredictorTo32Shift( int32_t * in, uint16_t * shift, int32_t * out, uint32_t stride, int32_t numSamples, int32_t bytesShifted );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* __MATRIXLIB_H */
diff --git a/libs/libsndfile/src/G72x/g72x.h b/libs/libsndfile/src/G72x/g72x.h
index 785a5d090d..d7631e6d8e 100644
--- a/libs/libsndfile/src/G72x/g72x.h
+++ b/libs/libsndfile/src/G72x/g72x.h
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2011 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
diff --git a/libs/libsndfile/src/G72x/g72x_test.c b/libs/libsndfile/src/G72x/g72x_test.c
index 3959efe69e..79cabce11b 100644
--- a/libs/libsndfile/src/G72x/g72x_test.c
+++ b/libs/libsndfile/src/G72x/g72x_test.c
@@ -1,21 +1,21 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
-**  
+** Copyright (C) 1999-2011 Erik de Castro Lopo 
+**
 ** 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 
+** along with this program; if not, write to the Free Software
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
- 
+
 #include 
 #include 
 #include 
@@ -77,20 +77,20 @@ main (int argc, char *argv [])
 	return 0 ;
 } /* main */
 
-static void 
+static void
 g721_test	(void)
 {
 	return ;
 } /* g721_test */
 
-static void 
+static void
 g723_test	(double margin)
 {	static double	orig_buffer [BUFFER_SIZE] ;
 	static short 	orig [BUFFER_SIZE] ;
 	static short 	data [BUFFER_SIZE] ;
 
 	G72x_STATE encoder_state, decoder_state ;
-	
+
 	long	k ;
 	int 	code, position, max_err ;
 
@@ -104,10 +104,10 @@ g723_test	(double margin)
 
 	memset (data, 0, BUFFER_SIZE * sizeof (short)) ;
 	memset (orig, 0, BUFFER_SIZE * sizeof (short)) ;
-	
+
 	printf ("    g723_test    : ") ;
 	fflush (stdout) ;
-	
+
 	gen_signal_double (orig_buffer, 32000.0, BUFFER_SIZE) ;
 	for (k = 0 ; k < BUFFER_SIZE ; k++)
 		orig [k] = (short) orig_buffer [k] ;
@@ -144,13 +144,13 @@ g723_test	(double margin)
 #define		SIGNAL_MAXVAL	30000.0
 #define		DECAY_COUNT		1000
 
-static void	
+static void
 gen_signal_double (double *gendata, double scale, int gendatalen)
 {	int		k, ramplen ;
 	double	amp = 0.0 ;
-	
+
 	ramplen = DECAY_COUNT ;
-	
+
 	for (k = 0 ; k < gendatalen ; k++)
 	{	if (k <= ramplen)
 			amp = scale * k / ((double) ramplen) ;
@@ -160,11 +160,11 @@ gen_signal_double (double *gendata, double scale, int gendatalen)
 		gendata [k] = amp * (0.4 * sin (33.3 * 2.0 * M_PI * ((double) (k+1)) / ((double) SAMPLE_RATE))
 						+ 0.3 * cos (201.1 * 2.0 * M_PI * ((double) (k+1)) / ((double) SAMPLE_RATE))) ;
 		} ;
-	
+
 	return ;
 } /* gen_signal_double */
 
-static int 
+static int
 error_function (double data, double orig, double margin)
 {	double error ;
 
@@ -174,7 +174,7 @@ error_function (double data, double orig, double margin)
 		error = fabs (data - orig) / 3000.0 ;
 	else
 		error = fabs (data - orig) / fabs (orig) ;
-		
+
 	if (error > margin)
 	{	printf ("\n\n*******************\nError : %f\n", error) ;
 		return 1 ;
@@ -182,21 +182,21 @@ error_function (double data, double orig, double margin)
 	return 0 ;
 } /* error_function */
 
-static int		
+static int
 oct_save_short	(short *a, short *b, int len)
 {	FILE 	*file ;
 	int		k ;
 
 	if (! (file = fopen ("error.dat", "w")))
 		return 1 ;
-		
+
 	fprintf (file, "# Not created by Octave\n") ;
-	
+
 	fprintf (file, "# name: a\n") ;
 	fprintf (file, "# type: matrix\n") ;
 	fprintf (file, "# rows: %d\n", len) ;
 	fprintf (file, "# columns: 1\n") ;
-	
+
 	for (k = 0 ; k < len ; k++)
 		fprintf (file, "% d\n", a [k]) ;
 
@@ -204,7 +204,7 @@ oct_save_short	(short *a, short *b, int len)
 	fprintf (file, "# type: matrix\n") ;
 	fprintf (file, "# rows: %d\n", len) ;
 	fprintf (file, "# columns: 1\n") ;
-	
+
 	for (k = 0 ; k < len ; k++)
 		fprintf (file, "% d\n", b [k]) ;
 
diff --git a/libs/libsndfile/src/Makefile.am b/libs/libsndfile/src/Makefile.am
index 1297b360f7..090489abf3 100644
--- a/libs/libsndfile/src/Makefile.am
+++ b/libs/libsndfile/src/Makefile.am
@@ -1,100 +1,134 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = GSM610 G72x
+AUTOMAKE_OPTIONS = subdir-objects
 
-INCLUDES = @EXTERNAL_CFLAGS@
+AM_CPPFLAGS = @EXTERNAL_CFLAGS@
 
 lib_LTLIBRARIES = libsndfile.la
 include_HEADERS = sndfile.hh
 nodist_include_HEADERS = sndfile.h
 
-noinst_LTLIBRARIES = libcommon.la
+noinst_LTLIBRARIES =  GSM610/libgsm.la G72x/libg72x.la ALAC/libalac.la libcommon.la
 
 OS_SPECIFIC_CFLAGS = @OS_SPECIFIC_CFLAGS@
 OS_SPECIFIC_LINKS = @OS_SPECIFIC_LINKS@
 
-SYMBOL_FILES = Symbols.linux Symbols.darwin libsndfile-1.def Symbols.os2
+SYMBOL_FILES = Symbols.gnu-binutils Symbols.darwin libsndfile-1.def Symbols.os2 Symbols.static
 
 EXTRA_DIST = sndfile.h.in config.h.in test_endswap.tpl test_endswap.def \
-			$(SYMBOL_FILES) create_symbols_file.py binheader_writef_check.py
+			$(SYMBOL_FILES) create_symbols_file.py binheader_writef_check.py \
+			GSM610/README GSM610/COPYRIGHT GSM610/ChangeLog \
+			G72x/README G72x/README.original G72x/ChangeLog \
+			make-static-lib-hidden-privates.sh
 
-noinst_HEADERS = common.h sfconfig.h sfendian.h wav_w64.h sf_unistd.h
+noinst_HEADERS = common.h sfconfig.h sfendian.h wav_w64.h sf_unistd.h ogg.h chanmap.h
 
-noinst_PROGRAMS =
+check_PROGRAMS = test_main G72x/g72x_test
 
 COMMON = common.c file_io.c command.c pcm.c ulaw.c alaw.c float32.c \
 		double64.c ima_adpcm.c ms_adpcm.c gsm610.c dwvw.c vox_adpcm.c \
-		interleave.c strings.c dither.c broadcast.c audio_detect.c \
- 		ima_oki_adpcm.c ima_oki_adpcm.h chunk.c
+		interleave.c strings.c dither.c cart.c broadcast.c audio_detect.c \
+ 		ima_oki_adpcm.c ima_oki_adpcm.h alac.c chunk.c ogg.c chanmap.c \
+		windows.c id3.c $(WIN_VERSION_FILE)
 
 FILESPECIFIC = sndfile.c aiff.c au.c avr.c caf.c dwd.c flac.c g72x.c htk.c ircam.c \
-		macbinary3.c macos.c mat4.c mat5.c nist.c ogg.c paf.c pvf.c raw.c rx2.c sd2.c \
-		sds.c svx.c txw.c voc.c wve.c w64.c wav_w64.c wav.c xi.c mpc2k.c rf64.c
+		macbinary3.c macos.c mat4.c mat5.c nist.c paf.c pvf.c raw.c rx2.c sd2.c \
+		sds.c svx.c txw.c voc.c wve.c w64.c wav_w64.c wav.c xi.c mpc2k.c rf64.c \
+		ogg_vorbis.c ogg_speex.c ogg_pcm.c ogg_opus.c
 
+CLEANFILES = *~ *.exe G72x/*.exe
+
+if USE_WIN_VERSION_FILE
+WIN_VERSION_FILE = version-metadata.rc
+else
+WIN_VERSION_FILE =
+endif
+
+#===============================================================================
 # MinGW requires -no-undefined if a DLL is to be built.
 libsndfile_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@ @SHLIB_VERSION_ARG@
 libsndfile_la_SOURCES = $(FILESPECIFIC) $(noinst_HEADERS)
 nodist_libsndfile_la_SOURCES = $(nodist_include_HEADERS)
-libsndfile_la_LIBADD = libcommon.la GSM610/libgsm.la G72x/libg72x.la \
-		@EXTERNAL_LIBS@ -lm
+libsndfile_la_LIBADD = GSM610/libgsm.la G72x/libg72x.la ALAC/libalac.la \
+		libcommon.la @EXTERNAL_LIBS@ -lm
 
 libcommon_la_SOURCES = $(COMMON)
 
-#test_main_SOURCES = test_main.c test_main.h test_conversions.c test_float.c test_endswap.c \
-#					test_audio_detect.c test_log_printf.c test_file_io.c test_ima_oki_adpcm.c
-#test_main_LDADD = libcommon.la
-#
-#
-#test_endswap.c: test_endswap.def test_endswap.tpl
-#	autogen --writable test_endswap.def
+#======================================================================
+# Subdir libraries.
 
-genfiles : $(SYMBOL_FILES)
+GSM610_libgsm_la_SOURCES = GSM610/config.h GSM610/gsm.h GSM610/gsm610_priv.h \
+		GSM610/add.c GSM610/code.c GSM610/decode.c GSM610/gsm_create.c \
+		GSM610/gsm_decode.c GSM610/gsm_destroy.c GSM610/gsm_encode.c \
+		GSM610/gsm_option.c GSM610/long_term.c GSM610/lpc.c GSM610/preprocess.c \
+		GSM610/rpe.c GSM610/short_term.c GSM610/table.c
 
-# A single test programs.
-# It is not possible to place these in the tests/ directory because they
-# need access to the internals of the SF_PRIVATE struct.
+G72x_libg72x_la_SOURCES = G72x/g72x.h G72x/g72x_priv.h \
+		G72x/g721.c G72x/g723_16.c G72x/g723_24.c G72x/g723_40.c G72x/g72x.c
 
-check: $(noinst_PROGRAMS)
-	@echo
-	@echo
-	@echo
-	@echo "============================================================"
-	@if [ -x /usr/bin/python2.5 ]; then $(srcdir)/binheader_writef_check.py $(srcdir)/*.c ; fi
+ALAC_libalac_la_SOURCES = ALAC/ALACAudioTypes.h ALAC/ALACBitUtilities.h \
+		ALAC/EndianPortable.h ALAC/aglib.h ALAC/dplib.h ALAC/matrixlib.h \
+		ALAC/alac_codec.h \
+		ALAC/ALACBitUtilities.c ALAC/ag_dec.c \
+		ALAC/ag_enc.c ALAC/dp_dec.c ALAC/dp_enc.c ALAC/matrix_dec.c \
+		ALAC/matrix_enc.c ALAC/alac_decoder.c ALAC/alac_encoder.c
+
+#===============================================================================
+# Test programs.
+
+test_main_SOURCES = test_main.c test_main.h test_conversions.c test_float.c test_endswap.c \
+					test_audio_detect.c test_log_printf.c test_file_io.c test_ima_oki_adpcm.c \
+					test_strncpy_crlf.c test_broadcast_var.c test_cart_var.c
+test_main_LDADD = libcommon.la
+
+G72x_g72x_test_SOURCES = G72x/g72x_test.c
+G72x_g72x_test_LDADD = G72x/libg72x.la
+
+test_endswap.c: test_endswap.def test_endswap.tpl
+	cd $(srcdir) && autogen --writable test_endswap.def && cd $(abs_builddir)
+
+genfiles : $(SYMBOL_FILES) test_endswap.c
+
+check :
+	@if [ -x /usr/bin/python ]; then $(srcdir)/binheader_writef_check.py $(srcdir)/*.c ; fi
+	G72x/g72x_test$(EXEEXT) all
 	./test_main$(EXEEXT)
-	@echo "============================================================"
-	@echo
-	@echo
-	@echo
+
+# Need this target to force building of test programs.
+checkprograms : $(check_PROGRAMS)
 
 #======================================================================
 # Generate an OS specific Symbols files. This is done when the author
 # builds the distribution tarball. There should be not need for the
 # end user to create these files.
 
-Symbols.linux: create_symbols_file.py
-	./create_symbols_file.py linux $(VERSION) > $@
+Symbols.gnu-binutils: create_symbols_file.py
+	python $(srcdir)/create_symbols_file.py linux $(VERSION) > $@
 
 Symbols.darwin: create_symbols_file.py
-	./create_symbols_file.py darwin $(VERSION) > $@
+	python $(srcdir)/create_symbols_file.py darwin $(VERSION) > $@
 
 libsndfile-1.def: create_symbols_file.py
-	./create_symbols_file.py win32 $(VERSION) > $@
+	python $(srcdir)/create_symbols_file.py win32 $(VERSION) > $@
 
 Symbols.os2: create_symbols_file.py
-	./create_symbols_file.py os2 $(VERSION) > $@
+	python $(srcdir)/create_symbols_file.py os2 $(VERSION) > $@
+
+Symbols.static: create_symbols_file.py
+	python $(srcdir)/create_symbols_file.py static $(VERSION) > $@
 
 # Fake dependancy to force the creation of these files.
 sndfile.o : $(SYMBOL_FILES)
 
+#======================================================================
+# Building windows resource files (if needed).
+
+.rc.lo:
+	$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --tag=RC --mode=compile $(RC) $(RCFLAGS) $< -o $@
+
 #======================================================================
 # Disable autoheader.
 AUTOHEADER=echo
 
-# Dependancies.
 
-aiff.c au.c g72x.c ircam.c mat4.c mat5.c nist.c paf.c pvf.c : sndfile.h common.h
-raw.c svx.c voc.c w64.c wav.c wav_w64.c htk.c sd2.c rx2.c txw.c : sndfile.h common.h
-sds.c wve.c dwd.c ogg.c xi.c sndfile.c common.c file_io.c : sndfile.h common.h
-command.c pcm.c ulaw.c alaw.c float32.c double64.c ima_adpcm.c : sndfile.h common.h
-ms_adpcm.c gsm610.c dwvw.c vox_adpcm.c interleave.c strings.c : sndfile.h common.h
-dither.c : sndfile.h common.h
+
diff --git a/libs/libsndfile/src/Symbols.darwin b/libs/libsndfile/src/Symbols.darwin
index 271e0b0c87..a671460756 100644
--- a/libs/libsndfile/src/Symbols.darwin
+++ b/libs/libsndfile/src/Symbols.darwin
@@ -30,6 +30,7 @@ _sf_write_double
 _sf_strerror
 _sf_get_string
 _sf_set_string
+_sf_version_string
 _sf_open_fd
 _sf_open_virtual
 _sf_write_sync
diff --git a/libs/libsndfile/src/Symbols.os2 b/libs/libsndfile/src/Symbols.os2
index fbef2c42e4..118ceba728 100644
--- a/libs/libsndfile/src/Symbols.os2
+++ b/libs/libsndfile/src/Symbols.os2
@@ -1,6 +1,6 @@
 ; Auto-generated by create_symbols_file.py
 
-LIBRARY sndfile1.dll
+LIBRARY sndfile1
 INITINSTANCE TERMINSTANCE
 CODE PRELOAD MOVEABLE DISCARDABLE
 DATA PRELOAD MOVEABLE MULTIPLE NONSHARED
@@ -36,6 +36,7 @@ _sf_write_double      @40
 _sf_strerror          @50
 _sf_get_string        @60
 _sf_set_string        @61
+_sf_version_string    @68
 _sf_open_fd           @70
 _sf_open_virtual      @80
 _sf_write_sync        @90
diff --git a/libs/libsndfile/src/aiff.c b/libs/libsndfile/src/aiff.c
index c18324c262..c0175b2f24 100644
--- a/libs/libsndfile/src/aiff.c
+++ b/libs/libsndfile/src/aiff.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2012 Erik de Castro Lopo 
 ** Copyright (C) 2005 David Viens 
 **
 ** This program is free software; you can redistribute it and/or modify
@@ -24,10 +24,14 @@
 #include 
 #include 
 #include 
+#ifdef HAVE_INTTYPES_H
+#include 
+#endif
 
 #include "sndfile.h"
 #include "sfendian.h"
 #include "common.h"
+#include "chanmap.h"
 
 /*------------------------------------------------------------------------------
  * Macros to handle big/little endian issues.
@@ -41,6 +45,7 @@
 #define MARK_MARKER		(MAKE_MARKER ('M', 'A', 'R', 'K'))
 #define INST_MARKER		(MAKE_MARKER ('I', 'N', 'S', 'T'))
 #define APPL_MARKER		(MAKE_MARKER ('A', 'P', 'P', 'L'))
+#define CHAN_MARKER		(MAKE_MARKER ('C', 'H', 'A', 'N'))
 
 #define c_MARKER		(MAKE_MARKER ('(', 'c', ')', ' '))
 #define NAME_MARKER		(MAKE_MARKER ('N', 'A', 'M', 'E'))
@@ -182,11 +187,11 @@ typedef struct
 } MARK_ID_POS ;
 
 typedef struct
-{	PRIV_CHUNK4 chunk4 ;
-
-	sf_count_t	comm_offset ;
+{	sf_count_t	comm_offset ;
 	sf_count_t	ssnd_offset ;
 
+	int chanmap_tag ;
+
 	MARK_ID_POS *markstr ;
 } AIFF_PRIVATE ;
 
@@ -215,8 +220,15 @@ static short get_loop_mode (short mode) ;
 
 static int aiff_read_basc_chunk (SF_PRIVATE * psf, int) ;
 
+static int aiff_read_chanmap (SF_PRIVATE * psf, unsigned dword) ;
+
 static unsigned int marker_to_position (const MARK_ID_POS *m, unsigned short n, int marksize) ;
 
+static int aiff_set_chunk (SF_PRIVATE *psf, const SF_CHUNK_INFO * chunk_info) ;
+static SF_CHUNK_ITERATOR * aiff_next_chunk_iterator (SF_PRIVATE *psf, SF_CHUNK_ITERATOR * iterator) ;
+static int aiff_get_chunk_size (SF_PRIVATE *psf, const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info) ;
+static int aiff_get_chunk_data (SF_PRIVATE *psf, const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info) ;
+
 /*------------------------------------------------------------------------------
 ** Public function.
 */
@@ -233,38 +245,44 @@ aiff_open (SF_PRIVATE *psf)
 	if ((psf->container_data = calloc (1, sizeof (AIFF_PRIVATE))) == NULL)
 		return SFE_MALLOC_FAILED ;
 
-	if (psf->mode == SFM_READ || (psf->mode == SFM_RDWR && psf->filelength > 0))
+	if (psf->file.mode == SFM_READ || (psf->file.mode == SFM_RDWR && psf->filelength > 0))
 	{	if ((error = aiff_read_header (psf, &comm_fmt)))
 			return error ;
+
+		psf->next_chunk_iterator = aiff_next_chunk_iterator ;
+		psf->get_chunk_size = aiff_get_chunk_size ;
+		psf->get_chunk_data = aiff_get_chunk_data ;
+
 		psf_fseek (psf, psf->dataoffset, SEEK_SET) ;
 		} ;
 
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{	if (psf->is_pipe)
 			return SFE_NO_PIPE_WRITE ;
 
 		if ((SF_CONTAINER (psf->sf.format)) != SF_FORMAT_AIFF)
 			return SFE_BAD_OPEN_FORMAT ;
 
-		if (psf->mode == SFM_WRITE && (subformat == SF_FORMAT_FLOAT || subformat == SF_FORMAT_DOUBLE))
+		if (psf->file.mode == SFM_WRITE && (subformat == SF_FORMAT_FLOAT || subformat == SF_FORMAT_DOUBLE))
 		{	if ((psf->peak_info = peak_info_calloc (psf->sf.channels)) == NULL)
 				return SFE_MALLOC_FAILED ;
 			psf->peak_info->peak_loc = SF_PEAK_START ;
 			} ;
 
-		if (psf->mode != SFM_RDWR || psf->filelength < 40)
+		if (psf->file.mode != SFM_RDWR || psf->filelength < 40)
 		{	psf->filelength = 0 ;
 			psf->datalength = 0 ;
 			psf->dataoffset = 0 ;
 			psf->sf.frames = 0 ;
 			} ;
 
-		psf->str_flags = SF_STR_ALLOW_START | SF_STR_ALLOW_END ;
+		psf->strings.flags = SF_STR_ALLOW_START | SF_STR_ALLOW_END ;
 
 		if ((error = aiff_write_header (psf, SF_FALSE)))
 			return error ;
 
-		psf->write_header = aiff_write_header ;
+		psf->write_header	= aiff_write_header ;
+		psf->set_chunk		= aiff_set_chunk ;
 		} ;
 
 	psf->container_close = aiff_close ;
@@ -315,7 +333,7 @@ aiff_open (SF_PRIVATE *psf)
 				break ;
 
 		case SF_FORMAT_DWVW_N :
-				if (psf->mode != SFM_READ)
+				if (psf->file.mode != SFM_READ)
 				{	error = SFE_DWVW_BAD_BITWIDTH ;
 					break ;
 					} ;
@@ -357,19 +375,20 @@ static unsigned int
 marker_to_position (const MARK_ID_POS *m, unsigned short n, int marksize)
 {	int i ;
 
-    for (i = 0 ; i < marksize ; i++)
+	for (i = 0 ; i < marksize ; i++)
 		if (m [i].markerID == n)
 			return m [i].position ;
-    return 0 ;
+	return 0 ;
 } /* marker_to_position */
 
 static int
 aiff_read_header (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt)
 {	SSND_CHUNK	ssnd_fmt ;
 	AIFF_PRIVATE *paiff ;
-	unsigned	marker, dword, FORMsize, SSNDsize, bytesread ;
+	BUF_UNION	ubuf ;
+	unsigned	chunk_size = 0, FORMsize, SSNDsize, bytesread ;
 	int			k, found_chunk = 0, done = 0, error = 0 ;
-	char		*cptr, byte ;
+	char		*cptr ;
 	int			instr_found = 0, mark_found = 0, mark_count = 0 ;
 
 	if (psf->filelength > SF_PLATFORM_S64 (0xffffffff))
@@ -394,54 +413,61 @@ aiff_read_header (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt)
 	**	one and then check for the mandatory chunks at the end.
 	*/
 	while (! done)
-	{	psf_binheader_readf (psf, "m", &marker) ;
+	{	unsigned	marker ;
+		size_t jump = chunk_size & 1 ;
 
-		if (psf->mode == SFM_RDWR && (found_chunk & HAVE_SSND))
+		marker = chunk_size = 0 ;
+		psf_binheader_readf (psf, "Ejm4", jump, &marker, &chunk_size) ;
+		if (marker == 0)
+		{	psf_log_printf (psf, "Have 0 marker.\n") ;
+			break ;
+			} ;
+
+		if (psf->file.mode == SFM_RDWR && (found_chunk & HAVE_SSND))
 			return SFE_AIFF_RW_SSND_NOT_LAST ;
 
+		psf_store_read_chunk_u32 (&psf->rchunks, marker, psf_ftell (psf), chunk_size) ;
+
 		switch (marker)
 		{	case FORM_MARKER :
 					if (found_chunk)
 						return SFE_AIFF_NO_FORM ;
 
-					psf_binheader_readf (psf, "E4", &FORMsize) ;
-					pchk4_store (&(paiff->chunk4), marker, psf->headindex - 8, FORMsize) ;
+					FORMsize = chunk_size ;
+
+					found_chunk |= HAVE_FORM ;
+					psf_binheader_readf (psf, "m", &marker) ;
+					switch (marker)
+					{	case AIFC_MARKER :
+						case AIFF_MARKER :
+							found_chunk |= (marker == AIFC_MARKER) ? (HAVE_AIFC | HAVE_AIFF) : HAVE_AIFF ;
+							break ;
+						default :
+							break ;
+						} ;
 
 					if (psf->fileoffset > 0 && psf->filelength > FORMsize + 8)
 					{	/* Set file length. */
 						psf->filelength = FORMsize + 8 ;
-						psf_log_printf (psf, "FORM : %u\n", FORMsize) ;
+						psf_log_printf (psf, "FORM : %u\n %M\n", FORMsize, marker) ;
 						}
-					else if (FORMsize != psf->filelength - 2 * SIGNED_SIZEOF (dword))
-					{	dword = psf->filelength - 2 * sizeof (dword) ;
-						psf_log_printf (psf, "FORM : %u (should be %u)\n", FORMsize, dword) ;
-						FORMsize = dword ;
+					else if (FORMsize != psf->filelength - 2 * SIGNED_SIZEOF (chunk_size))
+					{	chunk_size = psf->filelength - 2 * sizeof (chunk_size) ;
+						psf_log_printf (psf, "FORM : %u (should be %u)\n %M\n", FORMsize, chunk_size, marker) ;
+						FORMsize = chunk_size ;
 						}
 					else
-						psf_log_printf (psf, "FORM : %u\n", FORMsize) ;
-					found_chunk |= HAVE_FORM ;
+						psf_log_printf (psf, "FORM : %u\n %M\n", FORMsize, marker) ;
+					/* Set this to 0, so we don't jump a byte when parsing the next marker. */
+					chunk_size = 0 ;
 					break ;
 
-			case AIFC_MARKER :
-			case AIFF_MARKER :
-					if ((found_chunk & HAVE_FORM) == 0)
-						return SFE_AIFF_AIFF_NO_FORM ;
-					psf_log_printf (psf, " %M\n", marker) ;
-					found_chunk |= (marker == AIFC_MARKER) ? (HAVE_AIFC | HAVE_AIFF) : HAVE_AIFF ;
-					break ;
 
 			case COMM_MARKER :
-					paiff->comm_offset = psf_ftell (psf) - 4 ;
-					error = aiff_read_comm_chunk (psf, comm_fmt) ;
-					pchk4_store (&paiff->chunk4, marker, paiff->comm_offset, comm_fmt->size) ;
-
-
-					psf->sf.samplerate = tenbytefloat2int (comm_fmt->sampleRate) ;
-					psf->sf.frames = comm_fmt->numSampleFrames ;
-					psf->sf.channels = comm_fmt->numChannels ;
-					psf->bytewidth = BITWIDTH2BYTES (comm_fmt->sampleSize) ;
-
-					if (error)
+					paiff->comm_offset = psf_ftell (psf) - 8 ;
+					chunk_size += chunk_size & 1 ;
+					comm_fmt->size = chunk_size ;
+					if ((error = aiff_read_comm_chunk (psf, comm_fmt)) != 0)
 						return error ;
 
 					found_chunk |= HAVE_COMM ;
@@ -452,12 +478,9 @@ aiff_read_header (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt)
 					if ((found_chunk & (HAVE_FORM | HAVE_AIFF | HAVE_COMM)) != (HAVE_FORM | HAVE_AIFF | HAVE_COMM))
 						return SFE_AIFF_PEAK_B4_COMM ;
 
-					psf_binheader_readf (psf, "E4", &dword) ;
-					pchk4_store (&paiff->chunk4, marker, psf->headindex - 8, dword) ;
-
-					psf_log_printf (psf, "%M : %d\n", marker, dword) ;
-					if (dword != AIFF_PEAK_CHUNK_SIZE (psf->sf.channels))
-					{	psf_binheader_readf (psf, "j", dword) ;
+					psf_log_printf (psf, "%M : %d\n", marker, chunk_size) ;
+					if (chunk_size != AIFF_PEAK_CHUNK_SIZE (psf->sf.channels))
+					{	psf_binheader_readf (psf, "j", chunk_size) ;
 						psf_log_printf (psf, "*** File PEAK chunk too big.\n") ;
 						return SFE_WAV_BAD_PEAK ;
 						} ;
@@ -476,19 +499,19 @@ aiff_read_header (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt)
 					psf_log_printf (psf, "  time stamp : %d\n", psf->peak_info->timestamp) ;
 					psf_log_printf (psf, "    Ch   Position       Value\n") ;
 
-					cptr = psf->u.cbuf ;
-					for (dword = 0 ; dword < (unsigned) psf->sf.channels ; dword++)
+					cptr = ubuf.cbuf ;
+					for (k = 0 ; k < psf->sf.channels ; k++)
 					{	float value ;
 						unsigned int position ;
 
 						psf_binheader_readf (psf, "Ef4", &value, &position) ;
-						psf->peak_info->peaks [dword].value = value ;
-						psf->peak_info->peaks [dword].position = position ;
+						psf->peak_info->peaks [k].value = value ;
+						psf->peak_info->peaks [k].position = position ;
 
-						snprintf (cptr, sizeof (psf->u.scbuf), "    %2d   %-12ld   %g\n",
-								dword, (long) psf->peak_info->peaks [dword].position, psf->peak_info->peaks [dword].value) ;
-						cptr [sizeof (psf->u.scbuf) - 1] = 0 ;
-						psf_log_printf (psf, cptr) ;
+						snprintf (cptr, sizeof (ubuf.scbuf), "    %2d   %-12" PRId64 "   %g\n",
+								k, psf->peak_info->peaks [k].position, psf->peak_info->peaks [k].value) ;
+						cptr [sizeof (ubuf.scbuf) - 1] = 0 ;
+						psf_log_printf (psf, "%s", cptr) ;
 						} ;
 
 					psf->peak_info->peak_loc = ((found_chunk & HAVE_SSND) == 0) ? SF_PEAK_START : SF_PEAK_END ;
@@ -498,9 +521,9 @@ aiff_read_header (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt)
 					if ((found_chunk & HAVE_AIFC) && (found_chunk & HAVE_FVER) == 0)
 						psf_log_printf (psf, "*** Valid AIFC files should have an FVER chunk.\n") ;
 
-					paiff->ssnd_offset = psf_ftell (psf) - 4 ;
-					psf_binheader_readf (psf, "E444", &SSNDsize, &(ssnd_fmt.offset), &(ssnd_fmt.blocksize)) ;
-					pchk4_store (&paiff->chunk4, marker, paiff->ssnd_offset, SSNDsize) ;
+					paiff->ssnd_offset = psf_ftell (psf) - 8 ;
+					SSNDsize = chunk_size ;
+					psf_binheader_readf (psf, "E44", &(ssnd_fmt.offset), &(ssnd_fmt.blocksize)) ;
 
 					psf->datalength = SSNDsize - sizeof (ssnd_fmt) ;
 					psf->dataoffset = psf_ftell (psf) ;
@@ -520,8 +543,10 @@ aiff_read_header (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt)
 						psf->datalength -= ssnd_fmt.offset ;
 						}
 					else
-					{	psf_log_printf (psf, "  Offset     : %u (Should be zero)\n", ssnd_fmt.offset) ;
+					{	psf_log_printf (psf, "  Offset     : %u\n", ssnd_fmt.offset) ;
 						psf_log_printf (psf, "  Block Size : %u ???\n", ssnd_fmt.blocksize) ;
+						psf->dataoffset += ssnd_fmt.offset ;
+						psf->datalength -= ssnd_fmt.offset ;
 						} ;
 
 					/* Only set dataend if there really is data at the end. */
@@ -534,155 +559,146 @@ aiff_read_header (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt)
 						break ;
 
 					/* Seek to end of SSND chunk. */
-					psf_fseek (psf, psf->dataoffset + psf->datalength + (SSNDsize & 1), SEEK_SET) ;
+					psf_fseek (psf, psf->dataoffset + psf->datalength, SEEK_SET) ;
 					break ;
 
 			case c_MARKER :
-					psf_binheader_readf (psf, "E4", &dword) ;
-					pchk4_store (&paiff->chunk4, marker, psf_ftell (psf) - 8, dword) ;
-					if (dword == 0)
+					if (chunk_size == 0)
 						break ;
-					if (dword >= SIGNED_SIZEOF (psf->u.scbuf))
-					{	psf_log_printf (psf, " %M : %d (too big)\n", marker, dword) ;
+					if (chunk_size >= SIGNED_SIZEOF (ubuf.scbuf))
+					{	psf_log_printf (psf, " %M : %d (too big)\n", marker, chunk_size) ;
 						return SFE_INTERNAL ;
 						} ;
 
-					cptr = psf->u.cbuf ;
-					psf_binheader_readf (psf, "b", cptr, dword + (dword & 1)) ;
-					cptr [dword] = 0 ;
+					cptr = ubuf.cbuf ;
+					psf_binheader_readf (psf, "b", cptr, chunk_size + (chunk_size & 1)) ;
+					cptr [chunk_size] = 0 ;
 
-					psf_sanitize_string (cptr, dword) ;
+					psf_sanitize_string (cptr, chunk_size) ;
 
 					psf_log_printf (psf, " %M : %s\n", marker, cptr) ;
 					psf_store_string (psf, SF_STR_COPYRIGHT, cptr) ;
+					chunk_size += chunk_size & 1 ;
 					break ;
 
 			case AUTH_MARKER :
-					psf_binheader_readf (psf, "E4", &dword) ;
-					pchk4_store (&paiff->chunk4, marker, psf_ftell (psf) - 8, dword) ;
-					if (dword == 0)
+					if (chunk_size == 0)
 						break ;
-					if (dword >= SIGNED_SIZEOF (psf->u.scbuf) - 1)
-					{	psf_log_printf (psf, " %M : %d (too big)\n", marker, dword) ;
+					if (chunk_size >= SIGNED_SIZEOF (ubuf.scbuf) - 1)
+					{	psf_log_printf (psf, " %M : %d (too big)\n", marker, chunk_size) ;
 						return SFE_INTERNAL ;
 						} ;
 
-					cptr = psf->u.cbuf ;
-					psf_binheader_readf (psf, "b", cptr, dword + (dword & 1)) ;
-					cptr [dword] = 0 ;
+					cptr = ubuf.cbuf ;
+					psf_binheader_readf (psf, "b", cptr, chunk_size + (chunk_size & 1)) ;
+					cptr [chunk_size] = 0 ;
 					psf_log_printf (psf, " %M : %s\n", marker, cptr) ;
 					psf_store_string (psf, SF_STR_ARTIST, cptr) ;
+					chunk_size += chunk_size & 1 ;
 					break ;
 
 			case COMT_MARKER :
 				{	unsigned short count, id, len ;
-					unsigned int timestamp ;
+					unsigned int timestamp, bytes ;
 
-					psf_binheader_readf (psf, "E42", &dword, &count) ;
-					pchk4_store (&paiff->chunk4, marker, psf_ftell (psf) - 8, dword) ;
-					psf_log_printf (psf, " %M : %d\n  count  : %d\n", marker, dword, count) ;
-					dword += (dword & 1) ;
-					if (dword == 0)
+					if (chunk_size == 0)
 						break ;
-					dword -= 2 ;
+					bytes = chunk_size ;
+					bytes -= psf_binheader_readf (psf, "E2", &count) ;
+					psf_log_printf (psf, " %M : %d\n  count  : %d\n", marker, chunk_size, count) ;
 
 					for (k = 0 ; k < count ; k++)
-					{	dword -= psf_binheader_readf (psf, "E422", ×tamp, &id, &len) ;
+					{	bytes -= psf_binheader_readf (psf, "E422", ×tamp, &id, &len) ;
 						psf_log_printf (psf, "   time   : 0x%x\n   marker : %x\n   length : %d\n", timestamp, id, len) ;
 
-						if (len + 1 > SIGNED_SIZEOF (psf->u.scbuf))
+						if (len + 1 > SIGNED_SIZEOF (ubuf.scbuf))
 						{	psf_log_printf (psf, "\nError : string length (%d) too big.\n", len) ;
 							return SFE_INTERNAL ;
 							} ;
 
-						cptr = psf->u.cbuf ;
-						dword -= psf_binheader_readf (psf, "b", cptr, len) ;
+						cptr = ubuf.cbuf ;
+						bytes -= psf_binheader_readf (psf, "b", cptr, len) ;
 						cptr [len] = 0 ;
 						psf_log_printf (psf, "   string : %s\n", cptr) ;
 						} ;
 
-					if (dword > 0)
-						psf_binheader_readf (psf, "j", dword) ;
+					if (bytes > 0)
+						psf_binheader_readf (psf, "j", bytes) ;
 					} ;
 					break ;
 
 			case APPL_MARKER :
 				{	unsigned appl_marker ;
 
-					psf_binheader_readf (psf, "E4", &dword) ;
-					pchk4_store (&paiff->chunk4, marker, psf_ftell (psf) - 8, dword) ;
-					if (dword == 0)
+					if (chunk_size == 0)
 						break ;
-					if (dword >= SIGNED_SIZEOF (psf->u.scbuf) - 1)
-					{	psf_log_printf (psf, " %M : %d (too big, skipping)\n", marker, dword) ;
-						psf_binheader_readf (psf, "j", dword + (dword & 1)) ;
+					if (chunk_size >= SIGNED_SIZEOF (ubuf.scbuf) - 1)
+					{	psf_log_printf (psf, " %M : %d (too big, skipping)\n", marker, chunk_size) ;
+						psf_binheader_readf (psf, "j", chunk_size + (chunk_size & 1)) ;
 						break ;
 						} ;
 
-					if (dword < 4)
-					{	psf_log_printf (psf, " %M : %d (too small, skipping)\n", marker, dword) ;
-						psf_binheader_readf (psf, "j", dword + (dword & 1)) ;
+					if (chunk_size < 4)
+					{	psf_log_printf (psf, " %M : %d (too small, skipping)\n", marker, chunk_size) ;
+						psf_binheader_readf (psf, "j", chunk_size + (chunk_size & 1)) ;
 						break ;
 						} ;
 
-					cptr = psf->u.cbuf ;
-					psf_binheader_readf (psf, "mb", &appl_marker, cptr, dword + (dword & 1) - 4) ;
-					cptr [dword] = 0 ;
+					cptr = ubuf.cbuf ;
+					psf_binheader_readf (psf, "mb", &appl_marker, cptr, chunk_size + (chunk_size & 1) - 4) ;
+					cptr [chunk_size] = 0 ;
 
-					for (k = 0 ; k < (int) dword ; k++)
-						if (! isprint (cptr [k]))
+					for (k = 0 ; k < (int) chunk_size ; k++)
+						if (! psf_isprint (cptr [k]))
 						{	cptr [k] = 0 ;
 							break ;
 							} ;
 
-					psf_log_printf (psf, " %M : %d\n  AppSig : %M\n  Name   : %s\n", marker, dword, appl_marker, cptr) ;
+					psf_log_printf (psf, " %M : %d\n  AppSig : %M\n  Name   : %s\n", marker, chunk_size, appl_marker, cptr) ;
 					psf_store_string (psf, SF_STR_SOFTWARE, cptr) ;
+					chunk_size += chunk_size & 1 ;
 					} ;
 					break ;
 
 			case NAME_MARKER :
-					psf_binheader_readf (psf, "E4", &dword) ;
-					pchk4_store (&paiff->chunk4, marker, psf_ftell (psf) - 8, dword) ;
-					if (dword == 0)
+					if (chunk_size == 0)
 						break ;
-					if (dword >= SIGNED_SIZEOF (psf->u.scbuf) - 2)
-					{	psf_log_printf (psf, " %M : %d (too big)\n", marker, dword) ;
+					if (chunk_size >= SIGNED_SIZEOF (ubuf.scbuf) - 2)
+					{	psf_log_printf (psf, " %M : %d (too big)\n", marker, chunk_size) ;
 						return SFE_INTERNAL ;
 						} ;
 
-					cptr = psf->u.cbuf ;
-					psf_binheader_readf (psf, "b", cptr, dword + (dword & 1)) ;
-					cptr [dword] = 0 ;
+					cptr = ubuf.cbuf ;
+					psf_binheader_readf (psf, "b", cptr, chunk_size + (chunk_size & 1)) ;
+					cptr [chunk_size] = 0 ;
 					psf_log_printf (psf, " %M : %s\n", marker, cptr) ;
 					psf_store_string (psf, SF_STR_TITLE, cptr) ;
+					chunk_size += chunk_size & 1 ;
 					break ;
 
 			case ANNO_MARKER :
-					psf_binheader_readf (psf, "E4", &dword) ;
-					pchk4_store (&paiff->chunk4, marker, psf_ftell (psf) - 8, dword) ;
-					if (dword == 0)
+					if (chunk_size == 0)
 						break ;
-					if (dword >= SIGNED_SIZEOF (psf->u.scbuf) - 2)
-					{	psf_log_printf (psf, " %M : %d (too big)\n", marker, dword) ;
+					if (chunk_size >= SIGNED_SIZEOF (ubuf.scbuf) - 2)
+					{	psf_log_printf (psf, " %M : %d (too big)\n", marker, chunk_size) ;
 						return SFE_INTERNAL ;
 						} ;
 
-					cptr = psf->u.cbuf ;
-					psf_binheader_readf (psf, "b", cptr, dword + (dword & 1)) ;
-					cptr [dword] = 0 ;
+					cptr = ubuf.cbuf ;
+					psf_binheader_readf (psf, "b", cptr, chunk_size + (chunk_size & 1)) ;
+					cptr [chunk_size] = 0 ;
 					psf_log_printf (psf, " %M : %s\n", marker, cptr) ;
 					psf_store_string (psf, SF_STR_COMMENT, cptr) ;
+					chunk_size += chunk_size & 1 ;
 					break ;
 
 			case INST_MARKER :
-					psf_binheader_readf (psf, "E4", &dword) ;
-					pchk4_store (&paiff->chunk4, marker, psf_ftell (psf) - 8, dword) ;
-					if (dword != SIZEOF_INST_CHUNK)
-					{	psf_log_printf (psf, " %M : %d (should be %d)\n", marker, dword, SIZEOF_INST_CHUNK) ;
-						psf_binheader_readf (psf, "j", dword) ;
+					if (chunk_size != SIZEOF_INST_CHUNK)
+					{	psf_log_printf (psf, " %M : %d (should be %d)\n", marker, chunk_size, SIZEOF_INST_CHUNK) ;
+						psf_binheader_readf (psf, "j", chunk_size) ;
 						break ;
 						} ;
-					psf_log_printf (psf, " %M : %d\n", marker, dword) ;
+					psf_log_printf (psf, " %M : %d\n", marker, chunk_size) ;
 					{	unsigned char bytes [6] ;
 						short gain ;
 
@@ -743,20 +759,15 @@ aiff_read_header (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt)
 					break ;
 
 			case basc_MARKER :
-					psf_binheader_readf (psf, "E4", &dword) ;
-					pchk4_store (&paiff->chunk4, marker, psf_ftell (psf) - 8, dword) ;
-					psf_log_printf (psf, " basc : %u\n", dword) ;
+					psf_log_printf (psf, " basc : %u\n", chunk_size) ;
 
-					if ((error = aiff_read_basc_chunk (psf, dword)))
+					if ((error = aiff_read_basc_chunk (psf, chunk_size)))
 						return error ;
 					break ;
 
 			case MARK_MARKER :
-					psf_binheader_readf (psf, "E4", &dword) ;
-					pchk4_store (&paiff->chunk4, marker, psf_ftell (psf) - 8, dword) ;
-					psf_log_printf (psf, " %M : %d\n", marker, dword) ;
+					psf_log_printf (psf, " %M : %d\n", marker, chunk_size) ;
 					{	unsigned short mark_id, n = 0 ;
-						unsigned char pstr_len ;
 						unsigned int position ;
 
 						bytesread = psf_binheader_readf (psf, "E2", &n) ;
@@ -770,20 +781,31 @@ aiff_read_header (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt)
 						if (paiff->markstr == NULL)
 							return SFE_MALLOC_FAILED ;
 
-						for (n = 0 ; n < mark_count && bytesread < dword ; n++)
-						{	bytesread += psf_binheader_readf (psf, "E241", &mark_id, &position, &pstr_len) ;
+						for (n = 0 ; n < mark_count && bytesread < chunk_size ; n++)
+						{	unsigned int pstr_len ;
+							unsigned char ch ;
+
+							bytesread += psf_binheader_readf (psf, "E241", &mark_id, &position, &ch) ;
 							psf_log_printf (psf, "   Mark ID  : %u\n   Position : %u\n", mark_id, position) ;
 
-							pstr_len += (pstr_len & 1) ? 0 : 1 ;
+							pstr_len = (ch & 1) ? ch : ch + 1 ;
 
-							bytesread += psf_binheader_readf (psf, "b", psf->u.scbuf, pstr_len) ;
-							psf->u.scbuf [pstr_len] = 0 ;
-							psf_log_printf (psf, "   Name     : %s\n", psf->u.scbuf) ;
+							if (pstr_len < sizeof (ubuf.scbuf) - 1)
+							{	bytesread += psf_binheader_readf (psf, "b", ubuf.scbuf, pstr_len) ;
+								ubuf.scbuf [pstr_len] = 0 ;
+								}
+							else
+							{	unsigned int read_len = pstr_len - (sizeof (ubuf.scbuf) - 1) ;
+								bytesread += psf_binheader_readf (psf, "bj", ubuf.scbuf, read_len, pstr_len - read_len) ;
+								ubuf.scbuf [sizeof (ubuf.scbuf) - 1] = 0 ;
+								}
+
+							psf_log_printf (psf, "   Name     : %s\n", ubuf.scbuf) ;
 
 							paiff->markstr [n].markerID = mark_id ;
 							paiff->markstr [n].position = position ;
 							/*
-							**	TODO if psf->u.scbuf is equal to
+							**	TODO if ubuf.scbuf is equal to
 							**	either Beg_loop, Beg loop or beg loop and spam
 							**	if (psf->instrument == NULL && (psf->instrument = psf_instrument_alloc ()) == NULL)
 							**		return SFE_MALLOC_FAILED ;
@@ -791,7 +813,7 @@ aiff_read_header (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt)
 							} ;
 						} ;
 					mark_found++ ;
-					psf_binheader_readf (psf, "j", dword - bytesread) ;
+					psf_binheader_readf (psf, "j", chunk_size - bytesread) ;
 					break ;
 
 			case FVER_MARKER :
@@ -799,31 +821,40 @@ aiff_read_header (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt)
 					/* Fall through to next case. */
 
 			case SFX_MARKER :
-					psf_binheader_readf (psf, "E4", &dword) ;
-					pchk4_store (&paiff->chunk4, marker, psf_ftell (psf) - 8, dword) ;
-					psf_log_printf (psf, " %M : %d\n", marker, dword) ;
-
-					psf_binheader_readf (psf, "j", dword) ;
+					psf_log_printf (psf, " %M : %d\n", marker, chunk_size) ;
+					psf_binheader_readf (psf, "j", chunk_size) ;
 					break ;
 
 			case NONE_MARKER :
 					/* Fix for broken AIFC files with incorrect COMM chunk length. */
-					psf_binheader_readf (psf, "1", &byte) ;
-					dword = byte ;
-					psf_binheader_readf (psf, "j", dword) ;
+					chunk_size = (chunk_size >> 24) - 3 ;
+					psf_log_printf (psf, " %M : %d\n", marker, chunk_size) ;
+					psf_binheader_readf (psf, "j", make_size_t (chunk_size)) ;
+					break ;
+
+			case CHAN_MARKER :
+					if (chunk_size < 12)
+					{	psf_log_printf (psf, " %M : %d (should be >= 12)\n", marker, chunk_size) ;
+						psf_binheader_readf (psf, "j", chunk_size) ;
+						break ;
+						}
+
+					psf_log_printf (psf, " %M : %d\n", marker, chunk_size) ;
+
+					if ((error = aiff_read_chanmap (psf, chunk_size)))
+						return error ;
 					break ;
 
 			default :
-					if (isprint ((marker >> 24) & 0xFF) && isprint ((marker >> 16) & 0xFF)
-						&& isprint ((marker >> 8) & 0xFF) && isprint (marker & 0xFF))
-					{	psf_binheader_readf (psf, "E4", &dword) ;
-						psf_log_printf (psf, " %M : %d (unknown marker)\n", marker, dword) ;
+					if (psf_isprint ((marker >> 24) & 0xFF) && psf_isprint ((marker >> 16) & 0xFF)
+						&& psf_isprint ((marker >> 8) & 0xFF) && psf_isprint (marker & 0xFF))
+					{	psf_log_printf (psf, " %M : %d (unknown marker)\n", marker, chunk_size) ;
 
-						psf_binheader_readf (psf, "j", dword) ;
+						psf_binheader_readf (psf, "j", chunk_size) ;
 						break ;
 						} ;
-					if ((dword = psf_ftell (psf)) & 0x03)
-					{	psf_log_printf (psf, "  Unknown chunk marker %X at position %d. Resyncing.\n", marker, dword - 4) ;
+					if ((chunk_size = psf_ftell (psf)) & 0x03)
+					{	psf_log_printf (psf, "  Unknown chunk marker %X at position %d. Resyncing.\n", marker, chunk_size - 4) ;
 
 						psf_binheader_readf (psf, "j", -3) ;
 						break ;
@@ -836,20 +867,20 @@ aiff_read_header (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt)
 		if ((! psf->sf.seekable) && (found_chunk & HAVE_SSND))
 			break ;
 
-		if (psf_ftell (psf) >= psf->filelength - (2 * SIGNED_SIZEOF (dword)))
+		if (psf_ftell (psf) >= psf->filelength - (2 * SIGNED_SIZEOF (int32_t)))
 			break ;
 		} ; /* while (1) */
 
 	if (instr_found && mark_found)
 	{	int j ;
 
-		for (j = 0 ; jinstrument->loop_count ; j ++)
+		for (j = 0 ; j < psf->instrument->loop_count ; j ++)
 		{	if (j < ARRAY_LEN (psf->instrument->loops))
 			{	psf->instrument->loops [j].start = marker_to_position (paiff->markstr, psf->instrument->loops [j].start, mark_count) ;
 				psf->instrument->loops [j].end = marker_to_position (paiff->markstr, psf->instrument->loops [j].end, mark_count) ;
 				psf->instrument->loops [j].mode = SF_LOOP_FORWARD ;
 				} ;
-  			} ;
+			} ;
 		} ;
 
 	if (! (found_chunk & HAVE_FORM))
@@ -876,7 +907,7 @@ aiff_close (SF_PRIVATE *psf)
 		paiff->markstr = NULL ;
 		} ;
 
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{	aiff_write_tailer (psf) ;
 		aiff_write_header (psf, SF_TRUE) ;
 		} ;
@@ -886,25 +917,22 @@ aiff_close (SF_PRIVATE *psf)
 
 static int
 aiff_read_comm_chunk (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt)
-{	int error = 0, bytesread, subformat ;
+{	BUF_UNION	ubuf ;
+	int subformat, samplerate ;
 
-	psf->u.scbuf [0] = 0 ;
-
-	bytesread = psf_binheader_readf (psf, "E4", &(comm_fmt->size)) ;
+	ubuf.scbuf [0] = 0 ;
 
 	/* The COMM chunk has an int aligned to an odd word boundary. Some
 	** procesors are not able to deal with this (ie bus fault) so we have
 	** to take special care.
 	*/
-	comm_fmt->size += comm_fmt->size & 1 ;
 
-	bytesread +=
 	psf_binheader_readf (psf, "E242b", &(comm_fmt->numChannels), &(comm_fmt->numSampleFrames),
-			&(comm_fmt->sampleSize), &(comm_fmt->sampleRate), SIGNED_SIZEOF (comm_fmt->sampleRate)) ;
+				&(comm_fmt->sampleSize), &(comm_fmt->sampleRate), SIGNED_SIZEOF (comm_fmt->sampleRate)) ;
 
 	if (comm_fmt->size > 0x10000 && (comm_fmt->size & 0xffff) == 0)
 	{	psf_log_printf (psf, " COMM : %d (0x%x) *** should be ", comm_fmt->size, comm_fmt->size) ;
-		comm_fmt->size = ENDSWAP_INT (comm_fmt->size) ;
+		comm_fmt->size = ENDSWAP_32 (comm_fmt->size) ;
 		psf_log_printf (psf, "%d (0x%x)\n", comm_fmt->size, comm_fmt->size) ;
 		}
 	else
@@ -913,21 +941,23 @@ aiff_read_comm_chunk (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt)
 	if (comm_fmt->size == SIZEOF_AIFF_COMM)
 		comm_fmt->encoding = NONE_MARKER ;
 	else if (comm_fmt->size == SIZEOF_AIFC_COMM_MIN)
-		bytesread += psf_binheader_readf (psf, "Em", &(comm_fmt->encoding)) ;
+		psf_binheader_readf (psf, "Em", &(comm_fmt->encoding)) ;
 	else if (comm_fmt->size >= SIZEOF_AIFC_COMM)
 	{	unsigned char encoding_len ;
 		unsigned read_len ;
 
-		bytesread += psf_binheader_readf (psf, "Em1", &(comm_fmt->encoding), &encoding_len) ;
+		psf_binheader_readf (psf, "Em1", &(comm_fmt->encoding), &encoding_len) ;
 
-		comm_fmt->size = SF_MIN (sizeof (psf->u.scbuf), make_size_t (comm_fmt->size)) ;
-		memset (psf->u.scbuf, 0, comm_fmt->size) ;
+		comm_fmt->size = SF_MIN (sizeof (ubuf.scbuf), make_size_t (comm_fmt->size)) ;
+		memset (ubuf.scbuf, 0, comm_fmt->size) ;
 		read_len = comm_fmt->size - SIZEOF_AIFC_COMM + 1 ;
-		bytesread += psf_binheader_readf (psf, "b", psf->u.scbuf, read_len) ;
-		psf->u.scbuf [read_len + 1] = 0 ;
+		psf_binheader_readf (psf, "b", ubuf.scbuf, read_len) ;
+		ubuf.scbuf [read_len + 1] = 0 ;
 		} ;
 
-	psf_log_printf (psf, "  Sample Rate : %d\n", tenbytefloat2int (comm_fmt->sampleRate)) ;
+	samplerate = tenbytefloat2int (comm_fmt->sampleRate) ;
+
+	psf_log_printf (psf, "  Sample Rate : %d\n", samplerate) ;
 	psf_log_printf (psf, "  Frames      : %u%s\n", comm_fmt->numSampleFrames, (comm_fmt->numSampleFrames == 0 && psf->filelength > 104) ? " (Should not be 0)" : "") ;
 	psf_log_printf (psf, "  Channels    : %d\n", comm_fmt->numChannels) ;
 
@@ -945,6 +975,11 @@ aiff_read_comm_chunk (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt)
 
 	subformat = s_bitwidth_to_subformat (comm_fmt->sampleSize) ;
 
+	psf->sf.samplerate = samplerate ;
+	psf->sf.frames = comm_fmt->numSampleFrames ;
+	psf->sf.channels = comm_fmt->numChannels ;
+	psf->bytewidth = BITWIDTH2BYTES (comm_fmt->sampleSize) ;
+
 	psf->endian = SF_ENDIAN_BIG ;
 
 	switch (comm_fmt->encoding)
@@ -1021,74 +1056,68 @@ aiff_read_comm_chunk (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt)
 
 		default :
 			psf_log_printf (psf, "AIFC : Unimplemented format : %M\n", comm_fmt->encoding) ;
-			error = SFE_UNIMPLEMENTED ;
+			return SFE_UNIMPLEMENTED ;
 		} ;
 
-	if (! psf->u.scbuf [0])
+	if (! ubuf.scbuf [0])
 		psf_log_printf (psf, "  Encoding    : %M\n", comm_fmt->encoding) ;
 	else
-		psf_log_printf (psf, "  Encoding    : %M => %s\n", comm_fmt->encoding, psf->u.scbuf) ;
+		psf_log_printf (psf, "  Encoding    : %M => %s\n", comm_fmt->encoding, ubuf.scbuf) ;
 
-	return error ;
+	return 0 ;
 } /* aiff_read_comm_chunk */
 
 
 /*==========================================================================================
 */
 
-static int
-aiff_rewrite_header (SF_PRIVATE *psf, AIFF_PRIVATE * paiff)
+static void
+aiff_rewrite_header (SF_PRIVATE *psf)
 {
 	/* Assuming here that the header has already been written and just
 	** needs to be corrected for new data length. That means that we
 	** only change the length fields of the FORM and SSND chunks ;
 	** everything else can be skipped over.
 	*/
-	int k, ch ;
-	int comm_size, comm_frames ;
+	int k, ch, comm_size, comm_frames ;
 
 	psf_fseek (psf, 0, SEEK_SET) ;
 	psf_fread (psf->header, psf->dataoffset, 1, psf) ;
 
 	psf->headindex = 0 ;
 
-	for (k = 0 ; k < paiff->chunk4.count ; k++)
-	{	switch (paiff->chunk4.l [k].chunk)
-		{	case FORM_MARKER :
-				psf_binheader_writef (psf, "Etm8", FORM_MARKER, psf->filelength - 8) ;
-				break ;
+	/* FORM chunk. */
+	psf_binheader_writef (psf, "Etm8", FORM_MARKER, psf->filelength - 8) ;
 
-			case COMM_MARKER :
-				psf->headindex = paiff->chunk4.l [k].offset ;
-				comm_frames = psf->sf.frames ;
-				comm_size = paiff->chunk4.l [k].len ;
-				psf_binheader_writef (psf, "Em42t4", COMM_MARKER, comm_size, psf->sf.channels, comm_frames) ;
-				break ;
+	/* COMM chunk. */
+	if ((k = psf_find_read_chunk_m32 (&psf->rchunks, COMM_MARKER)) >= 0)
+	{	psf->headindex = psf->rchunks.chunks [k].offset - 8 ;
+		comm_frames = psf->sf.frames ;
+		comm_size = psf->rchunks.chunks [k].len ;
+		psf_binheader_writef (psf, "Em42t4", COMM_MARKER, comm_size, psf->sf.channels, comm_frames) ;
+		} ;
 
-			case SSND_MARKER :
-				psf->headindex = paiff->chunk4.l [k].offset ;
-				psf_binheader_writef (psf, "Etm8", SSND_MARKER, psf->datalength + SIZEOF_SSND_CHUNK) ;
-				break ;
+	/* PEAK chunk. */
+	if ((k = psf_find_read_chunk_m32 (&psf->rchunks, PEAK_MARKER)) >= 0)
+	{	psf->headindex = psf->rchunks.chunks [k].offset - 8 ;
+		psf_binheader_writef (psf, "Em4", PEAK_MARKER, AIFF_PEAK_CHUNK_SIZE (psf->sf.channels)) ;
+		psf_binheader_writef (psf, "E44", 1, time (NULL)) ;
+		for (ch = 0 ; ch < psf->sf.channels ; ch++)
+			psf_binheader_writef (psf, "Eft8", (float) psf->peak_info->peaks [ch].value, psf->peak_info->peaks [ch].position) ;
+		} ;
 
-			case PEAK_MARKER :
-				psf->headindex = paiff->chunk4.l [k].offset ;
-				psf_binheader_writef (psf, "Em4", PEAK_MARKER, AIFF_PEAK_CHUNK_SIZE (psf->sf.channels)) ;
-				psf_binheader_writef (psf, "E44", 1, time (NULL)) ;
-				for (ch = 0 ; ch < psf->sf.channels ; ch++)
-					psf_binheader_writef (psf, "Eft8", (float) psf->peak_info->peaks [ch].value, psf->peak_info->peaks [ch].position) ;
-				break ;
 
-			default :
-				/* There are a whole bunch of chunks we should just ignore. */
-				break ;
-			} ;
+	/* SSND chunk. */
+	if ((k = psf_find_read_chunk_m32 (&psf->rchunks, SSND_MARKER)) >= 0)
+	{	psf->headindex = psf->rchunks.chunks [k].offset - 8 ;
+		psf_binheader_writef (psf, "Etm8", SSND_MARKER, psf->datalength + SIZEOF_SSND_CHUNK) ;
 		} ;
 
 	/* Header mangling complete so write it out. */
 	psf_fseek (psf, 0, SEEK_SET) ;
 	psf_fwrite (psf->header, psf->headindex, 1, psf) ;
 
-	return 0 ;
+	return ;
 } /* aiff_rewrite_header */
 
 static int
@@ -1096,7 +1125,7 @@ aiff_write_header (SF_PRIVATE *psf, int calc_length)
 {	sf_count_t		current ;
 	AIFF_PRIVATE	*paiff ;
 	unsigned char	comm_sample_rate [10], comm_zero_bytes [2] = { 0, 0 } ;
-	unsigned int	comm_type, comm_size, comm_encoding, comm_frames = 0 ;
+	unsigned int	comm_type, comm_size, comm_encoding, comm_frames = 0, uk ;
 	int				k, endian, has_data = SF_FALSE ;
 	short			bit_width ;
 
@@ -1119,11 +1148,11 @@ aiff_write_header (SF_PRIVATE *psf, int calc_length)
 			psf->sf.frames = psf->datalength / (psf->bytewidth * psf->sf.channels) ;
 		} ;
 
-	if (psf->mode == SFM_RDWR && psf->dataoffset > 0 && paiff->chunk4.count > 0)
-	{	int err = aiff_rewrite_header (psf, paiff) ;
+	if (psf->file.mode == SFM_RDWR && psf->dataoffset > 0 && psf->rchunks.count > 0)
+	{	aiff_rewrite_header (psf) ;
 		if (current > 0)
 			psf_fseek (psf, current, SEEK_SET) ;
-		return err ;
+		return 0 ;
 		} ;
 
 	endian = SF_ENDIAN (psf->sf.format) ;
@@ -1134,34 +1163,72 @@ aiff_write_header (SF_PRIVATE *psf, int calc_length)
 	bit_width = psf->bytewidth * 8 ;
 	comm_frames = (psf->sf.frames > 0xFFFFFFFF) ? 0xFFFFFFFF : psf->sf.frames ;
 
-	switch (SF_CODEC (psf->sf.format))
-	{	case SF_FORMAT_PCM_S8 :
+	switch (SF_CODEC (psf->sf.format) | endian)
+	{	case SF_FORMAT_PCM_S8 | SF_ENDIAN_BIG :
+			psf->endian = SF_ENDIAN_BIG ;
+			comm_type = AIFC_MARKER ;
+			comm_size = SIZEOF_AIFC_COMM ;
+			comm_encoding = twos_MARKER ;
+			break ;
+
+		case SF_FORMAT_PCM_S8 | SF_ENDIAN_LITTLE :
+			psf->endian = SF_ENDIAN_LITTLE ;
+			comm_type = AIFC_MARKER ;
+			comm_size = SIZEOF_AIFC_COMM ;
+			comm_encoding = sowt_MARKER ;
+			break ;
+
+		case SF_FORMAT_PCM_16 | SF_ENDIAN_BIG :
+			psf->endian = SF_ENDIAN_BIG ;
+			comm_type = AIFC_MARKER ;
+			comm_size = SIZEOF_AIFC_COMM ;
+			comm_encoding = twos_MARKER ;
+			break ;
+
+		case SF_FORMAT_PCM_16 | SF_ENDIAN_LITTLE :
+			psf->endian = SF_ENDIAN_LITTLE ;
+			comm_type = AIFC_MARKER ;
+			comm_size = SIZEOF_AIFC_COMM ;
+			comm_encoding = sowt_MARKER ;
+			break ;
+
+		case SF_FORMAT_PCM_24 | SF_ENDIAN_BIG :
+			psf->endian = SF_ENDIAN_BIG ;
+			comm_type = AIFC_MARKER ;
+			comm_size = SIZEOF_AIFC_COMM ;
+			comm_encoding = in24_MARKER ;
+			break ;
+
+		case SF_FORMAT_PCM_24 | SF_ENDIAN_LITTLE :
+			psf->endian = SF_ENDIAN_LITTLE ;
+			comm_type = AIFC_MARKER ;
+			comm_size = SIZEOF_AIFC_COMM ;
+			comm_encoding = ni24_MARKER ;
+			break ;
+
+		case SF_FORMAT_PCM_32 | SF_ENDIAN_BIG :
+			psf->endian = SF_ENDIAN_BIG ;
+			comm_type = AIFC_MARKER ;
+			comm_size = SIZEOF_AIFC_COMM ;
+			comm_encoding = in32_MARKER ;
+			break ;
+
+		case SF_FORMAT_PCM_32 | SF_ENDIAN_LITTLE :
+			psf->endian = SF_ENDIAN_LITTLE ;
+			comm_type = AIFC_MARKER ;
+			comm_size = SIZEOF_AIFC_COMM ;
+			comm_encoding = ni32_MARKER ;
+			break ;
+
+		case SF_FORMAT_PCM_S8 :			/* SF_ENDIAN_FILE */
 		case SF_FORMAT_PCM_16 :
 		case SF_FORMAT_PCM_24 :
 		case SF_FORMAT_PCM_32 :
-				switch (endian)
-				{	case SF_ENDIAN_BIG :
-							psf->endian = SF_ENDIAN_BIG ;
-							comm_type = AIFC_MARKER ;
-							comm_size = SIZEOF_AIFC_COMM ;
-							comm_encoding = twos_MARKER ;
-							break ;
-
-					case SF_ENDIAN_LITTLE :
-							psf->endian = SF_ENDIAN_LITTLE ;
-							comm_type = AIFC_MARKER ;
-							comm_size = SIZEOF_AIFC_COMM ;
-							comm_encoding = sowt_MARKER ;
-							break ;
-
-					default : /* SF_ENDIAN_FILE */
-							psf->endian = SF_ENDIAN_BIG ;
-							comm_type = AIFF_MARKER ;
-							comm_size = SIZEOF_AIFF_COMM ;
-							comm_encoding = 0 ;
-							break ;
-					} ;
-				break ;
+			psf->endian = SF_ENDIAN_BIG ;
+			comm_type = AIFF_MARKER ;
+			comm_size = SIZEOF_AIFF_COMM ;
+			comm_encoding = 0 ;
+			break ;
 
 		case SF_FORMAT_FLOAT :					/* Big endian floating point. */
 				psf->endian = SF_ENDIAN_BIG ;
@@ -1278,6 +1345,9 @@ aiff_write_header (SF_PRIVATE *psf, int calc_length)
 	if (comm_type == AIFC_MARKER)
 		psf_binheader_writef (psf, "mb", comm_encoding, comm_zero_bytes, sizeof (comm_zero_bytes)) ;
 
+	if (psf->channel_map && paiff->chanmap_tag)
+		psf_binheader_writef (psf, "Em4444", CHAN_MARKER, 12, paiff->chanmap_tag, 0, 0) ;
+
 	if (psf->instrument != NULL)
 	{	MARK_ID_POS	m [4] ;
 		INST_CHUNK ch ;
@@ -1337,7 +1407,7 @@ aiff_write_header (SF_PRIVATE *psf, int calc_length)
 					m [3].markerID, m [3].position, 8, "end loop", make_size_t (9)) ;
 		} ;
 
-	if (psf->str_flags & SF_STR_LOCATE_START)
+	if (psf->strings.flags & SF_STR_LOCATE_START)
 		aiff_write_strings (psf, SF_STR_LOCATE_START) ;
 
 	if (psf->peak_info != NULL && psf->peak_info->peak_loc == SF_PEAK_START)
@@ -1347,6 +1417,10 @@ aiff_write_header (SF_PRIVATE *psf, int calc_length)
 			psf_binheader_writef (psf, "Eft8", (float) psf->peak_info->peaks [k].value, psf->peak_info->peaks [k].position) ;
 		} ;
 
+	/* Write custom headers. */
+	for (uk = 0 ; uk < psf->wchunks.used ; uk++)
+		psf_binheader_writef (psf, "Em4b", psf->wchunks.chunks [uk].mark32, psf->wchunks.chunks [uk].len, psf->wchunks.chunks [uk].data, make_size_t (psf->wchunks.chunks [uk].len)) ;
+
 	/* Write SSND chunk. */
 	paiff->ssnd_offset = psf->headindex ;
 	psf_binheader_writef (psf, "Etm844", SSND_MARKER, psf->datalength + SIZEOF_SSND_CHUNK, 0, 0) ;
@@ -1393,7 +1467,7 @@ aiff_write_tailer (SF_PRIVATE *psf)
 			psf_binheader_writef (psf, "Eft8", (float) psf->peak_info->peaks [k].value, psf->peak_info->peaks [k].position) ;
 		} ;
 
-	if (psf->str_flags & SF_STR_LOCATE_END)
+	if (psf->strings.flags & SF_STR_LOCATE_END)
 		aiff_write_strings (psf, SF_STR_LOCATE_END) ;
 
 	/* Write the tailer. */
@@ -1408,37 +1482,37 @@ aiff_write_strings (SF_PRIVATE *psf, int location)
 {	int	k, slen ;
 
 	for (k = 0 ; k < SF_MAX_STRINGS ; k++)
-	{	if (psf->strings [k].type == 0)
+	{	if (psf->strings.data [k].type == 0)
 			break ;
 
-		if (psf->strings [k].flags != location)
+		if (psf->strings.data [k].flags != location)
 			continue ;
 
-		switch (psf->strings [k].type)
+		switch (psf->strings.data [k].type)
 		{	case SF_STR_SOFTWARE :
-				slen = strlen (psf->strings [k].str) ;
-				psf_binheader_writef (psf, "Em4mb", APPL_MARKER, slen + 4, m3ga_MARKER, psf->strings [k].str, make_size_t (slen + (slen & 1))) ;
+				slen = strlen (psf->strings.storage + psf->strings.data [k].offset) ;
+				psf_binheader_writef (psf, "Em4mb", APPL_MARKER, slen + 4, m3ga_MARKER, psf->strings.storage + psf->strings.data [k].offset, make_size_t (slen + (slen & 1))) ;
 				break ;
 
 			case SF_STR_TITLE :
-				psf_binheader_writef (psf, "EmS", NAME_MARKER, psf->strings [k].str) ;
+				psf_binheader_writef (psf, "EmS", NAME_MARKER, psf->strings.storage + psf->strings.data [k].offset) ;
 				break ;
 
 			case SF_STR_COPYRIGHT :
-				psf_binheader_writef (psf, "EmS", c_MARKER, psf->strings [k].str) ;
+				psf_binheader_writef (psf, "EmS", c_MARKER, psf->strings.storage + psf->strings.data [k].offset) ;
 				break ;
 
 			case SF_STR_ARTIST :
-				psf_binheader_writef (psf, "EmS", AUTH_MARKER, psf->strings [k].str) ;
+				psf_binheader_writef (psf, "EmS", AUTH_MARKER, psf->strings.storage + psf->strings.data [k].offset) ;
 				break ;
 
 			case SF_STR_COMMENT :
-				psf_binheader_writef (psf, "EmS", ANNO_MARKER, psf->strings [k].str) ;
+				psf_binheader_writef (psf, "EmS", ANNO_MARKER, psf->strings.storage + psf->strings.data [k].offset) ;
 				break ;
 
 			/*
 			case SF_STR_DATE :
-				psf_binheader_writef (psf, "Ems", ICRD_MARKER, psf->strings [k].str) ;
+				psf_binheader_writef (psf, "Ems", ICRD_MARKER, psf->strings.data [k].str) ;
 				break ;
 			*/
 			} ;
@@ -1448,8 +1522,21 @@ aiff_write_strings (SF_PRIVATE *psf, int location)
 } /* aiff_write_strings */
 
 static int
-aiff_command (SF_PRIVATE * UNUSED (psf), int UNUSED (command), void * UNUSED (data), int UNUSED (datasize))
-{
+aiff_command (SF_PRIVATE * psf, int command, void * UNUSED (data), int UNUSED (datasize))
+{	AIFF_PRIVATE	*paiff ;
+
+	if ((paiff = psf->container_data) == NULL)
+		return SFE_INTERNAL ;
+
+	switch (command)
+	{	case SFC_SET_CHANNEL_MAP_INFO :
+			paiff->chanmap_tag = aiff_caf_find_channel_layout_tag (psf->channel_map, psf->sf.channels) ;
+			return (paiff->chanmap_tag != 0) ;
+
+		default :
+			break ;
+	} ;
+
 	return 0 ;
 } /* aiff_command */
 
@@ -1610,3 +1697,82 @@ aiff_read_basc_chunk (SF_PRIVATE * psf, int datasize)
 	return 0 ;
 } /* aiff_read_basc_chunk */
 
+
+static int
+aiff_read_chanmap (SF_PRIVATE * psf, unsigned dword)
+{	const AIFF_CAF_CHANNEL_MAP * map_info ;
+	unsigned channel_bitmap, channel_decriptions, bytesread ;
+	int layout_tag ;
+
+	bytesread = psf_binheader_readf (psf, "444", &layout_tag, &channel_bitmap, &channel_decriptions) ;
+
+	if ((map_info = aiff_caf_of_channel_layout_tag (layout_tag)) == NULL)
+		return 0 ;
+
+	psf_log_printf (psf, "  Tag    : %x\n", layout_tag) ;
+	if (map_info)
+		psf_log_printf (psf, "  Layout : %s\n", map_info->name) ;
+
+	if (bytesread < dword)
+		psf_binheader_readf (psf, "j", dword - bytesread) ;
+
+	if (map_info->channel_map != NULL)
+	{	size_t chanmap_size = psf->sf.channels * sizeof (psf->channel_map [0]) ;
+
+		free (psf->channel_map) ;
+
+		if ((psf->channel_map = malloc (chanmap_size)) == NULL)
+			return SFE_MALLOC_FAILED ;
+
+		memcpy (psf->channel_map, map_info->channel_map, chanmap_size) ;
+		} ;
+
+	return 0 ;
+} /* aiff_read_chanmap */
+
+/*==============================================================================
+*/
+
+static int
+aiff_set_chunk (SF_PRIVATE *psf, const SF_CHUNK_INFO * chunk_info)
+{	return psf_save_write_chunk (&psf->wchunks, chunk_info) ;
+} /* aiff_set_chunk */
+
+static SF_CHUNK_ITERATOR *
+aiff_next_chunk_iterator (SF_PRIVATE *psf, SF_CHUNK_ITERATOR * iterator)
+{	return psf_next_chunk_iterator (&psf->rchunks, iterator) ;
+} /* aiff_next_chunk_iterator */
+
+static int
+aiff_get_chunk_size (SF_PRIVATE *psf, const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info)
+{	int indx ;
+
+	if ((indx = psf_find_read_chunk_iterator (&psf->rchunks, iterator)) < 0)
+		return SFE_UNKNOWN_CHUNK ;
+
+	chunk_info->datalen = psf->rchunks.chunks [indx].len ;
+
+	return SFE_NO_ERROR ;
+} /* aiff_get_chunk_size */
+
+static int
+aiff_get_chunk_data (SF_PRIVATE *psf, const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info)
+{	sf_count_t pos ;
+	int indx ;
+
+	if ((indx = psf_find_read_chunk_iterator (&psf->rchunks, iterator)) < 0)
+		return SFE_UNKNOWN_CHUNK ;
+
+	if (chunk_info->data == NULL)
+		return SFE_BAD_CHUNK_DATA_PTR ;
+
+	chunk_info->id_size = psf->rchunks.chunks [indx].id_size ;
+	memcpy (chunk_info->id, psf->rchunks.chunks [indx].id, sizeof (chunk_info->id) / sizeof (*chunk_info->id)) ;
+
+	pos = psf_ftell (psf) ;
+	psf_fseek (psf, psf->rchunks.chunks [indx].offset, SEEK_SET) ;
+	psf_fread (chunk_info->data, SF_MIN (chunk_info->datalen, psf->rchunks.chunks [indx].len), 1, psf) ;
+	psf_fseek (psf, pos, SEEK_SET) ;
+
+	return SFE_NO_ERROR ;
+} /* aiff_get_chunk_data */
diff --git a/libs/libsndfile/src/alac.c b/libs/libsndfile/src/alac.c
new file mode 100644
index 0000000000..0ea2d8011c
--- /dev/null
+++ b/libs/libsndfile/src/alac.c
@@ -0,0 +1,966 @@
+/*
+** Copyright (C) 2011-2013 Erik de Castro Lopo 
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU Lesser General Public License as published by
+** the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
+**
+** You should have received a copy of the GNU Lesser 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	"sfconfig.h"
+
+#include	
+#include	
+#include	
+#include	
+#include	
+
+#include	"sndfile.h"
+#include	"sfendian.h"
+#include	"common.h"
+#include	"ALAC/alac_codec.h"
+#include	"ALAC/ALACBitUtilities.h"
+
+#define		ALAC_MAX_FRAME_SIZE		8192
+#define		ALAC_BYTE_BUFFER_SIZE	82000
+
+
+typedef struct
+{	uint32_t	current, count, allocated ;
+	uint32_t	packet_size [] ;
+} PAKT_INFO ;
+
+typedef struct
+{	sf_count_t	input_data_pos ;
+
+	PAKT_INFO	* pakt_info ;
+
+	int			channels, final_write_block ;
+
+	uint32_t	frames_this_block, partial_block_frames, frames_per_block ;
+	uint32_t	bits_per_sample, kuki_size ;
+
+
+	/* Can't have a decoder and an encoder at the same time so stick
+	** them in an un-named union.
+	*/
+	union
+	{	ALAC_DECODER decoder ;
+		ALAC_ENCODER encoder ;
+	} ;
+
+	char enctmpname [512] ;
+	FILE *enctmp ;
+
+	int	buffer	[] ;
+
+} ALAC_PRIVATE ;
+
+/*============================================================================================
+*/
+
+static int alac_reader_init (SF_PRIVATE *psf, const ALAC_DECODER_INFO * info) ;
+static int alac_writer_init (SF_PRIVATE *psf) ;
+
+static sf_count_t alac_reader_calc_frames (SF_PRIVATE *psf, ALAC_PRIVATE *plac) ;
+
+static sf_count_t alac_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len) ;
+static sf_count_t alac_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) ;
+static sf_count_t alac_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) ;
+static sf_count_t alac_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) ;
+
+static sf_count_t alac_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len) ;
+static sf_count_t alac_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) ;
+static sf_count_t alac_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) ;
+static sf_count_t alac_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) ;
+
+static sf_count_t	alac_seek	(SF_PRIVATE *psf, int mode, sf_count_t offset) ;
+
+static int	alac_close		(SF_PRIVATE *psf) ;
+static int	alac_byterate	(SF_PRIVATE *psf) ;
+
+static int alac_decode_block (SF_PRIVATE *psf, ALAC_PRIVATE *plac) ;
+static int alac_encode_block (SF_PRIVATE *psf, ALAC_PRIVATE *plac) ;
+
+static uint32_t alac_kuki_read (SF_PRIVATE * psf, uint32_t kuki_offset, uint8_t * kuki, size_t kuki_maxlen) ;
+
+static PAKT_INFO * alac_pakt_alloc (uint32_t initial_count) ;
+static PAKT_INFO * alac_pakt_read_decode (SF_PRIVATE * psf, uint32_t pakt_offset) ;
+static PAKT_INFO * alac_pakt_append (PAKT_INFO * info, uint32_t value) ;
+static uint8_t * alac_pakt_encode (const SF_PRIVATE *psf, uint32_t * pakt_size) ;
+static sf_count_t alac_pakt_block_offset (const PAKT_INFO *info, uint32_t block) ;
+
+/*============================================================================================
+** ALAC Reader initialisation function.
+*/
+
+int
+alac_init (SF_PRIVATE *psf, const ALAC_DECODER_INFO * info)
+{	int error ;
+
+	if ((psf->codec_data = calloc (1, sizeof (ALAC_PRIVATE) + psf->sf.channels * sizeof (int) * ALAC_MAX_FRAME_SIZE)) == NULL)
+		return SFE_MALLOC_FAILED ;
+
+	psf->codec_close = alac_close ;
+
+	switch (psf->file.mode)
+	{	case SFM_RDWR :
+			return SFE_BAD_MODE_RW ;
+
+		case SFM_READ :
+			if ((error = alac_reader_init (psf, info)))
+				return error ;
+			break ;
+
+		case SFM_WRITE :
+			if ((error = alac_writer_init (psf)))
+				return error ;
+			break ;
+
+		default :
+			psf_log_printf (psf, "%s : Bad psf->file.mode.\n", __func__) ;
+			return SFE_INTERNAL ;
+		} ;
+
+	psf->byterate = alac_byterate ;
+
+	return 0 ;
+} /* aiff_alac_init */
+
+void
+alac_get_desc_chunk_items (int subformat, uint32_t *fmt_flags, uint32_t *frames_per_packet)
+{	switch (subformat)
+	{	case SF_FORMAT_ALAC_16 :
+			*fmt_flags = 1 ;
+			break ;
+		case SF_FORMAT_ALAC_20 :
+			*fmt_flags = 2 ;
+			break ;
+		case SF_FORMAT_ALAC_24 :
+			*fmt_flags = 3 ;
+			break ;
+		case SF_FORMAT_ALAC_32 :
+			*fmt_flags = 4 ;
+			break ;
+		default :
+			break ;
+		} ;
+	*frames_per_packet = ALAC_FRAME_LENGTH ;
+} /* alac_get_desc_chunk_items */
+
+static int
+alac_close	(SF_PRIVATE *psf)
+{	ALAC_PRIVATE *plac ;
+	BUF_UNION	ubuf ;
+
+	plac = psf->codec_data ;
+
+	if (psf->file.mode == SFM_WRITE)
+	{	ALAC_ENCODER *penc = &plac->encoder ;
+		SF_CHUNK_INFO chunk_info ;
+		sf_count_t readcount ;
+		uint32_t pakt_size = 0, saved_partial_block_frames ;
+		uint8_t *kuki_data = (uint8_t *)malloc (plac->kuki_size);
+
+		if (!kuki_data)
+		{
+			return SFE_MALLOC_FAILED ;
+		}
+
+		plac->final_write_block = 1 ;
+		saved_partial_block_frames = plac->partial_block_frames ;
+
+		/*	If a block has been partially assembled, write it out as the final block. */
+		if (plac->partial_block_frames && plac->partial_block_frames < plac->frames_per_block)
+			alac_encode_block (psf, plac) ;
+
+		plac->partial_block_frames = saved_partial_block_frames ;
+
+		alac_get_magic_cookie (penc, kuki_data, &plac->kuki_size) ;
+
+		memset (&chunk_info, 0, sizeof (chunk_info)) ;
+		chunk_info.id_size = snprintf (chunk_info.id, sizeof (chunk_info.id), "kuki") ;
+		chunk_info.data = kuki_data ;
+		chunk_info.datalen = plac->kuki_size ;
+		psf_save_write_chunk (&psf->wchunks, &chunk_info) ;
+
+		memset (&chunk_info, 0, sizeof (chunk_info)) ;
+		chunk_info.id_size = snprintf (chunk_info.id, sizeof (chunk_info.id), "pakt") ;
+		chunk_info.data = alac_pakt_encode (psf, &pakt_size) ;
+		chunk_info.datalen = pakt_size ;
+		psf_save_write_chunk (&psf->wchunks, &chunk_info) ;
+
+		free (chunk_info.data) ;
+		chunk_info.data = NULL ;
+
+		psf->write_header (psf, 1) ;
+
+		if (plac->enctmp != NULL)
+		{	fseek (plac->enctmp, 0, SEEK_SET) ;
+
+			while ((readcount = fread (ubuf.ucbuf, 1, sizeof (ubuf.ucbuf), plac->enctmp)) > 0)
+				psf_fwrite (ubuf.ucbuf, 1, readcount, psf) ;
+			fclose (plac->enctmp) ;
+			remove (plac->enctmpname) ;
+			} ;
+			free(kuki_data);
+		} ;
+
+	if (plac->pakt_info)
+		free (plac->pakt_info) ;
+	plac->pakt_info = NULL ;
+
+	return 0 ;
+} /* alac_close */
+
+static int
+alac_byterate	(SF_PRIVATE *psf)
+{
+	if (psf->file.mode == SFM_READ)
+		return (psf->datalength * psf->sf.samplerate) / psf->sf.frames ;
+
+	return -1 ;
+} /* alac_byterate */
+
+/*============================================================================================
+** ALAC initialisation Functions.
+*/
+
+static int
+alac_reader_init (SF_PRIVATE *psf, const ALAC_DECODER_INFO * info)
+{	ALAC_PRIVATE	*plac ;
+	uint32_t		kuki_size ;
+	union			{ uint8_t kuki [512] ; uint32_t alignment ; } u ;
+
+	if (info == NULL)
+	{	psf_log_printf (psf, "%s : ALAC_DECODER_INFO is NULL.\n", __func__) ;
+		return SFE_INTERNAL ;
+		} ;
+
+	plac = psf->codec_data ;
+
+	plac->channels			= psf->sf.channels ;
+	plac->frames_per_block	= info->frames_per_packet ;
+	plac->bits_per_sample	= info->bits_per_sample ;
+
+	if (plac->pakt_info != NULL)
+		free (plac->pakt_info) ;
+	plac->pakt_info = alac_pakt_read_decode (psf, info->pakt_offset) ;
+
+
+	if (plac->pakt_info == NULL)
+	{	psf_log_printf (psf, "%s : alac_pkt_read() returns NULL.\n", __func__) ;
+		return SFE_MALLOC_FAILED ;
+		} ;
+
+	/* Read in the ALAC cookie data and pass it to the init function. */
+	kuki_size = alac_kuki_read (psf, info->kuki_offset, u.kuki, sizeof (u.kuki)) ;
+
+	alac_decoder_init (&plac->decoder, u.kuki, kuki_size) ;
+
+	switch (info->bits_per_sample)
+	{	case 16 :
+		case 20 :
+		case 24 :
+		case 32 :
+			psf->read_short		= alac_read_s ;
+			psf->read_int		= alac_read_i ;
+			psf->read_float		= alac_read_f ;
+			psf->read_double	= alac_read_d ;
+			break ;
+
+		default :
+			printf ("%s : info->bits_per_sample %u\n", __func__, info->bits_per_sample) ;
+			return SFE_UNSUPPORTED_ENCODING ;
+		} ;
+
+	psf->codec_close	= alac_close ;
+	psf->seek			= alac_seek ;
+
+	psf->sf.frames		= alac_reader_calc_frames (psf, plac) ;
+	alac_seek (psf, SFM_READ, 0) ;
+
+	return 0 ;
+} /* alac_reader_init */
+
+static int
+alac_writer_init (SF_PRIVATE *psf)
+{	ALAC_PRIVATE	*plac ;
+	uint32_t		alac_format_flags = 0 ;
+
+	plac = psf->codec_data ;
+
+	if (psf->file.mode != SFM_WRITE)
+		return SFE_BAD_MODE_RW ;
+
+	plac->channels	= psf->sf.channels ;
+	plac->kuki_size = alac_get_magic_cookie_size (psf->sf.channels) ;
+
+	psf->write_short	= alac_write_s ;
+	psf->write_int		= alac_write_i ;
+	psf->write_float	= alac_write_f ;
+	psf->write_double	= alac_write_d ;
+
+	switch (SF_CODEC (psf->sf.format))
+	{	case SF_FORMAT_ALAC_16 :
+			alac_format_flags	= 1 ;
+			plac->bits_per_sample = 16 ;
+			break ;
+
+		case SF_FORMAT_ALAC_20 :
+			alac_format_flags	= 2 ;
+			plac->bits_per_sample = 20 ;
+			break ;
+
+		case SF_FORMAT_ALAC_24 :
+			alac_format_flags	= 3 ;
+			plac->bits_per_sample = 24 ;
+			break ;
+
+		case SF_FORMAT_ALAC_32 :
+			alac_format_flags	= 4 ;
+			plac->bits_per_sample = 32 ;
+			break ;
+
+		default :
+			psf_log_printf (psf, "%s : Can't figure out bits per sample.\n", __func__) ;
+			return SFE_UNIMPLEMENTED ;
+		} ;
+
+	plac->frames_per_block = ALAC_FRAME_LENGTH ;
+
+	plac->pakt_info = alac_pakt_alloc (2000) ;
+
+	if ((plac->enctmp = psf_open_tmpfile (plac->enctmpname, sizeof (plac->enctmpname))) == NULL)
+	{	psf_log_printf (psf, "Error : Failed to open temp file '%s' : \n", plac->enctmpname, strerror (errno)) ;
+		return SFE_ALAC_FAIL_TMPFILE ;
+		} ;
+
+	alac_encoder_init (&plac->encoder, psf->sf.samplerate, psf->sf.channels, alac_format_flags, ALAC_FRAME_LENGTH) ;
+
+	return 0 ;
+} /* alac_writer_init */
+
+/*============================================================================================
+** ALAC block decoder and encoder.
+*/
+
+static inline uint32_t
+alac_reader_next_packet_size (PAKT_INFO * info)
+{	if (info->current >= info->count)
+		return 0 ;
+	return info->packet_size [info->current++] ;
+} /* alac_reader_next_packet_size */
+
+static sf_count_t
+alac_reader_calc_frames (SF_PRIVATE *psf, ALAC_PRIVATE *plac)
+{	sf_count_t	frames = 0 ;
+	uint32_t	current_pos = 1, blocks = 0 ;
+
+	plac->pakt_info->current = 0 ;
+
+	while (current_pos < psf->filelength && current_pos > 0)
+	{	current_pos = alac_reader_next_packet_size (plac->pakt_info) ;
+		blocks = current_pos > 0 ? blocks + 1 : blocks ;
+		} ;
+
+	if (blocks == 0)
+		return 0 ;
+
+	/* Only count full blocks. */
+	frames = plac->frames_per_block * (blocks - 1) ;
+
+	alac_seek (psf, SFM_READ, frames) ;
+	alac_decode_block (psf, plac) ;
+	frames += plac->frames_this_block ;
+
+	plac->pakt_info->current = 0 ;
+
+	return frames ;
+} /* alac_reader_calc_frames */
+
+static int
+alac_decode_block (SF_PRIVATE *psf, ALAC_PRIVATE *plac)
+{	ALAC_DECODER *pdec = &plac->decoder ;
+	uint8_t		byte_buffer [ALAC_BYTE_BUFFER_SIZE] ;
+	uint32_t	packet_size ;
+	BitBuffer	bit_buffer ;
+
+	packet_size = alac_reader_next_packet_size (plac->pakt_info) ;
+	if (packet_size == 0)
+	{	if (plac->pakt_info->current < plac->pakt_info->count)
+			psf_log_printf (psf, "packet_size is 0 (%d of %d)\n", plac->pakt_info->current, plac->pakt_info->count) ;
+		return 0 ;
+		} ;
+
+	psf_fseek (psf, plac->input_data_pos, SEEK_SET) ;
+
+	if (packet_size > SIGNED_SIZEOF (byte_buffer))
+	{	psf_log_printf (psf, "%s : bad packet_size (%u)\n", __func__, packet_size) ;
+		return 0 ;
+		} ;
+
+	if ((packet_size != psf_fread (byte_buffer, 1, packet_size, psf)))
+		return 0 ;
+
+	BitBufferInit (&bit_buffer, byte_buffer, packet_size) ;
+
+	plac->input_data_pos += packet_size ;
+	plac->frames_this_block = 0 ;
+	alac_decode (pdec, &bit_buffer, plac->buffer, plac->frames_per_block, psf->sf.channels, &plac->frames_this_block) ;
+
+	plac->partial_block_frames = 0 ;
+
+	return 1 ;
+} /* alac_decode_block */
+
+
+static int
+alac_encode_block (SF_PRIVATE * psf, ALAC_PRIVATE *plac)
+{	ALAC_ENCODER *penc = &plac->encoder ;
+	uint32_t num_bytes = 0 ;
+	uint8_t* byte_buffer = (uint8_t*)malloc (psf->sf.channels * ALAC_BYTE_BUFFER_SIZE) ;
+
+	if (!byte_buffer)
+	{
+		return SFE_MALLOC_FAILED ;
+	}
+
+	alac_encode (penc, plac->channels, plac->partial_block_frames, plac->buffer, byte_buffer, &num_bytes) ;
+
+	if (fwrite (byte_buffer, 1, num_bytes, plac->enctmp) != num_bytes)
+	{
+		free (byte_buffer);
+		return 0 ;
+	}
+	free(byte_buffer);
+
+	if ((plac->pakt_info = alac_pakt_append (plac->pakt_info, num_bytes)) == NULL)
+		return 0 ;
+
+	plac->partial_block_frames = 0 ;
+
+	return 1 ;
+} /* alac_encode_block */
+
+/*============================================================================================
+** ALAC read functions.
+*/
+
+static sf_count_t
+alac_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len)
+{	ALAC_PRIVATE *plac ;
+	int			*iptr ;
+	int			k, readcount ;
+	sf_count_t	total = 0 ;
+
+	if ((plac = (ALAC_PRIVATE*) psf->codec_data) == NULL)
+		return 0 ;
+
+	while (len > 0)
+	{	if (plac->partial_block_frames >= plac->frames_this_block && alac_decode_block (psf, plac) == 0)
+			break ;
+
+		readcount = (plac->frames_this_block - plac->partial_block_frames) * plac->channels ;
+		readcount = readcount > len ? len : readcount ;
+
+		iptr = plac->buffer + plac->partial_block_frames * plac->channels ;
+
+		for (k = 0 ; k < readcount ; k++)
+			ptr [total + k] = iptr [k] >> 16 ;
+
+		plac->partial_block_frames += readcount / plac->channels ;
+		total += readcount ;
+		len -= readcount ;
+		} ;
+
+	return total ;
+} /* alac_read_s */
+
+static sf_count_t
+alac_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len)
+{	ALAC_PRIVATE *plac ;
+	int			*iptr ;
+	int			k, readcount ;
+	sf_count_t	total = 0 ;
+
+	if ((plac = (ALAC_PRIVATE*) psf->codec_data) == NULL)
+		return 0 ;
+
+	while (len > 0)
+	{	if (plac->partial_block_frames >= plac->frames_this_block && alac_decode_block (psf, plac) == 0)
+			break ;
+
+		readcount = (plac->frames_this_block - plac->partial_block_frames) * plac->channels ;
+		readcount = readcount > len ? len : readcount ;
+
+		iptr = plac->buffer + plac->partial_block_frames * plac->channels ;
+
+		for (k = 0 ; k < readcount ; k++)
+			ptr [total + k] = iptr [k] ;
+
+		plac->partial_block_frames += readcount / plac->channels ;
+		total += readcount ;
+		len -= readcount ;
+		} ;
+
+	return total ;
+} /* alac_read_i */
+
+static sf_count_t
+alac_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
+{	ALAC_PRIVATE *plac ;
+	int			*iptr ;
+	int			k, readcount ;
+	sf_count_t	total = 0 ;
+	float		normfact ;
+
+	if ((plac = (ALAC_PRIVATE*) psf->codec_data) == NULL)
+		return 0 ;
+
+	normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x80000000) : 1.0 ;
+
+	while (len > 0)
+	{	if (plac->partial_block_frames >= plac->frames_this_block && alac_decode_block (psf, plac) == 0)
+			break ;
+
+		readcount = (plac->frames_this_block - plac->partial_block_frames) * plac->channels ;
+		readcount = readcount > len ? len : readcount ;
+
+		iptr = plac->buffer + plac->partial_block_frames * plac->channels ;
+
+		for (k = 0 ; k < readcount ; k++)
+			ptr [total + k] = normfact * iptr [k] ;
+
+		plac->partial_block_frames += readcount / plac->channels ;
+		total += readcount ;
+		len -= readcount ;
+		} ;
+
+	return total ;
+} /* alac_read_f */
+
+static sf_count_t
+alac_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
+{	ALAC_PRIVATE *plac ;
+	int			*iptr ;
+	int			k, readcount ;
+	sf_count_t	total = 0 ;
+	double		normfact ;
+
+	if ((plac = (ALAC_PRIVATE*) psf->codec_data) == NULL)
+		return 0 ;
+
+	normfact = (psf->norm_double == SF_TRUE) ? 1.0 / ((float) 0x80000000) : 1.0 ;
+
+	while (len > 0)
+	{	if (plac->partial_block_frames >= plac->frames_this_block && alac_decode_block (psf, plac) == 0)
+			break ;
+
+		readcount = (plac->frames_this_block - plac->partial_block_frames) * plac->channels ;
+		readcount = readcount > len ? len : readcount ;
+
+		iptr = plac->buffer + plac->partial_block_frames * plac->channels ;
+
+		for (k = 0 ; k < readcount ; k++)
+			ptr [total + k] = normfact * iptr [k] ;
+
+		plac->partial_block_frames += readcount / plac->channels ;
+		total += readcount ;
+		len -= readcount ;
+		} ;
+
+	return total ;
+} /* alac_read_d */
+
+/*============================================================================================
+*/
+
+static sf_count_t
+alac_seek (SF_PRIVATE *psf, int mode, sf_count_t offset)
+{	ALAC_PRIVATE *plac ;
+	int			newblock, newsample ;
+
+	if (! psf->codec_data)
+		return 0 ;
+	plac = (ALAC_PRIVATE*) psf->codec_data ;
+
+	if (psf->datalength < 0 || psf->dataoffset < 0)
+	{	psf->error = SFE_BAD_SEEK ;
+		return PSF_SEEK_ERROR ;
+		} ;
+
+	if (offset == 0)
+	{	psf_fseek (psf, psf->dataoffset, SEEK_SET) ;
+
+		plac->frames_this_block = 0 ;
+		plac->input_data_pos = psf->dataoffset ;
+		plac->pakt_info->current = 0 ;
+		return 0 ;
+		} ;
+
+	if (offset < 0 || offset > plac->pakt_info->count * plac->frames_per_block)
+	{	psf->error = SFE_BAD_SEEK ;
+		return	PSF_SEEK_ERROR ;
+		} ;
+
+	newblock	= offset / plac->frames_per_block ;
+	newsample	= offset % plac->frames_per_block ;
+
+	if (mode == SFM_READ)
+	{	plac->input_data_pos = psf->dataoffset + alac_pakt_block_offset (plac->pakt_info, newblock) ;
+
+		plac->pakt_info->current = newblock ;
+		alac_decode_block (psf, plac) ;
+		plac->partial_block_frames = newsample ;
+		}
+	else
+	{	/* What to do about write??? */
+		psf->error = SFE_BAD_SEEK ;
+		return	PSF_SEEK_ERROR ;
+		} ;
+
+	return newblock * plac->frames_per_block + newsample ;
+} /* alac_seek */
+
+/*==========================================================================================
+** ALAC Write Functions.
+*/
+
+static sf_count_t
+alac_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len)
+{	ALAC_PRIVATE *plac ;
+	int			*iptr ;
+	int			k, writecount ;
+	sf_count_t	total = 0 ;
+
+	if ((plac = (ALAC_PRIVATE*) psf->codec_data) == NULL)
+		return 0 ;
+
+	while (len > 0)
+	{	writecount = (plac->frames_per_block - plac->partial_block_frames) * plac->channels ;
+		writecount = (writecount == 0 || writecount > len) ? len : writecount ;
+
+		iptr = plac->buffer + plac->partial_block_frames * plac->channels ;
+
+		for (k = 0 ; k < writecount ; k++)
+			iptr [k] = ptr [total + k] << 16 ;
+
+		plac->partial_block_frames += writecount / plac->channels ;
+		total += writecount ;
+		len -= writecount ;
+
+		if (plac->partial_block_frames >= plac->frames_per_block)
+			alac_encode_block (psf, plac) ;
+		} ;
+
+	return total ;
+} /* alac_write_s */
+
+static sf_count_t
+alac_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len)
+{	ALAC_PRIVATE *plac ;
+	int			*iptr ;
+	int			k, writecount ;
+	sf_count_t	total = 0 ;
+
+	if ((plac = (ALAC_PRIVATE*) psf->codec_data) == NULL)
+		return 0 ;
+
+	while (len > 0)
+	{	writecount = (plac->frames_per_block - plac->partial_block_frames) * plac->channels ;
+		writecount = (writecount == 0 || writecount > len) ? len : writecount ;
+
+		iptr = plac->buffer + plac->partial_block_frames * plac->channels ;
+
+		for (k = 0 ; k < writecount ; k++)
+			iptr [k] = ptr [total + k] ;
+
+		plac->partial_block_frames += writecount / plac->channels ;
+		total += writecount ;
+		len -= writecount ;
+
+		if (plac->partial_block_frames >= plac->frames_per_block)
+			alac_encode_block (psf, plac) ;
+		} ;
+
+	return total ;
+} /* alac_write_i */
+
+static sf_count_t
+alac_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len)
+{	ALAC_PRIVATE *plac ;
+	void		(*convert) (const float *, int *t, int, int) ;
+	int			*iptr ;
+	int			writecount ;
+	sf_count_t	total = 0 ;
+
+	if ((plac = (ALAC_PRIVATE*) psf->codec_data) == NULL)
+		return 0 ;
+
+	convert = (psf->add_clipping) ? psf_f2i_clip_array : psf_f2i_array ;
+
+	while (len > 0)
+	{	writecount = (plac->frames_per_block - plac->partial_block_frames) * plac->channels ;
+		writecount = (writecount == 0 || writecount > len) ? len : writecount ;
+
+		iptr = plac->buffer + plac->partial_block_frames * plac->channels ;
+
+		convert (ptr, iptr, writecount, psf->norm_float) ;
+
+		plac->partial_block_frames += writecount / plac->channels ;
+		total += writecount ;
+		len -= writecount ;
+
+		if (plac->partial_block_frames >= plac->frames_per_block)
+			alac_encode_block (psf, plac) ;
+		} ;
+
+	return total ;
+} /* alac_write_f */
+
+static sf_count_t
+alac_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len)
+{	ALAC_PRIVATE *plac ;
+	void		(*convert) (const double *, int *t, int, int) ;
+	int			*iptr ;
+	int			writecount ;
+	sf_count_t	total = 0 ;
+
+	if ((plac = (ALAC_PRIVATE*) psf->codec_data) == NULL)
+		return 0 ;
+
+	convert = (psf->add_clipping) ? psf_d2i_clip_array : psf_d2i_array ;
+
+	while (len > 0)
+	{	writecount = (plac->frames_per_block - plac->partial_block_frames) * plac->channels ;
+		writecount = (writecount == 0 || writecount > len) ? len : writecount ;
+
+		iptr = plac->buffer + plac->partial_block_frames * plac->channels ;
+
+		convert (ptr, iptr, writecount, psf->norm_float) ;
+
+		plac->partial_block_frames += writecount / plac->channels ;
+		total += writecount ;
+		len -= writecount ;
+
+		if (plac->partial_block_frames >= plac->frames_per_block)
+			alac_encode_block (psf, plac) ;
+		} ;
+
+	return total ;
+} /* alac_write_d */
+
+/*==============================================================================
+** PAKT_INFO handling.
+*/
+
+static PAKT_INFO *
+alac_pakt_alloc (uint32_t initial_count)
+{	PAKT_INFO * info ;
+
+	if ((info = calloc (1, sizeof (PAKT_INFO) + initial_count * sizeof (info->packet_size [0]))) == NULL)
+		return NULL ;
+
+	info->allocated = initial_count ;
+	info->current = 0 ;
+	info->count = 0 ;
+
+	return info ;
+} /* alac_pakt_alloc */
+
+static PAKT_INFO *
+alac_pakt_append (PAKT_INFO * info, uint32_t value)
+{
+	if (info->count >= info->allocated)
+	{	PAKT_INFO * temp ;
+		uint32_t newcount = info->allocated + info->allocated / 2 ;
+
+		if ((temp = realloc (info, sizeof (PAKT_INFO) + newcount * sizeof (info->packet_size [0]))) == NULL)
+			return NULL ;
+
+		info = temp ;
+		info->allocated = newcount ;
+		} ;
+
+	info->packet_size [info->count++] = value ;
+	return info ;
+} /* alac_pakt_append */
+
+static PAKT_INFO *
+alac_pakt_read_decode (SF_PRIVATE * psf, uint32_t UNUSED (pakt_offset))
+{	SF_CHUNK_INFO chunk_info ;
+	PAKT_INFO * info = NULL ;
+	uint8_t *pakt_data = NULL ;
+	uint32_t bcount, value = 1, pakt_size ;
+	SF_CHUNK_ITERATOR * chunk_iterator ;
+
+
+	memset (&chunk_info, 0, sizeof (chunk_info)) ;
+	snprintf (chunk_info.id, sizeof (chunk_info.id), "pakt") ;
+	chunk_info.id_size = 4 ;
+
+	if ((chunk_iterator = psf_get_chunk_iterator (psf, chunk_info.id)) == NULL)
+	{	printf ("%s %d : no chunk iterator found\n\n", __func__, __LINE__) ;
+		free (chunk_info.data) ;
+		chunk_info.data = NULL ;
+		return NULL ;
+		} ;
+
+	psf->get_chunk_size (psf, chunk_iterator, &chunk_info) ;
+
+	pakt_size = chunk_info.datalen ;
+	chunk_info.data = pakt_data = malloc (pakt_size + 5) ;
+
+	if ((bcount = psf->get_chunk_data (psf, chunk_iterator, &chunk_info)) != SF_ERR_NO_ERROR)
+	{	printf ("%s %d : %s\n\n", __func__, __LINE__, sf_error_number (bcount)) ;
+		while (chunk_iterator)
+			chunk_iterator = psf->next_chunk_iterator (psf, chunk_iterator) ;
+		free (chunk_info.data) ;
+		chunk_info.data = NULL ;
+		return NULL ;
+		} ;
+
+	while (chunk_iterator)
+		chunk_iterator = psf->next_chunk_iterator (psf, chunk_iterator) ;
+
+	info = alac_pakt_alloc (pakt_size / 4) ;
+
+	/* Start at 24 bytes in, skipping over the 'pakt' chunks header. */
+	for (bcount = 24 ; bcount < pakt_size && value != 0 ; )
+	{	uint8_t byte ;
+		int32_t count = 0 ;
+
+		value = 0 ;
+		do
+		{	byte = pakt_data [bcount + count] ;
+			value = (value << 7) + (byte & 0x7F) ;
+
+			count ++ ;
+			if (count > 5 || bcount + count > pakt_size)
+			{	printf ("%s %d : Ooops! count %d    bcount %d\n", __func__, __LINE__, count, bcount) ;
+				value = 0 ;
+				break ;
+				} ;
+			}
+			while (byte & 0x80) ;
+
+		bcount += count ;
+
+		if ((info = alac_pakt_append (info, value)) == NULL)
+			goto FreeExit ;
+		} ;
+
+	free (pakt_data) ;
+
+	return info ;
+
+FreeExit :
+	free (pakt_data) ;
+	free (info) ;
+	return NULL ;
+} /* alac_pakt_read_decode */
+
+static uint8_t *
+alac_pakt_encode (const SF_PRIVATE *psf, uint32_t * pakt_size_out)
+{	const ALAC_PRIVATE *plac ;
+	const PAKT_INFO *info ;
+	uint8_t	*data ;
+	uint32_t k, allocated, pakt_size ;
+
+	plac = psf->codec_data ;
+	info = plac->pakt_info ;
+
+	allocated = 100 + 2 * info->count ;
+	if ((data = calloc (1, allocated)) == NULL)
+		return NULL ;
+
+	psf_put_be64 (data, 0, info->count) ;
+	psf_put_be64 (data, 8, psf->sf.frames) ;
+	psf_put_be32 (data, 20, kALACDefaultFramesPerPacket - plac->partial_block_frames) ;
+
+	/* Real 'pakt' data starts after 24 byte header. */
+	pakt_size = 24 ;
+
+	for (k = 0 ; k < info->count ; k++)
+	{	int32_t value = info->packet_size [k] ;
+
+		if ((value & 0x7f) == value)
+		{	data [pakt_size++] = value ;
+			continue ;
+			} ;
+
+		if ((value & 0x3fff) == value)
+		{	data [pakt_size++] = (value >> 7) | 0x80 ;
+			data [pakt_size++] = value & 0x7f ;
+			continue ;
+			} ;
+
+		if ((value & 0x1fffff) == value)
+		{	data [pakt_size++] = (value >> 14) | 0x80 ;
+			data [pakt_size++] = ((value >> 7) & 0x7f) | 0x80 ;
+			data [pakt_size++] = value & 0x7f ;
+			continue ;
+		} ;
+
+		if ((value & 0x0fffffff) == value)
+		{	data [pakt_size++] = (value >> 21) | 0x80 ;
+			data [pakt_size++] = ((value >> 14) & 0x7f) | 0x80 ;
+			data [pakt_size++] = ((value >> 7) & 0x7f) | 0x80 ;
+			data [pakt_size++] = value & 0x7f ;
+			continue ;
+			} ;
+
+		*pakt_size_out = 0 ;
+		free (data) ;
+		return NULL ;
+		} ;
+
+	*pakt_size_out = pakt_size ;
+	return data ;
+} /* alac_pakt_encode */
+
+static sf_count_t
+alac_pakt_block_offset (const PAKT_INFO *info, uint32_t block)
+{	sf_count_t offset = 0 ;
+	uint32_t k ;
+
+	for (k = 0 ; k < block ; k++)
+		offset += info->packet_size [k] ;
+
+	return offset ;
+} /* alac_pakt_block_offset */
+
+static uint32_t
+alac_kuki_read (SF_PRIVATE * psf, uint32_t kuki_offset, uint8_t * kuki, size_t kuki_maxlen)
+{	uint32_t marker ;
+	uint64_t kuki_size ;
+
+	if (psf_fseek (psf, kuki_offset, SEEK_SET) != kuki_offset)
+		return 0 ;
+
+	psf_fread (&marker, 1, sizeof (marker), psf) ;
+	if (marker != MAKE_MARKER ('k', 'u', 'k', 'i'))
+		return 0 ;
+
+	psf_fread (&kuki_size, 1, sizeof (kuki_size), psf) ;
+	kuki_size = BE2H_64 (kuki_size) ;
+
+	if (kuki_size == 0 || kuki_size > kuki_maxlen)
+	{	psf_log_printf (psf, "%s : Bad size (%D) of 'kuki' chunk.\n", __func__, kuki_size) ;
+		return 0 ;
+		} ;
+
+	psf_fread (kuki, 1, kuki_size, psf) ;
+
+	return kuki_size ;
+} /* alac_kuki_read */
diff --git a/libs/libsndfile/src/alaw.c b/libs/libsndfile/src/alaw.c
index 900054aae5..81d7696863 100644
--- a/libs/libsndfile/src/alaw.c
+++ b/libs/libsndfile/src/alaw.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2012 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -47,14 +47,14 @@ static void d2alaw_array (const double *buffer, int count, unsigned char *ptr, d
 int
 alaw_init (SF_PRIVATE *psf)
 {
-	if (psf->mode == SFM_READ || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_READ || psf->file.mode == SFM_RDWR)
 	{	psf->read_short		= alaw_read_alaw2s ;
 		psf->read_int		= alaw_read_alaw2i ;
 		psf->read_float		= alaw_read_alaw2f ;
 		psf->read_double	= alaw_read_alaw2d ;
 		} ;
 
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{	psf->write_short	= alaw_write_s2alaw ;
 		psf->write_int		= alaw_write_i2alaw ;
 		psf->write_float	= alaw_write_f2alaw ;
@@ -69,7 +69,7 @@ alaw_init (SF_PRIVATE *psf)
 	else
 		psf->datalength = 0 ;
 
-	psf->sf.frames = psf->datalength / psf->blockwidth ;
+	psf->sf.frames = psf->blockwidth > 0 ? psf->datalength / psf->blockwidth : 0 ;
 
 	return 0 ;
 } /* alaw_init */
@@ -286,7 +286,7 @@ unsigned char alaw_encode [2048 + 1] =
 	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
 	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
 	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x2a
+	0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa
 } ; /* alaw_encode */
 
 static inline void
@@ -358,16 +358,17 @@ d2alaw_array (const double *ptr, int count, unsigned char *buffer, double normfa
 
 static sf_count_t
 alaw_read_alaw2s (SF_PRIVATE *psf, short *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ucbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ucbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.ucbuf, 1, bufferlen, psf) ;
-		alaw2s_array (psf->u.ucbuf, readcount, ptr + total) ;
+		readcount = psf_fread (ubuf.ucbuf, 1, bufferlen, psf) ;
+		alaw2s_array (ubuf.ucbuf, readcount, ptr + total) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -379,16 +380,17 @@ alaw_read_alaw2s (SF_PRIVATE *psf, short *ptr, sf_count_t len)
 
 static sf_count_t
 alaw_read_alaw2i (SF_PRIVATE *psf, int *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ucbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ucbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.ucbuf, 1, bufferlen, psf) ;
-		alaw2i_array (psf->u.ucbuf, readcount, ptr + total) ;
+		readcount = psf_fread (ubuf.ucbuf, 1, bufferlen, psf) ;
+		alaw2i_array (ubuf.ucbuf, readcount, ptr + total) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -400,19 +402,20 @@ alaw_read_alaw2i (SF_PRIVATE *psf, int *ptr, sf_count_t len)
 
 static sf_count_t
 alaw_read_alaw2f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 	float	normfact ;
 
 	normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x8000) : 1.0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ucbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ucbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.ucbuf, 1, bufferlen, psf) ;
-		alaw2f_array (psf->u.ucbuf, readcount, ptr + total, normfact) ;
+		readcount = psf_fread (ubuf.ucbuf, 1, bufferlen, psf) ;
+		alaw2f_array (ubuf.ucbuf, readcount, ptr + total, normfact) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -424,18 +427,19 @@ alaw_read_alaw2f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
 
 static sf_count_t
 alaw_read_alaw2d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 	double	normfact ;
 
 	normfact = (psf->norm_double) ? 1.0 / ((double) 0x8000) : 1.0 ;
-	bufferlen = ARRAY_LEN (psf->u.ucbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ucbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.ucbuf, 1, bufferlen, psf) ;
-		alaw2d_array (psf->u.ucbuf, readcount, ptr + total, normfact) ;
+		readcount = psf_fread (ubuf.ucbuf, 1, bufferlen, psf) ;
+		alaw2d_array (ubuf.ucbuf, readcount, ptr + total, normfact) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -450,16 +454,17 @@ alaw_read_alaw2d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
 
 static sf_count_t
 alaw_write_s2alaw	(SF_PRIVATE *psf, const short *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ucbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ucbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		s2alaw_array (ptr + total, bufferlen, psf->u.ucbuf) ;
-		writecount = psf_fwrite (psf->u.ucbuf, 1, bufferlen, psf) ;
+		s2alaw_array (ptr + total, bufferlen, ubuf.ucbuf) ;
+		writecount = psf_fwrite (ubuf.ucbuf, 1, bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -471,16 +476,17 @@ alaw_write_s2alaw	(SF_PRIVATE *psf, const short *ptr, sf_count_t len)
 
 static sf_count_t
 alaw_write_i2alaw	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ucbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ucbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		i2alaw_array (ptr + total, bufferlen, psf->u.ucbuf) ;
-		writecount = psf_fwrite (psf->u.ucbuf, 1, bufferlen, psf) ;
+		i2alaw_array (ptr + total, bufferlen, ubuf.ucbuf) ;
+		writecount = psf_fwrite (ubuf.ucbuf, 1, bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -492,19 +498,20 @@ alaw_write_i2alaw	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
 
 static sf_count_t
 alaw_write_f2alaw	(SF_PRIVATE *psf, const float *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 	float	normfact ;
 
 	normfact = (psf->norm_float == SF_TRUE) ? (1.0 * 0x7FFF) / 16.0 : 1.0 / 16 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ucbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ucbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		f2alaw_array (ptr + total, bufferlen, psf->u.ucbuf, normfact) ;
-		writecount = psf_fwrite (psf->u.ucbuf, 1, bufferlen, psf) ;
+		f2alaw_array (ptr + total, bufferlen, ubuf.ucbuf, normfact) ;
+		writecount = psf_fwrite (ubuf.ucbuf, 1, bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -516,19 +523,20 @@ alaw_write_f2alaw	(SF_PRIVATE *psf, const float *ptr, sf_count_t len)
 
 static sf_count_t
 alaw_write_d2alaw	(SF_PRIVATE *psf, const double *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 	double	normfact ;
 
 	normfact = (psf->norm_double) ? (1.0 * 0x7FFF) / 16.0 : 1.0 / 16.0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ucbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ucbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		d2alaw_array (ptr + total, bufferlen, psf->u.ucbuf, normfact) ;
-		writecount = psf_fwrite (psf->u.ucbuf, 1, bufferlen, psf) ;
+		d2alaw_array (ptr + total, bufferlen, ubuf.ucbuf, normfact) ;
+		writecount = psf_fwrite (ubuf.ucbuf, 1, bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
diff --git a/libs/libsndfile/src/au.c b/libs/libsndfile/src/au.c
index cdc1c203d5..bcd869a70a 100644
--- a/libs/libsndfile/src/au.c
+++ b/libs/libsndfile/src/au.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2012 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -81,8 +81,8 @@ typedef	struct
 {	int		dataoffset ;
 	int		datasize ;
 	int		encoding ;
-    int		samplerate ;
-    int		channels ;
+	int		samplerate ;
+	int		channels ;
 } AU_FMT ;
 
 
@@ -106,7 +106,7 @@ au_open	(SF_PRIVATE *psf)
 {	int		subformat ;
 	int		error = 0 ;
 
-	if (psf->mode == SFM_READ || (psf->mode == SFM_RDWR && psf->filelength > 0))
+	if (psf->file.mode == SFM_READ || (psf->file.mode == SFM_RDWR && psf->filelength > 0))
 	{	if ((error = au_read_header (psf)))
 			return error ;
 		} ;
@@ -116,7 +116,7 @@ au_open	(SF_PRIVATE *psf)
 
 	subformat = SF_CODEC (psf->sf.format) ;
 
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{	psf->endian = SF_ENDIAN (psf->sf.format) ;
 		if (CPU_IS_LITTLE_ENDIAN && psf->endian == SF_ENDIAN_CPU)
 			psf->endian = SF_ENDIAN_LITTLE ;
@@ -189,7 +189,7 @@ au_open	(SF_PRIVATE *psf)
 static int
 au_close	(SF_PRIVATE *psf)
 {
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 		au_write_header (psf, SF_TRUE) ;
 
 	return 0 ;
@@ -211,8 +211,6 @@ au_write_header (SF_PRIVATE *psf, int calc_length)
 		psf->datalength = psf->filelength - psf->dataoffset ;
 		if (psf->dataend)
 			psf->datalength -= psf->filelength - psf->dataend ;
-
-		psf->sf.frames = psf->datalength / (psf->bytewidth * psf->sf.channels) ;
 		} ;
 
 	encoding = au_format_to_encoding (SF_CODEC (psf->sf.format)) ;
diff --git a/libs/libsndfile/src/audio_detect.c b/libs/libsndfile/src/audio_detect.c
index 9e73bc5d0e..9cac83bcff 100644
--- a/libs/libsndfile/src/audio_detect.c
+++ b/libs/libsndfile/src/audio_detect.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2012 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -60,7 +60,7 @@ audio_detect (SF_PRIVATE * psf, AUDIO_DETECT *ad, const unsigned char * data, in
 			"    be_int_24_32 : %d\n",
 			vote.le_float, vote.be_float, vote.le_int_24_32, vote.be_int_24_32) ;
 
-	if (0) puts (psf->logbuffer) ;
+	if (0) puts (psf->parselog.buf) ;
 
 	if (ad->endianness == SF_ENDIAN_LITTLE && vote.le_float > (3 * datalen) / 4)
 	{	/* Almost certainly 32 bit floats. */
diff --git a/libs/libsndfile/src/avr.c b/libs/libsndfile/src/avr.c
index 33288af5ce..a235b0d7a4 100644
--- a/libs/libsndfile/src/avr.c
+++ b/libs/libsndfile/src/avr.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2004-2009 Erik de Castro Lopo 
+** Copyright (C) 2004-2012 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -80,7 +80,7 @@ int
 avr_open	(SF_PRIVATE *psf)
 {	int		error = 0 ;
 
-	if (psf->mode == SFM_READ || (psf->mode == SFM_RDWR && psf->filelength > 0))
+	if (psf->file.mode == SFM_READ || (psf->file.mode == SFM_RDWR && psf->filelength > 0))
 	{	if ((error = avr_read_header (psf)))
 			return error ;
 		} ;
@@ -88,9 +88,8 @@ avr_open	(SF_PRIVATE *psf)
 	if ((SF_CONTAINER (psf->sf.format)) != SF_FORMAT_AVR)
 		return	SFE_BAD_OPEN_FORMAT ;
 
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
-	{	psf->endian = SF_ENDIAN (psf->sf.format) ;
-		psf->endian = SF_ENDIAN_BIG ;
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
+	{	psf->endian = SF_ENDIAN_BIG ;
 
 		if (avr_write_header (psf, SF_FALSE))
 			return psf->error ;
@@ -239,7 +238,7 @@ avr_write_header (SF_PRIVATE *psf, int calc_length)
 static int
 avr_close (SF_PRIVATE *psf)
 {
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 		avr_write_header (psf, SF_TRUE) ;
 
 	return 0 ;
diff --git a/libs/libsndfile/src/binheader_writef_check.py b/libs/libsndfile/src/binheader_writef_check.py
index 3c5d1c8423..6ee609e010 100644
--- a/libs/libsndfile/src/binheader_writef_check.py
+++ b/libs/libsndfile/src/binheader_writef_check.py
@@ -1,6 +1,6 @@
-#!/usr/bin/python2.5
+#!/usr/bin/python
 
-# Copyright (C) 2006 Erik de Castro Lopo 
+# Copyright (C) 2006-2011 Erik de Castro Lopo 
 #
 # All rights reserved.
 #
@@ -48,19 +48,19 @@ def find_binheader_writefs (data):
 def find_format_string (s):
 	fmt = re.search ('"([^"]+)"', s)
 	if not fmt:
-		print "Bad format in :\n\n\t%s\n\n" % s
+		print ("Bad format in :\n\n\t%s\n\n" % s)
 		sys.exit (1)
 	fmt = fmt.groups ()
 	if len (fmt) != 1:
-		print "Bad format in :\n\n\t%s\n\n" % s
+		print ("Bad format in :\n\n\t%s\n\n" % s)
 		sys.exit (1)
 	return _whitespace_re.sub ("", fmt [0])
 
 def get_param_list (data):
 	dlist = re.search ("\((.+)\)\s*;", data)
 	dlist = dlist.groups ()[0]
-	dlist = string.split (dlist, ",")
-	dlist = [string.strip (x) for x in dlist]
+	dlist = dlist.split(",")
+	dlist = [x.strip() for x in dlist]
 	return dlist [2:]
 
 def handle_file (fname):
@@ -88,29 +88,30 @@ def handle_file (fname):
 			# print item
 			# print "    param [%d] %c : %s <-> %s" % (param_index, ch, params [param_index], params [param_index + 1])
 
-			if string.find (params [param_index + 1], "sizeof") < 0 \
-						and string.find (params [param_index + 1], "make_size_t") < 0 \
-						and string.find (params [param_index + 1], "strlen") < 0:
-				if errors == 0: print
-				print "\n%s :" % fname
-				print "    param [%d] %c : %s <-> %s" % (param_index, ch, params [param_index], params [param_index + 1])
-				print "    %s" % item
+			# print (params [param_index + 1])
+			if params [param_index + 1].find ("sizeof") < 0 \
+						and params [param_index + 1].find ("make_size_t") < 0 \
+						and params [param_index + 1].find ("strlen") < 0:
+				if errors == 0: sys.stdout.write ("\n")
+				print ("\n%s :" % fname)
+				print ("    param [%d] %c : %s <-> %s" % (param_index, ch, params [param_index], params [param_index + 1]))
+				print ("    %s" % item)
 				errors += 1
 			param_index += 2
-			
+
 	return errors
 
 #===============================================================================
 
 if len (sys.argv) > 1:
-	print "%s\n    binheader_writef_check   :" % sys.argv [0],
+	sys.stdout.write ("\n    binheader_writef_check                   :")
 	sys.stdout.flush ()
 	errors = 0
 	for fname in sys.argv [1:]:
 		errors += handle_file (fname)
 	if errors > 0:
-		print "\nErrors : %d\n" % errors
+		print ("\nErrors : %d\n" % errors)
 		sys.exit (1)
 
-print "ok"
+print ("ok\n")
 
diff --git a/libs/libsndfile/src/broadcast.c b/libs/libsndfile/src/broadcast.c
index 8654452dab..128a6a2c55 100644
--- a/libs/libsndfile/src/broadcast.c
+++ b/libs/libsndfile/src/broadcast.c
@@ -1,6 +1,6 @@
 /*
+** Copyright (C) 2006-2013 Erik de Castro Lopo 
 ** Copyright (C) 2006 Paul Davis 
-** Copyright (C) 2006-2009 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -17,13 +17,15 @@
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
+#include "sfconfig.h"
+
 #include 
 #include 
 #include 
 
 #include "common.h"
 
-static void strncpy_crlf (char *dest, const char *src, size_t destmax, size_t srcmax) ;
+
 static int gen_coding_history (char * added_history, int added_history_max, const SF_INFO * psfinfo) ;
 
 static inline size_t
@@ -32,29 +34,16 @@ bc_min_size (const SF_BROADCAST_INFO* info)
 		return 0 ;
 
 	return offsetof (SF_BROADCAST_INFO, coding_history) + info->coding_history_size ;
-} /* broadcast_size */
+} /* bc_min_size */
 
-
-static inline size_t
-bc_var_coding_hist_size (const SF_BROADCAST_VAR* var)
-{	return var->size - offsetof (SF_BROADCAST_VAR, binfo.coding_history) ;
-} /* broadcast_size */
-
-SF_BROADCAST_VAR*
-broadcast_var_alloc (size_t datasize)
-{	SF_BROADCAST_VAR * data ;
-
-	if ((data = calloc (1, datasize)) != NULL)
-		data->size = datasize ;
-
-	return data ;
+SF_BROADCAST_INFO_16K*
+broadcast_var_alloc (void)
+{	return calloc (1, sizeof (SF_BROADCAST_INFO_16K)) ;
 } /* broadcast_var_alloc */
 
-
 int
 broadcast_var_set (SF_PRIVATE *psf, const SF_BROADCAST_INFO * info, size_t datasize)
-{	char added_history [256] ;
-	int added_history_len, len ;
+{	size_t len ;
 
 	if (info == NULL)
 		return SF_FALSE ;
@@ -64,42 +53,41 @@ broadcast_var_set (SF_PRIVATE *psf, const SF_BROADCAST_INFO * info, size_t datas
 		return SF_FALSE ;
 		} ;
 
-	added_history_len = gen_coding_history (added_history, sizeof (added_history), &(psf->sf)) ;
+	if (datasize >= sizeof (SF_BROADCAST_INFO_16K))
+	{	psf->error = SFE_BAD_BROADCAST_INFO_TOO_BIG ;
+		return SF_FALSE ;
+		} ;
 
-	if (psf->broadcast_var != NULL)
-	{	size_t coding_hist_offset = offsetof (SF_BROADCAST_INFO, coding_history) ;
-
-		if (psf->broadcast_var->binfo.coding_history_size + added_history_len < datasize - coding_hist_offset)
-		{	free (psf->broadcast_var) ;
-			psf->broadcast_var = NULL ;
+	if (psf->broadcast_16k == NULL)
+	{	if ((psf->broadcast_16k = broadcast_var_alloc ()) == NULL)
+		{	psf->error = SFE_MALLOC_FAILED ;
+			return SF_FALSE ;
 			} ;
 		} ;
 
-	if (psf->broadcast_var == NULL)
-	{	int size = datasize + added_history_len + 512 ;
+	/* Only copy the first part of the struct. */
+	memcpy (psf->broadcast_16k, info, offsetof (SF_BROADCAST_INFO, coding_history)) ;
 
-		psf->broadcast_var = calloc (1, size) ;
-		psf->broadcast_var->size = size ;
+	psf_strlcpy_crlf (psf->broadcast_16k->coding_history, info->coding_history, sizeof (psf->broadcast_16k->coding_history), datasize - offsetof (SF_BROADCAST_INFO, coding_history)) ;
+	len = strlen (psf->broadcast_16k->coding_history) ;
+
+	if (len > 0 && psf->broadcast_16k->coding_history [len - 1] != '\n')
+		psf_strlcat (psf->broadcast_16k->coding_history, sizeof (psf->broadcast_16k->coding_history), "\r\n") ;
+
+	if (psf->file.mode == SFM_WRITE)
+	{	char added_history [256] ;
+
+		gen_coding_history (added_history, sizeof (added_history), &(psf->sf)) ;
+		psf_strlcat (psf->broadcast_16k->coding_history, sizeof (psf->broadcast_16k->coding_history), added_history) ;
 		} ;
 
-	memcpy (&(psf->broadcast_var->binfo), info, offsetof (SF_BROADCAST_INFO, coding_history)) ;
-
-	strncpy_crlf (psf->broadcast_var->binfo.coding_history, info->coding_history, bc_var_coding_hist_size (psf->broadcast_var), info->coding_history_size) ;
-	len = strlen (psf->broadcast_var->binfo.coding_history) ;
-
-	if (len > 0 && psf->broadcast_var->binfo.coding_history [len] != '\n')
-		strncat (psf->broadcast_var->binfo.coding_history, "\r\n", 2) ;
-
-	if (psf->mode == SFM_WRITE)
-		strncat (psf->broadcast_var->binfo.coding_history, added_history, strlen (added_history)) ;
-
-	psf->broadcast_var->binfo.coding_history_size = strlen (psf->broadcast_var->binfo.coding_history) ;
-
-	/* Fore coding_history_size to be even. */
-	psf->broadcast_var->binfo.coding_history_size += (psf->broadcast_var->binfo.coding_history_size & 1) ? 1 : 0 ;
+	/* Force coding_history_size to be even. */
+	len = strlen (psf->broadcast_16k->coding_history) ;
+	len += (len & 1) ? 1 : 0 ;
+	psf->broadcast_16k->coding_history_size = len ;
 
 	/* Currently writing this version. */
-	psf->broadcast_var->binfo.version = 1 ;
+	psf->broadcast_16k->version = 1 ;
 
 	return SF_TRUE ;
 } /* broadcast_var_set */
@@ -109,54 +97,19 @@ int
 broadcast_var_get (SF_PRIVATE *psf, SF_BROADCAST_INFO * data, size_t datasize)
 {	size_t size ;
 
-	if (psf->broadcast_var == NULL)
+	if (psf->broadcast_16k == NULL)
 		return SF_FALSE ;
 
-	size = SF_MIN (datasize, bc_min_size (&(psf->broadcast_var->binfo))) ;
+	size = SF_MIN (datasize, bc_min_size ((const SF_BROADCAST_INFO *) psf->broadcast_16k)) ;
 
-	memcpy (data, &(psf->broadcast_var->binfo), size) ;
+	memcpy (data, psf->broadcast_16k, size) ;
 
 	return SF_TRUE ;
-} /* broadcast_var_set */
+} /* broadcast_var_get */
 
 /*------------------------------------------------------------------------------
-**	Strncpy which converts all line endings to CR/LF.
 */
 
-static void
-strncpy_crlf (char *dest, const char *src, size_t destmax, size_t srcmax)
-{	char * destend = dest + destmax - 1 ;
-	const char * srcend = src + srcmax ;
-
-	while (dest < destend && src < srcend)
-	{	if ((src [0] == '\r' && src [1] == '\n') || (src [0] == '\n' && src [1] == '\r'))
-		{	*dest++ = '\r' ;
-			*dest++ = '\n' ;
-			src += 2 ;
-			continue ;
-			} ;
-
-		if (src [0] == '\r')
-		{	*dest++ = '\r' ;
-			*dest++ = '\n' ;
-			src += 1 ;
-			continue ;
-			} ;
-
-		if (src [0] == '\n')
-		{	*dest++ = '\r' ;
-			*dest++ = '\n' ;
-			src += 1 ;
-			continue ;
-			} ;
-
-		*dest++ = *src++ ;
-		} ;
-
-	/* Make sure dest is terminated. */
-	*dest = 0 ;
-} /* strncpy_crlf */
-
 static int
 gen_coding_history (char * added_history, int added_history_max, const SF_INFO * psfinfo)
 {	char chnstr [16] ;
@@ -168,16 +121,16 @@ gen_coding_history (char * added_history, int added_history_max, const SF_INFO *
 	**	Parameter            Variable string                  Unit
 	**	==========================================================================================
 	**	Coding Algorithm     A=
+	**	                    MPEG2L1, MPEG2L2, MPEG2L3>
 	**	Sampling frequency   F=<11000,22050,24000,32000,44100,48000>          [Hz]
 	**	Bit-rate             B=
+	**	                    13818-3)>
 	**	Word Length          W=<8, 12, 14, 16, 18, 20, 22, 24>                [bits]
 	**	Mode                 M=
 	**	Text, free string    T=
+	**	                    This string should contain no commas (ASCII
+	**	                    2Chex). Examples of the contents: ID-No; codec
+	**	                    type; A/D type>
 	*/
 
 	switch (psfinfo->channels)
@@ -185,11 +138,11 @@ gen_coding_history (char * added_history, int added_history_max, const SF_INFO *
 			return SF_FALSE ;
 
 		case 1 :
-			strncpy (chnstr, "mono", sizeof (chnstr)) ;
+			psf_strlcpy (chnstr, sizeof (chnstr), "mono") ;
 			break ;
 
 		case 2 :
-			strncpy (chnstr, "stereo", sizeof (chnstr)) ;
+			psf_strlcpy (chnstr, sizeof (chnstr), "stereo") ;
 			break ;
 
 		default :
@@ -227,7 +180,7 @@ gen_coding_history (char * added_history, int added_history_max, const SF_INFO *
 		} ;
 
 	count = snprintf (added_history, added_history_max,
-							"A=PCM,F=%u,W=%hu,M=%s,T=%s-%s\r\n",
+							"A=PCM,F=%u,W=%d,M=%s,T=%s-%s\r\n",
 							psfinfo->samplerate, width, chnstr, PACKAGE, VERSION) ;
 
 	if (count >= added_history_max)
diff --git a/libs/libsndfile/src/caf.c b/libs/libsndfile/src/caf.c
index 93d8e9a2ee..8f95d781eb 100644
--- a/libs/libsndfile/src/caf.c
+++ b/libs/libsndfile/src/caf.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2005-2009 Erik de Castro Lopo 
+** Copyright (C) 2005-2013 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -23,10 +23,14 @@
 #include	
 #include	
 #include	
+#ifdef HAVE_INTTYPES_H
+#include	
+#endif
 
 #include	"sndfile.h"
 #include	"sfendian.h"
 #include	"common.h"
+#include	"chanmap.h"
 
 /*------------------------------------------------------------------------------
 ** Macros to handle big/little endian issues.
@@ -73,15 +77,21 @@
 */
 
 typedef struct
-{	unsigned char srate [8] ;
-	unsigned int fmt_id ;
-	unsigned int fmt_flags ;
-	unsigned int pkt_bytes ;
-	unsigned int pkt_frames ;
-	unsigned int channels_per_frame ;
-	unsigned int bits_per_chan ;
+{	uint8_t		srate [8] ;
+	uint32_t	fmt_id ;
+	uint32_t	fmt_flags ;
+	uint32_t	pkt_bytes ;
+	uint32_t	frames_per_packet ;
+	uint32_t	channels_per_frame ;
+	uint32_t	bits_per_chan ;
 } DESC_CHUNK ;
 
+typedef struct
+{	int			chanmap_tag ;
+
+	ALAC_DECODER_INFO	alac ;
+} CAF_PRIVATE ;
+
 /*------------------------------------------------------------------------------
 ** Private static functions.
 */
@@ -89,6 +99,13 @@ typedef struct
 static int	caf_close (SF_PRIVATE *psf) ;
 static int	caf_read_header (SF_PRIVATE *psf) ;
 static int	caf_write_header (SF_PRIVATE *psf, int calc_length) ;
+static int	caf_command (SF_PRIVATE *psf, int command, void *data, int datasize) ;
+static int	caf_read_chanmap (SF_PRIVATE * psf, sf_count_t chunk_size) ;
+
+static int caf_set_chunk (SF_PRIVATE *psf, const SF_CHUNK_INFO * chunk_info) ;
+static SF_CHUNK_ITERATOR * caf_next_chunk_iterator (SF_PRIVATE *psf, SF_CHUNK_ITERATOR * iterator) ;
+static int caf_get_chunk_size (SF_PRIVATE *psf, const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info) ;
+static int caf_get_chunk_data (SF_PRIVATE *psf, const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info) ;
 
 /*------------------------------------------------------------------------------
 ** Public function.
@@ -96,16 +113,26 @@ static int	caf_write_header (SF_PRIVATE *psf, int calc_length) ;
 
 int
 caf_open (SF_PRIVATE *psf)
-{	int	subformat, format, error = 0 ;
+{	CAF_PRIVATE * pcaf ;
+	int	subformat, format, error = 0 ;
 
-	if (psf->mode == SFM_READ || (psf->mode == SFM_RDWR && psf->filelength > 0))
+	if ((psf->container_data = calloc (1, sizeof (CAF_PRIVATE))) == NULL)
+		return SFE_MALLOC_FAILED ;
+
+	pcaf = psf->container_data ;
+
+	if (psf->file.mode == SFM_READ || (psf->file.mode == SFM_RDWR && psf->filelength > 0))
 	{	if ((error = caf_read_header (psf)))
 			return error ;
+
+		psf->next_chunk_iterator = caf_next_chunk_iterator ;
+		psf->get_chunk_size = caf_get_chunk_size ;
+		psf->get_chunk_data = caf_get_chunk_data ;
 		} ;
 
 	subformat = SF_CODEC (psf->sf.format) ;
 
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{	if (psf->is_pipe)
 			return SFE_NO_PIPE_WRITE ;
 
@@ -115,20 +142,20 @@ caf_open (SF_PRIVATE *psf)
 
 		psf->blockwidth = psf->bytewidth * psf->sf.channels ;
 
-		if (psf->mode != SFM_RDWR || psf->filelength < 44)
+		if (psf->file.mode != SFM_RDWR || psf->filelength < 44)
 		{	psf->filelength = 0 ;
 			psf->datalength = 0 ;
 			psf->dataoffset = 0 ;
 			psf->sf.frames = 0 ;
 			} ;
 
-		psf->str_flags = SF_STR_ALLOW_START ;
+		psf->strings.flags = SF_STR_ALLOW_START ;
 
 		/*
 		**	By default, add the peak chunk to floating point files. Default behaviour
 		**	can be switched off using sf_command (SFC_SET_PEAK_CHUNK, SF_FALSE).
 		*/
-		if (psf->mode == SFM_WRITE && (subformat == SF_FORMAT_FLOAT || subformat == SF_FORMAT_DOUBLE))
+		if (psf->file.mode == SFM_WRITE && (subformat == SF_FORMAT_FLOAT || subformat == SF_FORMAT_DOUBLE))
 		{	if ((psf->peak_info = peak_info_calloc (psf->sf.channels)) == NULL)
 				return SFE_MALLOC_FAILED ;
 			psf->peak_info->peak_loc = SF_PEAK_START ;
@@ -137,11 +164,12 @@ caf_open (SF_PRIVATE *psf)
 		if ((error = caf_write_header (psf, SF_FALSE)) != 0)
 			return error ;
 
-		psf->write_header = caf_write_header ;
+		psf->write_header	= caf_write_header ;
+		psf->set_chunk		= caf_set_chunk ;
 		} ;
 
 	psf->container_close = caf_close ;
-	/*psf->command = caf_command ;*/
+	psf->command = caf_command ;
 
 	switch (subformat)
 	{	case SF_FORMAT_PCM_S8 :
@@ -167,6 +195,18 @@ caf_open (SF_PRIVATE *psf)
 		case SF_FORMAT_DOUBLE :
 					error = double64_init (psf) ;
 					break ;
+
+		case SF_FORMAT_ALAC_16 :
+		case SF_FORMAT_ALAC_20 :
+		case SF_FORMAT_ALAC_24 :
+		case SF_FORMAT_ALAC_32 :
+					if (psf->file.mode == SFM_READ)
+						/* Only pass the ALAC_DECODER_INFO in read mode. */
+						error = alac_init (psf, &pcaf->alac) ;
+					else
+						error = alac_init (psf, NULL) ;
+					break ;
+
 		/* Lite remove end */
 
 		default :
@@ -179,22 +219,72 @@ caf_open (SF_PRIVATE *psf)
 static int
 caf_close (SF_PRIVATE *psf)
 {
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 		caf_write_header (psf, SF_TRUE) ;
 
 	return 0 ;
 } /* caf_close */
 
+static int
+caf_command (SF_PRIVATE * psf, int command, void * UNUSED (data), int UNUSED (datasize))
+{	CAF_PRIVATE	*pcaf ;
+
+	if ((pcaf = psf->container_data) == NULL)
+		return SFE_INTERNAL ;
+
+	switch (command)
+	{	case SFC_SET_CHANNEL_MAP_INFO :
+			pcaf->chanmap_tag = aiff_caf_find_channel_layout_tag (psf->channel_map, psf->sf.channels) ;
+			return (pcaf->chanmap_tag != 0) ;
+
+		default :
+			break ;
+	} ;
+
+	return 0 ;
+} /* caf_command */
+
 /*------------------------------------------------------------------------------
 */
 
 static int
 decode_desc_chunk (SF_PRIVATE *psf, const DESC_CHUNK *desc)
-{	int format ;
+{	int format = SF_FORMAT_CAF ;
 
 	psf->sf.channels = desc->channels_per_frame ;
 
-	format = SF_FORMAT_CAF | (psf->endian == SF_ENDIAN_LITTLE ? SF_ENDIAN_LITTLE : 0) ;
+	if (desc->fmt_id == alac_MARKER)
+	{	CAF_PRIVATE	*pcaf ;
+
+		if ((pcaf = psf->container_data) != NULL)
+		{	switch (desc->fmt_flags)
+			{	case 1 :
+					pcaf->alac.bits_per_sample = 16 ;
+					format |= SF_FORMAT_ALAC_16 ;
+					break ;
+				case 2 :
+					pcaf->alac.bits_per_sample = 20 ;
+					format |= SF_FORMAT_ALAC_20 ;
+					break ;
+				case 3 :
+					pcaf->alac.bits_per_sample = 24 ;
+					format |= SF_FORMAT_ALAC_24 ;
+					break ;
+				case 4 :
+					pcaf->alac.bits_per_sample = 32 ;
+					format |= SF_FORMAT_ALAC_32 ;
+					break ;
+				default :
+					psf_log_printf (psf, "Bad ALAC format flag value of %d\n", desc->fmt_flags) ;
+				} ;
+
+			pcaf->alac.frames_per_packet = desc->frames_per_packet ;
+			} ;
+
+		return format ;
+		} ;
+
+	format |= psf->endian == SF_ENDIAN_LITTLE ? SF_ENDIAN_LITTLE : 0 ;
 
 	if (desc->fmt_id == lpcm_MARKER && desc->fmt_flags & 1)
 	{	/* Floating point data. */
@@ -208,12 +298,7 @@ decode_desc_chunk (SF_PRIVATE *psf, const DESC_CHUNK *desc)
 			} ;
 		} ;
 
-	if ((desc->fmt_flags & 1) != 0)
-	{	psf_log_printf (psf, "**** Ooops, 'desc' chunk suggests float data, but other info invalid.\n") ;
-		return 0 ;
-		} ;
-
-	if (desc->fmt_id == lpcm_MARKER)
+	if (desc->fmt_id == lpcm_MARKER && (desc->fmt_flags & 1) == 0)
 	{	/* Integer data. */
 		if (desc->bits_per_chan == 32 && desc->pkt_bytes == 4 * desc->channels_per_frame)
 		{	psf->bytewidth = 4 ;
@@ -243,16 +328,23 @@ decode_desc_chunk (SF_PRIVATE *psf, const DESC_CHUNK *desc)
 		return format | SF_FORMAT_ULAW ;
 		} ;
 
+	psf_log_printf (psf, "**** Unknown format identifier.\n") ;
+
 	return 0 ;
 } /* decode_desc_chunk */
 
 static int
 caf_read_header (SF_PRIVATE *psf)
-{	DESC_CHUNK desc ;
+{	CAF_PRIVATE	*pcaf ;
+	BUF_UNION	ubuf ;
+	DESC_CHUNK desc ;
 	sf_count_t chunk_size ;
 	double srate ;
 	short version, flags ;
-	int marker, k, have_data = 0 ;
+	int marker, k, have_data = 0, error ;
+
+	if ((pcaf = psf->container_data) == NULL)
+		return SFE_INTERNAL ;
 
 	memset (&desc, 0, sizeof (desc)) ;
 
@@ -262,10 +354,10 @@ caf_read_header (SF_PRIVATE *psf)
 	if (marker != caff_MARKER)
 		return SFE_CAF_NOT_CAF ;
 
-	psf_binheader_readf (psf, "mE8b", &marker, &chunk_size, psf->u.ucbuf, 8) ;
-	srate = double64_be_read (psf->u.ucbuf) ;
-	snprintf (psf->u.cbuf, sizeof (psf->u.cbuf), "%5.3f", srate) ;
-	psf_log_printf (psf, "%M : %D\n  Sample rate  : %s\n", marker, chunk_size, psf->u.cbuf) ;
+	psf_binheader_readf (psf, "mE8b", &marker, &chunk_size, ubuf.ucbuf, 8) ;
+	srate = double64_be_read (ubuf.ucbuf) ;
+	snprintf (ubuf.cbuf, sizeof (ubuf.cbuf), "%5.3f", srate) ;
+	psf_log_printf (psf, "%M : %D\n  Sample rate  : %s\n", marker, chunk_size, ubuf.cbuf) ;
 	if (marker != desc_MARKER)
 		return SFE_CAF_NO_DESC ;
 
@@ -276,13 +368,13 @@ caf_read_header (SF_PRIVATE *psf)
 
 	psf->sf.samplerate = lrint (srate) ;
 
-	psf_binheader_readf (psf, "mE44444", &desc.fmt_id, &desc.fmt_flags, &desc.pkt_bytes, &desc.pkt_frames,
+	psf_binheader_readf (psf, "mE44444", &desc.fmt_id, &desc.fmt_flags, &desc.pkt_bytes, &desc.frames_per_packet,
 			&desc.channels_per_frame, &desc.bits_per_chan) ;
 	psf_log_printf (psf, "  Format id    : %M\n  Format flags : %x\n  Bytes / packet   : %u\n"
 			"  Frames / packet  : %u\n  Channels / frame : %u\n  Bits / channel   : %u\n",
-			desc.fmt_id, desc.fmt_flags, desc.pkt_bytes, desc.pkt_frames, desc.channels_per_frame, desc.bits_per_chan) ;
+			desc.fmt_id, desc.fmt_flags, desc.pkt_bytes, desc.frames_per_packet, desc.channels_per_frame, desc.bits_per_chan) ;
 
-	if (desc.channels_per_frame > 200)
+	if (desc.channels_per_frame > SF_MAX_CHANNELS)
 	{	psf_log_printf (psf, "**** Bad channels per frame value %u.\n", desc.channels_per_frame) ;
 		return SFE_MALFORMED_FILE ;
 		} ;
@@ -292,14 +384,23 @@ caf_read_header (SF_PRIVATE *psf)
 
 	psf->sf.channels = desc.channels_per_frame ;
 
-	while (have_data == 0 && psf_ftell (psf) < psf->filelength - SIGNED_SIZEOF (marker))
-	{	psf_binheader_readf (psf, "mE8", &marker, &chunk_size) ;
+	while (psf_ftell (psf) < psf->filelength)
+	{	marker = 0 ;
+		chunk_size = 0 ;
+
+		psf_binheader_readf (psf, "mE8", &marker, &chunk_size) ;
+		if (marker == 0)
+		{	psf_log_printf (psf, "Have 0 marker.\n") ;
+			break ;
+			} ;
+
+		psf_store_read_chunk_u32 (&psf->rchunks, marker, psf_ftell (psf), chunk_size) ;
 
 		switch (marker)
 		{	case peak_MARKER :
 				psf_log_printf (psf, "%M : %D\n", marker, chunk_size) ;
 				if (chunk_size != CAF_PEAK_CHUNK_SIZE (psf->sf.channels))
-				{	psf_binheader_readf (psf, "j", (int) chunk_size) ;
+				{	psf_binheader_readf (psf, "j", make_size_t (chunk_size)) ;
 					psf_log_printf (psf, "*** File PEAK chunk %D should be %d.\n", chunk_size, CAF_PEAK_CHUNK_SIZE (psf->sf.channels)) ;
 					return SFE_CAF_BAD_PEAK ;
 					} ;
@@ -311,7 +412,7 @@ caf_read_header (SF_PRIVATE *psf)
 				psf_binheader_readf (psf, "E4", & (psf->peak_info->edit_number)) ;
 				psf_log_printf (psf, "  edit count : %d\n", psf->peak_info->edit_number) ;
 
-				psf_log_printf (psf, "     Ch   Position      Value\n") ;
+				psf_log_printf (psf, "     Ch   Position       Value\n") ;
 				for (k = 0 ; k < psf->sf.channels ; k++)
 				{	sf_count_t position ;
 					float value ;
@@ -320,29 +421,95 @@ caf_read_header (SF_PRIVATE *psf)
 					psf->peak_info->peaks [k].value = value ;
 					psf->peak_info->peaks [k].position = position ;
 
-					snprintf (psf->u.cbuf, sizeof (psf->u.cbuf), "    %2d   %-12ld   %g\n", k, (long) position, value) ;
-					psf_log_printf (psf, psf->u.cbuf) ;
+					snprintf (ubuf.cbuf, sizeof (ubuf.cbuf), "    %2d   %-12" PRId64 "   %g\n", k, position, value) ;
+					psf_log_printf (psf, ubuf.cbuf) ;
 					} ;
 
 				psf->peak_info->peak_loc = SF_PEAK_START ;
 				break ;
 
+			case chan_MARKER :
+				if (chunk_size < 12)
+				{	psf_log_printf (psf, "%M : %D (should be >= 12)\n", marker, chunk_size) ;
+					psf_binheader_readf (psf, "j", make_size_t (chunk_size)) ;
+					break ;
+					}
+
+				psf_log_printf (psf, "%M : %D\n", marker, chunk_size) ;
+
+				if ((error = caf_read_chanmap (psf, chunk_size)))
+					return error ;
+				break ;
+
 			case free_MARKER :
 				psf_log_printf (psf, "%M : %D\n", marker, chunk_size) ;
-				psf_binheader_readf (psf, "j", (int) chunk_size) ;
+				psf_binheader_readf (psf, "j", make_size_t (chunk_size)) ;
 				break ;
 
 			case data_MARKER :
-				psf_log_printf (psf, "%M : %D\n", marker, chunk_size) ;
 				psf_binheader_readf (psf, "E4", &k) ;
 				psf_log_printf (psf, "  edit : %u\n", k) ;
+
+				if (chunk_size == -1)
+				{	psf_log_printf (psf, "%M : -1\n") ;
+					chunk_size = psf->filelength - psf->headindex ;
+					}
+				else if (psf->filelength > 0 && psf->filelength < psf->headindex + chunk_size - 16)
+					psf_log_printf (psf, "%M : %D (should be %D)\n", marker, chunk_size, psf->filelength - psf->headindex - 8) ;
+				else
+					psf_log_printf (psf, "%M : %D\n", marker, chunk_size) ;
+
+
+				psf->dataoffset = psf->headindex ;
+
+				/* Subtract the 4 bytes of the 'edit' field above. */
+				psf->datalength = chunk_size - 4 ;
+
+				psf_binheader_readf (psf, "j", psf->datalength) ;
 				have_data = 1 ;
 				break ;
 
-			default :
-				psf_log_printf (psf, " %M : %D (skipped)\n", marker, chunk_size) ;
-				psf_binheader_readf (psf, "j", (int) chunk_size) ;
+			case kuki_MARKER :
+				psf_log_printf (psf, "%M : %D\n", marker, chunk_size) ;
+				pcaf->alac.kuki_offset = psf_ftell (psf) - 12 ;
+				psf_binheader_readf (psf, "j", make_size_t (chunk_size)) ;
 				break ;
+
+			case pakt_MARKER :
+				psf_log_printf (psf, "%M : %D\n", marker, chunk_size) ;
+
+				psf_binheader_readf (psf, "E8844", &pcaf->alac.packets, &pcaf->alac.valid_frames,
+									&pcaf->alac.priming_frames, &pcaf->alac.remainder_frames) ;
+
+				psf_log_printf (psf,
+						"  Packets          : %D\n"
+						"  Valid frames     : %D\n"
+						"  Priming frames   : %d\n"
+						"  Remainder frames : %d\n",
+						pcaf->alac.packets, pcaf->alac.valid_frames, pcaf->alac.priming_frames,
+						pcaf->alac.remainder_frames
+						) ;
+
+				if (pcaf->alac.packets == 0 && pcaf->alac.valid_frames == 0
+							&& pcaf->alac.priming_frames == 0 && pcaf->alac.remainder_frames == 0)
+					psf_log_printf (psf, "*** 'pakt' chunk header is all zero.\n") ;
+
+				pcaf->alac.pakt_offset = psf_ftell (psf) - 12 ;
+				psf_binheader_readf (psf, "j", make_size_t (chunk_size) - 24) ;
+				break ;
+
+			default :
+				psf_log_printf (psf, "%M : %D (skipped)\n", marker, chunk_size) ;
+				psf_binheader_readf (psf, "j", make_size_t (chunk_size)) ;
+				break ;
+			} ;
+
+		if (! psf->sf.seekable && have_data)
+			break ;
+
+		if (psf_ftell (psf) >= psf->filelength - SIGNED_SIZEOF (chunk_size))
+		{	psf_log_printf (psf, "End\n") ;
+			break ;
 			} ;
 		} ;
 
@@ -351,12 +518,10 @@ caf_read_header (SF_PRIVATE *psf)
 		return SFE_MALFORMED_FILE ;
 		} ;
 
-	psf_log_printf (psf, "End\n") ;
-
-	psf->dataoffset = psf_ftell (psf) ;
-	psf->datalength = psf->filelength - psf->dataoffset ;
 	psf->endian = (desc.fmt_flags & 2) ? SF_ENDIAN_LITTLE : SF_ENDIAN_BIG ;
 
+	psf_fseek (psf, psf->dataoffset, SEEK_SET) ;
+
 	if ((psf->sf.format = decode_desc_chunk (psf, &desc)) == 0)
 		return SFE_UNSUPPORTED_ENCODING ;
 
@@ -371,9 +536,15 @@ caf_read_header (SF_PRIVATE *psf)
 
 static int
 caf_write_header (SF_PRIVATE *psf, int calc_length)
-{	DESC_CHUNK desc ;
+{	BUF_UNION	ubuf ;
+	CAF_PRIVATE	*pcaf ;
+	DESC_CHUNK desc ;
 	sf_count_t current, free_len ;
-	int subformat ;
+	uint32_t uk ;
+	int subformat, append_free_block = SF_TRUE ;
+
+	if ((pcaf = psf->container_data) == NULL)
+		return SFE_INTERNAL ;
 
 	memset (&desc, 0, sizeof (desc)) ;
 
@@ -402,8 +573,8 @@ caf_write_header (SF_PRIVATE *psf, int calc_length)
 	/* 'desc' marker and chunk size. */
 	psf_binheader_writef (psf, "Em8", desc_MARKER, (sf_count_t) (sizeof (DESC_CHUNK))) ;
 
- 	double64_be_write (1.0 * psf->sf.samplerate, psf->u.ucbuf) ;
-	psf_binheader_writef (psf, "b", psf->u.ucbuf, make_size_t (8)) ;
+ 	double64_be_write (1.0 * psf->sf.samplerate, ubuf.ucbuf) ;
+	psf_binheader_writef (psf, "b", ubuf.ucbuf, make_size_t (8)) ;
 
 	subformat = SF_CODEC (psf->sf.format) ;
 
@@ -425,7 +596,7 @@ caf_write_header (SF_PRIVATE *psf, int calc_length)
 			desc.fmt_id = lpcm_MARKER ;
 			psf->bytewidth = 1 ;
 			desc.pkt_bytes = psf->bytewidth * psf->sf.channels ;
-			desc.pkt_frames = 1 ;
+			desc.frames_per_packet = 1 ;
 			desc.channels_per_frame = psf->sf.channels ;
 			desc.bits_per_chan = 8 ;
 			break ;
@@ -434,7 +605,7 @@ caf_write_header (SF_PRIVATE *psf, int calc_length)
 			desc.fmt_id = lpcm_MARKER ;
 			psf->bytewidth = 2 ;
 			desc.pkt_bytes = psf->bytewidth * psf->sf.channels ;
-			desc.pkt_frames = 1 ;
+			desc.frames_per_packet = 1 ;
 			desc.channels_per_frame = psf->sf.channels ;
 			desc.bits_per_chan = 16 ;
 			break ;
@@ -442,7 +613,7 @@ caf_write_header (SF_PRIVATE *psf, int calc_length)
 		case SF_FORMAT_PCM_24 :
 			psf->bytewidth = 3 ;
 			desc.pkt_bytes = psf->bytewidth * psf->sf.channels ;
-			desc.pkt_frames = 1 ;
+			desc.frames_per_packet = 1 ;
 			desc.channels_per_frame = psf->sf.channels ;
 			desc.bits_per_chan = 24 ;
 			desc.fmt_id = lpcm_MARKER ;
@@ -452,7 +623,7 @@ caf_write_header (SF_PRIVATE *psf, int calc_length)
 			desc.fmt_id = lpcm_MARKER ;
 			psf->bytewidth = 4 ;
 			desc.pkt_bytes = psf->bytewidth * psf->sf.channels ;
-			desc.pkt_frames = 1 ;
+			desc.frames_per_packet = 1 ;
 			desc.channels_per_frame = psf->sf.channels ;
 			desc.bits_per_chan = 32 ;
 			break ;
@@ -462,7 +633,7 @@ caf_write_header (SF_PRIVATE *psf, int calc_length)
 			desc.fmt_flags |= 1 ;
 			psf->bytewidth = 4 ;
 			desc.pkt_bytes = psf->bytewidth * psf->sf.channels ;
-			desc.pkt_frames = 1 ;
+			desc.frames_per_packet = 1 ;
 			desc.channels_per_frame = psf->sf.channels ;
 			desc.bits_per_chan = 32 ;
 			break ;
@@ -472,7 +643,7 @@ caf_write_header (SF_PRIVATE *psf, int calc_length)
 			desc.fmt_flags |= 1 ;
 			psf->bytewidth = 8 ;
 			desc.pkt_bytes = psf->bytewidth * psf->sf.channels ;
-			desc.pkt_frames = 1 ;
+			desc.frames_per_packet = 1 ;
 			desc.channels_per_frame = psf->sf.channels ;
 			desc.bits_per_chan = 64 ;
 			break ;
@@ -481,7 +652,7 @@ caf_write_header (SF_PRIVATE *psf, int calc_length)
 			desc.fmt_id = alaw_MARKER ;
 			psf->bytewidth = 1 ;
 			desc.pkt_bytes = psf->bytewidth * psf->sf.channels ;
-			desc.pkt_frames = 1 ;
+			desc.frames_per_packet = 1 ;
 			desc.channels_per_frame = psf->sf.channels ;
 			desc.bits_per_chan = 8 ;
 			break ;
@@ -490,19 +661,30 @@ caf_write_header (SF_PRIVATE *psf, int calc_length)
 			desc.fmt_id = ulaw_MARKER ;
 			psf->bytewidth = 1 ;
 			desc.pkt_bytes = psf->bytewidth * psf->sf.channels ;
-			desc.pkt_frames = 1 ;
+			desc.frames_per_packet = 1 ;
 			desc.channels_per_frame = psf->sf.channels ;
 			desc.bits_per_chan = 8 ;
 			break ;
 
+		case SF_FORMAT_ALAC_16 :
+		case SF_FORMAT_ALAC_20 :
+		case SF_FORMAT_ALAC_24 :
+		case SF_FORMAT_ALAC_32 :
+			desc.fmt_id = alac_MARKER ;
+			desc.pkt_bytes = psf->bytewidth * psf->sf.channels ;
+			desc.channels_per_frame = psf->sf.channels ;
+			alac_get_desc_chunk_items (subformat, &desc.fmt_flags, &desc.frames_per_packet) ;
+			append_free_block = SF_FALSE ;
+			break ;
+
 		default :
 			return SFE_UNIMPLEMENTED ;
 		} ;
 
-	psf_binheader_writef (psf, "mE44444", desc.fmt_id, desc.fmt_flags, desc.pkt_bytes, desc.pkt_frames, desc.channels_per_frame, desc.bits_per_chan) ;
+	psf_binheader_writef (psf, "mE44444", desc.fmt_id, desc.fmt_flags, desc.pkt_bytes, desc.frames_per_packet, desc.channels_per_frame, desc.bits_per_chan) ;
 
 #if 0
-	if (psf->str_flags & SF_STR_LOCATE_START)
+	if (psf->strings.flags & SF_STR_LOCATE_START)
 		caf_write_strings (psf, SF_STR_LOCATE_START) ;
 #endif
 
@@ -513,13 +695,22 @@ caf_write_header (SF_PRIVATE *psf, int calc_length)
 			psf_binheader_writef (psf, "Ef8", (float) psf->peak_info->peaks [k].value, psf->peak_info->peaks [k].position) ;
 		} ;
 
-	/* Add free chunk so that the actual audio data starts at a multiple 0x1000. */
-	free_len = 0x1000 - psf->headindex - 16 - 12 ;
-	while (free_len < 0)
-		free_len += 0x1000 ;
-	psf_binheader_writef (psf, "Em8z", free_MARKER, free_len, (int) free_len) ;
+	if (psf->channel_map && pcaf->chanmap_tag)
+		psf_binheader_writef (psf, "Em8444", chan_MARKER, (sf_count_t) 12, pcaf->chanmap_tag, 0, 0) ;
 
-	psf_binheader_writef (psf, "Em84", data_MARKER, psf->datalength, 0) ;
+	/* Write custom headers. */
+	for (uk = 0 ; uk < psf->wchunks.used ; uk++)
+		psf_binheader_writef (psf, "m44b", (int) psf->wchunks.chunks [uk].mark32, 0, psf->wchunks.chunks [uk].len, psf->wchunks.chunks [uk].data, make_size_t (psf->wchunks.chunks [uk].len)) ;
+
+	if (append_free_block)
+	{	/* Add free chunk so that the actual audio data starts at a multiple 0x1000. */
+		free_len = 0x1000 - psf->headindex - 16 - 12 ;
+		while (free_len < 0)
+			free_len += 0x1000 ;
+		psf_binheader_writef (psf, "Em8z", free_MARKER, free_len, (int) free_len) ;
+		} ;
+
+	psf_binheader_writef (psf, "Em84", data_MARKER, psf->datalength + 4, 0) ;
 
 	psf_fwrite (psf->header, psf->headindex, 1, psf) ;
 	if (psf->error)
@@ -534,3 +725,80 @@ caf_write_header (SF_PRIVATE *psf, int calc_length)
 	return psf->error ;
 } /* caf_write_header */
 
+static int
+caf_read_chanmap (SF_PRIVATE * psf, sf_count_t chunk_size)
+{	const AIFF_CAF_CHANNEL_MAP * map_info ;
+	unsigned channel_bitmap, channel_decriptions, bytesread ;
+	int layout_tag ;
+
+	bytesread = psf_binheader_readf (psf, "E444", &layout_tag, &channel_bitmap, &channel_decriptions) ;
+
+	map_info = aiff_caf_of_channel_layout_tag (layout_tag) ;
+
+	psf_log_printf (psf, "  Tag    : %x\n", layout_tag) ;
+	if (map_info)
+		psf_log_printf (psf, "  Layout : %s\n", map_info->name) ;
+
+	if (bytesread < chunk_size)
+		psf_binheader_readf (psf, "j", chunk_size - bytesread) ;
+
+	if (map_info->channel_map != NULL)
+	{	size_t chanmap_size = psf->sf.channels * sizeof (psf->channel_map [0]) ;
+
+		free (psf->channel_map) ;
+
+		if ((psf->channel_map = malloc (chanmap_size)) == NULL)
+			return SFE_MALLOC_FAILED ;
+
+		memcpy (psf->channel_map, map_info->channel_map, chanmap_size) ;
+		} ;
+
+	return 0 ;
+} /* caf_read_chanmap */
+
+/*==============================================================================
+*/
+
+static int
+caf_set_chunk (SF_PRIVATE *psf, const SF_CHUNK_INFO * chunk_info)
+{	return psf_save_write_chunk (&psf->wchunks, chunk_info) ;
+} /* caf_set_chunk */
+
+static SF_CHUNK_ITERATOR *
+caf_next_chunk_iterator (SF_PRIVATE *psf, SF_CHUNK_ITERATOR * iterator)
+{	return psf_next_chunk_iterator (&psf->rchunks, iterator) ;
+} /* caf_next_chunk_iterator */
+
+static int
+caf_get_chunk_size (SF_PRIVATE *psf, const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info)
+{	int indx ;
+
+	if ((indx = psf_find_read_chunk_iterator (&psf->rchunks, iterator)) < 0)
+		return SFE_UNKNOWN_CHUNK ;
+
+	chunk_info->datalen = psf->rchunks.chunks [indx].len ;
+
+	return SFE_NO_ERROR ;
+} /* caf_get_chunk_size */
+
+static int
+caf_get_chunk_data (SF_PRIVATE *psf, const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info)
+{	int indx ;
+	sf_count_t pos ;
+
+	if ((indx = psf_find_read_chunk_iterator (&psf->rchunks, iterator)) < 0)
+		return SFE_UNKNOWN_CHUNK ;
+
+	if (chunk_info->data == NULL)
+		return SFE_BAD_CHUNK_DATA_PTR ;
+
+	chunk_info->id_size = psf->rchunks.chunks [indx].id_size ;
+	memcpy (chunk_info->id, psf->rchunks.chunks [indx].id, sizeof (chunk_info->id) / sizeof (*chunk_info->id)) ;
+
+	pos = psf_ftell (psf) ;
+	psf_fseek (psf, psf->rchunks.chunks [indx].offset, SEEK_SET) ;
+	psf_fread (chunk_info->data, SF_MIN (chunk_info->datalen, psf->rchunks.chunks [indx].len), 1, psf) ;
+	psf_fseek (psf, pos, SEEK_SET) ;
+
+	return SFE_NO_ERROR ;
+} /* caf_get_chunk_data */
diff --git a/libs/libsndfile/src/cart.c b/libs/libsndfile/src/cart.c
new file mode 100644
index 0000000000..a56ed60e51
--- /dev/null
+++ b/libs/libsndfile/src/cart.c
@@ -0,0 +1,101 @@
+/*
+** Copyright (C) 2012 Chris Roberts 
+** Copyright (C) 2006-2013 Erik de Castro Lopo 
+** Copyright (C) 2006 Paul Davis 
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU Lesser General Public License as published by
+** the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
+**
+** You should have received a copy of the GNU Lesser 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 "sfconfig.h"
+
+#include 
+#include 
+#include 
+#include 
+#include "common.h"
+
+
+
+static inline size_t
+cart_min_size (const SF_CART_INFO* info)
+{	if (info == NULL)
+		return 0 ;
+
+	return offsetof (SF_CART_INFO, tag_text) + info->tag_text_size ;
+} /* cart_min_size */
+
+SF_CART_INFO_16K*
+cart_var_alloc (void)
+{	SF_CART_INFO_16K* thing ;
+	thing = malloc (sizeof (SF_CART_INFO_16K)) ;
+	return thing ;
+} /* cart_var_alloc */
+
+int
+cart_var_set (SF_PRIVATE *psf, const SF_CART_INFO * info, size_t datasize)
+{	size_t len ;
+
+	if (info == NULL)
+		return SF_FALSE ;
+
+	if (cart_min_size (info) > datasize)
+	{	psf->error = SFE_BAD_CART_INFO_SIZE ;
+		return SF_FALSE ;
+		} ;
+
+	if (datasize >= sizeof (SF_CART_INFO_16K))
+	{	psf->error = SFE_BAD_CART_INFO_TOO_BIG ;
+		return SF_FALSE ;
+		} ;
+
+	if (psf->cart_16k == NULL)
+	{	if ((psf->cart_16k = cart_var_alloc ()) == NULL)
+		{	psf->error = SFE_MALLOC_FAILED ;
+			return SF_FALSE ;
+			} ;
+		} ;
+
+	memcpy (psf->cart_16k, info, offsetof (SF_CART_INFO, tag_text)) ;
+	psf_strlcpy_crlf (psf->cart_16k->tag_text, info->tag_text, sizeof (psf->cart_16k->tag_text), datasize - offsetof (SF_CART_INFO, tag_text)) ;
+
+	len = strlen (psf->cart_16k->tag_text) ;
+
+	if (len > 0 && psf->cart_16k->tag_text [len - 1] != '\n')
+		psf_strlcat (psf->cart_16k->tag_text, sizeof (psf->cart_16k->tag_text), "\r\n") ;
+
+	/* Force tag_text_size to be even. */
+	len = strlen (psf->cart_16k->tag_text) ;
+	len += (len & 1) ? 1 : 2 ;
+
+	psf->cart_16k->tag_text_size = len ;
+
+	return SF_TRUE ;
+} /* cart_var_set */
+
+
+int
+cart_var_get (SF_PRIVATE *psf, SF_CART_INFO * data, size_t datasize)
+{	size_t size ;
+	if (psf->cart_16k == NULL)
+		return SF_FALSE ;
+
+	size = SF_MIN (datasize, cart_min_size ((const SF_CART_INFO *) psf->cart_16k)) ;
+
+	memcpy (data, psf->cart_16k, size) ;
+
+	return SF_TRUE ;
+} /* cart_var_get */
+
+
diff --git a/libs/libsndfile/src/chanmap.c b/libs/libsndfile/src/chanmap.c
new file mode 100644
index 0000000000..9a9f7f0f16
--- /dev/null
+++ b/libs/libsndfile/src/chanmap.c
@@ -0,0 +1,262 @@
+/*
+** Copyright (C) 2009-2011 Erik de Castro Lopo 
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU Lesser General Public License as published by
+** the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
+**
+** You should have received a copy of the GNU Lesser 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.
+*/
+
+/*
+**	Mostly from "Apple Core Audio Format Specification 1.0":
+**
+**		http://developer.apple.com/documentation/MusicAudio/Reference/CAFSpec/CAFSpec.pdf
+*/
+
+#include "sfconfig.h"
+
+#include 
+#include 
+#include 
+
+#include "sndfile.h"
+#include "common.h"
+#include "chanmap.h"
+
+
+static const AIFF_CAF_CHANNEL_MAP zero_chan [] =
+{	{	(0 << 16) | 0, NULL, "Use channel descriptions." },
+	{	(1 << 16) | 0, NULL, "Use channel bitmap." }
+} ; /* zero_chan */
+
+
+static const int one_chan_mono [1] = {	SF_CHANNEL_MAP_MONO } ;
+
+static const AIFF_CAF_CHANNEL_MAP one_chan [] =
+{	{	(100 << 16) | 1, one_chan_mono, "mono" }
+} ; /* one_chan */
+
+
+static const int two_channel_stereo [2] = {	SF_CHANNEL_MAP_LEFT, SF_CHANNEL_MAP_RIGHT } ;
+
+static const AIFF_CAF_CHANNEL_MAP two_chan [] =
+{	{	(101 << 16) | 2, two_channel_stereo, "stereo (L, R)" },
+	{	(102 << 16) | 2, two_channel_stereo, "stereo headphones (L, R)" },
+#if 0
+	{	(103 << 16) | 2, NULL, "matrix stereo (Lt, Rt)" },
+	{	(104 << 16) | 2, NULL, "2 channels (mid, side)" },
+	{	(105 << 16) | 2, NULL, "coincident mic pair" },
+	{	(106 << 16) | 2, NULL, "binaural stereo (L, R)"
+		}
+#endif
+} ; /* two_chan */
+
+
+static const int three_channel_mpeg_30a [3] =
+	{	SF_CHANNEL_MAP_LEFT, SF_CHANNEL_MAP_RIGHT, SF_CHANNEL_MAP_CENTER } ;
+static const int three_channel_mpeg_30b [3] =
+	{	SF_CHANNEL_MAP_CENTER, SF_CHANNEL_MAP_LEFT, SF_CHANNEL_MAP_RIGHT } ;
+static const int three_channel_itu_21 [3] =
+	{	SF_CHANNEL_MAP_LEFT, SF_CHANNEL_MAP_RIGHT, SF_CHANNEL_MAP_REAR_CENTER } ;
+static const int three_channel_dvd_4 [3] =
+	{	SF_CHANNEL_MAP_LEFT, SF_CHANNEL_MAP_RIGHT, SF_CHANNEL_MAP_LFE } ;
+
+static const AIFF_CAF_CHANNEL_MAP three_chan [] =
+{	{	(113 << 16) | 3, three_channel_mpeg_30a, "MPEG 3 0 A (L, R, C)" },
+	{	(114 << 16) | 3, three_channel_mpeg_30b, "MPEG 3 0 B (C, L, R)" },
+	{	(131 << 16) | 3, three_channel_itu_21, "ITU 2.1 (L, R, Cs)" },
+	{	(133 << 16) | 3, three_channel_dvd_4, "DVD 4 (L, R, LFE)" }
+} ; /* three_chan */
+
+
+static const int four_channel_ambisonc_b [4] =
+	{	SF_CHANNEL_MAP_AMBISONIC_B_W, SF_CHANNEL_MAP_AMBISONIC_B_X, SF_CHANNEL_MAP_AMBISONIC_B_Y, SF_CHANNEL_MAP_AMBISONIC_B_Z } ;
+static const int four_channel_quad [4] =
+	{	SF_CHANNEL_MAP_LEFT, SF_CHANNEL_MAP_RIGHT, SF_CHANNEL_MAP_REAR_LEFT, SF_CHANNEL_MAP_REAR_RIGHT } ;
+static const int four_channel_mpeg_40a [4] =
+	{	SF_CHANNEL_MAP_LEFT, SF_CHANNEL_MAP_RIGHT, SF_CHANNEL_MAP_CENTER, SF_CHANNEL_MAP_REAR_CENTER } ;
+static const int four_channel_mpeg_40b [4] =
+	{	SF_CHANNEL_MAP_CENTER, SF_CHANNEL_MAP_LEFT, SF_CHANNEL_MAP_RIGHT, SF_CHANNEL_MAP_REAR_CENTER } ;
+static const int four_channel_itu_23 [4] =
+	{	SF_CHANNEL_MAP_LEFT, SF_CHANNEL_MAP_RIGHT, SF_CHANNEL_MAP_REAR_LEFT, SF_CHANNEL_MAP_REAR_RIGHT } ;
+static const int four_channel_dvd_5 [4] =
+	{	SF_CHANNEL_MAP_LEFT, SF_CHANNEL_MAP_RIGHT, SF_CHANNEL_MAP_LFE, SF_CHANNEL_MAP_REAR_CENTER } ;
+static const int four_channel_dvd_10 [4] =
+	{	SF_CHANNEL_MAP_LEFT, SF_CHANNEL_MAP_RIGHT, SF_CHANNEL_MAP_CENTER, SF_CHANNEL_MAP_LFE } ;
+
+static const AIFF_CAF_CHANNEL_MAP four_chan [] =
+{	{	(107 << 16) | 4, four_channel_ambisonc_b, "ambisonic B (W,  X, Y, Z)" },
+	{	(108 << 16) | 4, four_channel_quad, "quad (Lfront, Rfront, Lrear, Rrear)" },
+	{	(115 << 16) | 4, four_channel_mpeg_40a, "MPEG 4.0 A (L, R, C, Cs)" },
+	{	(116 << 16) | 4, four_channel_mpeg_40b, "MPEG 4.0 B (C, L, R, Cs)" },
+	{	(132 << 16) | 4, four_channel_itu_23, "ITU 2.3 (L, R, Ls, Rs)" },
+	{	(134 << 16) | 4, four_channel_dvd_5, "DVD 5 (L, R, LFE, Cs)" },
+	{	(136 << 16) | 4, four_channel_dvd_10, "DVD 10 (L, R, C, LFE)" }
+} ; /* four_chan */
+
+
+static const int five_channel_pentagonal [5] =
+	{	SF_CHANNEL_MAP_LEFT, SF_CHANNEL_MAP_RIGHT, SF_CHANNEL_MAP_REAR_LEFT, SF_CHANNEL_MAP_REAR_RIGHT, SF_CHANNEL_MAP_CENTER } ;
+static const int five_channel_mpeg_50_a [5] =
+	{	SF_CHANNEL_MAP_LEFT, SF_CHANNEL_MAP_RIGHT, SF_CHANNEL_MAP_CENTER, SF_CHANNEL_MAP_REAR_LEFT, SF_CHANNEL_MAP_REAR_RIGHT } ;
+static const int five_channel_mpeg_50_b [5] =
+	{	SF_CHANNEL_MAP_LEFT, SF_CHANNEL_MAP_RIGHT, SF_CHANNEL_MAP_REAR_LEFT, SF_CHANNEL_MAP_REAR_RIGHT, SF_CHANNEL_MAP_CENTER } ;
+static const int five_channel_mpeg_50_c [5] =
+	{	SF_CHANNEL_MAP_LEFT, SF_CHANNEL_MAP_CENTER, SF_CHANNEL_MAP_RIGHT, SF_CHANNEL_MAP_REAR_LEFT, SF_CHANNEL_MAP_REAR_RIGHT } ;
+static const int five_channel_mpeg_50_d [5] =
+	{	SF_CHANNEL_MAP_CENTER, SF_CHANNEL_MAP_LEFT, SF_CHANNEL_MAP_RIGHT, SF_CHANNEL_MAP_REAR_LEFT, SF_CHANNEL_MAP_REAR_RIGHT } ;
+static const int five_channel_dvd_6 [5] =
+	{	SF_CHANNEL_MAP_LEFT, SF_CHANNEL_MAP_RIGHT, SF_CHANNEL_MAP_LFE, SF_CHANNEL_MAP_REAR_LEFT, SF_CHANNEL_MAP_REAR_RIGHT } ;
+static const int five_channel_dvd_11 [5] =
+	{	SF_CHANNEL_MAP_LEFT, SF_CHANNEL_MAP_RIGHT, SF_CHANNEL_MAP_CENTER, SF_CHANNEL_MAP_LFE, SF_CHANNEL_MAP_REAR_CENTER } ;
+static const int five_channel_dvd_18 [5] =
+	{	SF_CHANNEL_MAP_LEFT, SF_CHANNEL_MAP_RIGHT, SF_CHANNEL_MAP_REAR_LEFT, SF_CHANNEL_MAP_REAR_RIGHT, SF_CHANNEL_MAP_LFE } ;
+
+static const AIFF_CAF_CHANNEL_MAP five_chan [] =
+{	{	(109 << 16) | 5, five_channel_pentagonal, "pentagonal (L,  R, Lrear, Rrear, C)" },
+	{	(117 << 16) | 5, five_channel_mpeg_50_a, "MPEG 5.0 A (L, R, C, Ls, Rs)" },
+	{	(118 << 16) | 5, five_channel_mpeg_50_b, "MPEG 5.0 B (L, R, Ls, Rs, C)" },
+	{	(119 << 16) | 5, five_channel_mpeg_50_c, "MPEG 5.0 C (L, C, R, Ls, Rs,)" },
+	{	(120 << 16) | 5, five_channel_mpeg_50_d, "MPEG 5.0 D (C, L, R, Ls, Rs)" },
+	{	(135 << 16) | 5, five_channel_dvd_6, "DVD 6 (L, R, LFE, Ls, Rs)" },
+	{	(137 << 16) | 5, five_channel_dvd_11, "DVD 11 (L, R, C, LFE, Cs)" },
+	{	(138 << 16) | 5, five_channel_dvd_18, "DVD 18 (L, R, Ls, Rs, LFE)" }
+} ; /* five_chan */
+
+
+static const int six_channel_mpeg_51_a [6] =
+	{	SF_CHANNEL_MAP_LEFT, SF_CHANNEL_MAP_RIGHT, SF_CHANNEL_MAP_CENTER, SF_CHANNEL_MAP_LFE, SF_CHANNEL_MAP_REAR_LEFT, SF_CHANNEL_MAP_REAR_RIGHT } ;
+static const int six_channel_mpeg_51_b [6] =
+	{	SF_CHANNEL_MAP_LEFT, SF_CHANNEL_MAP_RIGHT, SF_CHANNEL_MAP_REAR_LEFT, SF_CHANNEL_MAP_REAR_RIGHT, SF_CHANNEL_MAP_CENTER, SF_CHANNEL_MAP_LFE } ;
+static const int six_channel_mpeg_51_c [6] =
+	{	SF_CHANNEL_MAP_LEFT, SF_CHANNEL_MAP_CENTER, SF_CHANNEL_MAP_RIGHT, SF_CHANNEL_MAP_REAR_LEFT, SF_CHANNEL_MAP_REAR_RIGHT, SF_CHANNEL_MAP_LFE } ;
+static const int six_channel_mpeg_51_d [6] =
+	{	SF_CHANNEL_MAP_CENTER, SF_CHANNEL_MAP_LEFT, SF_CHANNEL_MAP_RIGHT, SF_CHANNEL_MAP_REAR_LEFT, SF_CHANNEL_MAP_REAR_RIGHT, SF_CHANNEL_MAP_LFE } ;
+static const int six_channel_audio_unit_60 [6] =
+	{	SF_CHANNEL_MAP_LEFT, SF_CHANNEL_MAP_RIGHT, SF_CHANNEL_MAP_REAR_LEFT, SF_CHANNEL_MAP_REAR_RIGHT, SF_CHANNEL_MAP_CENTER, SF_CHANNEL_MAP_REAR_CENTER } ;
+static const int six_channel_aac_60 [6] =
+	{	SF_CHANNEL_MAP_CENTER, SF_CHANNEL_MAP_LEFT, SF_CHANNEL_MAP_RIGHT, SF_CHANNEL_MAP_REAR_LEFT, SF_CHANNEL_MAP_REAR_RIGHT, SF_CHANNEL_MAP_REAR_CENTER } ;
+
+static const AIFF_CAF_CHANNEL_MAP six_chan [] =
+{	{	(110 << 16) | 6, NULL, "hexagonal (L, R, Lr, Rr, C, Rear)" },
+	{	(121 << 16) | 6, six_channel_mpeg_51_a, "MPEG 5.1 A (L, R, C, LFE, Ls, Rs)" },
+	{	(122 << 16) | 6, six_channel_mpeg_51_b, "MPEG 5.1 B (L, R, Ls, Rs, C, LFE)" },
+	{	(123 << 16) | 6, six_channel_mpeg_51_c, "MPEG 5.1 C (L, C, R, Ls, Rs, LFE)" },
+	{	(124 << 16) | 6, six_channel_mpeg_51_d, "MPEG 5.1 D (C, L, R, Ls, Rs, LFE)" },
+	{	(139 << 16) | 6, six_channel_audio_unit_60, "AudioUnit 6.0 (L, R, Ls, Rs, C, Cs)" },
+	{	(141 << 16) | 6, six_channel_aac_60, "AAC 6.0 (C, L, R, Ls, Rs, Cs)" }
+} ; /* six_chan */
+
+
+static const int six_channel_mpeg_61a [7] =
+	{	SF_CHANNEL_MAP_LEFT, SF_CHANNEL_MAP_RIGHT, SF_CHANNEL_MAP_CENTER, SF_CHANNEL_MAP_LFE, SF_CHANNEL_MAP_REAR_LEFT, SF_CHANNEL_MAP_REAR_RIGHT, SF_CHANNEL_MAP_REAR_CENTER } ;
+static const int six_channel_aac_61 [7] =
+	{	SF_CHANNEL_MAP_CENTER, SF_CHANNEL_MAP_LEFT, SF_CHANNEL_MAP_RIGHT, SF_CHANNEL_MAP_REAR_LEFT, SF_CHANNEL_MAP_REAR_RIGHT, SF_CHANNEL_MAP_REAR_CENTER, SF_CHANNEL_MAP_LFE } ;
+
+static const AIFF_CAF_CHANNEL_MAP seven_chan [] =
+{	{	(125 << 16) | 7, six_channel_mpeg_61a, "MPEG 6.1 A (L, R, C, LFE, Ls, Rs, Cs)" },
+	{	(140 << 16) | 7, NULL, "AudioUnit 7.0 (L, R, Ls, Rs, C, Rls, Rrs)" },
+	{	(142 << 16) | 7, six_channel_aac_61, "AAC 6.1 (C, L, R, Ls, Rs, Cs, Lfe)" },
+	{	(143 << 16) | 7, NULL, "AAC 7.0 (C, L, R, Ls, Rs, Rls, Rrs,)" }
+} ; /* seven_chan */
+
+
+static const AIFF_CAF_CHANNEL_MAP eight_chan [] =
+{	{	(111 << 16) | 8, NULL,
+		// front left, front right, rear left, rear right,
+		// front center, rear center, side left, side right
+		"octagonal (Lf, Rf, Lr, Rr, Cf, Cr, Ls, Rs)"
+		},
+	{	(112 << 16) | 8, NULL,
+		// left, right, rear left, rear right
+		// top left, top right, top rear left, top rear right
+		"cube (L, R, Lrear, Rrear, Ltop, Rtop, Ltoprear, Rtoprear)"
+		},
+	{	(126 << 16) | 8, NULL, "MPEG 7.1 A (L, R, C, LFE, Ls, Rs, Lc, Rc)" },
+	{	(127 << 16) | 8, NULL, "MPEG 7.1 B (C, Lc, Rc, L, R, Ls, Rs, LFE)" },
+	{	(128 << 16) | 8, NULL, "MPEG 7.1 C (L, R, C, LFE, Ls, R, Rls, Rrs)" },
+	{	(129 << 16) | 8, NULL, "Emagic Default 7.1 (L, R, Ls, Rs, C, LFE, Lc, Rc)" },
+	{	(130 << 16) | 8, NULL,
+		// (ITU_5_1 plus a matrix encoded stereo mix)
+		"SMPTE DTV (L, R, C, LFE, Ls, Rs, Lt, Rt)"
+		},
+	{	(144 << 16) | 8, NULL, "AAC octagonal (C, L, R, Ls, Rs, Rls, Rrs, Cs)" }
+} ; /* eight_chan */
+
+
+
+#if 0
+
+TMH_10_2_std = (145 << 16) | 16,
+// L R C Vhc Lsd Rsd Ls Rs Vhl Vhr Lw Rw Csd Cs LFE1 LFE2
+
+TMH_10_2_full = (146 << 16) | 21,
+// TMH_10_2_std plus: Lc Rc HI VI Haptic
+
+#endif
+
+
+typedef struct
+{	const AIFF_CAF_CHANNEL_MAP * map ;
+	int len ;
+} MAP_MAP ;
+
+static const MAP_MAP map [] =
+{	{ zero_chan,	ARRAY_LEN (zero_chan) },
+	{ one_chan,		ARRAY_LEN (one_chan) },
+	{ two_chan,		ARRAY_LEN (two_chan) },
+	{ three_chan,	ARRAY_LEN (three_chan) },
+	{ four_chan,	ARRAY_LEN (four_chan) },
+	{ five_chan,	ARRAY_LEN (five_chan) },
+	{ six_chan,		ARRAY_LEN (six_chan) },
+	{ seven_chan,	ARRAY_LEN (seven_chan) },
+	{ eight_chan,	ARRAY_LEN (eight_chan) }
+} ; /* map */
+
+
+int
+aiff_caf_find_channel_layout_tag (const int *chan_map, int channels)
+{	const AIFF_CAF_CHANNEL_MAP * curr_map ;
+	unsigned k, len ;
+
+	if (channels < 1 || channels > ARRAY_LEN (map))
+		return 0 ;
+
+	curr_map = map [channels].map ;
+	len = map [channels].len ;
+
+	for (k = 0 ; k < len ; k++)
+		if (curr_map [k].channel_map != NULL)
+			if (memcmp (chan_map, curr_map [k].channel_map, channels * sizeof (chan_map [0])) == 0)
+				return curr_map [k].channel_layout_tag ;
+
+	return 0 ;
+} /* aiff_caf_find_channel_layout_tag */
+
+const AIFF_CAF_CHANNEL_MAP *
+aiff_caf_of_channel_layout_tag (int tag)
+{	const AIFF_CAF_CHANNEL_MAP * curr_map ;
+	unsigned k, len ;
+	int channels = tag & 0xffff ;
+
+	if (channels < 0 || channels > ARRAY_LEN (map))
+		return NULL ;
+
+	curr_map = map [channels].map ;
+	len = map [channels].len ;
+
+	for (k = 0 ; k < len ; k++)
+		if (curr_map [k].channel_layout_tag == tag)
+			return curr_map + k ;
+
+	return NULL ;
+} /* aiff_caf_of_channel_layout_tag */
diff --git a/libs/libsndfile/src/chanmap.h b/libs/libsndfile/src/chanmap.h
new file mode 100644
index 0000000000..8af409dbac
--- /dev/null
+++ b/libs/libsndfile/src/chanmap.h
@@ -0,0 +1,32 @@
+/*
+** Copyright (C) 2009-2011 Erik de Castro Lopo 
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU Lesser General Public License as published by
+** the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
+**
+** You should have received a copy of the GNU Lesser 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.
+*/
+
+typedef struct
+{	/* The tag in the AIFF or CAF file. */
+	int channel_layout_tag ;
+
+	/* The equivalent array of SF_CHANNEL_MAP_* entries. */
+	const int * channel_map ;
+
+	const char * name ;
+} AIFF_CAF_CHANNEL_MAP ;
+
+
+int aiff_caf_find_channel_layout_tag (const int *chan_map, int channels) ;
+
+const AIFF_CAF_CHANNEL_MAP * aiff_caf_of_channel_layout_tag (int tag) ;
diff --git a/libs/libsndfile/src/chunk.c b/libs/libsndfile/src/chunk.c
index 98ff05ae54..b661ce5c2b 100644
--- a/libs/libsndfile/src/chunk.c
+++ b/libs/libsndfile/src/chunk.c
@@ -1,5 +1,6 @@
 /*
-** Copyright (C) 2008-2009 Erik de Castro Lopo 
+** Copyright (C) 2008-2012 Erik de Castro Lopo 
+** Copyright (C) 2012 IOhannes m zmoelnig, IEM 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -25,30 +26,230 @@
 #include	"sfendian.h"
 #include	"common.h"
 
+static int64_t
+hash_of_str (const char * str)
+{	int64_t marker = 0 ;
+	int k ;
 
-void
-pchk4_store (PRIV_CHUNK4 * pchk, int marker, sf_count_t offset, sf_count_t len)
-{
-	if (pchk->count >= ARRAY_LEN (pchk->l))
-		return ;
+	for (k = 0 ; str [k] ; k++)
+		marker = marker * 0x7f + ((const uint8_t *) str) [k] ;
 
-	pchk->l [pchk->count].chunk = marker ;
-	pchk->l [pchk->count].offset = offset ;
-	pchk->l [pchk->count].len = len ;
+	return marker ;
+} /* hash_of_str */
 
-	pchk->count ++ ;
+SF_CHUNK_ITERATOR *
+psf_get_chunk_iterator (SF_PRIVATE * psf, const char * marker_str)
+{	const READ_CHUNKS * pchk = &psf->rchunks ;
+	int idx ;
 
-	return ;
-} /* pchk4_store */
+	if (marker_str)
+		idx = psf_find_read_chunk_str (pchk, marker_str) ;
+	else
+		idx = pchk->used > 0 ? 0 : -1 ;
+
+	if (idx < 0)
+		return NULL ;
+
+	if (psf->iterator == NULL)
+	{	psf->iterator = calloc (1, sizeof (SF_CHUNK_ITERATOR)) ;
+		if (psf->iterator == NULL)
+			return NULL ;
+		} ;
+
+	psf->iterator->sndfile = (SNDFILE *) psf ;
+
+	if (marker_str)
+	{	int64_t hash ;
+		size_t marker_len ;
+		union
+		{	uint32_t marker ;
+			char str [5] ;
+		} u ;
+
+		snprintf (u.str, sizeof (u.str), "%s", marker_str) ;
+
+		marker_len = strlen (marker_str) ;
+		if (marker_len > 64)
+			marker_len = 64 ;
+
+		hash = marker_len > 4 ? hash_of_str (marker_str) : u.marker ;
+
+		memcpy (psf->iterator->id, marker_str, marker_len) ;
+		psf->iterator->id_size = marker_len ;
+		psf->iterator->hash = hash ;
+		}
+
+	psf->iterator->current = idx ;
+
+	return psf->iterator ;
+} /* psf_get_chunk_iterator */
+
+SF_CHUNK_ITERATOR *
+psf_next_chunk_iterator (const READ_CHUNKS * pchk , SF_CHUNK_ITERATOR * iterator)
+{	int64_t hash = iterator->hash ;
+	uint32_t k ;
+
+	iterator->current++ ;
+
+	if (hash)
+	{	for (k = iterator->current ; k < pchk->used ; k++)
+			if (pchk->chunks [k].hash == hash)
+			{	iterator->current = k ;
+				return iterator ;
+				}
+		}
+	else if (iterator->current < pchk->used)
+		return iterator ;
+
+	/* No match, clear iterator and return NULL */
+	memset (iterator, 0, sizeof (*iterator)) ;
+	return NULL ;
+} /* psf_next_chunk_iterator */
+
+static int
+psf_store_read_chunk (READ_CHUNKS * pchk, const READ_CHUNK * rchunk)
+{	if (pchk->count == 0)
+	{	pchk->used = 0 ;
+		pchk->count = 20 ;
+		pchk->chunks = calloc (pchk->count, sizeof (READ_CHUNK)) ;
+		}
+	else if (pchk->used > pchk->count)
+		return SFE_INTERNAL ;
+	else if (pchk->used == pchk->count)
+	{	READ_CHUNK * old_ptr = pchk->chunks ;
+		int new_count = 3 * (pchk->count + 1) / 2 ;
+
+		pchk->chunks = realloc (old_ptr, new_count * sizeof (READ_CHUNK)) ;
+		if (pchk->chunks == NULL)
+		{	pchk->chunks = old_ptr ;
+			return SFE_MALLOC_FAILED ;
+			} ;
+		pchk->count = new_count ;
+		} ;
+
+	pchk->chunks [pchk->used] = *rchunk ;
+
+	pchk->used ++ ;
+
+	return SFE_NO_ERROR ;
+} /* psf_store_read_chunk */
 
 int
-pchk4_find (PRIV_CHUNK4 * pchk, int marker)
-{	int k ;
+psf_store_read_chunk_u32 (READ_CHUNKS * pchk, uint32_t marker, sf_count_t offset, uint32_t len)
+{	READ_CHUNK rchunk ;
 
-	for (k = 0 ; k < pchk->count ; k++)
-		if (pchk->l [k].chunk == marker)
+	memset (&rchunk, 0, sizeof (rchunk)) ;
+
+	rchunk.hash = marker ;
+	rchunk.mark32 = marker ;
+	rchunk.offset = offset ;
+	rchunk.len = len ;
+
+	rchunk.id_size = 4 ;
+	memcpy (rchunk.id, &marker, rchunk.id_size) ;
+
+	return psf_store_read_chunk (pchk, &rchunk) ;
+} /* psf_store_read_chunk_u32 */
+
+int
+psf_find_read_chunk_str (const READ_CHUNKS * pchk, const char * marker_str)
+{	int64_t hash ;
+	uint32_t k ;
+	union
+	{	uint32_t marker ;
+		char str [5] ;
+	} u ;
+
+	snprintf (u.str, sizeof (u.str), "%s", marker_str) ;
+
+	hash = strlen (marker_str) > 4 ? hash_of_str (marker_str) : u.marker ;
+
+	for (k = 0 ; k < pchk->used ; k++)
+		if (pchk->chunks [k].hash == hash)
 			return k ;
 
 	return -1 ;
-} /* pchk4_find */
+} /* psf_find_read_chunk_str */
+
+int
+psf_find_read_chunk_m32 (const READ_CHUNKS * pchk, uint32_t marker)
+{	uint32_t k ;
+
+	for (k = 0 ; k < pchk->used ; k++)
+		if (pchk->chunks [k].mark32 == marker)
+			return k ;
+
+	return -1 ;
+} /* psf_find_read_chunk_m32 */
+int
+psf_find_read_chunk_iterator (const READ_CHUNKS * pchk, const SF_CHUNK_ITERATOR * marker)
+{	if (marker->current < pchk->used)
+		return marker->current ;
+
+	return -1 ;
+} /* psf_find_read_chunk_iterator */
+
+int
+psf_store_read_chunk_str (READ_CHUNKS * pchk, const char * marker_str, sf_count_t offset, uint32_t len)
+{	READ_CHUNK rchunk ;
+	union
+	{	uint32_t marker ;
+		char str [5] ;
+	} u ;
+	size_t marker_len ;
+
+	memset (&rchunk, 0, sizeof (rchunk)) ;
+	snprintf (u.str, sizeof (u.str), "%s", marker_str) ;
+
+	marker_len = strlen (marker_str) ;
+
+	rchunk.hash = marker_len > 4 ? hash_of_str (marker_str) : u.marker ;
+	rchunk.mark32 = u.marker ;
+	rchunk.offset = offset ;
+	rchunk.len = len ;
+
+	rchunk.id_size = marker_len > 64 ? 64 : marker_len ;
+	memcpy (rchunk.id, marker_str, rchunk.id_size) ;
+
+	return psf_store_read_chunk (pchk, &rchunk) ;
+} /* psf_store_read_chunk_str */
+
+int
+psf_save_write_chunk (WRITE_CHUNKS * pchk, const SF_CHUNK_INFO * chunk_info)
+{	union
+	{	uint32_t marker ;
+		char str [5] ;
+	} u ;
+	uint32_t len ;
+
+	if (pchk->count == 0)
+	{	pchk->used = 0 ;
+		pchk->count = 20 ;
+		pchk->chunks = calloc (pchk->count, sizeof (WRITE_CHUNK)) ;
+		}
+	else if (pchk->used >= pchk->count)
+	{	WRITE_CHUNK * old_ptr = pchk->chunks ;
+		int new_count = 3 * (pchk->count + 1) / 2 ;
+
+		pchk->chunks = realloc (old_ptr, new_count * sizeof (WRITE_CHUNK)) ;
+		if (pchk->chunks == NULL)
+		{	pchk->chunks = old_ptr ;
+			return SFE_MALLOC_FAILED ;
+			} ;
+		} ;
+
+	len = chunk_info->datalen ;
+	while (len & 3) len ++ ;
+
+	snprintf (u.str, sizeof (u.str), "%s", chunk_info->id) ;
+
+	pchk->chunks [pchk->used].hash = strlen (chunk_info->id) > 4 ? hash_of_str (chunk_info->id) : u.marker ;
+	pchk->chunks [pchk->used].mark32 = u.marker ;
+	pchk->chunks [pchk->used].len = len ;
+	pchk->chunks [pchk->used].data = psf_memdup (chunk_info->data, chunk_info->datalen) ;
+
+	pchk->used ++ ;
+
+	return SFE_NO_ERROR ;
+} /* psf_save_write_chunk */
 
diff --git a/libs/libsndfile/src/command.c b/libs/libsndfile/src/command.c
index 72c892c40f..6db7315415 100644
--- a/libs/libsndfile/src/command.c
+++ b/libs/libsndfile/src/command.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2001-2009 Erik de Castro Lopo 
+** Copyright (C) 2001-2013 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -47,6 +47,10 @@ static SF_FORMAT_INFO const simple_formats [] =
 		"AU (Sun/Next 8-bit u-law)", "au"
 		},
 
+	{	SF_FORMAT_CAF | SF_FORMAT_ALAC_16,
+		"CAF (Apple 16 bit ALAC)", "caf"
+		},
+
 	{	SF_FORMAT_CAF | SF_FORMAT_PCM_16,
 		"CAF (Apple 16 bit PCM)", "caf"
 		},
@@ -115,28 +119,30 @@ static SF_FORMAT_INFO const major_formats [] =
 {
 	{	SF_FORMAT_AIFF,		"AIFF (Apple/SGI)",						"aiff" 	},
 	{	SF_FORMAT_AU,		"AU (Sun/NeXT)", 						"au"	},
-	{	SF_FORMAT_AVR,		"AVR (Audio Visual Research)",	 		"avr"	},
-	{	SF_FORMAT_CAF,		"CAF (Apple Core Audio File)",	 		"caf"	},
+	{	SF_FORMAT_AVR,		"AVR (Audio Visual Research)",			"avr"	},
+	{	SF_FORMAT_CAF,		"CAF (Apple Core Audio File)",			"caf"	},
 #if HAVE_EXTERNAL_LIBS
-	{	SF_FORMAT_FLAC,		"FLAC (FLAC Lossless Audio Codec)",	 	"flac"	},
+	{	SF_FORMAT_FLAC,		"FLAC (Free Lossless Audio Codec)",		"flac"	},
 #endif
 	{	SF_FORMAT_HTK,		"HTK (HMM Tool Kit)",					"htk"	},
 	{	SF_FORMAT_SVX,		"IFF (Amiga IFF/SVX8/SV16)",			"iff"	},
 	{	SF_FORMAT_MAT4,		"MAT4 (GNU Octave 2.0 / Matlab 4.2)",	"mat"	},
 	{	SF_FORMAT_MAT5,		"MAT5 (GNU Octave 2.1 / Matlab 5.0)",	"mat"	},
+	{	SF_FORMAT_MPC2K,	"MPC (Akai MPC 2k)",					"mpc"	},
 #if HAVE_EXTERNAL_LIBS
-	{	SF_FORMAT_OGG,		"OGG (OGG Container format)",		 	"oga"	},
+	{	SF_FORMAT_OGG,		"OGG (OGG Container format)",			"oga"	},
 #endif
 	{	SF_FORMAT_PAF,		"PAF (Ensoniq PARIS)", 					"paf"	},
 	{	SF_FORMAT_PVF,		"PVF (Portable Voice Format)",			"pvf"	},
-	{	SF_FORMAT_RAW,		"RAW (header-less)",				 	"raw"	},
+	{	SF_FORMAT_RAW,		"RAW (header-less)",					"raw"	},
+	{	SF_FORMAT_RF64,		"RF64 (RIFF 64)",						"rf64"	},
 	{	SF_FORMAT_SD2,		"SD2 (Sound Designer II)", 				"sd2"	},
 	{	SF_FORMAT_SDS,		"SDS (Midi Sample Dump Standard)", 		"sds"	},
 	{	SF_FORMAT_IRCAM,	"SF (Berkeley/IRCAM/CARL)",				"sf"	},
 	{	SF_FORMAT_VOC,		"VOC (Creative Labs)",					"voc"	},
 	{	SF_FORMAT_W64,		"W64 (SoundFoundry WAVE 64)",			"w64"	},
 	{	SF_FORMAT_WAV,		"WAV (Microsoft)",						"wav"	},
-	{	SF_FORMAT_NIST,		"WAV (NIST Sphere)",	 				"wav"	},
+	{	SF_FORMAT_NIST,		"WAV (NIST Sphere)",					"wav"	},
 	{	SF_FORMAT_WAVEX,	"WAVEX (Microsoft)",					"wav"	},
 	{	SF_FORMAT_WVE,		"WVE (Psion Series 3)",					"wve"	},
 	{	SF_FORMAT_XI,		"XI (FastTracker 2)",					"xi"	},
@@ -198,6 +204,11 @@ static SF_FORMAT_INFO subtype_formats [] =
 #if HAVE_EXTERNAL_LIBS
 	{	SF_FORMAT_VORBIS,		"Vorbis",				NULL 	},
 #endif
+
+	{	SF_FORMAT_ALAC_16,		"16 bit ALAC",			NULL	},
+	{	SF_FORMAT_ALAC_20,		"20 bit ALAC",			NULL	},
+	{	SF_FORMAT_ALAC_24,		"24 bit ALAC",			NULL	},
+	{	SF_FORMAT_ALAC_32,		"32 bit ALAC",			NULL	},
 } ; /* subtype_formats */
 
 int
@@ -210,7 +221,9 @@ psf_get_format_subtype (SF_FORMAT_INFO *data)
 {	int indx ;
 
 	if (data->format < 0 || data->format >= (SIGNED_SIZEOF (subtype_formats) / SIGNED_SIZEOF (SF_FORMAT_INFO)))
+	{	data->format = 0 ;
 		return SFE_BAD_COMMAND_PARAM ;
+		} ;
 
 	indx = data->format ;
 	memcpy (data, &(subtype_formats [indx]), sizeof (SF_FORMAT_INFO)) ;
@@ -256,7 +269,8 @@ psf_get_format_info (SF_FORMAT_INFO *data)
 
 double
 psf_calc_signal_max (SF_PRIVATE *psf, int normalize)
-{	sf_count_t	position ;
+{	BUF_UNION	ubuf ;
+	sf_count_t	position ;
 	double 		max_val, temp, *data ;
 	int			k, len, readcount, save_state ;
 
@@ -280,8 +294,9 @@ psf_calc_signal_max (SF_PRIVATE *psf, int normalize)
 	/* Go to start of file. */
 	sf_seek ((SNDFILE*) psf, 0, SEEK_SET) ;
 
-	data = psf->u.dbuf ;
-	len = ARRAY_LEN (psf->u.dbuf) ;
+	data = ubuf.dbuf ;
+	/* Make sure len is an integer multiple of the channel count. */
+	len = ARRAY_LEN (ubuf.dbuf) - (ARRAY_LEN (ubuf.dbuf) % psf->sf.channels) ;
 
 	for (readcount = 1, max_val = 0.0 ; readcount > 0 ; /* nothing */)
 	{	readcount = sf_read_double ((SNDFILE*) psf, data, len) ;
@@ -300,7 +315,8 @@ psf_calc_signal_max (SF_PRIVATE *psf, int normalize)
 
 int
 psf_calc_max_all_channels (SF_PRIVATE *psf, double *peaks, int normalize)
-{	sf_count_t	position ;
+{	BUF_UNION	ubuf ;
+	sf_count_t	position ;
 	double 		temp, *data ;
 	int			k, len, readcount, save_state ;
 	int			chan ;
@@ -321,9 +337,9 @@ psf_calc_max_all_channels (SF_PRIVATE *psf, double *peaks, int normalize)
 	position = sf_seek ((SNDFILE*) psf, 0, SEEK_CUR) ; /* Get current position in file */
 	sf_seek ((SNDFILE*) psf, 0, SEEK_SET) ;			/* Go to start of file. */
 
-	len = ARRAY_LEN (psf->u.dbuf) ;
+	len = ARRAY_LEN (ubuf.dbuf) ;
 
-	data = psf->u.dbuf ;
+	data = ubuf.dbuf ;
 
 	chan = 0 ;
 	readcount = len ;
diff --git a/libs/libsndfile/src/common.c b/libs/libsndfile/src/common.c
index 3b937f90e9..bb14a6dc71 100644
--- a/libs/libsndfile/src/common.c
+++ b/libs/libsndfile/src/common.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2013 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -20,30 +20,35 @@
 
 #include	
 #include	
+
+#ifndef MSC_VER
+#include	
+#endif
 #include	
 #include	
 #include	
 #ifndef _MSC_VER
 #include	
 #endif
+
 #include	"sndfile.h"
 #include	"sfendian.h"
 #include	"common.h"
 
 /*-----------------------------------------------------------------------------------------------
-** psf_log_printf allows libsndfile internal functions to print to an internal logbuffer which
+** psf_log_printf allows libsndfile internal functions to print to an internal parselog which
 ** can later be displayed.
 ** The format specifiers are as for printf but without the field width and other modifiers.
-** Printing is performed to the logbuffer char array of the SF_PRIVATE struct.
+** Printing is performed to the parselog char array of the SF_PRIVATE struct.
 ** Printing is done in such a way as to guarantee that the log never overflows the end of the
-** logbuffer array.
+** parselog array.
 */
 
 static inline void
 log_putchar (SF_PRIVATE *psf, char ch)
-{	if (psf->logindex < SIGNED_SIZEOF (psf->logbuffer) - 1)
-	{	psf->logbuffer [psf->logindex++] = ch ;
-		psf->logbuffer [psf->logindex] = 0 ;
+{	if (psf->parselog.indx < SIGNED_SIZEOF (psf->parselog.buf) - 1)
+	{	psf->parselog.buf [psf->parselog.indx++] = ch ;
+		psf->parselog.buf [psf->parselog.indx] = 0 ;
 		} ;
 	return ;
 } /* log_putchar */
@@ -757,37 +762,37 @@ psf_binheader_writef (SF_PRIVATE *psf, const char *format, ...)
 
 #if (CPU_IS_BIG_ENDIAN == 1)
 #define	GET_MARKER(ptr)	(	((ptr) [0] << 24)	| ((ptr) [1] << 16) |	\
-							((ptr) [2] << 8)	| ((ptr) [3]) )
+							((ptr) [2] << 8)	| ((ptr) [3]))
 
 #elif (CPU_IS_LITTLE_ENDIAN == 1)
 #define	GET_MARKER(ptr)	(	((ptr) [0])			| ((ptr) [1] << 8) |	\
-							((ptr) [2] << 16)	| ((ptr) [3] << 24) )
+							((ptr) [2] << 16)	| ((ptr) [3] << 24))
 
 #else
 #	error "Cannot determine endian-ness of processor."
 #endif
 
-#define	GET_LE_SHORT(ptr)	( ((ptr) [1] << 8) | ((ptr) [0]) )
-#define	GET_BE_SHORT(ptr)	( ((ptr) [0] << 8) | ((ptr) [1]) )
+#define	GET_LE_SHORT(ptr)	(((ptr) [1] << 8) | ((ptr) [0]))
+#define	GET_BE_SHORT(ptr)	(((ptr) [0] << 8) | ((ptr) [1]))
 
-#define	GET_LE_3BYTE(ptr)	( 	((ptr) [2] << 16) | ((ptr) [1] << 8) | ((ptr) [0]) )
-#define	GET_BE_3BYTE(ptr)	( 	((ptr) [0] << 16) | ((ptr) [1] << 8) | ((ptr) [2]) )
+#define	GET_LE_3BYTE(ptr)	(	((ptr) [2] << 16) | ((ptr) [1] << 8) | ((ptr) [0]))
+#define	GET_BE_3BYTE(ptr)	(	((ptr) [0] << 16) | ((ptr) [1] << 8) | ((ptr) [2]))
 
-#define	GET_LE_INT(ptr)		( 	((ptr) [3] << 24)	| ((ptr) [2] << 16) |	\
-								((ptr) [1] << 8)	| ((ptr) [0]) )
+#define	GET_LE_INT(ptr)		(	((ptr) [3] << 24)	| ((ptr) [2] << 16) |	\
+								((ptr) [1] << 8)	| ((ptr) [0]))
 
-#define	GET_BE_INT(ptr)		( 	((ptr) [0] << 24)	| ((ptr) [1] << 16) |	\
-							 	((ptr) [2] << 8)	| ((ptr) [3]) )
+#define	GET_BE_INT(ptr)		(	((ptr) [0] << 24)	| ((ptr) [1] << 16) |	\
+								((ptr) [2] << 8)	| ((ptr) [3]))
 
-#define	GET_LE_8BYTE(ptr)	( 	(((sf_count_t) (ptr) [7]) << 56) | (((sf_count_t) (ptr) [6]) << 48) |	\
-							 	(((sf_count_t) (ptr) [5]) << 40) | (((sf_count_t) (ptr) [4]) << 32) |	\
-							 	(((sf_count_t) (ptr) [3]) << 24) | (((sf_count_t) (ptr) [2]) << 16) |	\
-							 	(((sf_count_t) (ptr) [1]) << 8 ) | ((ptr) [0]))
+#define	GET_LE_8BYTE(ptr)	(	(((sf_count_t) (ptr) [7]) << 56)	| (((sf_count_t) (ptr) [6]) << 48) |	\
+								(((sf_count_t) (ptr) [5]) << 40)	| (((sf_count_t) (ptr) [4]) << 32) |	\
+								(((sf_count_t) (ptr) [3]) << 24)	| (((sf_count_t) (ptr) [2]) << 16) |	\
+								(((sf_count_t) (ptr) [1]) << 8)		| ((ptr) [0]))
 
-#define	GET_BE_8BYTE(ptr)	( 	(((sf_count_t) (ptr) [0]) << 56) | (((sf_count_t) (ptr) [1]) << 48) |	\
-							 	(((sf_count_t) (ptr) [2]) << 40) | (((sf_count_t) (ptr) [3]) << 32) |	\
-							 	(((sf_count_t) (ptr) [4]) << 24) | (((sf_count_t) (ptr) [5]) << 16) |	\
-							 	(((sf_count_t) (ptr) [6]) << 8 ) | ((ptr) [7]))
+#define	GET_BE_8BYTE(ptr)	(	(((sf_count_t) (ptr) [0]) << 56)	| (((sf_count_t) (ptr) [1]) << 48) |	\
+								(((sf_count_t) (ptr) [2]) << 40)	| (((sf_count_t) (ptr) [3]) << 32) |	\
+								(((sf_count_t) (ptr) [4]) << 24)	| (((sf_count_t) (ptr) [5]) << 16) |	\
+								(((sf_count_t) (ptr) [6]) << 8)		| ((ptr) [7]))
 
 
 
@@ -1026,7 +1031,7 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...)
 					strptr = va_arg (argptr, char *) ;
 					size   = strlen (strptr) + 1 ;
 					size  += (size & 1) ;
-					longdata = H2LE_INT (size) ;
+					longdata = H2LE_32 (size) ;
 					get_int (psf, longdata) ;
 					memcpy (&(psf->header [psf->headindex]), strptr, size) ;
 					psf->headindex += size ;
@@ -1035,14 +1040,14 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...)
 
 			case 'b' :
 					charptr = va_arg (argptr, char*) ;
-					count = va_arg (argptr, int) ;
+					count = va_arg (argptr, size_t) ;
 					if (count > 0)
 						byte_count += header_read (psf, charptr, count) ;
 					break ;
 
 			case 'G' :
 					charptr = va_arg (argptr, char*) ;
-					count = va_arg (argptr, int) ;
+					count = va_arg (argptr, size_t) ;
 					if (count > 0)
 						byte_count += header_gets (psf, charptr, count) ;
 					break ;
@@ -1061,14 +1066,14 @@ psf_binheader_readf (SF_PRIVATE *psf, char const *format, ...)
 
 			case 'p' :
 					/* Get the seek position first. */
-					count = va_arg (argptr, int) ;
+					count = va_arg (argptr, size_t) ;
 					header_seek (psf, count, SEEK_SET) ;
 					byte_count = count ;
 					break ;
 
 			case 'j' :
 					/* Get the seek position first. */
-					count = va_arg (argptr, int) ;
+					count = va_arg (argptr, size_t) ;
 					header_seek (psf, count, SEEK_CUR) ;
 					byte_count += count ;
 					break ;
@@ -1133,7 +1138,7 @@ psf_hexdump (const void *ptr, int len)
 		printf ("%08X: ", k) ;
 		for (m = 0 ; m < 16 && k + m < len ; m++)
 		{	printf (m == 8 ? " %02X " : "%02X ", data [k + m] & 0xFF) ;
-			ascii [m] = isprint (data [k + m]) ? data [k + m] : '.' ;
+			ascii [m] = psf_isprint (data [k + m]) ? data [k + m] : '.' ;
 			} ;
 
 		if (m <= 8) printf (" ") ;
@@ -1151,7 +1156,10 @@ psf_log_SF_INFO (SF_PRIVATE *psf)
 {	psf_log_printf (psf, "---------------------------------\n") ;
 
 	psf_log_printf (psf, " Sample rate :   %d\n", psf->sf.samplerate) ;
-	psf_log_printf (psf, " Frames      :   %D\n", psf->sf.frames) ;
+	if (psf->sf.frames == SF_COUNT_MAX)
+		psf_log_printf (psf, " Frames      :   unknown\n") ;
+	else
+		psf_log_printf (psf, " Frames      :   %D\n", psf->sf.frames) ;
 	psf_log_printf (psf, " Channels    :   %d\n", psf->sf.channels) ;
 
 	psf_log_printf (psf, " Format      :   0x%X\n", psf->sf.format) ;
@@ -1208,7 +1216,7 @@ psf_sanitize_string (char * cptr, int len)
 	do
 	{
 		len -- ;
-		cptr [len] = isprint (cptr [len]) ? cptr [len] : '.' ;
+		cptr [len] = psf_isprint (cptr [len]) ? cptr [len] : '.' ;
 	}
 	while (len > 0) ;
 } /* psf_sanitize_string */
@@ -1315,6 +1323,79 @@ psf_rand_int32 (void)
 	return value ;
 } /* psf_rand_int32 */
 
+void
+append_snprintf (char * dest, size_t maxlen, const char * fmt, ...)
+{	size_t len = strlen (dest) ;
+
+	if (len < maxlen)
+	{	va_list ap ;
+
+		va_start (ap, fmt) ;
+		vsnprintf (dest + len, maxlen - len, fmt, ap) ;
+		va_end (ap) ;
+		} ;
+
+	return ;
+} /* append_snprintf */
+
+
+void
+psf_strlcpy_crlf (char *dest, const char *src, size_t destmax, size_t srcmax)
+{	/* Must be minus 2 so it can still expand a single trailing '\n' or '\r'. */
+	char * destend = dest + destmax - 2 ;
+	const char * srcend = src + srcmax ;
+
+	while (dest < destend && src < srcend)
+	{	if ((src [0] == '\r' && src [1] == '\n') || (src [0] == '\n' && src [1] == '\r'))
+		{	*dest++ = '\r' ;
+			*dest++ = '\n' ;
+			src += 2 ;
+			continue ;
+			} ;
+
+		if (src [0] == '\r')
+		{	*dest++ = '\r' ;
+			*dest++ = '\n' ;
+			src += 1 ;
+			continue ;
+			} ;
+
+		if (src [0] == '\n')
+		{	*dest++ = '\r' ;
+			*dest++ = '\n' ;
+			src += 1 ;
+			continue ;
+			} ;
+
+		*dest++ = *src++ ;
+		} ;
+
+	/* Make sure dest is terminated. */
+	*dest = 0 ;
+} /* psf_strlcpy_crlf */
+
+sf_count_t
+psf_decode_frame_count (SF_PRIVATE *psf)
+{	sf_count_t count, readlen, total = 0 ;
+	BUF_UNION	ubuf ;
+
+	/* If we're reading from a pipe or the file is too long, just return SF_COUNT_MAX. */
+	if (psf_is_pipe (psf) || psf->datalength > 0x1000000)
+		return SF_COUNT_MAX ;
+
+	psf_fseek (psf, psf->dataoffset, SEEK_SET) ;
+
+	readlen = ARRAY_LEN (ubuf.ibuf) / psf->sf.channels ;
+	readlen *= psf->sf.channels ;
+
+	while ((count = psf->read_int (psf, ubuf.ibuf, readlen)) > 0)
+		total += count ;
+
+	psf_fseek (psf, psf->dataoffset, SEEK_SET) ;
+
+	return total / psf->sf.channels ;
+} /* psf_decode_frame_count */
+
 /*==============================================================================
 */
 
@@ -1413,3 +1494,169 @@ str_of_endianness (int end)
 	/* Zero length string for SF_ENDIAN_FILE. */
 	return "" ;
 } /* str_of_endianness */
+
+/*==============================================================================
+*/
+
+void
+psf_f2s_array (const float *src, short *dest, int count, int normalize)
+{	float 			normfact ;
+
+	normfact = normalize ? (1.0 * 0x7FFF) : 1.0 ;
+	while (--count >= 0)
+		dest [count] = lrintf (src [count] * normfact) ;
+
+	return ;
+} /* psf_f2s_array */
+
+void
+psf_f2s_clip_array (const float *src, short *dest, int count, int normalize)
+{	float			normfact, scaled_value ;
+
+	normfact = normalize ? (1.0 * 0x8000) : 1.0 ;
+
+	while (--count >= 0)
+	{	scaled_value = src [count] * normfact ;
+		if (CPU_CLIPS_POSITIVE == 0 && scaled_value >= (1.0 * 0x7FFF))
+		{	dest [count] = 0x7FFF ;
+			continue ;
+			} ;
+		if (CPU_CLIPS_NEGATIVE == 0 && scaled_value <= (-8.0 * 0x1000))
+		{	dest [count] = 0x8000 ;
+			continue ;
+			} ;
+
+		dest [count] = lrintf (scaled_value) ;
+		} ;
+
+	return ;
+} /* psf_f2s_clip_array */
+
+void
+psf_d2s_array (const double *src, short *dest, int count, int normalize)
+{	double 			normfact ;
+
+	normfact = normalize ? (1.0 * 0x7FFF) : 1.0 ;
+	while (--count >= 0)
+		dest [count] = lrint (src [count] * normfact) ;
+
+	return ;
+} /* psf_f2s_array */
+
+void
+psf_d2s_clip_array (const double *src, short *dest, int count, int normalize)
+{	double			normfact, scaled_value ;
+
+	normfact = normalize ? (1.0 * 0x8000) : 1.0 ;
+
+	while (--count >= 0)
+	{	scaled_value = src [count] * normfact ;
+		if (CPU_CLIPS_POSITIVE == 0 && scaled_value >= (1.0 * 0x7FFF))
+		{	dest [count] = 0x7FFF ;
+			continue ;
+			} ;
+		if (CPU_CLIPS_NEGATIVE == 0 && scaled_value <= (-8.0 * 0x1000))
+		{	dest [count] = 0x8000 ;
+			continue ;
+			} ;
+
+		dest [count] = lrint (scaled_value) ;
+		} ;
+
+	return ;
+} /* psf_d2s_clip_array */
+
+
+void
+psf_f2i_array (const float *src, int *dest, int count, int normalize)
+{	float 			normfact ;
+
+	normfact = normalize ? (1.0 * 0x7FFFFFFF) : 1.0 ;
+	while (--count >= 0)
+		dest [count] = lrintf (src [count] * normfact) ;
+
+	return ;
+} /* psf_f2i_array */
+
+void
+psf_f2i_clip_array (const float *src, int *dest, int count, int normalize)
+{	float			normfact, scaled_value ;
+
+	normfact = normalize ? (8.0 * 0x10000000) : 1.0 ;
+
+	while (--count >= 0)
+	{	scaled_value = src [count] * normfact ;
+		if (CPU_CLIPS_POSITIVE == 0 && scaled_value >= (1.0 * 0x7FFFFFFF))
+		{	dest [count] = 0x7FFFFFFF ;
+			continue ;
+			} ;
+		if (CPU_CLIPS_NEGATIVE == 0 && scaled_value <= (-8.0 * 0x10000000))
+		{	dest [count] = 0x80000000 ;
+			continue ;
+			} ;
+
+		dest [count] = lrintf (scaled_value) ;
+		} ;
+
+	return ;
+} /* psf_f2i_clip_array */
+
+void
+psf_d2i_array (const double *src, int *dest, int count, int normalize)
+{	double 			normfact ;
+
+	normfact = normalize ? (1.0 * 0x7FFFFFFF) : 1.0 ;
+	while (--count >= 0)
+		dest [count] = lrint (src [count] * normfact) ;
+
+	return ;
+} /* psf_f2i_array */
+
+void
+psf_d2i_clip_array (const double *src, int *dest, int count, int normalize)
+{	double			normfact, scaled_value ;
+
+	normfact = normalize ? (8.0 * 0x10000000) : 1.0 ;
+
+	while (--count >= 0)
+	{	scaled_value = src [count] * normfact ;
+		if (CPU_CLIPS_POSITIVE == 0 && scaled_value >= (1.0 * 0x7FFFFFFF))
+		{	dest [count] = 0x7FFFFFFF ;
+			continue ;
+			} ;
+		if (CPU_CLIPS_NEGATIVE == 0 && scaled_value <= (-8.0 * 0x10000000))
+		{	dest [count] = 0x80000000 ;
+			continue ;
+			} ;
+
+		dest [count] = lrint (scaled_value) ;
+		} ;
+
+	return ;
+} /* psf_d2i_clip_array */
+
+FILE *
+psf_open_tmpfile (char * fname, size_t fnamelen)
+{	const char * tmpdir ;
+	FILE * file ;
+
+	if (OS_IS_WIN32)
+		tmpdir = getenv ("TEMP") ;
+	else
+	{	tmpdir = getenv ("TMPDIR") ;
+		tmpdir = tmpdir == NULL ? "/tmp" : tmpdir ;
+		} ;
+
+//	if (tmpdir && access (tmpdir, R_OK | W_OK | X_OK) == 0)
+	{	snprintf (fname, fnamelen, "%s/%x%x-alac.tmp", tmpdir, psf_rand_int32 (), psf_rand_int32 ()) ;
+		if ((file = fopen (fname, "wb+")) != NULL)
+			return file ;
+		} ;
+
+	snprintf (fname, fnamelen, "%x%x-alac.tmp", psf_rand_int32 (), psf_rand_int32 ()) ;
+	if ((file = fopen (fname, "wb+")) != NULL)
+		return file ;
+
+	memset (fname, 0, fnamelen) ;
+	return NULL ;
+} /* psf_open_tmpfile */
diff --git a/libs/libsndfile/src/common.h b/libs/libsndfile/src/common.h
index 3e3aec0cbc..4d61619804 100644
--- a/libs/libsndfile/src/common.h
+++ b/libs/libsndfile/src/common.h
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2013 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -22,15 +22,16 @@
 #include "sfconfig.h"
 
 #include 
+#include 
 
 #if HAVE_STDINT_H
 #include 
+#elif HAVE_INTTYPES_H
+#include 
 #endif
 
 #ifndef SNDFILE_H
 #include "sndfile.h"
-#elif HAVE_INTTYPES_H
-#include 
 #endif
 
 #ifdef __cplusplus
@@ -39,7 +40,9 @@
 
 #if (SIZEOF_LONG == 8)
 #	define	SF_PLATFORM_S64(x)		x##l
-#elif COMPILER_IS_GCC || __SUNPRO_C
+#elif (SIZEOF_LONG_LONG == 8)
+#	define	SF_PLATFORM_S64(x)		x##ll
+#elif COMPILER_IS_GCC
 #	define	SF_PLATFORM_S64(x)		x##ll
 #elif OS_IS_WIN32
 #	define	SF_PLATFORM_S64(x)		x##I64
@@ -67,16 +70,15 @@
 #	define WARN_UNUSED
 #endif
 
-#define	SF_BUFFER_LEN			(8192*2)
+#define	SF_BUFFER_LEN			(8192)
 #define	SF_FILENAME_LEN			(512)
 #define SF_SYSERR_LEN			(256)
 #define SF_MAX_STRINGS			(32)
-#define SF_STR_BUFFER_LEN		(8192)
-#define	SF_HEADER_LEN			(4100 + SF_STR_BUFFER_LEN)
+#define	SF_HEADER_LEN			(12292)
+#define	SF_PARSELOG_LEN			(2048)
 
 #define	PSF_SEEK_ERROR			((sf_count_t) -1)
 
-
 #define	BITWIDTH2BYTES(x)	(((x) + 7) / 8)
 
 /*	For some reason sizeof returns an unsigned  value which causes
@@ -87,32 +89,40 @@
 
 #define		ARRAY_LEN(x)	((int) (sizeof (x) / sizeof ((x) [0])))
 
+#define		NOT(x)			(! (x))
+
 #if (COMPILER_IS_GCC == 1)
-#define		SF_MAX(x,y)		({ \
+#define		SF_MAX(x, y)	({ \
 								typeof (x) sf_max_x1 = (x) ; \
 								typeof (y) sf_max_y1 = (y) ; \
 								(void) (&sf_max_x1 == &sf_max_y1) ; \
 								sf_max_x1 > sf_max_y1 ? sf_max_x1 : sf_max_y1 ; })
 
-#define		SF_MIN(x,y)		({ \
+#define		SF_MIN(x, y)	({ \
 								typeof (x) sf_min_x2 = (x) ; \
 								typeof (y) sf_min_y2 = (y) ; \
 								(void) (&sf_min_x2 == &sf_min_y2) ; \
 								sf_min_x2 < sf_min_y2 ? sf_min_x2 : sf_min_y2 ; })
 #else
-#define		SF_MAX(a,b)		((a) > (b) ? (a) : (b))
-#define		SF_MIN(a,b)		((a) < (b) ? (a) : (b))
+#define		SF_MAX(a, b)	((a) > (b) ? (a) : (b))
+#define		SF_MIN(a, b)	((a) < (b) ? (a) : (b))
 #endif
 
+
+#define		COMPILE_TIME_ASSERT(e)	(sizeof (struct { int : - !! (e) ; }))
+
+
+#define		SF_MAX_CHANNELS	256
+
+
 /*
-*	Macros for spliting the format file of SF_INFI into contrainer type,
+*	Macros for spliting the format file of SF_INFO into container type,
 **	codec type and endian-ness.
 */
 #define SF_CONTAINER(x)		((x) & SF_FORMAT_TYPEMASK)
 #define SF_CODEC(x)			((x) & SF_FORMAT_SUBMASK)
 #define SF_ENDIAN(x)		((x) & SF_FORMAT_ENDMASK)
 
-
 enum
 {	/* PEAK chunk location. */
 	SF_PEAK_START		= 42,
@@ -143,6 +153,8 @@ enum
 
 enum
 {	/* Work in progress. */
+	SF_FORMAT_SPEEX			= 0x5000000,
+	SF_FORMAT_OGGFLAC		= 0x5000001,
 
 	/* Formats supported read only. */
 	SF_FORMAT_TXW			= 0x4030000,		/* Yamaha TX16 sampler file */
@@ -162,6 +174,22 @@ enum
 	SF_FORMAT_PCM_N			= 0x1030
 } ;
 
+/*---------------------------------------------------------------------------------------
+*/
+
+typedef struct
+{	unsigned	kuki_offset ;
+	unsigned	pakt_offset ;
+
+	unsigned	bits_per_sample ;
+	unsigned	frames_per_packet ;
+
+	int64_t 	packets ;
+	int64_t 	valid_frames ;
+	int32_t 	priming_frames ;
+	int32_t 	remainder_frames ;
+} ALAC_DECODER_INFO ;
+
 /*---------------------------------------------------------------------------------------
 **	PEAK_CHUNK - This chunk type is common to both AIFF and WAVE files although their
 **	endian encodings are different.
@@ -183,19 +211,8 @@ typedef struct
 	/* CAF */
 	unsigned int	edit_number ;
 
-#if HAVE_FLEXIBLE_ARRAY
 	/* the per channel peak info */
 	PEAK_POS		peaks [] ;
-#else
-	/*
-	** This is not ISO compliant C. It works on some compilers which
-	** don't support the ISO standard flexible struct array which is
-	** used above. If your compiler doesn't like this I suggest you find
-	** youself a 1999 ISO C standards compilant compiler. GCC-3.X is
-	** highly recommended.
-	*/
-	PEAK_POS		peaks [0] ;
-#endif
 } PEAK_INFO ;
 
 static inline PEAK_INFO *
@@ -206,94 +223,180 @@ peak_info_calloc (int channels)
 typedef struct
 {	int		type ;
 	int		flags ;
-	char 	*str ;
+	size_t 	offset ;
 } STR_DATA ;
 
+typedef struct
+{	int64_t		hash ;
+	char		id [64] ;
+	unsigned	id_size ;
+	uint32_t	mark32 ;
+	sf_count_t	offset ;
+	uint32_t	len ;
+} READ_CHUNK ;
+
+typedef struct
+{	int64_t		hash ;
+	uint32_t	mark32 ;
+	uint32_t	len ;
+	void		*data ;
+} WRITE_CHUNK ;
+
+typedef struct
+{	uint32_t	count ;
+	uint32_t	used ;
+	READ_CHUNK	*chunks ;
+} READ_CHUNKS ;
+typedef struct
+{	uint32_t	count ;
+	uint32_t	used ;
+	WRITE_CHUNK	*chunks ;
+} WRITE_CHUNKS ;
+
+struct SF_CHUNK_ITERATOR
+{	uint32_t	current ;
+	int64_t		hash ;
+	char		id [64] ;
+	unsigned	id_size ;
+	SNDFILE		*sndfile ;
+} ;
+
 static inline size_t
 make_size_t (int x)
 {	return (size_t) x ;
 } /* size_t_of_int */
 
+typedef SF_BROADCAST_INFO_VAR (16 * 1024) SF_BROADCAST_INFO_16K ;
+
+typedef SF_CART_INFO_VAR (16 * 1024) SF_CART_INFO_16K ;
+
+#if SIZEOF_WCHAR_T == 2
+typedef wchar_t	sfwchar_t ;
+#else
+typedef int16_t sfwchar_t ;
+#endif
+
+
+static inline void *
+psf_memdup (const void *src, size_t n)
+{	void * mem = calloc (1, n & 3 ? n + 4 - (n & 3) : n) ;
+	return memcpy (mem, src, n) ;
+} /* psf_memdup */
+
+/*
+**	This version of isprint specifically ignores any locale info. Its used for
+**	determining which characters can be printed in things like hexdumps.
+*/
+static inline int
+psf_isprint (int ch)
+{	return (ch >= ' ' && ch <= '~') ;
+} /* psf_isprint */
+
 /*=======================================================================================
 **	SF_PRIVATE stuct - a pointer to this struct is passed back to the caller of the
 **	sf_open_XXXX functions. The caller however has no knowledge of the struct's
 **	contents.
 */
 
-
 typedef struct
-{	int size ;
-	SF_BROADCAST_INFO binfo ;
-} SF_BROADCAST_VAR ;
-
-typedef struct sf_private_tag
 {
-	/* Canary in a coal mine. */
-	char canary [64] ;
-
-	/* Force the compiler to double align the start of buffer. */
 	union
-	{	double			dbuf	[SF_BUFFER_LEN / sizeof (double)] ;
-#if (defined (SIZEOF_INT64_T) && (SIZEOF_INT64_T == 8))
-		int64_t			lbuf	[SF_BUFFER_LEN / sizeof (int64_t)] ;
-#else
-		long			lbuf	[SF_BUFFER_LEN / sizeof (double)] ;
-#endif
-		float			fbuf	[SF_BUFFER_LEN / sizeof (float)] ;
-		int				ibuf	[SF_BUFFER_LEN / sizeof (int)] ;
-		short			sbuf	[SF_BUFFER_LEN / sizeof (short)] ;
-		char			cbuf	[SF_BUFFER_LEN / sizeof (char)] ;
-		signed char		scbuf	[SF_BUFFER_LEN / sizeof (signed char)] ;
-		unsigned char	ucbuf	[SF_BUFFER_LEN / sizeof (signed char)] ;
-		} u ;
+	{	char		c [SF_FILENAME_LEN] ;
+		sfwchar_t	wc [SF_FILENAME_LEN] ;
+	} path ;
 
-	char			filepath	[SF_FILENAME_LEN] ;
-	char			rsrcpath	[SF_FILENAME_LEN] ;
-	char			directory	[SF_FILENAME_LEN] ;
-	char			filename	[SF_FILENAME_LEN / 4] ;
+	union
+	{	char		c [SF_FILENAME_LEN] ;
+		sfwchar_t	wc [SF_FILENAME_LEN] ;
+	} dir ;
 
-	char			syserr		[SF_SYSERR_LEN] ;
-
-	/* logbuffer and logindex should only be changed within the logging functions
-	** of common.c
-	*/
-	char			logbuffer	[SF_BUFFER_LEN] ;
-	unsigned char	header		[SF_HEADER_LEN] ; /* Must be unsigned */
-	int				rwf_endian ;	/* Header endian-ness flag. */
-
-	/* Storage and housekeeping data for adding/reading strings from
-	** sound files.
-	*/
-	STR_DATA		strings [SF_MAX_STRINGS] ;
-	char			str_storage [SF_STR_BUFFER_LEN] ;
-	char			*str_end ;
-	int				str_flags ;
-
-	/* Guard value. If this changes the buffers above have overflowed. */
-	int				Magick ;
-
-	unsigned		unique_id ;
-
-	/* Index variables for maintaining logbuffer and header above. */
-	int				logindex ;
-	int				headindex, headend ;
-	int				has_text ;
-	int				do_not_close_descriptor ;
+	union
+	{	char		c [SF_FILENAME_LEN / 4] ;
+		sfwchar_t	wc [SF_FILENAME_LEN / 4] ;
+	} name ;
 
 #if USE_WINDOWS_API
 	/*
 	**	These fields can only be used in src/file_io.c.
 	**	They are basically the same as a windows file HANDLE.
 	*/
-	void 			*hfile, *hrsrc, *hsaved ;
+	void 			*handle, *hsaved ;
+
+	int				use_wchar ;
 #else
 	/* These fields can only be used in src/file_io.c. */
-	int 			filedes, rsrcdes, savedes ;
+	int 			filedes, savedes ;
 #endif
 
+	int				do_not_close_descriptor ;
+	int				mode ;			/* Open mode : SFM_READ, SFM_WRITE or SFM_RDWR. */
+} PSF_FILE ;
+
+
+
+typedef union
+{	double			dbuf	[SF_BUFFER_LEN / sizeof (double)] ;
+#if (defined (SIZEOF_INT64_T) && (SIZEOF_INT64_T == 8))
+	int64_t			lbuf	[SF_BUFFER_LEN / sizeof (int64_t)] ;
+#else
+	long			lbuf	[SF_BUFFER_LEN / sizeof (double)] ;
+#endif
+	float			fbuf	[SF_BUFFER_LEN / sizeof (float)] ;
+	int				ibuf	[SF_BUFFER_LEN / sizeof (int)] ;
+	short			sbuf	[SF_BUFFER_LEN / sizeof (short)] ;
+	char			cbuf	[SF_BUFFER_LEN / sizeof (char)] ;
+	signed char		scbuf	[SF_BUFFER_LEN / sizeof (signed char)] ;
+	unsigned char	ucbuf	[SF_BUFFER_LEN / sizeof (signed char)] ;
+} BUF_UNION ;
+
+
+
+typedef struct sf_private_tag
+{
+	/* Canary in a coal mine. */
+	union
+	{	/* Place a double here to encourage double alignment. */
+		double d [2] ;
+		char c [16] ;
+		} canary ;
+
+	PSF_FILE		file, rsrc ;
+
+	char			syserr		[SF_SYSERR_LEN] ;
+
+	/* parselog and indx should only be changed within the logging functions
+	** of common.c
+	*/
+	struct
+	{	char			buf	[SF_PARSELOG_LEN] ;
+		int				indx ;
+	} parselog ;
+
+	unsigned char	header		[SF_HEADER_LEN] ; /* Must be unsigned */
+	int				rwf_endian ;	/* Header endian-ness flag. */
+
+	/* Storage and housekeeping data for adding/reading strings from
+	** sound files.
+	*/
+	struct
+	{	STR_DATA	data [SF_MAX_STRINGS] ;
+		char		*storage ;
+		size_t		storage_len ;
+		size_t		storage_used ;
+		uint32_t	flags ;
+	} strings ;
+
+	/* Guard value. If this changes the buffers above have overflowed. */
+	int				Magick ;
+
+	unsigned		unique_id ;
+
+	/* Index variables for maintaining parselog and header above. */
+	int				headindex, headend ;
+	int				has_text ;
+
 	int				error ;
 
-	int				mode ;			/* Open mode : SFM_READ, SFM_WRITE or SFM_RDWR. */
 	int				endian ;		/* File endianness : SF_ENDIAN_LITTLE or SF_ENDIAN_BIG. */
 	int				data_endswap ;	/* Need to endswap data? */
 
@@ -323,7 +426,10 @@ typedef struct sf_private_tag
 	SF_INSTRUMENT	*instrument ;
 
 	/* Broadcast (EBU) Info */
-	SF_BROADCAST_VAR *broadcast_var ;
+	SF_BROADCAST_INFO_16K *broadcast_16k ;
+
+	/* Cart (AES46) Info */
+	SF_CART_INFO_16K *cart_16k ;
 
 	/* Channel map data (if present) : an array of ints. */
 	int				*channel_map ;
@@ -379,6 +485,7 @@ typedef struct sf_private_tag
 	sf_count_t		(*seek) 		(struct sf_private_tag*, int mode, sf_count_t samples_from_start) ;
 	int				(*write_header)	(struct sf_private_tag*, int calc_length) ;
 	int				(*command)		(struct sf_private_tag*, int command, void *data, int datasize) ;
+	int				(*byterate)		(struct sf_private_tag*) ;
 
 	/*
 	**	Separate close functions for the codec and the container.
@@ -393,6 +500,17 @@ typedef struct sf_private_tag
 	int					virtual_io ;
 	SF_VIRTUAL_IO		vio ;
 	void				*vio_user_data ;
+
+	/* Chunk get/set. */
+	SF_CHUNK_ITERATOR	*iterator ;
+
+	READ_CHUNKS			rchunks ;
+	WRITE_CHUNKS		wchunks ;
+
+	int					(*set_chunk)		(struct sf_private_tag*, const SF_CHUNK_INFO * chunk_info) ;
+	SF_CHUNK_ITERATOR *	(*next_chunk_iterator)	(struct sf_private_tag*, SF_CHUNK_ITERATOR * iterator) ;
+	int					(*get_chunk_size)	(struct sf_private_tag*, const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info) ;
+	int					(*get_chunk_data)	(struct sf_private_tag*, const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info) ;
 } SF_PRIVATE ;
 
 
@@ -415,6 +533,7 @@ enum
 	SFE_BAD_FILE_PTR,
 	SFE_BAD_INT_PTR,
 	SFE_BAD_STAT_SIZE,
+	SFE_NO_TEMP_DIR,
 	SFE_MALLOC_FAILED,
 	SFE_UNIMPLEMENTED,
 	SFE_BAD_READ_ALIGN,
@@ -453,6 +572,9 @@ enum
 	SFE_RDWR_BAD_HEADER,
 	SFE_CMD_HAS_DATA,
 	SFE_BAD_BROADCAST_INFO_SIZE,
+	SFE_BAD_BROADCAST_INFO_TOO_BIG,
+	SFE_BAD_CART_INFO_SIZE,
+	SFE_BAD_CART_INFO_TOO_BIG,
 
 	SFE_STR_NO_SUPPORT,
 	SFE_STR_NOT_WRITE,
@@ -506,6 +628,7 @@ enum
 	SFE_PAF_VERSION,
 	SFE_PAF_UNKNOWN_FORMAT,
 	SFE_PAF_SHORT_HEADER,
+	SFE_PAF_BAD_CHANNELS,
 
 	SFE_SVX_NO_FORM,
 	SFE_SVX_NO_BODY,
@@ -584,6 +707,13 @@ enum
 	SFE_VORBIS_ENCODER_BUG,
 
 	SFE_RF64_NOT_RF64,
+	SFE_BAD_CHUNK_PTR,
+	SFE_UNKNOWN_CHUNK,
+	SFE_BAD_CHUNK_FORMAT,
+	SFE_BAD_CHUNK_MARKER,
+	SFE_BAD_CHUNK_DATA_PTR,
+
+	SFE_ALAC_FAIL_TMPFILE,
 
 	SFE_MAX_ERROR			/* This must be last in list. */
 } ;
@@ -595,13 +725,13 @@ int u_bitwidth_to_subformat (int bits) ;
 /*  Functions for reading and writing floats and doubles on processors
 **	with non-IEEE floats/doubles.
 */
-float	float32_be_read		(unsigned char *cptr) ;
-float	float32_le_read		(unsigned char *cptr) ;
+float	float32_be_read		(const unsigned char *cptr) ;
+float	float32_le_read		(const unsigned char *cptr) ;
 void	float32_be_write	(float in, unsigned char *out) ;
 void	float32_le_write	(float in, unsigned char *out) ;
 
-double	double64_be_read	(unsigned char *cptr) ;
-double	double64_le_read	(unsigned char *cptr) ;
+double	double64_be_read	(const unsigned char *cptr) ;
+double	double64_le_read	(const unsigned char *cptr) ;
 void	double64_be_write	(double in, unsigned char *out) ;
 void	double64_le_write	(double in, unsigned char *out) ;
 
@@ -612,6 +742,11 @@ void	psf_log_SF_INFO 	(SF_PRIVATE *psf) ;
 
 int32_t	psf_rand_int32 (void) ;
 
+void append_snprintf (char * dest, size_t maxlen, const char * fmt, ...) ;
+void psf_strlcpy_crlf (char *dest, const char *src, size_t destmax, size_t srcmax) ;
+
+sf_count_t psf_decode_frame_count (SF_PRIVATE *psf) ;
+
 /* Functions used when writing file headers. */
 
 int		psf_binheader_writef	(SF_PRIVATE *psf, const char *format, ...) ;
@@ -665,13 +800,15 @@ int macos_guess_file_type (SF_PRIVATE *psf, const char *filename) ;
 **	some 32 bit OSes. Implementation in file_io.c.
 */
 
-int psf_fopen (SF_PRIVATE *psf, const char *pathname, int flags) ;
-int psf_set_stdio (SF_PRIVATE *psf, int mode) ;
+int psf_fopen (SF_PRIVATE *psf) ;
+int psf_set_stdio (SF_PRIVATE *psf) ;
 int psf_file_valid (SF_PRIVATE *psf) ;
 void psf_set_file (SF_PRIVATE *psf, int fd) ;
 void psf_init_files (SF_PRIVATE *psf) ;
 void psf_use_rsrc (SF_PRIVATE *psf, int on_off) ;
 
+SNDFILE * psf_open_file (SF_PRIVATE *psf, SF_INFO *sfinfo) ;
+
 sf_count_t psf_fseek (SF_PRIVATE *psf, sf_count_t offset, int whence) ;
 sf_count_t psf_fread (void *ptr, sf_count_t bytes, sf_count_t count, SF_PRIVATE *psf) ;
 sf_count_t psf_fwrite (const void *ptr, sf_count_t bytes, sf_count_t count, SF_PRIVATE *psf) ;
@@ -687,7 +824,7 @@ int psf_ftruncate (SF_PRIVATE *psf, sf_count_t len) ;
 int psf_fclose (SF_PRIVATE *psf) ;
 
 /* Open and close the resource fork of a file. */
-int psf_open_rsrc (SF_PRIVATE *psf, int mode) ;
+int psf_open_rsrc (SF_PRIVATE *psf) ;
 int psf_close_rsrc (SF_PRIVATE *psf) ;
 
 /*
@@ -722,10 +859,16 @@ int		caf_open	(SF_PRIVATE *psf) ;
 int		mpc2k_open	(SF_PRIVATE *psf) ;
 int		rf64_open	(SF_PRIVATE *psf) ;
 
+int		ogg_vorbis_open	(SF_PRIVATE *psf) ;
+int		ogg_speex_open	(SF_PRIVATE *psf) ;
+int		ogg_pcm_open	(SF_PRIVATE *psf) ;
+int		ogg_opus_open	(SF_PRIVATE *psf) ;
+int		ogg_open	(SF_PRIVATE *psf) ;
+
+
 /* In progress. Do not currently work. */
 
 int		mpeg_open	(SF_PRIVATE *psf) ;
-int		ogg_open	(SF_PRIVATE *psf) ;
 int		rx2_open	(SF_PRIVATE *psf) ;
 int		txw_open	(SF_PRIVATE *psf) ;
 int		wve_open	(SF_PRIVATE *psf) ;
@@ -747,6 +890,7 @@ int		gsm610_init		(SF_PRIVATE *psf) ;
 int		vox_adpcm_init	(SF_PRIVATE *psf) ;
 int		flac_init		(SF_PRIVATE *psf) ;
 int		g72x_init 		(SF_PRIVATE * psf) ;
+int		alac_init		(SF_PRIVATE *psf, const ALAC_DECODER_INFO * info) ;
 
 int 	dither_init		(SF_PRIVATE *psf, int mode) ;
 
@@ -761,18 +905,51 @@ int		interleave_init (SF_PRIVATE *psf) ;
 ** Chunk logging functions.
 */
 
-typedef struct
-{	struct
-	{	int chunk ;
-		sf_count_t offset ;
-		sf_count_t len ;
-	} l [100] ;
+SF_CHUNK_ITERATOR * psf_get_chunk_iterator (SF_PRIVATE * psf, const char * marker_str) ;
+SF_CHUNK_ITERATOR * psf_next_chunk_iterator (const READ_CHUNKS * pchk , SF_CHUNK_ITERATOR *iterator) ;
+int		psf_store_read_chunk_u32 (READ_CHUNKS * pchk, uint32_t marker, sf_count_t offset, uint32_t len) ;
+int		psf_store_read_chunk_str (READ_CHUNKS * pchk, const char * marker, sf_count_t offset, uint32_t len) ;
+int		psf_save_write_chunk (WRITE_CHUNKS * pchk, const SF_CHUNK_INFO * chunk_info) ;
+int		psf_find_read_chunk_str (const READ_CHUNKS * pchk, const char * marker) ;
+int		psf_find_read_chunk_m32 (const READ_CHUNKS * pchk, uint32_t marker) ;
+int		psf_find_read_chunk_iterator (const READ_CHUNKS * pchk, const SF_CHUNK_ITERATOR * marker) ;
 
-	int count ;
-} PRIV_CHUNK4 ;
+int		psf_find_write_chunk (WRITE_CHUNKS * pchk, const char * marker) ;
 
-void pchk4_store (PRIV_CHUNK4 * pchk, int marker, sf_count_t offset, sf_count_t len) ;
-int pchk4_find (PRIV_CHUNK4 * pchk, int marker) ;
+static inline int
+fourcc_to_marker (const SF_CHUNK_INFO * chunk_info)
+{	const unsigned char * cptr ;
+
+	if (chunk_info->id_size != 4)
+		return 0 ;
+
+	cptr = (const unsigned char *) chunk_info->id ;
+	return (cptr [3] << 24) + (cptr [2] << 16) + (cptr [1] << 8) + cptr [0] ;
+} /* fourcc_to_marker */
+
+/*------------------------------------------------------------------------------------
+** Functions that work like OpenBSD's strlcpy/strlcat to replace strncpy/strncat.
+**
+** See : http://www.gratisoft.us/todd/papers/strlcpy.html
+**
+** These functions are available on *BSD, but are not avaialble everywhere so we
+** implement them here.
+**
+** The argument order has been changed to that of strncpy/strncat to cause
+** compiler errors if code is carelessly converted from one to the other.
+*/
+
+static inline void
+psf_strlcat (char *dest, size_t n, const char *src)
+{	strncat (dest, src, n - strlen (dest) - 1) ;
+	dest [n - 1] = 0 ;
+} /* psf_strlcat */
+
+static inline void
+psf_strlcpy (char *dest, size_t n, const char *src)
+{	strncpy (dest, src, n - 1) ;
+	dest [n - 1] = 0 ;
+} /* psf_strlcpy */
 
 /*------------------------------------------------------------------------------------
 ** Other helper functions.
@@ -787,18 +964,26 @@ void	psf_sanitize_string (char * cptr, int len) ;
 /* Generate the current date as a string. */
 void	psf_get_date_str (char *str, int maxlen) ;
 
-SF_BROADCAST_VAR* broadcast_var_alloc (size_t datasize) ;
+SF_BROADCAST_INFO_16K * broadcast_var_alloc (void) ;
 int		broadcast_var_set (SF_PRIVATE *psf, const SF_BROADCAST_INFO * data, size_t datasize) ;
 int		broadcast_var_get (SF_PRIVATE *psf, SF_BROADCAST_INFO * data, size_t datasize) ;
 
 
+SF_CART_INFO_16K * cart_var_alloc (void) ;
+int 		cart_var_set (SF_PRIVATE *psf, const SF_CART_INFO * date, size_t datasize) ;
+int		cart_var_get (SF_PRIVATE *psf, SF_CART_INFO * data, size_t datasize) ;
+
 typedef struct
 {	int channels ;
 	int endianness ;
 } AUDIO_DETECT ;
 
 int audio_detect (SF_PRIVATE * psf, AUDIO_DETECT *ad, const unsigned char * data, int datalen) ;
+int id3_skip (SF_PRIVATE * psf) ;
 
+void	alac_get_desc_chunk_items (int subformat, uint32_t *fmt_flags, uint32_t *frames_per_packet) ;
+
+FILE *	psf_open_tmpfile (char * fname, size_t fnamelen) ;
 
 /*------------------------------------------------------------------------------------
 ** Helper/debug functions.
@@ -834,5 +1019,26 @@ int sf_dither_float		(const SF_DITHER_INFO *dither, const float *in, float *out,
 int sf_dither_double	(const SF_DITHER_INFO *dither, const double *in, double *out, int count) ;
 #endif
 
+/*------------------------------------------------------------------------------------
+** Data conversion functions.
+*/
+
+static inline short
+psf_short_of_int (int x)
+{	return (x >> 16) ;
+}
+
+void psf_f2s_array (const float *src, short *dest, int count, int normalize) ;
+void psf_f2s_clip_array (const float *src, short *dest, int count, int normalize) ;
+
+void psf_d2s_array (const double *src, short *dest, int count, int normalize) ;
+void psf_d2s_clip_array (const double *src, short *dest, int count, int normalize) ;
+
+void psf_f2i_array (const float *src, int *dest, int count, int normalize) ;
+void psf_f2i_clip_array (const float *src, int *dest, int count, int normalize) ;
+
+void psf_d2i_array (const double *src, int *dest, int count, int normalize) ;
+void psf_d2i_clip_array (const double *src, int *dest, int count, int normalize) ;
+
 #endif /* SNDFILE_COMMON_H */
 
diff --git a/libs/libsndfile/src/create_symbols_file.py b/libs/libsndfile/src/create_symbols_file.py
index a91e89edb2..15b1ccaf4b 100755
--- a/libs/libsndfile/src/create_symbols_file.py
+++ b/libs/libsndfile/src/create_symbols_file.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (C) 2003-2007 Erik de Castro Lopo 
+# Copyright (C) 2003-2012 Erik de Castro Lopo 
 #
 # All rights reserved.
 #
@@ -39,89 +39,107 @@ import re, sys
 # the ordinal values in the second column.
 
 ALL_SYMBOLS = (
-	(	"sf_command", 		1	),
-	(	"sf_open",			2	),
-	(	"sf_close",			3	),
-	(	"sf_seek",			4	),
-	(	"sf_error",			7	),
-	(	"sf_perror",		8	),
-	(	"sf_error_str",		9	),
-	(	"sf_error_number",	10	),
-	(	"sf_format_check",	11	),
-	(	"sf_read_raw",		16	),
-	(	"sf_readf_short",	17	),
-	(	"sf_readf_int",		18	),
-	(	"sf_readf_float",	19	),
-	(	"sf_readf_double",	20	),
-	(	"sf_read_short",	21	),
-	(	"sf_read_int",		22	),
-	(	"sf_read_float",	23	),
-	(	"sf_read_double",	24	),
-	(	"sf_write_raw",		32	),
-	(	"sf_writef_short",	33	),
-	(	"sf_writef_int",	34	),
-	(	"sf_writef_float",	35	),
-	(	"sf_writef_double",	36	),
-	(	"sf_write_short",	37	),
-	(	"sf_write_int",		38	),
-	(	"sf_write_float",	39	),
-	(	"sf_write_double",	40	),
-	(	"sf_strerror",		50	),
-	(	"sf_get_string",	60	),
-	(	"sf_set_string",	61	),
-	(	"sf_open_fd",		70	),
-	(	"sf_open_virtual",	80	),
-	(	"sf_write_sync",	90	)
+	(	"sf_command",	 		1	),
+	(	"sf_open",				2	),
+	(	"sf_close",				3	),
+	(	"sf_seek",				4	),
+	(	"sf_error",				7	),
+	(	"sf_perror",			8	),
+	(	"sf_error_str",			9	),
+	(	"sf_error_number",		10	),
+	(	"sf_format_check",		11	),
+	(	"sf_read_raw",			16	),
+	(	"sf_readf_short",		17	),
+	(	"sf_readf_int",			18	),
+	(	"sf_readf_float",		19	),
+	(	"sf_readf_double",		20	),
+	(	"sf_read_short",		21	),
+	(	"sf_read_int",			22	),
+	(	"sf_read_float",		23	),
+	(	"sf_read_double",		24	),
+	(	"sf_write_raw",			32	),
+	(	"sf_writef_short",		33	),
+	(	"sf_writef_int",		34	),
+	(	"sf_writef_float",		35	),
+	(	"sf_writef_double",		36	),
+	(	"sf_write_short",		37	),
+	(	"sf_write_int",			38	),
+	(	"sf_write_float",		39	),
+	(	"sf_write_double",		40	),
+	(	"sf_strerror",			50	),
+	(	"sf_get_string",		60	),
+	(	"sf_set_string",		61	),
+	(	"sf_version_string",	68	),
+	(	"sf_open_fd",			70	),
+	(	"sf_wchar_open",		71  ),
+	(	"sf_open_virtual",		80	),
+	(	"sf_write_sync",		90	),
+	(	"sf_set_chunk",			100	),
+	(	"sf_get_chunk_size",	101 ),
+	(	"sf_get_chunk_data",	102 ),
+	(	"sf_get_chunk_iterator",	103 ),
+	(	"sf_next_chunk_iterator",	104 ),
+	(	"sf_current_byterate",	110 )
 	)
 
 #-------------------------------------------------------------------------------
 
 def linux_symbols (progname, version):
-	print "# Auto-generated by %s\n" %progname
-	print "libsndfile.so.%s" % version
-	print "{"
-	print "  global:"
+	print ("# Auto-generated by %s\n" %progname)
+	print ("libsndfile.so.%s" % version)
+	print ("{")
+	print ("  global:")
 	for name, ordinal in ALL_SYMBOLS:
-		print "    %s ;" % name
-	print "  local:"
-	print "    * ;"
-	print "} ;"
-	print
+		if  name == "sf_wchar_open":
+			continue
+		print ("    %s ;" % name)
+	print ("  local:")
+	print ("    * ;")
+	print ("} ;")
+	sys.stdout.write ("\n")
 	return
 
 def darwin_symbols (progname, version):
-	print "# Auto-generated by %s\n" %progname
+	print ("# Auto-generated by %s\n" %progname)
 	for name, ordinal in ALL_SYMBOLS:
-		print "_%s" % name
-	print
+		if  name == "sf_wchar_open":
+			continue
+		print ("_%s" % name)
+	sys.stdout.write ("\n")
 	return
 
 def win32_symbols (progname, version, name):
-	print "; Auto-generated by %s\n" %progname
-	print "LIBRARY %s-%s.dll" % (name, re.sub ("\..*", "", version))
-	print "EXPORTS\n"
+	print ("; Auto-generated by %s\n" %progname)
+	print ("LIBRARY %s-%s.dll" % (name, re.sub ("\..*", "", version)))
+	print ("EXPORTS\n")
 	for name, ordinal in ALL_SYMBOLS:
-		print "%-20s @%s" % (name, ordinal)
-	print
+		print ("%-20s @%s" % (name, ordinal))
+	sys.stdout.write ("\n")
 	return
 
 def os2_symbols (progname, version, name):
-	print "; Auto-generated by %s\n" %progname
-	print "LIBRARY %s%s.dll" % (name, re.sub ("\..*", "", version))
-	print "INITINSTANCE TERMINSTANCE"
-	print "CODE PRELOAD MOVEABLE DISCARDABLE"
-	print "DATA PRELOAD MOVEABLE MULTIPLE NONSHARED"
-	print "EXPORTS\n"
+	print ("; Auto-generated by %s\n" %progname)
+	print ("LIBRARY %s%s" % (name, re.sub ("\..*", "", version)))
+	print ("INITINSTANCE TERMINSTANCE")
+	print ("CODE PRELOAD MOVEABLE DISCARDABLE")
+	print ("DATA PRELOAD MOVEABLE MULTIPLE NONSHARED")
+	print ("EXPORTS\n")
 	for name, ordinal in ALL_SYMBOLS:
-        	print "_%-20s @%s" % (name, ordinal)
-	print
+		if  name == "sf_wchar_open":
+			continue
+		print ("_%-20s @%s" % (name, ordinal))
+	sys.stdout.write ("\n")
 	return
 
+def plain_symbols (progname, version, name):
+	for name, ordinal in ALL_SYMBOLS:
+		print (name)
+
 def no_symbols (os_name):
-	print
-	print "No known way of restricting exported symbols on '%s'." % os_name
-	print "If you know a way, please contact the author."
-	print
+	sys.stdout.write ("\n")
+	print ("No known way of restricting exported symbols on '%s'." % os_name)
+	print ("If you know a way, please contact the author.")
+	sys.stdout.write ("\n")
 	return
 
 #-------------------------------------------------------------------------------
@@ -129,22 +147,23 @@ def no_symbols (os_name):
 progname = re.sub (".*[\\/]", "", sys.argv [0])
 
 if len (sys.argv) != 3:
-	print
-	print "Usage : %s  ." % progname
-	print
-	print "    Currently supported values for target OS are:"
-	print "          linux"
-	print "          darwin     (ie MacOSX)"
-	print "          win32      (ie wintendo)"
-	print "          cygwin     (Cygwin on wintendo)"
-	print "          os2        (OS/2)"
-	print
+	sys.stdout.write ("\n")
+	print ("Usage : %s  ." % progname)
+	sys.stdout.write ("\n")
+	print ("    Currently supported values for target OS are:")
+	print ("          linux")
+	print ("          darwin     (ie MacOSX)")
+	print ("          win32      (ie wintendo)")
+	print ("          cygwin     (Cygwin on wintendo)")
+	print ("          os2        (OS/2)")
+	print ("          plain      (plain list of symbols)")
+	sys.stdout.write ("\n")
 	sys.exit (1)
 
 os_name = sys.argv [1]
 version = re.sub ("\.[a-z0-9]+$", "", sys.argv [2])
 
-if os_name == "linux":
+if os_name == "linux" or os_name == "gnu" or os_name == "binutils":
 	linux_symbols (progname, version)
 elif os_name == "darwin":
 	darwin_symbols (progname, version)
@@ -154,6 +173,8 @@ elif os_name == "cygwin":
 	win32_symbols (progname, version, "cygsndfile")
 elif os_name == "os2":
 	os2_symbols (progname, version, "sndfile")
+elif os_name == "static":
+	plain_symbols (progname, version, "")
 else:
 	no_symbols (os_name)
 
diff --git a/libs/libsndfile/src/dither.c b/libs/libsndfile/src/dither.c
index d6284ac72b..d149bc1b68 100644
--- a/libs/libsndfile/src/dither.c
+++ b/libs/libsndfile/src/dither.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2003-2009 Erik de Castro Lopo 
+** Copyright (C) 2003-2011 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
diff --git a/libs/libsndfile/src/double64.c b/libs/libsndfile/src/double64.c
index 7f5e107fbb..ce60699e61 100644
--- a/libs/libsndfile/src/double64.c
+++ b/libs/libsndfile/src/double64.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2012 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -95,7 +95,7 @@ double64_init	(SF_PRIVATE *psf)
 
 	psf->blockwidth = sizeof (double) * psf->sf.channels ;
 
-	if (psf->mode == SFM_READ || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_READ || psf->file.mode == SFM_RDWR)
 	{	switch (psf->endian + double64_caps)
 		{	case (SF_ENDIAN_BIG + DOUBLE_CAN_RW_BE) :
 					psf->data_endswap = SF_FALSE ;
@@ -166,7 +166,7 @@ double64_init	(SF_PRIVATE *psf)
 			} ;
 		} ;
 
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{	switch (psf->endian + double64_caps)
 		{	case (SF_ENDIAN_LITTLE + DOUBLE_CAN_RW_LE) :
 					psf->data_endswap = SF_FALSE ;
@@ -276,7 +276,7 @@ double64_init	(SF_PRIVATE *psf)
 */
 
 double
-double64_be_read (unsigned char *cptr)
+double64_be_read (const unsigned char *cptr)
 {	int		exponent, negative, upper, lower ;
 	double	dvalue ;
 
@@ -309,7 +309,7 @@ double64_be_read (unsigned char *cptr)
 } /* double64_be_read */
 
 double
-double64_le_read (unsigned char *cptr)
+double64_le_read (const unsigned char *cptr)
 {	int		exponent, negative, upper, lower ;
 	double	dvalue ;
 
@@ -554,24 +554,25 @@ f2d_array (const float *src, double *dest, int count)
 
 static sf_count_t
 host_read_d2s	(SF_PRIVATE *psf, short *ptr, sf_count_t len)
-{	void		(*convert) (const double *, int, short *, double) ;
+{	BUF_UNION	ubuf ;
+	void		(*convert) (const double *, int, short *, double) ;
 	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 	double		scale ;
 
 	convert = (psf->add_clipping) ? d2s_clip_array : d2s_array ;
-	bufferlen = ARRAY_LEN (psf->u.dbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.dbuf) ;
 	scale = (psf->float_int_mult == 0) ? 1.0 : 0x7FFF / psf->float_max ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.dbuf, sizeof (double), bufferlen, psf) ;
+		readcount = psf_fread (ubuf.dbuf, sizeof (double), bufferlen, psf) ;
 
 		if (psf->data_endswap == SF_TRUE)
-			endswap_double_array (psf->u.dbuf, readcount) ;
+			endswap_double_array (ubuf.dbuf, readcount) ;
 
-		convert (psf->u.dbuf, readcount, ptr + total, scale) ;
+		convert (ubuf.dbuf, readcount, ptr + total, scale) ;
 		total += readcount ;
 		len -= readcount ;
 		if (readcount < bufferlen)
@@ -583,24 +584,25 @@ host_read_d2s	(SF_PRIVATE *psf, short *ptr, sf_count_t len)
 
 static sf_count_t
 host_read_d2i	(SF_PRIVATE *psf, int *ptr, sf_count_t len)
-{	void		(*convert) (const double *, int, int *, double) ;
+{	BUF_UNION	ubuf ;
+	void		(*convert) (const double *, int, int *, double) ;
 	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 	double		scale ;
 
 	convert = (psf->add_clipping) ? d2i_clip_array : d2i_array ;
-	bufferlen = ARRAY_LEN (psf->u.dbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.dbuf) ;
 	scale = (psf->float_int_mult == 0) ? 1.0 : 0x7FFFFFFF / psf->float_max ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.dbuf, sizeof (double), bufferlen, psf) ;
+		readcount = psf_fread (ubuf.dbuf, sizeof (double), bufferlen, psf) ;
 
 		if (psf->data_endswap == SF_TRUE)
-			endswap_double_array (psf->u.dbuf, bufferlen) ;
+			endswap_double_array (ubuf.dbuf, bufferlen) ;
 
-		convert (psf->u.dbuf, readcount, ptr + total, scale) ;
+		convert (ubuf.dbuf, readcount, ptr + total, scale) ;
 		total += readcount ;
 		len -= readcount ;
 		if (readcount < bufferlen)
@@ -612,20 +614,21 @@ host_read_d2i	(SF_PRIVATE *psf, int *ptr, sf_count_t len)
 
 static sf_count_t
 host_read_d2f	(SF_PRIVATE *psf, float *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.dbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.dbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.dbuf, sizeof (double), bufferlen, psf) ;
+		readcount = psf_fread (ubuf.dbuf, sizeof (double), bufferlen, psf) ;
 
 		if (psf->data_endswap == SF_TRUE)
-			endswap_double_array (psf->u.dbuf, bufferlen) ;
+			endswap_double_array (ubuf.dbuf, bufferlen) ;
 
-		d2f_array (psf->u.dbuf, readcount, ptr + total) ;
+		d2f_array (ubuf.dbuf, readcount, ptr + total) ;
 		total += readcount ;
 		len -= readcount ;
 		if (readcount < bufferlen)
@@ -667,26 +670,27 @@ host_read_d	(SF_PRIVATE *psf, double *ptr, sf_count_t len)
 
 static sf_count_t
 host_write_s2d	(SF_PRIVATE *psf, const short *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 	double		scale ;
 
 	scale = (psf->scale_int_float == 0) ? 1.0 : 1.0 / 0x8000 ;
-	bufferlen = ARRAY_LEN (psf->u.dbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.dbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
 
-		s2d_array (ptr + total, psf->u.dbuf, bufferlen, scale) ;
+		s2d_array (ptr + total, ubuf.dbuf, bufferlen, scale) ;
 
 		if (psf->peak_info)
-			double64_peak_update (psf, psf->u.dbuf, bufferlen, total / psf->sf.channels) ;
+			double64_peak_update (psf, ubuf.dbuf, bufferlen, total / psf->sf.channels) ;
 
 		if (psf->data_endswap == SF_TRUE)
-			endswap_double_array (psf->u.dbuf, bufferlen) ;
+			endswap_double_array (ubuf.dbuf, bufferlen) ;
 
-		writecount = psf_fwrite (psf->u.dbuf, sizeof (double), bufferlen, psf) ;
+		writecount = psf_fwrite (ubuf.dbuf, sizeof (double), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -698,25 +702,26 @@ host_write_s2d	(SF_PRIVATE *psf, const short *ptr, sf_count_t len)
 
 static sf_count_t
 host_write_i2d	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 	double		scale ;
 
 	scale = (psf->scale_int_float == 0) ? 1.0 : 1.0 / (8.0 * 0x10000000) ;
-	bufferlen = ARRAY_LEN (psf->u.dbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.dbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		i2d_array (ptr + total, psf->u.dbuf, bufferlen, scale) ;
+		i2d_array (ptr + total, ubuf.dbuf, bufferlen, scale) ;
 
 		if (psf->peak_info)
-			double64_peak_update (psf, psf->u.dbuf, bufferlen, total / psf->sf.channels) ;
+			double64_peak_update (psf, ubuf.dbuf, bufferlen, total / psf->sf.channels) ;
 
 		if (psf->data_endswap == SF_TRUE)
-			endswap_double_array (psf->u.dbuf, bufferlen) ;
+			endswap_double_array (ubuf.dbuf, bufferlen) ;
 
-		writecount = psf_fwrite (psf->u.dbuf, sizeof (double), bufferlen, psf) ;
+		writecount = psf_fwrite (ubuf.dbuf, sizeof (double), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -728,23 +733,24 @@ host_write_i2d	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
 
 static sf_count_t
 host_write_f2d	(SF_PRIVATE *psf, const float *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.dbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.dbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		f2d_array (ptr + total, psf->u.dbuf, bufferlen) ;
+		f2d_array (ptr + total, ubuf.dbuf, bufferlen) ;
 
 		if (psf->peak_info)
-			double64_peak_update (psf, psf->u.dbuf, bufferlen, total / psf->sf.channels) ;
+			double64_peak_update (psf, ubuf.dbuf, bufferlen, total / psf->sf.channels) ;
 
 		if (psf->data_endswap == SF_TRUE)
-			endswap_double_array (psf->u.dbuf, bufferlen) ;
+			endswap_double_array (ubuf.dbuf, bufferlen) ;
 
-		writecount = psf_fwrite (psf->u.dbuf, sizeof (double), bufferlen, psf) ;
+		writecount = psf_fwrite (ubuf.dbuf, sizeof (double), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -756,7 +762,8 @@ host_write_f2d	(SF_PRIVATE *psf, const float *ptr, sf_count_t len)
 
 static sf_count_t
 host_write_d	(SF_PRIVATE *psf, const double *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
 	if (psf->peak_info)
@@ -765,15 +772,15 @@ host_write_d	(SF_PRIVATE *psf, const double *ptr, sf_count_t len)
 	if (psf->data_endswap != SF_TRUE)
 		return psf_fwrite (ptr, sizeof (double), len, psf) ;
 
-	bufferlen = ARRAY_LEN (psf->u.dbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.dbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
 
-		endswap_double_copy (psf->u.dbuf, ptr + total, bufferlen) ;
+		endswap_double_copy (ubuf.dbuf, ptr + total, bufferlen) ;
 
-		writecount = psf_fwrite (psf->u.dbuf, sizeof (double), bufferlen, psf) ;
+		writecount = psf_fwrite (ubuf.dbuf, sizeof (double), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -788,24 +795,25 @@ host_write_d	(SF_PRIVATE *psf, const double *ptr, sf_count_t len)
 
 static sf_count_t
 replace_read_d2s	(SF_PRIVATE *psf, short *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 	double		scale ;
 
-	bufferlen = ARRAY_LEN (psf->u.dbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.dbuf) ;
 	scale = (psf->float_int_mult == 0) ? 1.0 : 0x7FFF / psf->float_max ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.dbuf, sizeof (double), bufferlen, psf) ;
+		readcount = psf_fread (ubuf.dbuf, sizeof (double), bufferlen, psf) ;
 
 		if (psf->data_endswap == SF_TRUE)
-			endswap_double_array (psf->u.dbuf, bufferlen) ;
+			endswap_double_array (ubuf.dbuf, bufferlen) ;
 
-		d2bd_read (psf->u.dbuf, bufferlen) ;
+		d2bd_read (ubuf.dbuf, bufferlen) ;
 
-		d2s_array (psf->u.dbuf, readcount, ptr + total, scale) ;
+		d2s_array (ubuf.dbuf, readcount, ptr + total, scale) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -817,24 +825,25 @@ replace_read_d2s	(SF_PRIVATE *psf, short *ptr, sf_count_t len)
 
 static sf_count_t
 replace_read_d2i	(SF_PRIVATE *psf, int *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 	double		scale ;
 
-	bufferlen = ARRAY_LEN (psf->u.dbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.dbuf) ;
 	scale = (psf->float_int_mult == 0) ? 1.0 : 0x7FFFFFFF / psf->float_max ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.dbuf, sizeof (double), bufferlen, psf) ;
+		readcount = psf_fread (ubuf.dbuf, sizeof (double), bufferlen, psf) ;
 
 		if (psf->data_endswap == SF_TRUE)
-			endswap_double_array (psf->u.dbuf, bufferlen) ;
+			endswap_double_array (ubuf.dbuf, bufferlen) ;
 
-		d2bd_read (psf->u.dbuf, bufferlen) ;
+		d2bd_read (ubuf.dbuf, bufferlen) ;
 
-		d2i_array (psf->u.dbuf, readcount, ptr + total, scale) ;
+		d2i_array (ubuf.dbuf, readcount, ptr + total, scale) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -846,22 +855,23 @@ replace_read_d2i	(SF_PRIVATE *psf, int *ptr, sf_count_t len)
 
 static sf_count_t
 replace_read_d2f	(SF_PRIVATE *psf, float *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.dbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.dbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.dbuf, sizeof (double), bufferlen, psf) ;
+		readcount = psf_fread (ubuf.dbuf, sizeof (double), bufferlen, psf) ;
 
 		if (psf->data_endswap == SF_TRUE)
-			endswap_double_array (psf->u.dbuf, bufferlen) ;
+			endswap_double_array (ubuf.dbuf, bufferlen) ;
 
-		d2bd_read (psf->u.dbuf, bufferlen) ;
+		d2bd_read (ubuf.dbuf, bufferlen) ;
 
-		memcpy (ptr + total, psf->u.dbuf, bufferlen * sizeof (double)) ;
+		memcpy (ptr + total, ubuf.dbuf, bufferlen * sizeof (double)) ;
 
 		total += readcount ;
 		if (readcount < bufferlen)
@@ -874,23 +884,24 @@ replace_read_d2f	(SF_PRIVATE *psf, float *ptr, sf_count_t len)
 
 static sf_count_t
 replace_read_d	(SF_PRIVATE *psf, double *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 
 	/* FIXME : This is probably nowhere near optimal. */
-	bufferlen = ARRAY_LEN (psf->u.dbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.dbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.dbuf, sizeof (double), bufferlen, psf) ;
+		readcount = psf_fread (ubuf.dbuf, sizeof (double), bufferlen, psf) ;
 
 		if (psf->data_endswap == SF_TRUE)
-			endswap_double_array (psf->u.dbuf, readcount) ;
+			endswap_double_array (ubuf.dbuf, readcount) ;
 
-		d2bd_read (psf->u.dbuf, readcount) ;
+		d2bd_read (ubuf.dbuf, readcount) ;
 
-		memcpy (ptr + total, psf->u.dbuf, readcount * sizeof (double)) ;
+		memcpy (ptr + total, ubuf.dbuf, readcount * sizeof (double)) ;
 
 		total += readcount ;
 		if (readcount < bufferlen)
@@ -903,27 +914,28 @@ replace_read_d	(SF_PRIVATE *psf, double *ptr, sf_count_t len)
 
 static sf_count_t
 replace_write_s2d	(SF_PRIVATE *psf, const short *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 	double		scale ;
 
 	scale = (psf->scale_int_float == 0) ? 1.0 : 1.0 / 0x8000 ;
-	bufferlen = ARRAY_LEN (psf->u.dbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.dbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		s2d_array (ptr + total, psf->u.dbuf, bufferlen, scale) ;
+		s2d_array (ptr + total, ubuf.dbuf, bufferlen, scale) ;
 
 		if (psf->peak_info)
-			double64_peak_update (psf, psf->u.dbuf, bufferlen, total / psf->sf.channels) ;
+			double64_peak_update (psf, ubuf.dbuf, bufferlen, total / psf->sf.channels) ;
 
-		bd2d_write (psf->u.dbuf, bufferlen) ;
+		bd2d_write (ubuf.dbuf, bufferlen) ;
 
 		if (psf->data_endswap == SF_TRUE)
-			endswap_double_array (psf->u.dbuf, bufferlen) ;
+			endswap_double_array (ubuf.dbuf, bufferlen) ;
 
-		writecount = psf_fwrite (psf->u.dbuf, sizeof (double), bufferlen, psf) ;
+		writecount = psf_fwrite (ubuf.dbuf, sizeof (double), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -935,27 +947,28 @@ replace_write_s2d	(SF_PRIVATE *psf, const short *ptr, sf_count_t len)
 
 static sf_count_t
 replace_write_i2d	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 	double		scale ;
 
 	scale = (psf->scale_int_float == 0) ? 1.0 : 1.0 / (8.0 * 0x10000000) ;
-	bufferlen = ARRAY_LEN (psf->u.dbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.dbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		i2d_array (ptr + total, psf->u.dbuf, bufferlen, scale) ;
+		i2d_array (ptr + total, ubuf.dbuf, bufferlen, scale) ;
 
 		if (psf->peak_info)
-			double64_peak_update (psf, psf->u.dbuf, bufferlen, total / psf->sf.channels) ;
+			double64_peak_update (psf, ubuf.dbuf, bufferlen, total / psf->sf.channels) ;
 
-		bd2d_write (psf->u.dbuf, bufferlen) ;
+		bd2d_write (ubuf.dbuf, bufferlen) ;
 
 		if (psf->data_endswap == SF_TRUE)
-			endswap_double_array (psf->u.dbuf, bufferlen) ;
+			endswap_double_array (ubuf.dbuf, bufferlen) ;
 
-		writecount = psf_fwrite (psf->u.dbuf, sizeof (double), bufferlen, psf) ;
+		writecount = psf_fwrite (ubuf.dbuf, sizeof (double), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -967,22 +980,23 @@ replace_write_i2d	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
 
 static sf_count_t
 replace_write_f2d	(SF_PRIVATE *psf, const float *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.dbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.dbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		f2d_array (ptr + total, psf->u.dbuf, bufferlen) ;
+		f2d_array (ptr + total, ubuf.dbuf, bufferlen) ;
 
-		bd2d_write (psf->u.dbuf, bufferlen) ;
+		bd2d_write (ubuf.dbuf, bufferlen) ;
 
 		if (psf->data_endswap == SF_TRUE)
-			endswap_double_array (psf->u.dbuf, bufferlen) ;
+			endswap_double_array (ubuf.dbuf, bufferlen) ;
 
-		writecount = psf_fwrite (psf->u.dbuf, sizeof (double), bufferlen, psf) ;
+		writecount = psf_fwrite (ubuf.dbuf, sizeof (double), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -994,27 +1008,28 @@ replace_write_f2d	(SF_PRIVATE *psf, const float *ptr, sf_count_t len)
 
 static sf_count_t
 replace_write_d	(SF_PRIVATE *psf, const double *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
 	/* FIXME : This is probably nowhere near optimal. */
 	if (psf->peak_info)
 		double64_peak_update (psf, ptr, len, 0) ;
 
-	bufferlen = ARRAY_LEN (psf->u.dbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.dbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
 
-		memcpy (psf->u.dbuf, ptr + total, bufferlen * sizeof (double)) ;
+		memcpy (ubuf.dbuf, ptr + total, bufferlen * sizeof (double)) ;
 
-		bd2d_write (psf->u.dbuf, bufferlen) ;
+		bd2d_write (ubuf.dbuf, bufferlen) ;
 
 		if (psf->data_endswap == SF_TRUE)
-			endswap_double_array (psf->u.dbuf, bufferlen) ;
+			endswap_double_array (ubuf.dbuf, bufferlen) ;
 
-		writecount = psf_fwrite (psf->u.dbuf, sizeof (double), bufferlen, psf) ;
+		writecount = psf_fwrite (ubuf.dbuf, sizeof (double), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
diff --git a/libs/libsndfile/src/dwd.c b/libs/libsndfile/src/dwd.c
index 943c6d0a9e..af4d9f0e41 100644
--- a/libs/libsndfile/src/dwd.c
+++ b/libs/libsndfile/src/dwd.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2002-2009 Erik de Castro Lopo 
+** Copyright (C) 2002-2012 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -69,9 +69,9 @@ static int	dwd_close		(SF_PRIVATE *psf) ;
 
 int
 dwd_open (SF_PRIVATE *psf)
-{	int	subformat, error = 0 ;
+{	int	error = 0 ;
 
-	if (psf->mode == SFM_READ || (psf->mode == SFM_RDWR && psf->filelength > 0))
+	if (psf->file.mode == SFM_READ || (psf->file.mode == SFM_RDWR && psf->filelength > 0))
 	{	if ((error = dwd_read_header (psf)))
 			return error ;
 		} ;
@@ -79,9 +79,7 @@ dwd_open (SF_PRIVATE *psf)
 	if ((SF_CONTAINER (psf->sf.format)) != SF_FORMAT_DWD)
 		return	SFE_BAD_OPEN_FORMAT ;
 
-	subformat = SF_CODEC (psf->sf.format) ;
-
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{
 		/*-psf->endian = SF_ENDIAN (psf->sf.format) ;
 		if (CPU_IS_LITTLE_ENDIAN && psf->endian == SF_ENDIAN_CPU)
@@ -124,16 +122,17 @@ typedef struct
 
 static int
 dwd_read_header (SF_PRIVATE *psf)
-{	DWD_HEADER	dwdh ;
+{	BUF_UNION	ubuf ;
+	DWD_HEADER	dwdh ;
 
-	memset (psf->u.cbuf, 0, sizeof (psf->u.cbuf)) ;
+	memset (ubuf.cbuf, 0, sizeof (ubuf.cbuf)) ;
 	/* Set position to start of file to begin reading header. */
-	psf_binheader_readf (psf, "pb", 0, psf->u.cbuf, DWD_IDENTIFIER_LEN) ;
+	psf_binheader_readf (psf, "pb", 0, ubuf.cbuf, DWD_IDENTIFIER_LEN) ;
 
-	if (memcmp (psf->u.cbuf, DWD_IDENTIFIER, DWD_IDENTIFIER_LEN) != 0)
+	if (memcmp (ubuf.cbuf, DWD_IDENTIFIER, DWD_IDENTIFIER_LEN) != 0)
 		return SFE_DWD_NO_DWD ;
 
-	psf_log_printf (psf, "Read only : DiamondWare Digitized (.dwd)\n", psf->u.cbuf) ;
+	psf_log_printf (psf, "Read only : DiamondWare Digitized (.dwd)\n", ubuf.cbuf) ;
 
 	psf_binheader_readf (psf, "11", &dwdh.major, &dwdh.minor) ;
 	psf_binheader_readf (psf, "e4j1", &dwdh.id, 1, &dwdh.compression) ;
@@ -152,9 +151,9 @@ dwd_read_header (SF_PRIVATE *psf)
 	else
 		psf_log_printf (psf, "None\n") ;
 
-	psf_log_printf (psf, "  Sample Rate   : %d\n  Channels      : %d\n"
-						 "  Bit Width     : %d\n",
-						 dwdh.srate, dwdh.channels, dwdh.bitwidth) ;
+	psf_log_printf (psf,	"  Sample Rate   : %d\n  Channels      : %d\n"
+							"  Bit Width     : %d\n",
+						dwdh.srate, dwdh.channels, dwdh.bitwidth) ;
 
 	switch (dwdh.bitwidth)
 	{	case 8 :
diff --git a/libs/libsndfile/src/dwvw.c b/libs/libsndfile/src/dwvw.c
index d5537f1a23..ddf86f63d5 100644
--- a/libs/libsndfile/src/dwvw.c
+++ b/libs/libsndfile/src/dwvw.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2002-2009 Erik de Castro Lopo 
+** Copyright (C) 2002-2012 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -38,7 +38,7 @@
 #include	"common.h"
 
 typedef struct
-{	int		dwm_maxsize, bit_width, max_delta, span ;
+{	int		bit_width, dwm_maxsize, max_delta, span ;
 	int		samplecount ;
 	int		bit_count, bits, last_delta_width, last_sample ;
 	struct
@@ -61,7 +61,8 @@ static sf_count_t dwvw_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t le
 static sf_count_t dwvw_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) ;
 
 static sf_count_t	dwvw_seek	(SF_PRIVATE *psf, int mode, sf_count_t offset) ;
-static int	dwvw_close	(SF_PRIVATE *psf) ;
+static int	dwvw_close		(SF_PRIVATE *psf) ;
+static int	dwvw_byterate	(SF_PRIVATE *psf) ;
 
 static int	dwvw_decode_data (SF_PRIVATE *psf, DWVW_PRIVATE *pdwvw, int *ptr, int len) ;
 static int	dwvw_decode_load_bits (SF_PRIVATE *psf, DWVW_PRIVATE *pdwvw, int bit_count) ;
@@ -86,29 +87,24 @@ dwvw_init (SF_PRIVATE *psf, int bitwidth)
 	if (bitwidth > 24)
 		return SFE_DWVW_BAD_BITWIDTH ;
 
-	if (psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_RDWR)
 		return SFE_BAD_MODE_RW ;
 
 	if ((pdwvw = calloc (1, sizeof (DWVW_PRIVATE))) == NULL)
 		return SFE_MALLOC_FAILED ;
 
 	psf->codec_data = (void*) pdwvw ;
-
 	pdwvw->bit_width 	= bitwidth ;
-	pdwvw->dwm_maxsize	= bitwidth / 2 ;
-	pdwvw->max_delta	= 1 << (bitwidth - 1) ;
-	pdwvw->span			= 1 << bitwidth ;
-
 	dwvw_read_reset (pdwvw) ;
 
-	if (psf->mode == SFM_READ)
+	if (psf->file.mode == SFM_READ)
 	{	psf->read_short		= dwvw_read_s ;
 		psf->read_int		= dwvw_read_i ;
 		psf->read_float		= dwvw_read_f ;
 		psf->read_double	= dwvw_read_d ;
 		} ;
 
-	if (psf->mode == SFM_WRITE)
+	if (psf->file.mode == SFM_WRITE)
 	{	psf->write_short	= dwvw_write_s ;
 		psf->write_int		= dwvw_write_i ;
 		psf->write_float	= dwvw_write_f ;
@@ -117,11 +113,12 @@ dwvw_init (SF_PRIVATE *psf, int bitwidth)
 
 	psf->codec_close = dwvw_close ;
 	psf->seek = dwvw_seek ;
+	psf->byterate = dwvw_byterate ;
 
-	/* FIXME : This is bogus. */
-	psf->sf.frames = SF_COUNT_MAX ;
-	psf->datalength = psf->sf.frames ;
-	/* EMXIF : This is bogus. */
+	if (psf->file.mode == SFM_READ)
+	{	psf->sf.frames = psf_decode_frame_count (psf) ;
+		dwvw_read_reset (pdwvw) ;
+		} ;
 
 	return 0 ;
 } /* dwvw_init */
@@ -137,7 +134,7 @@ dwvw_close (SF_PRIVATE *psf)
 		return 0 ;
 	pdwvw = (DWVW_PRIVATE*) psf->codec_data ;
 
-	if (psf->mode == SFM_WRITE)
+	if (psf->file.mode == SFM_WRITE)
 	{	static int last_values [12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } ;
 
 		/* Write 8 zero samples to fully flush output. */
@@ -174,6 +171,14 @@ dwvw_seek	(SF_PRIVATE *psf, int UNUSED (mode), sf_count_t offset)
 	return	PSF_SEEK_ERROR ;
 } /* dwvw_seek */
 
+static int
+dwvw_byterate	(SF_PRIVATE *psf)
+{
+	if (psf->file.mode == SFM_READ)
+		return (psf->datalength * psf->sf.samplerate) / psf->sf.frames ;
+
+	return -1 ;
+} /* dwvw_byterate */
 
 /*==============================================================================
 */
@@ -181,6 +186,7 @@ dwvw_seek	(SF_PRIVATE *psf, int UNUSED (mode), sf_count_t offset)
 static sf_count_t
 dwvw_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len)
 {	DWVW_PRIVATE *pdwvw ;
+	BUF_UNION	ubuf ;
 	int		*iptr ;
 	int		k, bufferlen, readcount = 0, count ;
 	sf_count_t	total = 0 ;
@@ -189,8 +195,8 @@ dwvw_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len)
 		return 0 ;
 	pdwvw = (DWVW_PRIVATE*) psf->codec_data ;
 
-	iptr = psf->u.ibuf ;
-	bufferlen = ARRAY_LEN (psf->u.ibuf) ;
+	iptr = ubuf.ibuf ;
+	bufferlen = ARRAY_LEN (ubuf.ibuf) ;
 	while (len > 0)
 	{	readcount = (len >= bufferlen) ? bufferlen : len ;
 		count = dwvw_decode_data (psf, pdwvw, iptr, readcount) ;
@@ -234,8 +240,9 @@ dwvw_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len)
 static sf_count_t
 dwvw_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
 {	DWVW_PRIVATE *pdwvw ;
-	int		*iptr ;
-	int		k, bufferlen, readcount = 0, count ;
+	BUF_UNION	ubuf ;
+	int			*iptr ;
+	int			k, bufferlen, readcount = 0, count ;
 	sf_count_t	total = 0 ;
 	float	normfact ;
 
@@ -245,8 +252,8 @@ dwvw_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
 
 	normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x80000000) : 1.0 ;
 
-	iptr = psf->u.ibuf ;
-	bufferlen = ARRAY_LEN (psf->u.ibuf) ;
+	iptr = ubuf.ibuf ;
+	bufferlen = ARRAY_LEN (ubuf.ibuf) ;
 	while (len > 0)
 	{	readcount = (len >= bufferlen) ? bufferlen : len ;
 		count = dwvw_decode_data (psf, pdwvw, iptr, readcount) ;
@@ -265,8 +272,9 @@ dwvw_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
 static sf_count_t
 dwvw_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
 {	DWVW_PRIVATE *pdwvw ;
-	int		*iptr ;
-	int		k, bufferlen, readcount = 0, count ;
+	BUF_UNION	ubuf ;
+	int			*iptr ;
+	int			k, bufferlen, readcount = 0, count ;
 	sf_count_t	total = 0 ;
 	double 	normfact ;
 
@@ -276,8 +284,8 @@ dwvw_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
 
 	normfact = (psf->norm_double == SF_TRUE) ? 1.0 / ((double) 0x80000000) : 1.0 ;
 
-	iptr = psf->u.ibuf ;
-	bufferlen = ARRAY_LEN (psf->u.ibuf) ;
+	iptr = ubuf.ibuf ;
+	bufferlen = ARRAY_LEN (ubuf.ibuf) ;
 	while (len > 0)
 	{	readcount = (len >= bufferlen) ? bufferlen : len ;
 		count = dwvw_decode_data (psf, pdwvw, iptr, readcount) ;
@@ -307,7 +315,7 @@ dwvw_decode_data (SF_PRIVATE *psf, DWVW_PRIVATE *pdwvw, int *ptr, int len)
 		delta_width_modifier = dwvw_decode_load_bits (psf, pdwvw, -1) ;
 
 		/* Check for end of input bit stream. Break loop if end. */
-		if (delta_width_modifier < 0)
+		if (delta_width_modifier < 0 || (pdwvw->b.end == 0 && count == 0))
 			break ;
 
 		if (delta_width_modifier && dwvw_decode_load_bits (psf, pdwvw, 1))
@@ -406,13 +414,14 @@ dwvw_decode_load_bits (SF_PRIVATE *psf, DWVW_PRIVATE *pdwvw, int bit_count)
 
 static void
 dwvw_read_reset (DWVW_PRIVATE *pdwvw)
-{	pdwvw->samplecount		= 0 ;
-	pdwvw->b.index			= 0 ;
-	pdwvw->b.end			= 0 ;
-	pdwvw->bit_count		= 0 ;
-	pdwvw->bits				= 0 ;
-	pdwvw->last_delta_width = 0 ;
-	pdwvw->last_sample		= 0 ;
+{	int bitwidth = pdwvw->bit_width ;
+
+	memset (pdwvw, 0, sizeof (DWVW_PRIVATE)) ;
+
+	pdwvw->bit_width	= bitwidth ;
+	pdwvw->dwm_maxsize	= bitwidth / 2 ;
+	pdwvw->max_delta	= 1 << (bitwidth - 1) ;
+	pdwvw->span			= 1 << bitwidth ;
 } /* dwvw_read_reset */
 
 static void
@@ -461,9 +470,9 @@ dump_bits (DWVW_PRIVATE *pdwvw)
 } /* dump_bits */
 #endif
 
-#define HIGHEST_BIT(x,count)		\
+#define HIGHEST_BIT(x, count)		\
 			{	int y = x ;			\
-				(count) = 0 ;	 	\
+				(count) = 0 ;		\
 				while (y)			\
 				{	(count) ++ ;	\
 					y >>= 1 ;		\
@@ -548,6 +557,7 @@ dwvw_encode_data (SF_PRIVATE *psf, DWVW_PRIVATE *pdwvw, const int *ptr, int len)
 static sf_count_t
 dwvw_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len)
 {	DWVW_PRIVATE *pdwvw ;
+	BUF_UNION	ubuf ;
 	int		*iptr ;
 	int		k, bufferlen, writecount = 0, count ;
 	sf_count_t	total = 0 ;
@@ -556,8 +566,8 @@ dwvw_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len)
 		return 0 ;
 	pdwvw = (DWVW_PRIVATE*) psf->codec_data ;
 
-	iptr = psf->u.ibuf ;
-	bufferlen = ARRAY_LEN (psf->u.ibuf) ;
+	iptr = ubuf.ibuf ;
+	bufferlen = ARRAY_LEN (ubuf.ibuf) ;
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : len ;
 		for (k = 0 ; k < writecount ; k++)
@@ -601,6 +611,7 @@ dwvw_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len)
 static sf_count_t
 dwvw_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len)
 {	DWVW_PRIVATE *pdwvw ;
+	BUF_UNION	ubuf ;
 	int			*iptr ;
 	int			k, bufferlen, writecount = 0, count ;
 	sf_count_t	total = 0 ;
@@ -612,8 +623,8 @@ dwvw_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len)
 
 	normfact = (psf->norm_float == SF_TRUE) ? (1.0 * 0x7FFFFFFF) : 1.0 ;
 
-	iptr = psf->u.ibuf ;
-	bufferlen = ARRAY_LEN (psf->u.ibuf) ;
+	iptr = ubuf.ibuf ;
+	bufferlen = ARRAY_LEN (ubuf.ibuf) ;
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : len ;
 		for (k = 0 ; k < writecount ; k++)
@@ -632,6 +643,7 @@ dwvw_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len)
 static sf_count_t
 dwvw_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len)
 {	DWVW_PRIVATE *pdwvw ;
+	BUF_UNION	ubuf ;
 	int			*iptr ;
 	int			k, bufferlen, writecount = 0, count ;
 	sf_count_t	total = 0 ;
@@ -643,8 +655,8 @@ dwvw_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len)
 
 	normfact = (psf->norm_double == SF_TRUE) ? (1.0 * 0x7FFFFFFF) : 1.0 ;
 
-	iptr = psf->u.ibuf ;
-	bufferlen = ARRAY_LEN (psf->u.ibuf) ;
+	iptr = ubuf.ibuf ;
+	bufferlen = ARRAY_LEN (ubuf.ibuf) ;
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : len ;
 		for (k = 0 ; k < writecount ; k++)
diff --git a/libs/libsndfile/src/file_io.c b/libs/libsndfile/src/file_io.c
index b5ec7c39ce..26d3d6d6ae 100644
--- a/libs/libsndfile/src/file_io.c
+++ b/libs/libsndfile/src/file_io.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2002-2009 Erik de Castro Lopo 
+** Copyright (C) 2002-2013 Erik de Castro Lopo 
 ** Copyright (C) 2003 Ross Bencina 
 **
 ** This program is free software; you can redistribute it and/or modify
@@ -73,26 +73,24 @@ static void psf_log_syserr (SF_PRIVATE *psf, int error) ;
 */
 
 static int psf_close_fd (int fd) ;
-static int psf_open_fd (const char * path, int mode) ;
+static int psf_open_fd (PSF_FILE * pfile) ;
 static sf_count_t psf_get_filelen_fd (int fd) ;
 
 int
-psf_fopen (SF_PRIVATE *psf, const char *pathname, int open_mode)
+psf_fopen (SF_PRIVATE *psf)
 {
 	psf->error = 0 ;
-	psf->filedes = psf_open_fd (pathname, open_mode) ;
+	psf->file.filedes = psf_open_fd (&psf->file) ;
 
-	if (psf->filedes == - SFE_BAD_OPEN_MODE)
+	if (psf->file.filedes == - SFE_BAD_OPEN_MODE)
 	{	psf->error = SFE_BAD_OPEN_MODE ;
-		psf->filedes = -1 ;
+		psf->file.filedes = -1 ;
 		return psf->error ;
 		} ;
 
-	if (psf->filedes == -1)
+	if (psf->file.filedes == -1)
 		psf_log_syserr (psf, errno) ;
 
-	psf->mode = open_mode ;
-
 	return psf->error ;
 } /* psf_fopen */
 
@@ -100,43 +98,40 @@ int
 psf_fclose (SF_PRIVATE *psf)
 {	int retval ;
 
-	if (psf->filedes == -1)
-		return -1; /* already closed */
-
 	if (psf->virtual_io)
 		return 0 ;
 
-	if (psf->do_not_close_descriptor)
-	{	psf->filedes = -1 ;
+	if (psf->file.do_not_close_descriptor)
+	{	psf->file.filedes = -1 ;
 		return 0 ;
 		} ;
 
-	if ((retval = psf_close_fd (psf->filedes)) == -1)
+	if ((retval = psf_close_fd (psf->file.filedes)) == -1)
 		psf_log_syserr (psf, errno) ;
 
-	psf->filedes = -1 ;
+	psf->file.filedes = -1 ;
 
 	return retval ;
 } /* psf_fclose */
 
 int
-psf_open_rsrc (SF_PRIVATE *psf, int open_mode)
+psf_open_rsrc (SF_PRIVATE *psf)
 {
-	if (psf->rsrcdes > 0)
+	if (psf->rsrc.filedes > 0)
 		return 0 ;
 
 	/* Test for MacOSX style resource fork on HPFS or HPFS+ filesystems. */
-	snprintf (psf->rsrcpath, sizeof (psf->rsrcpath), "%s/rsrc", psf->filepath) ;
+	snprintf (psf->rsrc.path.c, sizeof (psf->rsrc.path.c), "%s/..namedfork/rsrc", psf->file.path.c) ;
 	psf->error = SFE_NO_ERROR ;
-	if ((psf->rsrcdes = psf_open_fd (psf->rsrcpath, open_mode)) >= 0)
-	{	psf->rsrclength = psf_get_filelen_fd (psf->rsrcdes) ;
-		if (psf->rsrclength > 0 || (open_mode & SFM_WRITE))
+	if ((psf->rsrc.filedes = psf_open_fd (&psf->rsrc)) >= 0)
+	{	psf->rsrclength = psf_get_filelen_fd (psf->rsrc.filedes) ;
+		if (psf->rsrclength > 0 || (psf->rsrc.mode & SFM_WRITE))
 			return SFE_NO_ERROR ;
-		psf_close_fd (psf->rsrcdes) ;
-		psf->rsrcdes = -1 ;
+		psf_close_fd (psf->rsrc.filedes) ;
+		psf->rsrc.filedes = -1 ;
 		} ;
 
-	if (psf->rsrcdes == - SFE_BAD_OPEN_MODE)
+	if (psf->rsrc.filedes == - SFE_BAD_OPEN_MODE)
 	{	psf->error = SFE_BAD_OPEN_MODE ;
 		return psf->error ;
 		} ;
@@ -145,10 +140,10 @@ psf_open_rsrc (SF_PRIVATE *psf, int open_mode)
 	** Now try for a resource fork stored as a separate file in the same
 	** directory, but preceded with a dot underscore.
 	*/
-	snprintf (psf->rsrcpath, sizeof (psf->rsrcpath), "%s._%s", psf->directory, psf->filename) ;
+	snprintf (psf->rsrc.path.c, sizeof (psf->rsrc.path.c), "%s._%s", psf->file.dir.c, psf->file.name.c) ;
 	psf->error = SFE_NO_ERROR ;
-	if ((psf->rsrcdes = psf_open_fd (psf->rsrcpath, open_mode)) >= 0)
-	{	psf->rsrclength = psf_get_filelen_fd (psf->rsrcdes) ;
+	if ((psf->rsrc.filedes = psf_open_fd (&psf->rsrc)) >= 0)
+	{	psf->rsrclength = psf_get_filelen_fd (psf->rsrc.filedes) ;
 		return SFE_NO_ERROR ;
 		} ;
 
@@ -156,18 +151,18 @@ psf_open_rsrc (SF_PRIVATE *psf, int open_mode)
 	** Now try for a resource fork stored in a separate file in the
 	** .AppleDouble/ directory.
 	*/
-	snprintf (psf->rsrcpath, sizeof (psf->rsrcpath), "%s.AppleDouble/%s", psf->directory, psf->filename) ;
+	snprintf (psf->rsrc.path.c, sizeof (psf->rsrc.path.c), "%s.AppleDouble/%s", psf->file.dir.c, psf->file.name.c) ;
 	psf->error = SFE_NO_ERROR ;
-	if ((psf->rsrcdes = psf_open_fd (psf->rsrcpath, open_mode)) >= 0)
-	{	psf->rsrclength = psf_get_filelen_fd (psf->rsrcdes) ;
+	if ((psf->rsrc.filedes = psf_open_fd (&psf->rsrc)) >= 0)
+	{	psf->rsrclength = psf_get_filelen_fd (psf->rsrc.filedes) ;
 		return SFE_NO_ERROR ;
 		} ;
 
 	/* No resource file found. */
-	if (psf->rsrcdes == -1)
+	if (psf->rsrc.filedes == -1)
 		psf_log_syserr (psf, errno) ;
 
-	psf->rsrcdes = -1 ;
+	psf->rsrc.filedes = -1 ;
 
 	return psf->error ;
 } /* psf_open_rsrc */
@@ -179,7 +174,7 @@ psf_get_filelen (SF_PRIVATE *psf)
 	if (psf->virtual_io)
 		return psf->vio.get_filelen (psf->vio_user_data) ;
 
-	filelen = psf_get_filelen_fd (psf->filedes) ;
+	filelen = psf_get_filelen_fd (psf->file.filedes) ;
 
 	if (filelen == -1)
 	{	psf_log_syserr (psf, errno) ;
@@ -191,7 +186,7 @@ psf_get_filelen (SF_PRIVATE *psf)
 		return (sf_count_t) -1 ;
 		} ;
 
-	switch (psf->mode)
+	switch (psf->file.mode)
 	{	case SFM_WRITE :
 			filelen = filelen - psf->fileoffset ;
 			break ;
@@ -219,28 +214,26 @@ psf_get_filelen (SF_PRIVATE *psf)
 
 int
 psf_close_rsrc (SF_PRIVATE *psf)
-{
-	if (psf->rsrcdes >= 0)
-		psf_close_fd (psf->rsrcdes) ;
-	psf->rsrcdes = -1 ;
+{	psf_close_fd (psf->rsrc.filedes) ;
+	psf->rsrc.filedes = -1 ;
 	return 0 ;
 } /* psf_close_rsrc */
 
 int
-psf_set_stdio (SF_PRIVATE *psf, int mode)
+psf_set_stdio (SF_PRIVATE *psf)
 {	int	error = 0 ;
 
-	switch (mode)
+	switch (psf->file.mode)
 	{	case SFM_RDWR :
 				error = SFE_OPEN_PIPE_RDWR ;
 				break ;
 
 		case SFM_READ :
-				psf->filedes = 0 ;
+				psf->file.filedes = 0 ;
 				break ;
 
 		case SFM_WRITE :
-				psf->filedes = 1 ;
+				psf->file.filedes = 1 ;
 				break ;
 
 		default :
@@ -254,29 +247,31 @@ psf_set_stdio (SF_PRIVATE *psf, int mode)
 
 void
 psf_set_file (SF_PRIVATE *psf, int fd)
-{	psf->filedes = fd ;
+{	psf->file.filedes = fd ;
 } /* psf_set_file */
 
 int
 psf_file_valid (SF_PRIVATE *psf)
-{	return (psf->filedes >= 0) ? SF_TRUE : SF_FALSE ;
+{	return (psf->file.filedes >= 0) ? SF_TRUE : SF_FALSE ;
 } /* psf_set_file */
 
 sf_count_t
 psf_fseek (SF_PRIVATE *psf, sf_count_t offset, int whence)
-{	sf_count_t	new_position ;
+{	sf_count_t	current_pos, new_position ;
 
 	if (psf->virtual_io)
 		return psf->vio.seek (offset, whence, psf->vio_user_data) ;
 
+	current_pos = psf_ftell (psf) ;
+
 	switch (whence)
 	{	case SEEK_SET :
 				offset += psf->fileoffset ;
 				break ;
 
 		case SEEK_END :
-				if (psf->mode == SFM_WRITE)
-				{	new_position = lseek (psf->filedes, offset, whence) ;
+				if (psf->file.mode == SFM_WRITE)
+				{	new_position = lseek (psf->file.filedes, offset, whence) ;
 
 					if (new_position < 0)
 						psf_log_syserr (psf, errno) ;
@@ -289,15 +284,25 @@ psf_fseek (SF_PRIVATE *psf, sf_count_t offset, int whence)
 				** get the offset wrt the start of file.
 				*/
 				whence = SEEK_SET ;
-				offset = lseek (psf->filedes, 0, SEEK_END) + offset ;
+				offset = lseek (psf->file.filedes, 0, SEEK_END) + offset ;
+				break ;
+
+		case SEEK_CUR :
+				/* Translate a SEEK_CUR into a SEEK_SET. */
+				offset += current_pos ;
+				whence = SEEK_SET ;
 				break ;
 
 		default :
-				/* No need to do anything about SEEK_CUR. */
-				break ;
+				/* We really should not be here. */
+				psf_log_printf (psf, "psf_fseek : whence is %d *****.\n", whence) ;
+				return 0 ;
 		} ;
 
-	new_position = lseek (psf->filedes, offset, whence) ;
+	if (current_pos != offset)
+		new_position = lseek (psf->file.filedes, offset, whence) ;
+	else
+		new_position = offset ;
 
 	if (new_position < 0)
 		psf_log_syserr (psf, errno) ;
@@ -325,7 +330,7 @@ psf_fread (void *ptr, sf_count_t bytes, sf_count_t items, SF_PRIVATE *psf)
 	{	/* Break the read down to a sensible size. */
 		count = (items > SENSIBLE_SIZE) ? SENSIBLE_SIZE : (ssize_t) items ;
 
-		count = read (psf->filedes, ((char*) ptr) + total, (size_t) count) ;
+		count = read (psf->file.filedes, ((char*) ptr) + total, (size_t) count) ;
 
 		if (count == -1)
 		{	if (errno == EINTR)
@@ -366,7 +371,7 @@ psf_fwrite (const void *ptr, sf_count_t bytes, sf_count_t items, SF_PRIVATE *psf
 	{	/* Break the writes down to a sensible size. */
 		count = (items > SENSIBLE_SIZE) ? SENSIBLE_SIZE : items ;
 
-		count = write (psf->filedes, ((const char*) ptr) + total, count) ;
+		count = write (psf->file.filedes, ((const char*) ptr) + total, count) ;
 
 		if (count == -1)
 		{	if (errno == EINTR)
@@ -399,7 +404,7 @@ psf_ftell (SF_PRIVATE *psf)
 	if (psf->is_pipe)
 		return psf->pipeoffset ;
 
-	pos = lseek (psf->filedes, 0, SEEK_CUR) ;
+	pos = lseek (psf->file.filedes, 0, SEEK_CUR) ;
 
 	if (pos == ((sf_count_t) -1))
 	{	psf_log_syserr (psf, errno) ;
@@ -413,6 +418,9 @@ static int
 psf_close_fd (int fd)
 {	int retval ;
 
+	if (fd < 0)
+		return 0 ;
+
 	while ((retval = close (fd)) == -1 && errno == EINTR)
 		/* Do nothing. */ ;
 
@@ -425,7 +433,7 @@ psf_fgets (char *buffer, sf_count_t bufsize, SF_PRIVATE *psf)
 	sf_count_t		count ;
 
 	while (k < bufsize - 1)
-	{	count = read (psf->filedes, &(buffer [k]), 1) ;
+	{	count = read (psf->file.filedes, &(buffer [k]), 1) ;
 
 		if (count == -1)
 		{	if (errno == EINTR)
@@ -451,7 +459,7 @@ psf_is_pipe (SF_PRIVATE *psf)
 	if (psf->virtual_io)
 		return SF_FALSE ;
 
-	if (fstat (psf->filedes, &statbuf) == -1)
+	if (fstat (psf->file.filedes, &statbuf) == -1)
 	{	psf_log_syserr (psf, errno) ;
 		/* Default to maximum safety. */
 		return SF_TRUE ;
@@ -465,19 +473,22 @@ psf_is_pipe (SF_PRIVATE *psf)
 
 static sf_count_t
 psf_get_filelen_fd (int fd)
-{	struct stat statbuf ;
+{
+#if (SIZEOF_OFF_T == 4 && SIZEOF_SF_COUNT_T == 8 && HAVE_FSTAT64)
+	struct stat64 statbuf ;
 
-	/*
-	** Sanity check.
-	** If everything is OK, this will be optimised out.
-	*/
-	if (sizeof (statbuf.st_size) == 4 && sizeof (sf_count_t) == 8)
-		return (sf_count_t) -SFE_BAD_STAT_SIZE ;
+	if (fstat64 (fd, &statbuf) == -1)
+		return (sf_count_t) -1 ;
+
+	return statbuf.st_size ;
+#else
+	struct stat statbuf ;
 
 	if (fstat (fd, &statbuf) == -1)
 		return (sf_count_t) -1 ;
 
 	return statbuf.st_size ;
+#endif
 } /* psf_get_filelen_fd */
 
 int
@@ -491,7 +502,7 @@ psf_ftruncate (SF_PRIVATE *psf, sf_count_t len)
 	if ((sizeof (off_t) < sizeof (sf_count_t)) && len > 0x7FFFFFFF)
 		return -1 ;
 
-	retval = ftruncate (psf->filedes, len) ;
+	retval = ftruncate (psf->file.filedes, len) ;
 
 	if (retval == -1)
 		psf_log_syserr (psf, errno) ;
@@ -501,28 +512,28 @@ psf_ftruncate (SF_PRIVATE *psf, sf_count_t len)
 
 void
 psf_init_files (SF_PRIVATE *psf)
-{	psf->filedes = -1 ;
-	psf->rsrcdes = -1 ;
-	psf->savedes = -1 ;
+{	psf->file.filedes = -1 ;
+	psf->rsrc.filedes = -1 ;
+	psf->file.savedes = -1 ;
 } /* psf_init_files */
 
 void
 psf_use_rsrc (SF_PRIVATE *psf, int on_off)
 {
 	if (on_off)
-	{	if (psf->filedes != psf->rsrcdes)
-		{	psf->savedes = psf->filedes ;
-			psf->filedes = psf->rsrcdes ;
+	{	if (psf->file.filedes != psf->rsrc.filedes)
+		{	psf->file.savedes = psf->file.filedes ;
+			psf->file.filedes = psf->rsrc.filedes ;
 			} ;
 		}
-	else if (psf->filedes == psf->rsrcdes)
-		psf->filedes = psf->savedes ;
+	else if (psf->file.filedes == psf->rsrc.filedes)
+		psf->file.filedes = psf->file.savedes ;
 
 	return ;
 } /* psf_use_rsrc */
 
 static int
-psf_open_fd (const char * pathname, int open_mode)
+psf_open_fd (PSF_FILE * pfile)
 {	int fd, oflag, mode ;
 
 	/*
@@ -530,13 +541,13 @@ psf_open_fd (const char * pathname, int open_mode)
 	** be optimised out. This is meant to catch the problems caused by
 	** "sfconfig.h" being included after .
 	*/
-	if (sizeof (off_t) != sizeof (sf_count_t))
-	{	puts ("\n\n*** Fatal error : sizeof (off_t) != sizeof (sf_count_t)") ;
+	if (sizeof (sf_count_t) != 8)
+	{	puts ("\n\n*** Fatal error : sizeof (sf_count_t) != 8") ;
 		puts ("*** This means that libsndfile was not configured correctly.\n") ;
 		exit (1) ;
 		} ;
 
-	switch (open_mode)
+	switch (pfile->mode)
 	{	case SFM_READ :
 				oflag = O_RDONLY | O_BINARY ;
 				mode = 0 ;
@@ -558,9 +569,9 @@ psf_open_fd (const char * pathname, int open_mode)
 		} ;
 
 	if (mode == 0)
-		fd = open (pathname, oflag) ;
+		fd = open (pfile->path.c, oflag) ;
 	else
-		fd = open (pathname, oflag, mode) ;
+		fd = open (pfile->path.c, oflag, mode) ;
 
 	return fd ;
 } /* psf_open_fd */
@@ -581,10 +592,10 @@ void
 psf_fsync (SF_PRIVATE *psf)
 {
 #if HAVE_FSYNC
-    if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
-        fsync (psf->filedes) ;
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
+		fsync (psf->file.filedes) ;
 #else
-    psf = NULL ;
+	psf = NULL ;
 #endif
 } /* psf_fsync */
 
@@ -596,20 +607,18 @@ psf_fsync (SF_PRIVATE *psf)
 #include 
 
 static int psf_close_handle (HANDLE handle) ;
-static HANDLE psf_open_handle (const char * path, int mode) ;
+static HANDLE psf_open_handle (PSF_FILE * pfile) ;
 static sf_count_t psf_get_filelen_handle (HANDLE handle) ;
 
 /* USE_WINDOWS_API */ int
-psf_fopen (SF_PRIVATE *psf, const char *pathname, int open_mode)
+psf_fopen (SF_PRIVATE *psf)
 {
 	psf->error = 0 ;
-	psf->hfile = psf_open_handle (pathname, open_mode) ;
+	psf->file.handle = psf_open_handle (&psf->file) ;
 
-	if (psf->hfile == NULL)
+	if (psf->file.handle == NULL)
 		psf_log_syserr (psf, GetLastError ()) ;
 
-	psf->mode = open_mode ;
-
 	return psf->error ;
 } /* psf_fopen */
 
@@ -620,30 +629,30 @@ psf_fclose (SF_PRIVATE *psf)
 	if (psf->virtual_io)
 		return 0 ;
 
-	if (psf->do_not_close_descriptor)
-	{	psf->hfile = NULL ;
+	if (psf->file.do_not_close_descriptor)
+	{	psf->file.handle = NULL ;
 		return 0 ;
 		} ;
 
-	if ((retval = psf_close_handle (psf->hfile)) == -1)
+	if ((retval = psf_close_handle (psf->file.handle)) == -1)
 		psf_log_syserr (psf, GetLastError ()) ;
 
-	psf->hfile = NULL ;
+	psf->file.handle = NULL ;
 
 	return retval ;
 } /* psf_fclose */
 
 /* USE_WINDOWS_API */ int
-psf_open_rsrc (SF_PRIVATE *psf, int open_mode)
+psf_open_rsrc (SF_PRIVATE *psf)
 {
-	if (psf->hrsrc != NULL)
+	if (psf->rsrc.handle != NULL)
 		return 0 ;
 
 	/* Test for MacOSX style resource fork on HPFS or HPFS+ filesystems. */
-	snprintf (psf->rsrcpath, sizeof (psf->rsrcpath), "%s/rsrc", psf->filepath) ;
+	snprintf (psf->rsrc.path.c, sizeof (psf->rsrc.path.c), "%s/rsrc", psf->file.path.c) ;
 	psf->error = SFE_NO_ERROR ;
-	if ((psf->hrsrc = psf_open_handle (psf->rsrcpath, open_mode)) != NULL)
-	{	psf->rsrclength = psf_get_filelen_handle (psf->hrsrc) ;
+	if ((psf->rsrc.handle = psf_open_handle (&psf->rsrc)) != NULL)
+	{	psf->rsrclength = psf_get_filelen_handle (psf->rsrc.handle) ;
 		return SFE_NO_ERROR ;
 		} ;
 
@@ -651,10 +660,10 @@ psf_open_rsrc (SF_PRIVATE *psf, int open_mode)
 	** Now try for a resource fork stored as a separate file in the same
 	** directory, but preceded with a dot underscore.
 	*/
-	snprintf (psf->rsrcpath, sizeof (psf->rsrcpath), "%s._%s", psf->directory, psf->filename) ;
+	snprintf (psf->rsrc.path.c, sizeof (psf->rsrc.path.c), "%s._%s", psf->file.dir.c, psf->file.name.c) ;
 	psf->error = SFE_NO_ERROR ;
-	if ((psf->hrsrc = psf_open_handle (psf->rsrcpath, open_mode)) != NULL)
-	{	psf->rsrclength = psf_get_filelen_handle (psf->hrsrc) ;
+	if ((psf->rsrc.handle = psf_open_handle (&psf->rsrc)) != NULL)
+	{	psf->rsrclength = psf_get_filelen_handle (psf->rsrc.handle) ;
 		return SFE_NO_ERROR ;
 		} ;
 
@@ -662,18 +671,18 @@ psf_open_rsrc (SF_PRIVATE *psf, int open_mode)
 	** Now try for a resource fork stored in a separate file in the
 	** .AppleDouble/ directory.
 	*/
-	snprintf (psf->rsrcpath, sizeof (psf->rsrcpath), "%s.AppleDouble/%s", psf->directory, psf->filename) ;
+	snprintf (psf->rsrc.path.c, sizeof (psf->rsrc.path.c), "%s.AppleDouble/%s", psf->file.dir.c, psf->file.name.c) ;
 	psf->error = SFE_NO_ERROR ;
-	if ((psf->hrsrc = psf_open_handle (psf->rsrcpath, open_mode)) != NULL)
-	{	psf->rsrclength = psf_get_filelen_handle (psf->hrsrc) ;
+	if ((psf->rsrc.handle = psf_open_handle (&psf->rsrc)) != NULL)
+	{	psf->rsrclength = psf_get_filelen_handle (psf->rsrc.handle) ;
 		return SFE_NO_ERROR ;
 		} ;
 
 	/* No resource file found. */
-	if (psf->hrsrc == NULL)
+	if (psf->rsrc.handle == NULL)
 		psf_log_syserr (psf, GetLastError ()) ;
 
-	psf->hrsrc = NULL ;
+	psf->rsrc.handle = NULL ;
 
 	return psf->error ;
 } /* psf_open_rsrc */
@@ -685,7 +694,7 @@ psf_get_filelen (SF_PRIVATE *psf)
 	if (psf->virtual_io)
 		return psf->vio.get_filelen (psf->vio_user_data) ;
 
-	filelen = psf_get_filelen_handle (psf->hfile) ;
+	filelen = psf_get_filelen_handle (psf->file.handle) ;
 
 	if (filelen == -1)
 	{	psf_log_syserr (psf, errno) ;
@@ -697,7 +706,7 @@ psf_get_filelen (SF_PRIVATE *psf)
 		return (sf_count_t) -1 ;
 		} ;
 
-	switch (psf->mode)
+	switch (psf->file.mode)
 	{	case SFM_WRITE :
 			filelen = filelen - psf->fileoffset ;
 			break ;
@@ -725,34 +734,34 @@ psf_get_filelen (SF_PRIVATE *psf)
 
 /* USE_WINDOWS_API */ void
 psf_init_files (SF_PRIVATE *psf)
-{	psf->hfile = NULL ;
-	psf->hrsrc = NULL ;
-	psf->hsaved = NULL ;
+{	psf->file.handle = NULL ;
+	psf->rsrc.handle = NULL ;
+	psf->file.hsaved = NULL ;
 } /* psf_init_files */
 
 /* USE_WINDOWS_API */ void
 psf_use_rsrc (SF_PRIVATE *psf, int on_off)
 {
 	if (on_off)
-	{	if (psf->hfile != psf->hrsrc)
-		{	psf->hsaved = psf->hfile ;
-			psf->hfile = psf->hrsrc ;
+	{	if (psf->file.handle != psf->rsrc.handle)
+		{	psf->file.hsaved = psf->file.handle ;
+			psf->file.handle = psf->rsrc.handle ;
 			} ;
 		}
-	else if (psf->hfile == psf->hrsrc)
-		psf->hfile = psf->hsaved ;
+	else if (psf->file.handle == psf->rsrc.handle)
+		psf->file.handle = psf->file.hsaved ;
 
 	return ;
 } /* psf_use_rsrc */
 
 /* USE_WINDOWS_API */ static HANDLE
-psf_open_handle (const char * pathname, int open_mode)
+psf_open_handle (PSF_FILE * pfile)
 {	DWORD dwDesiredAccess ;
 	DWORD dwShareMode ;
 	DWORD dwCreationDistribution ;
 	HANDLE handle ;
 
-	switch (open_mode)
+	switch (pfile->mode)
 	{	case SFM_READ :
 				dwDesiredAccess = GENERIC_READ ;
 				dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE ;
@@ -775,15 +784,26 @@ psf_open_handle (const char * pathname, int open_mode)
 				return NULL ;
 		} ;
 
-	handle = CreateFile (
-			pathname,					/* pointer to name of the file */
-			dwDesiredAccess,			/* access (read-write) mode */
-			dwShareMode,				/* share mode */
-			0,							/* pointer to security attributes */
-			dwCreationDistribution,		/* how to create */
-			FILE_ATTRIBUTE_NORMAL,		/* file attributes (could use FILE_FLAG_SEQUENTIAL_SCAN) */
-			NULL						/* handle to file with attributes to copy */
-			) ;
+	if (pfile->use_wchar)
+		handle = CreateFileW (
+					pfile->path.wc,				/* pointer to name of the file */
+					dwDesiredAccess,			/* access (read-write) mode */
+					dwShareMode,				/* share mode */
+					0,							/* pointer to security attributes */
+					dwCreationDistribution,		/* how to create */
+					FILE_ATTRIBUTE_NORMAL,		/* file attributes (could use FILE_FLAG_SEQUENTIAL_SCAN) */
+					NULL						/* handle to file with attributes to copy */
+					) ;
+	else
+		handle = CreateFile (
+					pfile->path.c,				/* pointer to name of the file */
+					dwDesiredAccess,			/* access (read-write) mode */
+					dwShareMode,				/* share mode */
+					0,							/* pointer to security attributes */
+					dwCreationDistribution,		/* how to create */
+					FILE_ATTRIBUTE_NORMAL,		/* file attributes (could use FILE_FLAG_SEQUENTIAL_SCAN) */
+					NULL						/* handle to file with attributes to copy */
+					) ;
 
 	if (handle == INVALID_HANDLE_VALUE)
 		return NULL ;
@@ -819,32 +839,30 @@ psf_log_syserr (SF_PRIVATE *psf, int error)
 
 /* USE_WINDOWS_API */ int
 psf_close_rsrc (SF_PRIVATE *psf)
-{
-	if (psf->hrsrc != NULL)
-		psf_close_handle (psf->hrsrc) ;
-	psf->hrsrc = NULL ;
+{	psf_close_handle (psf->rsrc.handle) ;
+	psf->rsrc.handle = NULL ;
 	return 0 ;
 } /* psf_close_rsrc */
 
 
 /* USE_WINDOWS_API */ int
-psf_set_stdio (SF_PRIVATE *psf, int mode)
+psf_set_stdio (SF_PRIVATE *psf)
 {	HANDLE	handle = NULL ;
 	int	error = 0 ;
 
-	switch (mode)
+	switch (psf->file.mode)
 	{	case SFM_RDWR :
 				error = SFE_OPEN_PIPE_RDWR ;
 				break ;
 
 		case SFM_READ :
 				handle = GetStdHandle (STD_INPUT_HANDLE) ;
-				psf->do_not_close_descriptor = 1 ;
+				psf->file.do_not_close_descriptor = 1 ;
 				break ;
 
 		case SFM_WRITE :
 				handle = GetStdHandle (STD_OUTPUT_HANDLE) ;
-				psf->do_not_close_descriptor = 1 ;
+				psf->file.do_not_close_descriptor = 1 ;
 				break ;
 
 		default :
@@ -852,7 +870,7 @@ psf_set_stdio (SF_PRIVATE *psf, int mode)
 				break ;
 		} ;
 
-	psf->hfile = handle ;
+	psf->file.handle = handle ;
 	psf->filelength = 0 ;
 
 	return error ;
@@ -866,14 +884,14 @@ psf_set_file (SF_PRIVATE *psf, int fd)
 	osfhandle = _get_osfhandle (fd) ;
 	handle = (HANDLE) osfhandle ;
 
-	psf->hfile = handle ;
+	psf->file.handle = handle ;
 } /* psf_set_file */
 
 /* USE_WINDOWS_API */ int
 psf_file_valid (SF_PRIVATE *psf)
-{	if (psf->hfile == NULL)
+{	if (psf->file.handle == NULL)
 		return SF_FALSE ;
-	if (psf->hfile == INVALID_HANDLE_VALUE)
+	if (psf->file.handle == INVALID_HANDLE_VALUE)
 		return SF_FALSE ;
 	return SF_TRUE ;
 } /* psf_set_file */
@@ -906,7 +924,7 @@ psf_fseek (SF_PRIVATE *psf, sf_count_t offset, int whence)
 	lDistanceToMove = (DWORD) (offset & 0xFFFFFFFF) ;
 	lDistanceToMoveHigh = (DWORD) ((offset >> 32) & 0xFFFFFFFF) ;
 
-	dwResult = SetFilePointer (psf->hfile, lDistanceToMove, &lDistanceToMoveHigh, dwMoveMethod) ;
+	dwResult = SetFilePointer (psf->file.handle, lDistanceToMove, &lDistanceToMoveHigh, dwMoveMethod) ;
 
 	if (dwResult == 0xFFFFFFFF)
 		dwError = GetLastError () ;
@@ -942,7 +960,7 @@ psf_fread (void *ptr, sf_count_t bytes, sf_count_t items, SF_PRIVATE *psf)
 	{	/* Break the writes down to a sensible size. */
 		count = (items > SENSIBLE_SIZE) ? SENSIBLE_SIZE : (ssize_t) items ;
 
-		if (ReadFile (psf->hfile, ((char*) ptr) + total, count, &dwNumberOfBytesRead, 0) == 0)
+		if (ReadFile (psf->file.handle, ((char*) ptr) + total, count, &dwNumberOfBytesRead, 0) == 0)
 		{	psf_log_syserr (psf, GetLastError ()) ;
 			break ;
 			}
@@ -965,7 +983,7 @@ psf_fread (void *ptr, sf_count_t bytes, sf_count_t items, SF_PRIVATE *psf)
 /* USE_WINDOWS_API */ sf_count_t
 psf_fwrite (const void *ptr, sf_count_t bytes, sf_count_t items, SF_PRIVATE *psf)
 {	sf_count_t total = 0 ;
-	ssize_t	 count ;
+	ssize_t	count ;
 	DWORD dwNumberOfBytesWritten ;
 
 	if (psf->virtual_io)
@@ -981,7 +999,7 @@ psf_fwrite (const void *ptr, sf_count_t bytes, sf_count_t items, SF_PRIVATE *psf
 	{	/* Break the writes down to a sensible size. */
 		count = (items > SENSIBLE_SIZE) ? SENSIBLE_SIZE : (ssize_t) items ;
 
-		if (WriteFile (psf->hfile, ((const char*) ptr) + total, count, &dwNumberOfBytesWritten, 0) == 0)
+		if (WriteFile (psf->file.handle, ((const char*) ptr) + total, count, &dwNumberOfBytesWritten, 0) == 0)
 		{	psf_log_syserr (psf, GetLastError ()) ;
 			break ;
 			}
@@ -1016,7 +1034,7 @@ psf_ftell (SF_PRIVATE *psf)
 	lDistanceToMoveLow = 0 ;
 	lDistanceToMoveHigh = 0 ;
 
-	dwResult = SetFilePointer (psf->hfile, lDistanceToMoveLow, &lDistanceToMoveHigh, FILE_CURRENT) ;
+	dwResult = SetFilePointer (psf->file.handle, lDistanceToMoveLow, &lDistanceToMoveHigh, FILE_CURRENT) ;
 
 	if (dwResult == 0xFFFFFFFF)
 		dwError = GetLastError () ;
@@ -1035,7 +1053,10 @@ psf_ftell (SF_PRIVATE *psf)
 
 /* USE_WINDOWS_API */ static int
 psf_close_handle (HANDLE handle)
-{	if (CloseHandle (handle) == 0)
+{	if (handle == NULL)
+		return 0 ;
+
+	if (CloseHandle (handle) == 0)
 		return -1 ;
 
 	return 0 ;
@@ -1048,7 +1069,7 @@ psf_fgets (char *buffer, sf_count_t bufsize, SF_PRIVATE *psf)
 	DWORD dwNumberOfBytesRead ;
 
 	while (k < bufsize - 1)
-	{	if (ReadFile (psf->hfile, &(buffer [k]), 1, &dwNumberOfBytesRead, 0) == 0)
+	{	if (ReadFile (psf->file.handle, &(buffer [k]), 1, &dwNumberOfBytesRead, 0) == 0)
 		{	psf_log_syserr (psf, GetLastError ()) ;
 			break ;
 			}
@@ -1071,7 +1092,7 @@ psf_is_pipe (SF_PRIVATE *psf)
 	if (psf->virtual_io)
 		return SF_FALSE ;
 
-	if (GetFileType (psf->hfile) == FILE_TYPE_DISK)
+	if (GetFileType (psf->file.handle) == FILE_TYPE_DISK)
 		return SF_FALSE ;
 
 	/* Default to maximum safety. */
@@ -1098,7 +1119,7 @@ psf_get_filelen_handle (HANDLE handle)
 
 /* USE_WINDOWS_API */ void
 psf_fsync (SF_PRIVATE *psf)
-{	FlushFileBuffers (psf->hfile) ;
+{	FlushFileBuffers (psf->file.handle) ;
 } /* psf_fsync */
 
 
@@ -1120,7 +1141,7 @@ psf_ftruncate (SF_PRIVATE *psf, sf_count_t len)
 	lDistanceToMoveLow = (DWORD) (len & 0xFFFFFFFF) ;
 	lDistanceToMoveHigh = (DWORD) ((len >> 32) & 0xFFFFFFFF) ;
 
-	dwResult = SetFilePointer (psf->hfile, lDistanceToMoveLow, &lDistanceToMoveHigh, FILE_BEGIN) ;
+	dwResult = SetFilePointer (psf->file.handle, lDistanceToMoveLow, &lDistanceToMoveHigh, FILE_BEGIN) ;
 
 	if (dwResult == 0xFFFFFFFF)
 		dwError = GetLastError () ;
@@ -1135,7 +1156,7 @@ psf_ftruncate (SF_PRIVATE *psf, sf_count_t len)
 		** which guarantees that the new portion of the file will be zeroed.
 		** Not sure if this is important or not.
 		*/
-		if (SetEndOfFile (psf->hfile) == 0)
+		if (SetEndOfFile (psf->file.handle) == 0)
 		{	retval = -1 ;
 			psf_log_syserr (psf, GetLastError ()) ;
 			} ;
@@ -1191,14 +1212,14 @@ psf_fopen (SF_PRIVATE *psf, const char *pathname, int open_mode)
 		} ;
 
 	if (mode == 0)
-		psf->filedes = open (pathname, oflag) ;
+		psf->file.filedes = open (pathname, oflag) ;
 	else
-		psf->filedes = open (pathname, oflag, mode) ;
+		psf->file.filedes = open (pathname, oflag, mode) ;
 
-	if (psf->filedes == -1)
+	if (psf->file.filedes == -1)
 		psf_log_syserr (psf, errno) ;
 
-	return psf->filedes ;
+	return psf->file.filedes ;
 } /* psf_fopen */
 
 /* Win32 */ sf_count_t
@@ -1214,8 +1235,8 @@ psf_fseek (SF_PRIVATE *psf, sf_count_t offset, int whence)
 				break ;
 
 		case SEEK_END :
-				if (psf->mode == SFM_WRITE)
-				{	new_position = _lseeki64 (psf->filedes, offset, whence) ;
+				if (psf->file.mode == SFM_WRITE)
+				{	new_position = _lseeki64 (psf->file.filedes, offset, whence) ;
 
 					if (new_position < 0)
 						psf_log_syserr (psf, errno) ;
@@ -1228,7 +1249,7 @@ psf_fseek (SF_PRIVATE *psf, sf_count_t offset, int whence)
 				** get the offset wrt the start of file.
 				*/
 				whence = SEEK_SET ;
-				offset = _lseeki64 (psf->filedes, 0, SEEK_END) + offset ;
+				offset = _lseeki64 (psf->file.filedes, 0, SEEK_END) + offset ;
 				break ;
 
 		default :
@@ -1243,9 +1264,9 @@ psf_fseek (SF_PRIVATE *psf, sf_count_t offset, int whence)
 	*** Use the _telli64() function instead.
 	*/
 	if (offset == 0 && whence == SEEK_CUR)
-		new_position = _telli64 (psf->filedes) ;
+		new_position = _telli64 (psf->file.filedes) ;
 	else
-		new_position = _lseeki64 (psf->filedes, offset, whence) ;
+		new_position = _lseeki64 (psf->file.filedes, offset, whence) ;
 
 	if (new_position < 0)
 		psf_log_syserr (psf, errno) ;
@@ -1258,7 +1279,7 @@ psf_fseek (SF_PRIVATE *psf, sf_count_t offset, int whence)
 /* Win32 */ sf_count_t
 psf_fread (void *ptr, sf_count_t bytes, sf_count_t items, SF_PRIVATE *psf)
 {	sf_count_t total = 0 ;
-	ssize_t	 count ;
+	ssize_t	count ;
 
 	if (psf->virtual_io)
 		return psf->vio.read (ptr, bytes*items, psf->vio_user_data) / bytes ;
@@ -1273,7 +1294,7 @@ psf_fread (void *ptr, sf_count_t bytes, sf_count_t items, SF_PRIVATE *psf)
 	{	/* Break the writes down to a sensible size. */
 		count = (items > SENSIBLE_SIZE) ? SENSIBLE_SIZE : (ssize_t) items ;
 
-		count = read (psf->filedes, ((char*) ptr) + total, (size_t) count) ;
+		count = read (psf->file.filedes, ((char*) ptr) + total, (size_t) count) ;
 
 		if (count == -1)
 		{	if (errno == EINTR)
@@ -1296,7 +1317,7 @@ psf_fread (void *ptr, sf_count_t bytes, sf_count_t items, SF_PRIVATE *psf)
 /* Win32 */ sf_count_t
 psf_fwrite (const void *ptr, sf_count_t bytes, sf_count_t items, SF_PRIVATE *psf)
 {	sf_count_t total = 0 ;
-	ssize_t	 count ;
+	ssize_t	count ;
 
 	if (psf->virtual_io)
 		return psf->vio.write (ptr, bytes*items, psf->vio_user_data) / bytes ;
@@ -1311,7 +1332,7 @@ psf_fwrite (const void *ptr, sf_count_t bytes, sf_count_t items, SF_PRIVATE *psf
 	{	/* Break the writes down to a sensible size. */
 		count = (items > SENSIBLE_SIZE) ? SENSIBLE_SIZE : items ;
 
-		count = write (psf->filedes, ((const char*) ptr) + total, count) ;
+		count = write (psf->file.filedes, ((const char*) ptr) + total, count) ;
 
 		if (count == -1)
 		{	if (errno == EINTR)
@@ -1338,7 +1359,7 @@ psf_ftell (SF_PRIVATE *psf)
 	if (psf->virtual_io)
 		return psf->vio.tell (psf->vio_user_data) ;
 
-	pos = _telli64 (psf->filedes) ;
+	pos = _telli64 (psf->file.filedes) ;
 
 	if (pos == ((sf_count_t) -1))
 	{	psf_log_syserr (psf, errno) ;
@@ -1352,13 +1373,13 @@ psf_ftell (SF_PRIVATE *psf)
 psf_fclose (SF_PRIVATE *psf)
 {	int retval ;
 
-	while ((retval = close (psf->filedes)) == -1 && errno == EINTR)
+	while ((retval = close (psf->file.filedes)) == -1 && errno == EINTR)
 		/* Do nothing. */ ;
 
 	if (retval == -1)
 		psf_log_syserr (psf, errno) ;
 
-	psf->filedes = -1 ;
+	psf->file.filedes = -1 ;
 
 	return retval ;
 } /* psf_fclose */
@@ -1369,7 +1390,7 @@ psf_fgets (char *buffer, sf_count_t bufsize, SF_PRIVATE *psf)
 	sf_count_t	count ;
 
 	while (k < bufsize - 1)
-	{	count = read (psf->filedes, &(buffer [k]), 1) ;
+	{	count = read (psf->file.filedes, &(buffer [k]), 1) ;
 
 		if (count == -1)
 		{	if (errno == EINTR)
@@ -1396,7 +1417,7 @@ psf_is_pipe (SF_PRIVATE *psf)
 		return SF_FALSE ;
 
 	/* Not sure if this works. */
-	if (fstat (psf->filedes, &statbuf) == -1)
+	if (fstat (psf->file.filedes, &statbuf) == -1)
 	{	psf_log_syserr (psf, errno) ;
 		/* Default to maximum safety. */
 		return SF_TRUE ;
@@ -1420,7 +1441,7 @@ psf_get_filelen (SF_PRIVATE *psf)
 	*/
 	struct _stati64 statbuf ;
 
-	if (_fstati64 (psf->filedes, &statbuf))
+	if (_fstati64 (psf->file.filedes, &statbuf))
 	{	psf_log_syserr (psf, errno) ;
 		return (sf_count_t) -1 ;
 		} ;
@@ -1432,7 +1453,7 @@ psf_get_filelen (SF_PRIVATE *psf)
 	if (psf->virtual_io)
 		return psf->vio.get_filelen (psf->vio_user_data) ;
 
-	if ((current = _telli64 (psf->filedes)) < 0)
+	if ((current = _telli64 (psf->file.filedes)) < 0)
 	{	psf_log_syserr (psf, errno) ;
 		return (sf_count_t) -1 ;
 		} ;
@@ -1450,17 +1471,17 @@ psf_get_filelen (SF_PRIVATE *psf)
 	** by libsndfile and changing the license to GPL at the same time.
 	*/
 
-	_lseeki64 (psf->filedes, 0, SEEK_END) ;
+	_lseeki64 (psf->file.filedes, 0, SEEK_END) ;
 
-	if ((filelen = _lseeki64 (psf->filedes, 0, SEEK_END)) < 0)
+	if ((filelen = _lseeki64 (psf->file.filedes, 0, SEEK_END)) < 0)
 	{	psf_log_syserr (psf, errno) ;
 		return (sf_count_t) -1 ;
 		} ;
 
 	if (filelen > current)
-		_lseeki64 (psf->filedes, current, SEEK_SET) ;
+		_lseeki64 (psf->file.filedes, current, SEEK_SET) ;
 
-	switch (psf->mode)
+	switch (psf->file.mode)
 	{	case SFM_WRITE :
 			filelen = filelen - psf->fileoffset ;
 			break ;
@@ -1504,7 +1525,7 @@ psf_ftruncate (SF_PRIVATE *psf, sf_count_t len)
 	if (len > 0x7FFFFFFF)
 		return -1 ;
 
-	retval = chsize (psf->filedes, len) ;
+	retval = chsize (psf->file.filedes, len) ;
 
 	if (retval == -1)
 		psf_log_syserr (psf, errno) ;
diff --git a/libs/libsndfile/src/flac.c b/libs/libsndfile/src/flac.c
index 9b580156d1..bb74e94bc0 100644
--- a/libs/libsndfile/src/flac.c
+++ b/libs/libsndfile/src/flac.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2004-2009 Erik de Castro Lopo 
+** Copyright (C) 2004-2013 Erik de Castro Lopo 
 ** Copyright (C) 2004 Tobias Gehrig 
 **
 ** This program is free software ; you can redistribute it and/or modify
@@ -35,12 +35,12 @@
 #include	
 #include	
 
-#include	"sfendian.h"
-
 /*------------------------------------------------------------------------------
 ** Private static functions.
 */
 
+#define	FLAC_DEFAULT_COMPRESSION_LEVEL	5
+
 #define ENC_BUFFER_SIZE 8192
 
 typedef enum
@@ -69,6 +69,8 @@ typedef struct
 
 	const FLAC__Frame *frame ;
 	FLAC__bool bufferbackup ;
+
+	unsigned compression ;
 } FLAC_PRIVATE ;
 
 typedef struct
@@ -77,6 +79,7 @@ typedef struct
 } FLAC_TAG ;
 
 static sf_count_t	flac_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) ;
+static int			flac_byterate (SF_PRIVATE *psf) ;
 static int			flac_close (SF_PRIVATE *psf) ;
 
 static int			flac_enc_init (SF_PRIVATE *psf) ;
@@ -122,10 +125,6 @@ static FLAC__StreamEncoderSeekStatus sf_flac_enc_seek_callback (const FLAC__Stre
 static FLAC__StreamEncoderTellStatus sf_flac_enc_tell_callback (const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data) ;
 static FLAC__StreamEncoderWriteStatus sf_flac_enc_write_callback (const FLAC__StreamEncoder *encoder, const FLAC__byte buffer [], size_t bytes, unsigned samples, unsigned current_frame, void *client_data) ;
 
-static const int legal_sample_rates [] =
-{	8000, 16000, 22050, 24000, 32000, 44100, 48000, 96000
-} ;
-
 static void
 s2flac8_array (const short *src, FLAC__int32 *dest, int count)
 {	while (--count >= 0)
@@ -153,8 +152,8 @@ i2flac8_array (const int *src, FLAC__int32 *dest, int count)
 static void
 i2flac16_array (const int *src, FLAC__int32 *dest, int count)
 {
-  while (--count >= 0)
-    dest [count] = src [count] >> 16 ;
+	while (--count >= 0)
+		dest [count] = src [count] >> 16 ;
 } /* i2flac16_array */
 
 static void
@@ -306,7 +305,7 @@ sf_flac_read_callback (const FLAC__StreamDecoder * UNUSED (decoder), FLAC__byte
 	if (*bytes > 0 && psf->error == 0)
 		return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE ;
 
-    return FLAC__STREAM_DECODER_READ_STATUS_ABORT ;
+	return FLAC__STREAM_DECODER_READ_STATUS_ABORT ;
 } /* sf_flac_read_callback */
 
 static FLAC__StreamDecoderSeekStatus
@@ -348,7 +347,7 @@ sf_flac_eof_callback (const FLAC__StreamDecoder *UNUSED (decoder), void *client_
 	if (psf_ftell (psf) == psf->filelength)
 		return SF_TRUE ;
 
-    return SF_FALSE ;
+	return SF_FALSE ;
 } /* sf_flac_eof_callback */
 
 static FLAC__StreamDecoderWriteStatus
@@ -377,7 +376,9 @@ sf_flac_meta_get_vorbiscomments (SF_PRIVATE *psf, const FLAC__StreamMetadata *me
 		{ "comment", SF_STR_COMMENT },
 		{ "date", SF_STR_DATE },
 		{ "album", SF_STR_ALBUM },
-		{ "license", SF_STR_LICENSE }
+		{ "license", SF_STR_LICENSE },
+		{ "tracknumber", SF_STR_TRACKNUMBER },
+		{ "genre", SF_STR_GENRE }
 		} ;
 
 	const char *value, *cptr ;
@@ -411,7 +412,14 @@ sf_flac_meta_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC_
 			psf->sf.samplerate = metadata->data.stream_info.sample_rate ;
 			psf->sf.frames = metadata->data.stream_info.total_samples ;
 
-			psf_log_printf (psf, "FLAC Stream Metadata\n  Channels    : %d\n  Sample rate : %d\n  Frames      : %D\n", psf->sf.channels, psf->sf.samplerate, psf->sf.frames) ;
+			psf_log_printf (psf, "FLAC Stream Metadata\n  Channels    : %d\n  Sample rate : %d\n", psf->sf.channels, psf->sf.samplerate) ;
+
+			if (psf->sf.frames == 0)
+			{	psf_log_printf (psf, "  Frames      : 0 (bumping to SF_COUNT_MAX)\n") ;
+				psf->sf.frames = SF_COUNT_MAX ;
+				}
+			else
+				psf_log_printf (psf, "  Frames      : %D\n", psf->sf.frames) ;
 
 			switch (metadata->data.stream_info.bits_per_sample)
 			{	case 8 :
@@ -501,7 +509,7 @@ sf_flac_enc_seek_callback (const FLAC__StreamEncoder * UNUSED (encoder), FLAC__u
 	if (psf->error)
 		return FLAC__STREAM_ENCODER_SEEK_STATUS_ERROR ;
 
-    return FLAC__STREAM_ENCODER_SEEK_STATUS_OK ;
+	return FLAC__STREAM_ENCODER_SEEK_STATUS_OK ;
 } /* sf_flac_enc_seek_callback */
 
 static FLAC__StreamEncoderTellStatus
@@ -531,7 +539,7 @@ flac_write_strings (SF_PRIVATE *psf, FLAC_PRIVATE* pflac)
 	int	k, string_count = 0 ;
 
 	for (k = 0 ; k < SF_MAX_STRINGS ; k++)
-	{	if (psf->strings [k].type != 0)
+	{	if (psf->strings.data [k].type != 0)
 			string_count ++ ;
 		} ;
 
@@ -543,10 +551,10 @@ flac_write_strings (SF_PRIVATE *psf, FLAC_PRIVATE* pflac)
 		return ;
 		} ;
 
-	for (k = 0 ; k < SF_MAX_STRINGS && psf->strings [k].type != 0 ; k++)
+	for (k = 0 ; k < SF_MAX_STRINGS && psf->strings.data [k].type != 0 ; k++)
 	{	const char * key, * value ;
 
-		switch (psf->strings [k].type)
+		switch (psf->strings.data [k].type)
 		{	case SF_STR_SOFTWARE :
 				key = "software" ;
 				break ;
@@ -571,11 +579,17 @@ flac_write_strings (SF_PRIVATE *psf, FLAC_PRIVATE* pflac)
 			case SF_STR_LICENSE :
 				key = "license" ;
 				break ;
+			case SF_STR_TRACKNUMBER :
+				key = "tracknumber" ;
+				break ;
+			case SF_STR_GENRE :
+				key = "genre" ;
+				break ;
 			default :
 				continue ;
 			} ;
 
-		value = psf->strings [k].str ;
+		value = psf->strings.storage + psf->strings.data [k].offset ;
 
 		FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair (&entry, key, value) ;
 		FLAC__metadata_object_vorbiscomment_append_comment (pflac->metadata, entry, /* copy */ SF_FALSE) ;
@@ -620,24 +634,28 @@ flac_open	(SF_PRIVATE *psf)
 	FLAC_PRIVATE* pflac = calloc (1, sizeof (FLAC_PRIVATE)) ;
 	psf->codec_data = pflac ;
 
-	if (psf->mode == SFM_RDWR)
+	/* Set the default value here. Over-ridden later if necessary. */
+	pflac->compression = FLAC_DEFAULT_COMPRESSION_LEVEL ;
+
+
+	if (psf->file.mode == SFM_RDWR)
 		return SFE_BAD_MODE_RW ;
 
-	if (psf->mode == SFM_READ)
+	if (psf->file.mode == SFM_READ)
 	{	if ((error = flac_read_header (psf)))
 			return error ;
 		} ;
 
 	subformat = SF_CODEC (psf->sf.format) ;
 
-	if (psf->mode == SFM_WRITE)
+	if (psf->file.mode == SFM_WRITE)
 	{	if ((SF_CONTAINER (psf->sf.format)) != SF_FORMAT_FLAC)
 			return	SFE_BAD_OPEN_FORMAT ;
 
 		psf->endian = SF_ENDIAN_BIG ;
 		psf->sf.seekable = 0 ;
 
-		psf->str_flags = SF_STR_ALLOW_START ;
+		psf->strings.flags = SF_STR_ALLOW_START ;
 
 		if ((error = flac_enc_init (psf)))
 			return error ;
@@ -647,14 +665,12 @@ flac_open	(SF_PRIVATE *psf)
 
 	psf->datalength = psf->filelength ;
 	psf->dataoffset = 0 ;
-	psf->blockwidth = 0 ;
-	psf->bytewidth = 1 ;
 
 	psf->container_close = flac_close ;
 	psf->seek = flac_seek ;
-	psf->command = flac_command ;
+	psf->byterate = flac_byterate ;
 
-	psf->blockwidth = psf->bytewidth * psf->sf.channels ;
+	psf->command = flac_command ;
 
 	switch (subformat)
 	{	case SF_FORMAT_PCM_S8 :	/* 8-bit FLAC.  */
@@ -683,7 +699,7 @@ flac_close	(SF_PRIVATE *psf)
 	if (pflac->metadata != NULL)
 		FLAC__metadata_object_delete (pflac->metadata) ;
 
-	if (psf->mode == SFM_WRITE)
+	if (psf->file.mode == SFM_WRITE)
 	{	FLAC__stream_encoder_finish (pflac->fse) ;
 		FLAC__stream_encoder_delete (pflac->fse) ;
 
@@ -691,7 +707,7 @@ flac_close	(SF_PRIVATE *psf)
 			free (pflac->encbuffer) ;
 		} ;
 
-	if (psf->mode == SFM_READ)
+	if (psf->file.mode == SFM_READ)
 	{	FLAC__stream_decoder_finish (pflac->fsd) ;
 		FLAC__stream_decoder_delete (pflac->fsd) ;
 		} ;
@@ -709,17 +725,16 @@ static int
 flac_enc_init (SF_PRIVATE *psf)
 {	FLAC_PRIVATE* pflac = (FLAC_PRIVATE*) psf->codec_data ;
 	unsigned bps ;
-	int k, found ;
 
-	found = 0 ;
-	for (k = 0 ; k < ARRAY_LEN (legal_sample_rates) ; k++)
-		if (psf->sf.samplerate == legal_sample_rates [k])
-		{	found = 1 ;
-			break ;
-			} ;
-
-	if (found == 0)
+	/* To cite the flac FAQ at
+	** http://flac.sourceforge.net/faq.html#general__samples
+	**     "FLAC supports linear sample rates from 1Hz - 655350Hz in 1Hz
+	**     increments."
+	*/
+	if (psf->sf.samplerate < 1 || psf->sf.samplerate > 655350)
+	{	psf_log_printf (psf, "flac sample rate out of range.\n", psf->sf.samplerate) ;
 		return SFE_FLAC_BAD_SAMPLE_RATE ;
+		} ;
 
 	psf_fseek (psf, 0, SEEK_SET) ;
 
@@ -739,6 +754,8 @@ flac_enc_init (SF_PRIVATE *psf)
 			break ;
 		} ;
 
+	if (pflac->fse)
+		FLAC__stream_encoder_delete (pflac->fse) ;
 	if ((pflac->fse = FLAC__stream_encoder_new ()) == NULL)
 		return SFE_FLAC_NEW_DECODER ;
 
@@ -757,6 +774,11 @@ flac_enc_init (SF_PRIVATE *psf)
 		return SFE_FLAC_INIT_DECODER ;
 		} ;
 
+	if (! FLAC__stream_encoder_set_compression_level (pflac->fse, pflac->compression))
+	{	psf_log_printf (psf, "FLAC__stream_encoder_set_compression_level (%d) return false.\n", pflac->compression) ;
+		return SFE_FLAC_INIT_DECODER ;
+		} ;
+
 	return 0 ;
 } /* flac_enc_init */
 
@@ -765,6 +787,8 @@ flac_read_header (SF_PRIVATE *psf)
 {	FLAC_PRIVATE* pflac = (FLAC_PRIVATE*) psf->codec_data ;
 
 	psf_fseek (psf, 0, SEEK_SET) ;
+	if (pflac->fsd)
+		FLAC__stream_decoder_delete (pflac->fsd) ;
 	if ((pflac->fsd = FLAC__stream_decoder_new ()) == NULL)
 		return SFE_FLAC_NEW_DECODER ;
 
@@ -788,34 +812,59 @@ flac_read_header (SF_PRIVATE *psf)
 } /* flac_read_header */
 
 static int
-flac_command (SF_PRIVATE * UNUSED (psf), int UNUSED (command), void * UNUSED (data), int UNUSED (datasize))
-{
-	return 0 ;
+flac_command (SF_PRIVATE * psf, int command, void * data, int datasize)
+{	FLAC_PRIVATE* pflac = (FLAC_PRIVATE*) psf->codec_data ;
+	double quality ;
+
+	switch (command)
+	{	case SFC_SET_COMPRESSION_LEVEL :
+			if (data == NULL || datasize != sizeof (double))
+				return SF_FALSE ;
+
+			if (psf->have_written)
+				return SF_FALSE ;
+
+			/* FLAC compression level is in the range [0, 8] while libsndfile takes
+			** values in the range [0.0, 1.0]. Massage the libsndfile value here.
+			*/
+			quality = (*((double *) data)) * 8.0 ;
+			/* Clip range. */
+			pflac->compression = lrint (SF_MAX (0.0, SF_MIN (8.0, quality))) ;
+
+			psf_log_printf (psf, "%s : Setting SFC_SET_COMPRESSION_LEVEL to %u.\n", __func__, pflac->compression) ;
+
+			if (flac_enc_init (psf))
+				return SF_FALSE ;
+
+			return SF_TRUE ;
+
+		default :
+			return SF_FALSE ;
+		} ;
+
+	return SF_FALSE ;
 } /* flac_command */
 
 int
 flac_init (SF_PRIVATE *psf)
 {
-	if (psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_RDWR)
 		return SFE_BAD_MODE_RW ;
 
-	if (psf->mode == SFM_READ)
+	if (psf->file.mode == SFM_READ)
 	{	psf->read_short		= flac_read_flac2s ;
 		psf->read_int		= flac_read_flac2i ;
 		psf->read_float		= flac_read_flac2f ;
 		psf->read_double	= flac_read_flac2d ;
 		} ;
 
-	if (psf->mode == SFM_WRITE)
+	if (psf->file.mode == SFM_WRITE)
 	{	psf->write_short	= flac_write_s2flac ;
 		psf->write_int		= flac_write_i2flac ;
 		psf->write_float	= flac_write_f2flac ;
 		psf->write_double	= flac_write_d2flac ;
 		} ;
 
-	psf->bytewidth = 1 ;
-	psf->blockwidth = psf->sf.channels ;
-
 	if (psf->filelength > psf->dataoffset)
 		psf->datalength = (psf->dataend) ? psf->dataend - psf->dataoffset : psf->filelength - psf->dataoffset ;
 	else
@@ -954,7 +1003,7 @@ flac_write_s2flac (SF_PRIVATE *psf, const short *ptr, sf_count_t len)
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
 		convert (ptr + total, buffer, writecount) ;
-		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount / psf->sf.channels))
 			thiswrite = writecount ;
 		else
 			break ;
@@ -996,7 +1045,7 @@ flac_write_i2flac (SF_PRIVATE *psf, const int *ptr, sf_count_t len)
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
 		convert (ptr + total, buffer, writecount) ;
-		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount / psf->sf.channels))
 			thiswrite = writecount ;
 		else
 			break ;
@@ -1038,7 +1087,7 @@ flac_write_f2flac (SF_PRIVATE *psf, const float *ptr, sf_count_t len)
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
 		convert (ptr + total, buffer, writecount, psf->norm_float) ;
-		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount / psf->sf.channels))
 			thiswrite = writecount ;
 		else
 			break ;
@@ -1076,23 +1125,22 @@ f2flac8_clip_array (const float *src, FLAC__int32 *dest, int count, int normaliz
 
 static void
 f2flac16_clip_array (const float *src, FLAC__int32 *dest, int count, int normalize)
-{
-  float normfact, scaled_value ;
+{	float normfact, scaled_value ;
 
-  normfact = normalize ? (8.0 * 0x1000) : 1.0 ;
+	normfact = normalize ? (8.0 * 0x1000) : 1.0 ;
 
-  while (--count >= 0) {
-    scaled_value = src [count] * normfact ;
-    if (CPU_CLIPS_POSITIVE == 0 && scaled_value >= (1.0 * 0x7FFF)) {
-      dest [count] = 0x7FFF ;
-      continue ;
-    }
-    if (CPU_CLIPS_NEGATIVE == 0 && scaled_value <= (-8.0 * 0x1000)) {
-      dest [count] = 0x8000 ;
-      continue ;
-    }
-    dest [count] = lrintf (scaled_value) ;
-  }
+	while (--count >= 0)
+	{	scaled_value = src [count] * normfact ;
+		if (CPU_CLIPS_POSITIVE == 0 && scaled_value >= (1.0 * 0x7FFF))
+		{	dest [count] = 0x7FFF ;
+			continue ;
+			} ;
+		if (CPU_CLIPS_NEGATIVE == 0 && scaled_value <= (-8.0 * 0x1000))
+		{	dest [count] = 0x8000 ;
+			continue ;
+			} ;
+		dest [count] = lrintf (scaled_value) ;
+		} ;
 } /* f2flac16_clip_array */
 
 static void
@@ -1170,7 +1218,7 @@ flac_write_d2flac (SF_PRIVATE *psf, const double *ptr, sf_count_t len)
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
 		convert (ptr + total, buffer, writecount, psf->norm_double) ;
-		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount/psf->sf.channels))
+		if (FLAC__stream_encoder_process_interleaved (pflac->fse, buffer, writecount / psf->sf.channels))
 			thiswrite = writecount ;
 		else
 			break ;
@@ -1288,13 +1336,24 @@ flac_seek (SF_PRIVATE *psf, int UNUSED (mode), sf_count_t offset)
 
 	pflac->frame = NULL ;
 
-	if (psf->mode == SFM_READ)
+	if (psf->file.mode == SFM_READ)
 	{	FLAC__uint64 position ;
+
 		if (FLAC__stream_decoder_seek_absolute (pflac->fsd, offset))
 		{	FLAC__stream_decoder_get_decode_position (pflac->fsd, &position) ;
 			return offset ;
 			} ;
 
+		if (offset == psf->sf.frames)
+		{	/*
+			** If we've been asked to seek to the very end of the file, libFLAC
+			** will return an error. However, we know the length of the file so
+			** instead of returning an error, we can return the offset.
+			*/
+			return offset ;
+			} ;
+
+		psf->error = SFE_BAD_SEEK ;
 		return ((sf_count_t) -1) ;
 		} ;
 
@@ -1304,6 +1363,16 @@ flac_seek (SF_PRIVATE *psf, int UNUSED (mode), sf_count_t offset)
 	return ((sf_count_t) -1) ;
 } /* flac_seek */
 
+static int
+flac_byterate (SF_PRIVATE *psf)
+{
+	if (psf->file.mode == SFM_READ)
+		return (psf->datalength * psf->sf.samplerate) / psf->sf.frames ;
+
+	return -1 ;
+} /* flac_byterate */
+
+
 #else /* HAVE_EXTERNAL_LIBS */
 
 int
diff --git a/libs/libsndfile/src/float32.c b/libs/libsndfile/src/float32.c
index 2ab4450f84..89bcf6b754 100644
--- a/libs/libsndfile/src/float32.c
+++ b/libs/libsndfile/src/float32.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2012 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -92,7 +92,7 @@ float32_init	(SF_PRIVATE *psf)
 
 	psf->blockwidth = sizeof (float) * psf->sf.channels ;
 
-	if (psf->mode == SFM_READ || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_READ || psf->file.mode == SFM_RDWR)
 	{	switch (psf->endian + float_caps)
 		{	case (SF_ENDIAN_BIG + FLOAT_CAN_RW_BE) :
 					psf->data_endswap = SF_FALSE ;
@@ -163,7 +163,7 @@ float32_init	(SF_PRIVATE *psf)
 			} ;
 		} ;
 
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{	switch (psf->endian + float_caps)
 		{	case (SF_ENDIAN_LITTLE + FLOAT_CAN_RW_LE) :
 					psf->data_endswap = SF_FALSE ;
@@ -241,13 +241,13 @@ float32_init	(SF_PRIVATE *psf)
 	else
 		psf->datalength = 0 ;
 
-	psf->sf.frames = psf->datalength / psf->blockwidth ;
+	psf->sf.frames = psf->blockwidth > 0 ? psf->datalength / psf->blockwidth : 0 ;
 
 	return 0 ;
 } /* float32_init */
 
 float
-float32_be_read (unsigned char *cptr)
+float32_be_read (const unsigned char *cptr)
 {	int		exponent, mantissa, negative ;
 	float	fvalue ;
 
@@ -275,7 +275,7 @@ float32_be_read (unsigned char *cptr)
 } /* float32_be_read */
 
 float
-float32_le_read (unsigned char *cptr)
+float32_le_read (const unsigned char *cptr)
 {	int		exponent, mantissa, negative ;
 	float	fvalue ;
 
@@ -444,7 +444,7 @@ f2s_clip_array (const float *src, int count, short *dest, float scale)
 
 		if (CPU_CLIPS_POSITIVE == 0 && tmp > 32767.0)
 			dest [count] = SHRT_MAX ;
-		else if (CPU_CLIPS_NEGATIVE == 0 && tmp < 32768.0)
+		else if (CPU_CLIPS_NEGATIVE == 0 && tmp < -32768.0)
 			dest [count] = SHRT_MIN ;
 		else
 			dest [count] = lrintf (tmp) ;
@@ -505,25 +505,26 @@ d2f_array (const double *src, float *dest, int count)
 
 static sf_count_t
 host_read_f2s	(SF_PRIVATE *psf, short *ptr, sf_count_t len)
-{	void		(*convert) (const float *, int, short *, float) ;
+{	BUF_UNION	ubuf ;
+	void		(*convert) (const float *, int, short *, float) ;
 	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 	float		scale ;
 
 	convert = (psf->add_clipping) ? f2s_clip_array : f2s_array ;
-	bufferlen = ARRAY_LEN (psf->u.fbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.fbuf) ;
 	scale = (psf->float_int_mult == 0) ? 1.0 : 0x7FFF / psf->float_max ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.fbuf, sizeof (float), bufferlen, psf) ;
+		readcount = psf_fread (ubuf.fbuf, sizeof (float), bufferlen, psf) ;
 
 /* Fix me : Need lef2s_array */
 		if (psf->data_endswap == SF_TRUE)
-			endswap_int_array (psf->u.ibuf, bufferlen) ;
+			endswap_int_array (ubuf.ibuf, bufferlen) ;
 
-		f2s_array (psf->u.fbuf, readcount, ptr + total, scale) ;
+		convert (ubuf.fbuf, readcount, ptr + total, scale) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -535,24 +536,25 @@ host_read_f2s	(SF_PRIVATE *psf, short *ptr, sf_count_t len)
 
 static sf_count_t
 host_read_f2i	(SF_PRIVATE *psf, int *ptr, sf_count_t len)
-{	void		(*convert) (const float *, int, int *, float) ;
+{	BUF_UNION	ubuf ;
+	void		(*convert) (const float *, int, int *, float) ;
 	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 	float		scale ;
 
 	convert = (psf->add_clipping) ? f2i_clip_array : f2i_array ;
-	bufferlen = ARRAY_LEN (psf->u.fbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.fbuf) ;
 	scale = (psf->float_int_mult == 0) ? 1.0 : 0x7FFFFFFF / psf->float_max ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.fbuf, sizeof (float), bufferlen, psf) ;
+		readcount = psf_fread (ubuf.fbuf, sizeof (float), bufferlen, psf) ;
 
 		if (psf->data_endswap == SF_TRUE)
-			endswap_int_array (psf->u.ibuf, bufferlen) ;
+			endswap_int_array (ubuf.ibuf, bufferlen) ;
 
-		convert (psf->u.fbuf, readcount, ptr + total, scale) ;
+		convert (ubuf.fbuf, readcount, ptr + total, scale) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -564,20 +566,21 @@ host_read_f2i	(SF_PRIVATE *psf, int *ptr, sf_count_t len)
 
 static sf_count_t
 host_read_f	(SF_PRIVATE *psf, float *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 
 	if (psf->data_endswap != SF_TRUE)
 		return psf_fread (ptr, sizeof (float), len, psf) ;
 
-	bufferlen = ARRAY_LEN (psf->u.fbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.fbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.fbuf, sizeof (float), bufferlen, psf) ;
+		readcount = psf_fread (ubuf.fbuf, sizeof (float), bufferlen, psf) ;
 
-		endswap_int_copy ((int*) (ptr + total), psf->u.ibuf, readcount) ;
+		endswap_int_copy ((int*) (ptr + total), ubuf.ibuf, readcount) ;
 
 		total += readcount ;
 		if (readcount < bufferlen)
@@ -590,21 +593,22 @@ host_read_f	(SF_PRIVATE *psf, float *ptr, sf_count_t len)
 
 static sf_count_t
 host_read_f2d	(SF_PRIVATE *psf, double *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.fbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.fbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.fbuf, sizeof (float), bufferlen, psf) ;
+		readcount = psf_fread (ubuf.fbuf, sizeof (float), bufferlen, psf) ;
 
 		if (psf->data_endswap == SF_TRUE)
-			endswap_int_array (psf->u.ibuf, bufferlen) ;
+			endswap_int_array (ubuf.ibuf, bufferlen) ;
 
 /* Fix me : Need lef2d_array */
-		f2d_array (psf->u.fbuf, readcount, ptr + total) ;
+		f2d_array (ubuf.fbuf, readcount, ptr + total) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -616,26 +620,27 @@ host_read_f2d	(SF_PRIVATE *psf, double *ptr, sf_count_t len)
 
 static sf_count_t
 host_write_s2f	(SF_PRIVATE *psf, const short *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 	float		scale ;
 
 /* Erik */
 	scale = (psf->scale_int_float == 0) ? 1.0 : 1.0 / 0x8000 ;
-	bufferlen = ARRAY_LEN (psf->u.fbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.fbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		s2f_array (ptr + total, psf->u.fbuf, bufferlen, scale) ;
+		s2f_array (ptr + total, ubuf.fbuf, bufferlen, scale) ;
 
 		if (psf->peak_info)
-			float32_peak_update (psf, psf->u.fbuf, bufferlen, total / psf->sf.channels) ;
+			float32_peak_update (psf, ubuf.fbuf, bufferlen, total / psf->sf.channels) ;
 
 		if (psf->data_endswap == SF_TRUE)
-			endswap_int_array (psf->u.ibuf, bufferlen) ;
+			endswap_int_array (ubuf.ibuf, bufferlen) ;
 
-		writecount = psf_fwrite (psf->u.fbuf, sizeof (float), bufferlen, psf) ;
+		writecount = psf_fwrite (ubuf.fbuf, sizeof (float), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -647,25 +652,26 @@ host_write_s2f	(SF_PRIVATE *psf, const short *ptr, sf_count_t len)
 
 static sf_count_t
 host_write_i2f	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 	float		scale ;
 
 	scale = (psf->scale_int_float == 0) ? 1.0 : 1.0 / (8.0 * 0x10000000) ;
-	bufferlen = ARRAY_LEN (psf->u.fbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.fbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		i2f_array (ptr + total, psf->u.fbuf, bufferlen, scale) ;
+		i2f_array (ptr + total, ubuf.fbuf, bufferlen, scale) ;
 
 		if (psf->peak_info)
-			float32_peak_update (psf, psf->u.fbuf, bufferlen, total / psf->sf.channels) ;
+			float32_peak_update (psf, ubuf.fbuf, bufferlen, total / psf->sf.channels) ;
 
 		if (psf->data_endswap == SF_TRUE)
-			endswap_int_array (psf->u.ibuf, bufferlen) ;
+			endswap_int_array (ubuf.ibuf, bufferlen) ;
 
-		writecount = psf_fwrite (psf->u.fbuf, sizeof (float) , bufferlen, psf) ;
+		writecount = psf_fwrite (ubuf.fbuf, sizeof (float) , bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -677,7 +683,8 @@ host_write_i2f	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
 
 static sf_count_t
 host_write_f	(SF_PRIVATE *psf, const float *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
 	if (psf->peak_info)
@@ -686,15 +693,15 @@ host_write_f	(SF_PRIVATE *psf, const float *ptr, sf_count_t len)
 	if (psf->data_endswap != SF_TRUE)
 		return psf_fwrite (ptr, sizeof (float), len, psf) ;
 
-	bufferlen = ARRAY_LEN (psf->u.fbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.fbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
 
-		endswap_int_copy (psf->u.ibuf, (const int*) (ptr + total), bufferlen) ;
+		endswap_int_copy (ubuf.ibuf, (const int*) (ptr + total), bufferlen) ;
 
-		writecount = psf_fwrite (psf->u.fbuf, sizeof (float), bufferlen, psf) ;
+		writecount = psf_fwrite (ubuf.fbuf, sizeof (float), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -706,24 +713,25 @@ host_write_f	(SF_PRIVATE *psf, const float *ptr, sf_count_t len)
 
 static sf_count_t
 host_write_d2f	(SF_PRIVATE *psf, const double *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.fbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.fbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
 
-		d2f_array (ptr + total, psf->u.fbuf, bufferlen) ;
+		d2f_array (ptr + total, ubuf.fbuf, bufferlen) ;
 
 		if (psf->peak_info)
-			float32_peak_update (psf, psf->u.fbuf, bufferlen, total / psf->sf.channels) ;
+			float32_peak_update (psf, ubuf.fbuf, bufferlen, total / psf->sf.channels) ;
 
 		if (psf->data_endswap == SF_TRUE)
-			endswap_int_array (psf->u.ibuf, bufferlen) ;
+			endswap_int_array (ubuf.ibuf, bufferlen) ;
 
-		writecount = psf_fwrite (psf->u.fbuf, sizeof (float), bufferlen, psf) ;
+		writecount = psf_fwrite (ubuf.fbuf, sizeof (float), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -738,24 +746,25 @@ host_write_d2f	(SF_PRIVATE *psf, const double *ptr, sf_count_t len)
 
 static sf_count_t
 replace_read_f2s	(SF_PRIVATE *psf, short *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 	float		scale ;
 
-	bufferlen = ARRAY_LEN (psf->u.fbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.fbuf) ;
 	scale = (psf->float_int_mult == 0) ? 1.0 : 0x7FFF / psf->float_max ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.fbuf, sizeof (float), bufferlen, psf) ;
+		readcount = psf_fread (ubuf.fbuf, sizeof (float), bufferlen, psf) ;
 
 		if (psf->data_endswap == SF_TRUE)
-			endswap_int_array (psf->u.ibuf, bufferlen) ;
+			endswap_int_array (ubuf.ibuf, bufferlen) ;
 
-		bf2f_array (psf->u.fbuf, bufferlen) ;
+		bf2f_array (ubuf.fbuf, bufferlen) ;
 
-		f2s_array (psf->u.fbuf, readcount, ptr + total, scale) ;
+		f2s_array (ubuf.fbuf, readcount, ptr + total, scale) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -767,24 +776,25 @@ replace_read_f2s	(SF_PRIVATE *psf, short *ptr, sf_count_t len)
 
 static sf_count_t
 replace_read_f2i	(SF_PRIVATE *psf, int *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 	float		scale ;
 
-	bufferlen = ARRAY_LEN (psf->u.fbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.fbuf) ;
 	scale = (psf->float_int_mult == 0) ? 1.0 : 0x7FFF / psf->float_max ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.fbuf, sizeof (float), bufferlen, psf) ;
+		readcount = psf_fread (ubuf.fbuf, sizeof (float), bufferlen, psf) ;
 
 		if (psf->data_endswap == SF_TRUE)
-			endswap_int_array (psf->u.ibuf, bufferlen) ;
+			endswap_int_array (ubuf.ibuf, bufferlen) ;
 
-		bf2f_array (psf->u.fbuf, bufferlen) ;
+		bf2f_array (ubuf.fbuf, bufferlen) ;
 
-		f2i_array (psf->u.fbuf, readcount, ptr + total, scale) ;
+		f2i_array (ubuf.fbuf, readcount, ptr + total, scale) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -796,24 +806,25 @@ replace_read_f2i	(SF_PRIVATE *psf, int *ptr, sf_count_t len)
 
 static sf_count_t
 replace_read_f	(SF_PRIVATE *psf, float *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 
 	/* FIX THIS */
 
-	bufferlen = ARRAY_LEN (psf->u.fbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.fbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.fbuf, sizeof (float), bufferlen, psf) ;
+		readcount = psf_fread (ubuf.fbuf, sizeof (float), bufferlen, psf) ;
 
 		if (psf->data_endswap == SF_TRUE)
-			endswap_int_array (psf->u.ibuf, bufferlen) ;
+			endswap_int_array (ubuf.ibuf, bufferlen) ;
 
-		bf2f_array (psf->u.fbuf, bufferlen) ;
+		bf2f_array (ubuf.fbuf, bufferlen) ;
 
-		memcpy (ptr + total, psf->u.fbuf, bufferlen * sizeof (float)) ;
+		memcpy (ptr + total, ubuf.fbuf, bufferlen * sizeof (float)) ;
 
 		total += readcount ;
 		if (readcount < bufferlen)
@@ -826,22 +837,23 @@ replace_read_f	(SF_PRIVATE *psf, float *ptr, sf_count_t len)
 
 static sf_count_t
 replace_read_f2d	(SF_PRIVATE *psf, double *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.fbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.fbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.fbuf, sizeof (float), bufferlen, psf) ;
+		readcount = psf_fread (ubuf.fbuf, sizeof (float), bufferlen, psf) ;
 
 		if (psf->data_endswap == SF_TRUE)
-			endswap_int_array (psf->u.ibuf, bufferlen) ;
+			endswap_int_array (ubuf.ibuf, bufferlen) ;
 
-		bf2f_array (psf->u.fbuf, bufferlen) ;
+		bf2f_array (ubuf.fbuf, bufferlen) ;
 
-		f2d_array (psf->u.fbuf, readcount, ptr + total) ;
+		f2d_array (ubuf.fbuf, readcount, ptr + total) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -853,27 +865,28 @@ replace_read_f2d	(SF_PRIVATE *psf, double *ptr, sf_count_t len)
 
 static sf_count_t
 replace_write_s2f	(SF_PRIVATE *psf, const short *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 	float		scale ;
 
 	scale = (psf->scale_int_float == 0) ? 1.0 : 1.0 / 0x8000 ;
-	bufferlen = ARRAY_LEN (psf->u.fbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.fbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		s2f_array (ptr + total, psf->u.fbuf, bufferlen, scale) ;
+		s2f_array (ptr + total, ubuf.fbuf, bufferlen, scale) ;
 
 		if (psf->peak_info)
-			float32_peak_update (psf, psf->u.fbuf, bufferlen, total / psf->sf.channels) ;
+			float32_peak_update (psf, ubuf.fbuf, bufferlen, total / psf->sf.channels) ;
 
-		f2bf_array (psf->u.fbuf, bufferlen) ;
+		f2bf_array (ubuf.fbuf, bufferlen) ;
 
 		if (psf->data_endswap == SF_TRUE)
-			endswap_int_array (psf->u.ibuf, bufferlen) ;
+			endswap_int_array (ubuf.ibuf, bufferlen) ;
 
-		writecount = psf_fwrite (psf->u.fbuf, sizeof (float), bufferlen, psf) ;
+		writecount = psf_fwrite (ubuf.fbuf, sizeof (float), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -885,27 +898,28 @@ replace_write_s2f	(SF_PRIVATE *psf, const short *ptr, sf_count_t len)
 
 static sf_count_t
 replace_write_i2f	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 	float		scale ;
 
 	scale = (psf->scale_int_float == 0) ? 1.0 : 1.0 / (8.0 * 0x10000000) ;
-	bufferlen = ARRAY_LEN (psf->u.fbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.fbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		i2f_array (ptr + total, psf->u.fbuf, bufferlen, scale) ;
+		i2f_array (ptr + total, ubuf.fbuf, bufferlen, scale) ;
 
 		if (psf->peak_info)
-			float32_peak_update (psf, psf->u.fbuf, bufferlen, total / psf->sf.channels) ;
+			float32_peak_update (psf, ubuf.fbuf, bufferlen, total / psf->sf.channels) ;
 
-		f2bf_array (psf->u.fbuf, bufferlen) ;
+		f2bf_array (ubuf.fbuf, bufferlen) ;
 
 		if (psf->data_endswap == SF_TRUE)
-			endswap_int_array (psf->u.ibuf, bufferlen) ;
+			endswap_int_array (ubuf.ibuf, bufferlen) ;
 
-		writecount = psf_fwrite (psf->u.fbuf, sizeof (float), bufferlen, psf) ;
+		writecount = psf_fwrite (ubuf.fbuf, sizeof (float), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -917,27 +931,28 @@ replace_write_i2f	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
 
 static sf_count_t
 replace_write_f	(SF_PRIVATE *psf, const float *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
 	/* FIX THIS */
 	if (psf->peak_info)
 		float32_peak_update (psf, ptr, len, 0) ;
 
-	bufferlen = ARRAY_LEN (psf->u.fbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.fbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
 
-		memcpy (psf->u.fbuf, ptr + total, bufferlen * sizeof (float)) ;
+		memcpy (ubuf.fbuf, ptr + total, bufferlen * sizeof (float)) ;
 
-		f2bf_array (psf->u.fbuf, bufferlen) ;
+		f2bf_array (ubuf.fbuf, bufferlen) ;
 
 		if (psf->data_endswap == SF_TRUE)
-			endswap_int_array (psf->u.ibuf, bufferlen) ;
+			endswap_int_array (ubuf.ibuf, bufferlen) ;
 
-		writecount = psf_fwrite (psf->u.fbuf, sizeof (float) , bufferlen, psf) ;
+		writecount = psf_fwrite (ubuf.fbuf, sizeof (float) , bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -949,25 +964,26 @@ replace_write_f	(SF_PRIVATE *psf, const float *ptr, sf_count_t len)
 
 static sf_count_t
 replace_write_d2f	(SF_PRIVATE *psf, const double *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.fbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.fbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		d2f_array (ptr + total, psf->u.fbuf, bufferlen) ;
+		d2f_array (ptr + total, ubuf.fbuf, bufferlen) ;
 
 		if (psf->peak_info)
-			float32_peak_update (psf, psf->u.fbuf, bufferlen, total / psf->sf.channels) ;
+			float32_peak_update (psf, ubuf.fbuf, bufferlen, total / psf->sf.channels) ;
 
-		f2bf_array (psf->u.fbuf, bufferlen) ;
+		f2bf_array (ubuf.fbuf, bufferlen) ;
 
 		if (psf->data_endswap == SF_TRUE)
-			endswap_int_array (psf->u.ibuf, bufferlen) ;
+			endswap_int_array (ubuf.ibuf, bufferlen) ;
 
-		writecount = psf_fwrite (psf->u.fbuf, sizeof (float), bufferlen, psf) ;
+		writecount = psf_fwrite (ubuf.fbuf, sizeof (float), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
diff --git a/libs/libsndfile/src/g72x.c b/libs/libsndfile/src/g72x.c
index a6b5fffde2..fec5d3f336 100644
--- a/libs/libsndfile/src/g72x.c
+++ b/libs/libsndfile/src/g72x.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2012 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -112,8 +112,6 @@ g72x_init (SF_PRIVATE * psf)
 		default : return SFE_UNIMPLEMENTED ;
 		} ;
 
-	psf->blockwidth = psf->bytewidth = 1 ;
-
 	psf->filelength = psf_get_filelen (psf) ;
 	if (psf->filelength < psf->dataoffset)
 		psf->filelength = psf->dataoffset ;
@@ -122,7 +120,7 @@ g72x_init (SF_PRIVATE * psf)
 	if (psf->dataend > 0)
 		psf->datalength -= psf->filelength - psf->dataend ;
 
-	if (psf->mode == SFM_READ)
+	if (psf->file.mode == SFM_READ)
 	{	pg72x->private = g72x_reader_init (codec, &(pg72x->blocksize), &(pg72x->samplesperblock)) ;
 		if (pg72x->private == NULL)
 			return SFE_MALLOC_FAILED ;
@@ -134,7 +132,7 @@ g72x_init (SF_PRIVATE * psf)
 		psf->read_float		= g72x_read_f ;
 		psf->read_double	= g72x_read_d ;
 
-	 	psf->seek = g72x_seek ;
+		psf->seek = g72x_seek ;
 
 		if (psf->datalength % pg72x->blocksize)
 		{	psf_log_printf (psf, "*** Odd psf->datalength (%D) should be a multiple of %d\n", psf->datalength, pg72x->blocksize) ;
@@ -147,7 +145,7 @@ g72x_init (SF_PRIVATE * psf)
 
 		psf_g72x_decode_block (psf, pg72x) ;
 		}
-	else if (psf->mode == SFM_WRITE)
+	else if (psf->file.mode == SFM_WRITE)
 	{	pg72x->private = g72x_writer_init (codec, &(pg72x->blocksize), &(pg72x->samplesperblock)) ;
 		if (pg72x->private == NULL)
 			return SFE_MALLOC_FAILED ;
@@ -253,7 +251,8 @@ g72x_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len)
 
 static sf_count_t
 g72x_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len)
-{	G72x_PRIVATE *pg72x ;
+{	BUF_UNION	ubuf ;
+	G72x_PRIVATE *pg72x ;
 	short		*sptr ;
 	int			k, bufferlen, readcount = 0, count ;
 	sf_count_t	total = 0 ;
@@ -262,7 +261,7 @@ g72x_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len)
 		return 0 ;
 	pg72x = (G72x_PRIVATE*) psf->codec_data ;
 
-	sptr = psf->u.sbuf ;
+	sptr = ubuf.sbuf ;
 	bufferlen = SF_BUFFER_LEN / sizeof (short) ;
 	while (len > 0)
 	{	readcount = (len >= bufferlen) ? bufferlen : len ;
@@ -282,7 +281,8 @@ g72x_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len)
 
 static sf_count_t
 g72x_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
-{	G72x_PRIVATE *pg72x ;
+{	BUF_UNION	ubuf ;
+	G72x_PRIVATE *pg72x ;
 	short		*sptr ;
 	int			k, bufferlen, readcount = 0, count ;
 	sf_count_t	total = 0 ;
@@ -294,7 +294,7 @@ g72x_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
 
 	normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x8000) : 1.0 ;
 
-	sptr = psf->u.sbuf ;
+	sptr = ubuf.sbuf ;
 	bufferlen = SF_BUFFER_LEN / sizeof (short) ;
 	while (len > 0)
 	{	readcount = (len >= bufferlen) ? bufferlen : len ;
@@ -313,7 +313,8 @@ g72x_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
 
 static sf_count_t
 g72x_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
-{	G72x_PRIVATE *pg72x ;
+{	BUF_UNION	ubuf ;
+	G72x_PRIVATE *pg72x ;
 	short		*sptr ;
 	int			k, bufferlen, readcount = 0, count ;
 	sf_count_t	total = 0 ;
@@ -325,7 +326,7 @@ g72x_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
 
 	normfact = (psf->norm_double == SF_TRUE) ? 1.0 / ((double) 0x8000) : 1.0 ;
 
-	sptr = psf->u.sbuf ;
+	sptr = ubuf.sbuf ;
 	bufferlen = SF_BUFFER_LEN / sizeof (short) ;
 	while (len > 0)
 	{	readcount = (len >= bufferlen) ? bufferlen : len ;
@@ -401,7 +402,7 @@ g72x_seek (SF_PRIVATE *psf, int UNUSED (mode), sf_count_t UNUSED (offset))
 **					return	PSF_SEEK_ERROR ;
 **			} ;
 **
-**		if (psf->mode == SFM_READ)
+**		if (psf->file.mode == SFM_READ)
 **		{	psf_fseek (psf, psf->dataoffset + newblock * pg72x->blocksize, SEEK_SET) ;
 **			pg72x->block_curr  = newblock ;
 **			psf_g72x_decode_block (psf, pg72x) ;
@@ -491,7 +492,8 @@ g72x_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len)
 
 static sf_count_t
 g72x_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len)
-{	G72x_PRIVATE *pg72x ;
+{	BUF_UNION	ubuf ;
+	G72x_PRIVATE *pg72x ;
 	short		*sptr ;
 	int			k, bufferlen, writecount = 0, count ;
 	sf_count_t	total = 0 ;
@@ -500,8 +502,8 @@ g72x_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len)
 		return 0 ;
 	pg72x = (G72x_PRIVATE*) psf->codec_data ;
 
-	sptr = psf->u.sbuf ;
-	bufferlen = ((SF_BUFFER_LEN / psf->blockwidth) * psf->blockwidth) / sizeof (short) ;
+	sptr = ubuf.sbuf ;
+	bufferlen = SF_BUFFER_LEN / sizeof (short) ;
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : len ;
 		for (k = 0 ; k < writecount ; k++)
@@ -518,7 +520,8 @@ g72x_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len)
 
 static sf_count_t
 g72x_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len)
-{	G72x_PRIVATE *pg72x ;
+{	BUF_UNION	ubuf ;
+	G72x_PRIVATE *pg72x ;
 	short		*sptr ;
 	int			k, bufferlen, writecount = 0, count ;
 	sf_count_t	total = 0 ;
@@ -530,8 +533,8 @@ g72x_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len)
 
 	normfact = (psf->norm_float == SF_TRUE) ? (1.0 * 0x8000) : 1.0 ;
 
-	sptr = psf->u.sbuf ;
-	bufferlen = ((SF_BUFFER_LEN / psf->blockwidth) * psf->blockwidth) / sizeof (short) ;
+	sptr = ubuf.sbuf ;
+	bufferlen = SF_BUFFER_LEN / sizeof (short) ;
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : len ;
 		for (k = 0 ; k < writecount ; k++)
@@ -549,7 +552,8 @@ g72x_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len)
 
 static sf_count_t
 g72x_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len)
-{	G72x_PRIVATE *pg72x ;
+{	BUF_UNION	ubuf ;
+	G72x_PRIVATE *pg72x ;
 	short		*sptr ;
 	int			k, bufferlen, writecount = 0, count ;
 	sf_count_t	total = 0 ;
@@ -561,8 +565,8 @@ g72x_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len)
 
 	normfact = (psf->norm_double == SF_TRUE) ? (1.0 * 0x8000) : 1.0 ;
 
-	sptr = psf->u.sbuf ;
-	bufferlen = ((SF_BUFFER_LEN / psf->blockwidth) * psf->blockwidth) / sizeof (short) ;
+	sptr = ubuf.sbuf ;
+	bufferlen = SF_BUFFER_LEN / sizeof (short) ;
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : len ;
 		for (k = 0 ; k < writecount ; k++)
@@ -584,7 +588,7 @@ g72x_close (SF_PRIVATE *psf)
 
 	pg72x = (G72x_PRIVATE*) psf->codec_data ;
 
-	if (psf->mode == SFM_WRITE)
+	if (psf->file.mode == SFM_WRITE)
 	{	/*	If a block has been partially assembled, write it out
 		**	as the final block.
 		*/
diff --git a/libs/libsndfile/src/gsm610.c b/libs/libsndfile/src/gsm610.c
index a459cb1e04..0d2800d92b 100644
--- a/libs/libsndfile/src/gsm610.c
+++ b/libs/libsndfile/src/gsm610.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2012 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -84,7 +84,7 @@ gsm610_init	(SF_PRIVATE *psf)
 		return SFE_INTERNAL ;
 		} ;
 
-	if (psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_RDWR)
 		return SFE_BAD_MODE_RW ;
 
 	psf->sf.seekable = SF_FALSE ;
@@ -132,7 +132,7 @@ Need separate gsm_data structs for encode and decode.
 			break ;
 		} ;
 
-	if (psf->mode == SFM_READ)
+	if (psf->file.mode == SFM_READ)
 	{	if (psf->datalength % pgsm610->blocksize == 0)
 			pgsm610->blocks = psf->datalength / pgsm610->blocksize ;
 		else if (psf->datalength % pgsm610->blocksize == 1 && pgsm610->blocksize == GSM610_BLOCKSIZE)
@@ -162,7 +162,7 @@ Need separate gsm_data structs for encode and decode.
 		psf->read_double	= gsm610_read_d ;
 		} ;
 
-	if (psf->mode == SFM_WRITE)
+	if (psf->file.mode == SFM_WRITE)
 	{	pgsm610->blockcount = 0 ;
 		pgsm610->samplecount = 0 ;
 
@@ -194,7 +194,7 @@ gsm610_wav_decode_block	(SF_PRIVATE *psf, GSM610_PRIVATE *pgsm610)
 	pgsm610->samplecount = 0 ;
 
 	if (pgsm610->blockcount > pgsm610->blocks)
-	{	memset (pgsm610->samples, 0, WAV_W64_GSM610_SAMPLES * sizeof (short)) ;
+	{	memset (pgsm610->samples, 0, sizeof (pgsm610->samples)) ;
 		return 1 ;
 		} ;
 
@@ -222,7 +222,7 @@ gsm610_decode_block	(SF_PRIVATE *psf, GSM610_PRIVATE *pgsm610)
 	pgsm610->samplecount = 0 ;
 
 	if (pgsm610->blockcount > pgsm610->blocks)
-	{	memset (pgsm610->samples, 0, GSM610_SAMPLES * sizeof (short)) ;
+	{	memset (pgsm610->samples, 0, sizeof (pgsm610->samples)) ;
 		return 1 ;
 		} ;
 
@@ -243,7 +243,7 @@ gsm610_read_block	(SF_PRIVATE *psf, GSM610_PRIVATE *pgsm610, short *ptr, int len
 
 	while (indx < len)
 	{	if (pgsm610->blockcount >= pgsm610->blocks && pgsm610->samplecount >= pgsm610->samplesperblock)
-		{	memset (&(ptr [indx]), 0, (len - indx) * sizeof (short)) ;
+		{	memset (ptr + indx, 0, (len - indx) * sizeof (short)) ;
 			return total ;
 			} ;
 
@@ -290,6 +290,7 @@ gsm610_read_s	(SF_PRIVATE *psf, short *ptr, sf_count_t len)
 static sf_count_t
 gsm610_read_i	(SF_PRIVATE *psf, int *ptr, sf_count_t len)
 {	GSM610_PRIVATE *pgsm610 ;
+	BUF_UNION	ubuf ;
 	short		*sptr ;
 	int			k, bufferlen, readcount = 0, count ;
 	sf_count_t	total = 0 ;
@@ -298,8 +299,8 @@ gsm610_read_i	(SF_PRIVATE *psf, int *ptr, sf_count_t len)
 		return 0 ;
 	pgsm610 = (GSM610_PRIVATE*) psf->codec_data ;
 
-	sptr = psf->u.sbuf ;
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	sptr = ubuf.sbuf ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 	while (len > 0)
 	{	readcount = (len >= bufferlen) ? bufferlen : len ;
 		count = gsm610_read_block (psf, pgsm610, sptr, readcount) ;
@@ -315,6 +316,7 @@ gsm610_read_i	(SF_PRIVATE *psf, int *ptr, sf_count_t len)
 static sf_count_t
 gsm610_read_f	(SF_PRIVATE *psf, float *ptr, sf_count_t len)
 {	GSM610_PRIVATE *pgsm610 ;
+	BUF_UNION	ubuf ;
 	short		*sptr ;
 	int			k, bufferlen, readcount = 0, count ;
 	sf_count_t	total = 0 ;
@@ -326,8 +328,8 @@ gsm610_read_f	(SF_PRIVATE *psf, float *ptr, sf_count_t len)
 
 	normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x8000) : 1.0 ;
 
-	sptr = psf->u.sbuf ;
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	sptr = ubuf.sbuf ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 	while (len > 0)
 	{	readcount = (len >= bufferlen) ? bufferlen : len ;
 		count = gsm610_read_block (psf, pgsm610, sptr, readcount) ;
@@ -343,6 +345,7 @@ gsm610_read_f	(SF_PRIVATE *psf, float *ptr, sf_count_t len)
 static sf_count_t
 gsm610_read_d	(SF_PRIVATE *psf, double *ptr, sf_count_t len)
 {	GSM610_PRIVATE *pgsm610 ;
+	BUF_UNION	ubuf ;
 	short		*sptr ;
 	int			k, bufferlen, readcount = 0, count ;
 	sf_count_t	total = 0 ;
@@ -354,8 +357,8 @@ gsm610_read_d	(SF_PRIVATE *psf, double *ptr, sf_count_t len)
 		return 0 ;
 	pgsm610 = (GSM610_PRIVATE*) psf->codec_data ;
 
-	sptr = psf->u.sbuf ;
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	sptr = ubuf.sbuf ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 	while (len > 0)
 	{	readcount = (len >= bufferlen) ? bufferlen : len ;
 		count = gsm610_read_block (psf, pgsm610, sptr, readcount) ;
@@ -406,7 +409,7 @@ gsm610_seek	(SF_PRIVATE *psf, int UNUSED (mode), sf_count_t offset)
 	newblock	= offset / pgsm610->samplesperblock ;
 	newsample	= offset % pgsm610->samplesperblock ;
 
-	if (psf->mode == SFM_READ)
+	if (psf->file.mode == SFM_READ)
 	{	if (psf->read_current != newblock * pgsm610->samplesperblock + newsample)
 		{	psf_fseek (psf, psf->dataoffset + newblock * pgsm610->samplesperblock, SEEK_SET) ;
 			pgsm610->blockcount = newblock ;
@@ -441,7 +444,7 @@ gsm610_encode_block	(SF_PRIVATE *psf, GSM610_PRIVATE *pgsm610)
 	pgsm610->blockcount ++ ;
 
 	/* Set samples to zero for next block. */
-	memset (pgsm610->samples, 0, WAV_W64_GSM610_SAMPLES * sizeof (short)) ;
+	memset (pgsm610->samples, 0, sizeof (pgsm610->samples)) ;
 
 	return 1 ;
 } /* gsm610_encode_block */
@@ -452,7 +455,7 @@ gsm610_wav_encode_block	(SF_PRIVATE *psf, GSM610_PRIVATE *pgsm610)
 
 	/* Encode the samples. */
 	gsm_encode (pgsm610->gsm_data, pgsm610->samples, pgsm610->block) ;
-	gsm_encode (pgsm610->gsm_data, pgsm610->samples+WAV_W64_GSM610_SAMPLES/2, pgsm610->block+WAV_W64_GSM610_BLOCKSIZE/2) ;
+	gsm_encode (pgsm610->gsm_data, pgsm610->samples+WAV_W64_GSM610_SAMPLES / 2, pgsm610->block+WAV_W64_GSM610_BLOCKSIZE / 2) ;
 
 	/* Write the block to disk. */
 	if ((k = psf_fwrite (pgsm610->block, 1, WAV_W64_GSM610_BLOCKSIZE, psf)) != WAV_W64_GSM610_BLOCKSIZE)
@@ -462,7 +465,7 @@ gsm610_wav_encode_block	(SF_PRIVATE *psf, GSM610_PRIVATE *pgsm610)
 	pgsm610->blockcount ++ ;
 
 	/* Set samples to zero for next block. */
-	memset (pgsm610->samples, 0, WAV_W64_GSM610_SAMPLES * sizeof (short)) ;
+	memset (pgsm610->samples, 0, sizeof (pgsm610->samples)) ;
 
 	return 1 ;
 } /* gsm610_wav_encode_block */
@@ -517,6 +520,7 @@ gsm610_write_s	(SF_PRIVATE *psf, const short *ptr, sf_count_t len)
 static sf_count_t
 gsm610_write_i	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
 {	GSM610_PRIVATE *pgsm610 ;
+	BUF_UNION	ubuf ;
 	short		*sptr ;
 	int			k, bufferlen, writecount = 0, count ;
 	sf_count_t	total = 0 ;
@@ -525,8 +529,8 @@ gsm610_write_i	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
 		return 0 ;
 	pgsm610 = (GSM610_PRIVATE*) psf->codec_data ;
 
-	sptr = psf->u.sbuf ;
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	sptr = ubuf.sbuf ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : len ;
 		for (k = 0 ; k < writecount ; k++)
@@ -542,6 +546,7 @@ gsm610_write_i	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
 static sf_count_t
 gsm610_write_f	(SF_PRIVATE *psf, const float *ptr, sf_count_t len)
 {	GSM610_PRIVATE *pgsm610 ;
+	BUF_UNION	ubuf ;
 	short		*sptr ;
 	int			k, bufferlen, writecount = 0, count ;
 	sf_count_t	total = 0 ;
@@ -553,8 +558,8 @@ gsm610_write_f	(SF_PRIVATE *psf, const float *ptr, sf_count_t len)
 
 	normfact = (psf->norm_float == SF_TRUE) ? (1.0 * 0x7FFF) : 1.0 ;
 
-	sptr = psf->u.sbuf ;
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	sptr = ubuf.sbuf ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : len ;
 		for (k = 0 ; k < writecount ; k++)
@@ -570,6 +575,7 @@ gsm610_write_f	(SF_PRIVATE *psf, const float *ptr, sf_count_t len)
 static sf_count_t
 gsm610_write_d	(SF_PRIVATE *psf, const double *ptr, sf_count_t len)
 {	GSM610_PRIVATE *pgsm610 ;
+	BUF_UNION	ubuf ;
 	short		*sptr ;
 	int			k, bufferlen, writecount = 0, count ;
 	sf_count_t	total = 0 ;
@@ -581,8 +587,8 @@ gsm610_write_d	(SF_PRIVATE *psf, const double *ptr, sf_count_t len)
 
 	normfact = (psf->norm_double == SF_TRUE) ? (1.0 * 0x7FFF) : 1.0 ;
 
-	sptr = psf->u.sbuf ;
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	sptr = ubuf.sbuf ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : len ;
 		for (k = 0 ; k < writecount ; k++)
@@ -604,7 +610,7 @@ gsm610_close	(SF_PRIVATE *psf)
 
 	pgsm610 = (GSM610_PRIVATE*) psf->codec_data ;
 
-	if (psf->mode == SFM_WRITE)
+	if (psf->file.mode == SFM_WRITE)
 	{	/*	If a block has been partially assembled, write it out
 		**	as the final block.
 		*/
diff --git a/libs/libsndfile/src/htk.c b/libs/libsndfile/src/htk.c
index c503042804..25390f1dc1 100644
--- a/libs/libsndfile/src/htk.c
+++ b/libs/libsndfile/src/htk.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2002-2009 Erik de Castro Lopo 
+** Copyright (C) 2002-2011 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -55,14 +55,14 @@ htk_open	(SF_PRIVATE *psf)
 	if (psf->is_pipe)
 		return SFE_HTK_NO_PIPE ;
 
-	if (psf->mode == SFM_READ || (psf->mode == SFM_RDWR && psf->filelength > 0))
+	if (psf->file.mode == SFM_READ || (psf->file.mode == SFM_RDWR && psf->filelength > 0))
 	{	if ((error = htk_read_header (psf)))
 			return error ;
 		} ;
 
 	subformat = SF_CODEC (psf->sf.format) ;
 
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{	if ((SF_CONTAINER (psf->sf.format)) != SF_FORMAT_HTK)
 			return	SFE_BAD_OPEN_FORMAT ;
 
@@ -95,7 +95,7 @@ htk_open	(SF_PRIVATE *psf)
 static int
 htk_close	(SF_PRIVATE *psf)
 {
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 		htk_write_header (psf, SF_TRUE) ;
 
 	return 0 ;
@@ -195,10 +195,17 @@ htk_read_header (SF_PRIVATE *psf)
 		return SFE_HTK_NOT_WAVEFORM ;
 
 	psf->sf.channels = 1 ;
-	psf->sf.samplerate = 10000000 / sample_period ;
 
-	psf_log_printf (psf, "HTK Waveform file\n  Sample Count  : %d\n  Sample Period : %d => %d Hz\n",
-				sample_count, sample_period, psf->sf.samplerate) ;
+	if (sample_period > 0)
+	{	psf->sf.samplerate = 10000000 / sample_period ;
+		psf_log_printf (psf, "HTK Waveform file\n  Sample Count  : %d\n  Sample Period : %d => %d Hz\n",
+					sample_count, sample_period, psf->sf.samplerate) ;
+		}
+	else
+	{	psf->sf.samplerate = 16000 ;
+		psf_log_printf (psf, "HTK Waveform file\n  Sample Count  : %d\n  Sample Period : %d (should be > 0) => Guessed sample rate %d Hz\n",
+					sample_count, sample_period, psf->sf.samplerate) ;
+		} ;
 
 	psf->sf.format = SF_FORMAT_HTK | SF_FORMAT_PCM_16 ;
 	psf->bytewidth = 2 ;
diff --git a/libs/libsndfile/src/id3.c b/libs/libsndfile/src/id3.c
new file mode 100644
index 0000000000..2fd0a0b971
--- /dev/null
+++ b/libs/libsndfile/src/id3.c
@@ -0,0 +1,57 @@
+/*
+** Copyright (C) 2010-2011 Erik de Castro Lopo 
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU Lesser General Public License as published by
+** the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
+**
+** You should have received a copy of the GNU Lesser 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	"sfconfig.h"
+
+#include	
+#include	
+#include	
+#include	
+
+#include	"sndfile.h"
+#include	"sfendian.h"
+#include	"common.h"
+
+int
+id3_skip (SF_PRIVATE * psf)
+{	unsigned char	buf [10] ;
+
+	memset (buf, 0, sizeof (buf)) ;
+	psf_binheader_readf (psf, "pb", 0, buf, 10) ;
+
+	if (buf [0] == 'I' && buf [1] == 'D' && buf [2] == '3')
+	{	int	offset = buf [6] & 0x7f ;
+		offset = (offset << 7) | (buf [7] & 0x7f) ;
+		offset = (offset << 7) | (buf [8] & 0x7f) ;
+		offset = (offset << 7) | (buf [9] & 0x7f) ;
+
+		psf_log_printf (psf, "ID3 length : %d\n--------------------\n", offset) ;
+
+		/* Never want to jump backwards in a file. */
+		if (offset < 0)
+			return 0 ;
+
+		/* Calculate new file offset and position ourselves there. */
+		psf->fileoffset += offset + 10 ;
+		psf_binheader_readf (psf, "p", psf->fileoffset) ;
+
+		return 1 ;
+		} ;
+
+	return 0 ;
+} /* id3_skip */
diff --git a/libs/libsndfile/src/ima_adpcm.c b/libs/libsndfile/src/ima_adpcm.c
index e3ab38d752..0ba4513758 100644
--- a/libs/libsndfile/src/ima_adpcm.c
+++ b/libs/libsndfile/src/ima_adpcm.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2013 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -37,11 +37,7 @@ typedef struct IMA_ADPCM_PRIVATE_tag
 	int				stepindx [2] ;
 	unsigned char	*block ;
 	short			*samples ;
-#if HAVE_FLEXIBLE_ARRAY
 	short			data	[] ; /* ISO C99 struct flexible array. */
-#else
-	short			data	[0] ; /* This is a hack and might not work. */
-#endif
 } IMA_ADPCM_PRIVATE ;
 
 /*============================================================================================
@@ -50,9 +46,9 @@ typedef struct IMA_ADPCM_PRIVATE_tag
 
 static int ima_indx_adjust [16] =
 {	-1, -1, -1, -1,		/* +0 - +3, decrease the step size */
-     2,  4,  6,  8,     /* +4 - +7, increase the step size */
-    -1, -1, -1, -1,		/* -0 - -3, decrease the step size */
-     2,  4,  6,  8,		/* -4 - -7, increase the step size */
+	+2, +4, +6, +8,		/* +4 - +7, increase the step size */
+	-1, -1, -1, -1,		/* -0 - -3, decrease the step size */
+	+2, +4, +6, +8,		/* -4 - -7, increase the step size */
 } ;
 
 static int ima_step_size [89] =
@@ -116,14 +112,14 @@ wav_w64_ima_init (SF_PRIVATE *psf, int blockalign, int samplesperblock)
 		return SFE_INTERNAL ;
 		} ;
 
-	if (psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_RDWR)
 		return SFE_BAD_MODE_RW ;
 
-	if (psf->mode == SFM_READ)
+	if (psf->file.mode == SFM_READ)
 		if ((error = ima_reader_init (psf, blockalign, samplesperblock)))
 			return error ;
 
-	if (psf->mode == SFM_WRITE)
+	if (psf->file.mode == SFM_WRITE)
 		if ((error = ima_writer_init (psf, blockalign)))
 			return error ;
 
@@ -137,14 +133,14 @@ int
 aiff_ima_init (SF_PRIVATE *psf, int blockalign, int samplesperblock)
 {	int error ;
 
-	if (psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_RDWR)
 		return SFE_BAD_MODE_RW ;
 
-	if (psf->mode == SFM_READ)
+	if (psf->file.mode == SFM_READ)
 		if ((error = ima_reader_init (psf, blockalign, samplesperblock)))
 			return error ;
 
-	if (psf->mode == SFM_WRITE)
+	if (psf->file.mode == SFM_WRITE)
 		if ((error = ima_writer_init (psf, blockalign)))
 			return error ;
 
@@ -159,7 +155,7 @@ ima_close	(SF_PRIVATE *psf)
 
 	pima = (IMA_ADPCM_PRIVATE*) psf->codec_data ;
 
-	if (psf->mode == SFM_WRITE)
+	if (psf->file.mode == SFM_WRITE)
 	{	/*	If a block has been partially assembled, write it out
 		**	as the final block.
 		*/
@@ -181,18 +177,16 @@ ima_reader_init (SF_PRIVATE *psf, int blockalign, int samplesperblock)
 {	IMA_ADPCM_PRIVATE	*pima ;
 	int		pimasize, count ;
 
-	if (psf->mode != SFM_READ)
+	if (psf->file.mode != SFM_READ)
 		return SFE_BAD_MODE_RW ;
 
 	pimasize = sizeof (IMA_ADPCM_PRIVATE) + blockalign * psf->sf.channels + 3 * psf->sf.channels * samplesperblock ;
 
-	if (! (pima = malloc (pimasize)))
+	if (! (pima = calloc (1, pimasize)))
 		return SFE_MALLOC_FAILED ;
 
 	psf->codec_data = (void*) pima ;
 
-	memset (pima, 0, pimasize) ;
-
 	pima->samples	= pima->data ;
 	pima->block		= (unsigned char*) (pima->data + samplesperblock * psf->sf.channels) ;
 
@@ -204,7 +198,7 @@ ima_reader_init (SF_PRIVATE *psf, int blockalign, int samplesperblock)
 	psf->datalength = (psf->dataend) ? psf->dataend - psf->dataoffset :
 							psf->filelength - psf->dataoffset ;
 
-    if (pima->blocksize == 0)
+	if (pima->blocksize == 0)
 	{	psf_log_printf (psf, "*** Error : pima->blocksize should not be zero.\n") ;
 		return SFE_INTERNAL ;
 		} ;
@@ -238,7 +232,6 @@ ima_reader_init (SF_PRIVATE *psf, int blockalign, int samplesperblock)
 		default :
 				psf_log_printf (psf, "ima_reader_init: bad psf->sf.format\n") ;
 				return SFE_INTERNAL ;
-				break ;
 		} ;
 
 	pima->decode_block (psf, pima) ;	/* Read first block. */
@@ -254,8 +247,8 @@ ima_reader_init (SF_PRIVATE *psf, int blockalign, int samplesperblock)
 static int
 aiff_ima_decode_block (SF_PRIVATE *psf, IMA_ADPCM_PRIVATE *pima)
 {	unsigned char *blockdata ;
-	int		chan, k, diff, bytecode ;
-	short	step, stepindx, predictor, *sampledata ;
+	int		chan, k, diff, bytecode, predictor ;
+	short	step, stepindx, *sampledata ;
 
 static int count = 0 ;
 count ++ ;
@@ -307,6 +300,11 @@ count ++ ;
 			if (bytecode & 8)	diff = -diff ;
 
 			predictor += diff ;
+			if (predictor < -32768)
+				predictor = -32768 ;
+			else if (predictor > 32767)
+				predictor = 32767 ;
+
 			pima->samples [pima->channels * k + chan] = predictor ;
 			} ;
 		} ;
@@ -376,7 +374,7 @@ aiff_ima_encode_block (SF_PRIVATE *psf, IMA_ADPCM_PRIVATE *pima)
 		{	blockindx = chan * pima->blocksize + 2 + indx / 2 ;
 
 			pima->block [blockindx] = pima->samples [indx] & 0x0F ;
-			pima->block [blockindx] |= (pima->samples [indx + pima->channels] << 4) & 0xF0 ;
+			pima->block [blockindx] |= (pima->samples [indx + chan] << 4) & 0xF0 ;
 			} ;
 		} ;
 
@@ -394,7 +392,7 @@ aiff_ima_encode_block (SF_PRIVATE *psf, IMA_ADPCM_PRIVATE *pima)
 
 static int
 wav_w64_ima_decode_block (SF_PRIVATE *psf, IMA_ADPCM_PRIVATE *pima)
-{	int		chan, k, current, blockindx, indx, indxstart, diff ;
+{	int		chan, k, predictor, blockindx, indx, indxstart, diff ;
 	short	step, bytecode, stepindx [2] ;
 
 	pima->blockcount ++ ;
@@ -411,9 +409,9 @@ wav_w64_ima_decode_block (SF_PRIVATE *psf, IMA_ADPCM_PRIVATE *pima)
 	/* Read and check the block header. */
 
 	for (chan = 0 ; chan < pima->channels ; chan++)
-	{	current = pima->block [chan*4] | (pima->block [chan*4+1] << 8) ;
-		if (current & 0x8000)
-			current -= 0x10000 ;
+	{	predictor = pima->block [chan*4] | (pima->block [chan*4+1] << 8) ;
+		if (predictor & 0x8000)
+			predictor -= 0x10000 ;
 
 		stepindx [chan] = pima->block [chan*4+2] ;
 		stepindx [chan] = clamp_ima_step_index (stepindx [chan]) ;
@@ -422,7 +420,7 @@ wav_w64_ima_decode_block (SF_PRIVATE *psf, IMA_ADPCM_PRIVATE *pima)
 		if (pima->block [chan*4+3] != 0)
 			psf_log_printf (psf, "IMA ADPCM synchronisation error.\n") ;
 
-		pima->samples [chan] = current ;
+		pima->samples [chan] = predictor ;
 		} ;
 
 	/*
@@ -455,7 +453,7 @@ wav_w64_ima_decode_block (SF_PRIVATE *psf, IMA_ADPCM_PRIVATE *pima)
 		bytecode = pima->samples [k] & 0xF ;
 
 		step = ima_step_size [stepindx [chan]] ;
-		current = pima->samples [k - pima->channels] ;
+		predictor = pima->samples [k - pima->channels] ;
 
 		diff = step >> 3 ;
 		if (bytecode & 1)
@@ -467,17 +465,17 @@ wav_w64_ima_decode_block (SF_PRIVATE *psf, IMA_ADPCM_PRIVATE *pima)
 		if (bytecode & 8)
 			diff = -diff ;
 
-		current += diff ;
+		predictor += diff ;
 
-		if (current > 32767)
-			current = 32767 ;
-		else if (current < -32768)
-			current = -32768 ;
+		if (predictor > 32767)
+			predictor = 32767 ;
+		else if (predictor < -32768)
+			predictor = -32768 ;
 
 		stepindx [chan] += ima_indx_adjust [bytecode] ;
 		stepindx [chan] = clamp_ima_step_index (stepindx [chan]) ;
 
-		pima->samples [k] = current ;
+		pima->samples [k] = predictor ;
 		} ;
 
 	return 1 ;
@@ -623,6 +621,7 @@ ima_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len)
 static sf_count_t
 ima_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len)
 {	IMA_ADPCM_PRIVATE *pima ;
+	BUF_UNION	ubuf ;
 	short		*sptr ;
 	int			k, bufferlen, readcount, count ;
 	sf_count_t	total = 0 ;
@@ -631,8 +630,8 @@ ima_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len)
 		return 0 ;
 	pima = (IMA_ADPCM_PRIVATE*) psf->codec_data ;
 
-	sptr = psf->u.sbuf ;
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	sptr = ubuf.sbuf ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 	while (len > 0)
 	{	readcount = (len >= bufferlen) ? bufferlen : (int) len ;
 		count = ima_read_block (psf, pima, sptr, readcount) ;
@@ -650,6 +649,7 @@ ima_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len)
 static sf_count_t
 ima_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
 {	IMA_ADPCM_PRIVATE *pima ;
+	BUF_UNION	ubuf ;
 	short		*sptr ;
 	int			k, bufferlen, readcount, count ;
 	sf_count_t	total = 0 ;
@@ -661,8 +661,8 @@ ima_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
 
 	normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x8000) : 1.0 ;
 
-	sptr = psf->u.sbuf ;
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	sptr = ubuf.sbuf ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 	while (len > 0)
 	{	readcount = (len >= bufferlen) ? bufferlen : (int) len ;
 		count = ima_read_block (psf, pima, sptr, readcount) ;
@@ -680,6 +680,7 @@ ima_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
 static sf_count_t
 ima_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
 {	IMA_ADPCM_PRIVATE *pima ;
+	BUF_UNION	ubuf ;
 	short		*sptr ;
 	int			k, bufferlen, readcount, count ;
 	sf_count_t	total = 0 ;
@@ -691,8 +692,8 @@ ima_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
 
 	normfact = (psf->norm_double == SF_TRUE) ? 1.0 / ((double) 0x8000) : 1.0 ;
 
-	sptr = psf->u.sbuf ;
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	sptr = ubuf.sbuf ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 	while (len > 0)
 	{	readcount = (len >= bufferlen) ? bufferlen : (int) len ;
 		count = ima_read_block (psf, pima, sptr, readcount) ;
@@ -724,9 +725,7 @@ ima_seek (SF_PRIVATE *psf, int mode, sf_count_t offset)
 	if (offset == 0)
 	{	psf_fseek (psf, psf->dataoffset, SEEK_SET) ;
 		pima->blockcount = 0 ;
-		if (pima->decode_block) {
-			pima->decode_block (psf, pima) ;
-		}
+		pima->decode_block (psf, pima) ;
 		pima->samplecount = 0 ;
 		return 0 ;
 		} ;
@@ -764,7 +763,7 @@ ima_writer_init (SF_PRIVATE *psf, int blockalign)
 	int					samplesperblock ;
 	unsigned int 		pimasize ;
 
-	if (psf->mode != SFM_WRITE)
+	if (psf->file.mode != SFM_WRITE)
 		return SFE_BAD_MODE_RW ;
 
 	samplesperblock = 2 * (blockalign - 4 * psf->sf.channels) / psf->sf.channels + 1 ;
@@ -798,7 +797,6 @@ ima_writer_init (SF_PRIVATE *psf, int blockalign)
 		default :
 				psf_log_printf (psf, "ima_reader_init: bad psf->sf.format\n") ;
 				return SFE_INTERNAL ;
-				break ;
 		} ;
 
 	psf->write_short	= ima_write_s ;
@@ -861,6 +859,7 @@ ima_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len)
 static sf_count_t
 ima_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len)
 {	IMA_ADPCM_PRIVATE *pima ;
+	BUF_UNION	ubuf ;
 	short		*sptr ;
 	int			k, bufferlen, writecount, count ;
 	sf_count_t	total = 0 ;
@@ -869,8 +868,8 @@ ima_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len)
 		return 0 ;
 	pima = (IMA_ADPCM_PRIVATE*) psf->codec_data ;
 
-	sptr = psf->u.sbuf ;
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	sptr = ubuf.sbuf ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
 		for (k = 0 ; k < writecount ; k++)
@@ -888,6 +887,7 @@ ima_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len)
 static sf_count_t
 ima_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len)
 {	IMA_ADPCM_PRIVATE *pima ;
+	BUF_UNION	ubuf ;
 	short		*sptr ;
 	int			k, bufferlen, writecount, count ;
 	sf_count_t	total = 0 ;
@@ -899,8 +899,8 @@ ima_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len)
 
 	normfact = (psf->norm_float == SF_TRUE) ? (1.0 * 0x7FFF) : 1.0 ;
 
-	sptr = psf->u.sbuf ;
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	sptr = ubuf.sbuf ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
 		for (k = 0 ; k < writecount ; k++)
@@ -918,6 +918,7 @@ ima_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len)
 static sf_count_t
 ima_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len)
 {	IMA_ADPCM_PRIVATE *pima ;
+	BUF_UNION	ubuf ;
 	short		*sptr ;
 	int			k, bufferlen, writecount, count ;
 	sf_count_t	total = 0 ;
@@ -929,8 +930,8 @@ ima_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len)
 
 	normfact = (psf->norm_double == SF_TRUE) ? (1.0 * 0x7FFF) : 1.0 ;
 
-	sptr = psf->u.sbuf ;
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	sptr = ubuf.sbuf ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
 		for (k = 0 ; k < writecount ; k++)
diff --git a/libs/libsndfile/src/ima_oki_adpcm.c b/libs/libsndfile/src/ima_oki_adpcm.c
index ca943c9b90..26db9f65fb 100644
--- a/libs/libsndfile/src/ima_oki_adpcm.c
+++ b/libs/libsndfile/src/ima_oki_adpcm.c
@@ -1,6 +1,6 @@
 /*
+** Copyright (C) 2007-2012 Erik de Castro Lopo 
 ** Copyright (c) 2007 
-** Copyright (C) 2007-2009 Erik de Castro Lopo 
 **
 ** This library is free software; you can redistribute it and/or modify it
 ** under the terms of the GNU Lesser General Public License as published by
@@ -19,6 +19,8 @@
 
 /* ADPCM: IMA, OKI <==> 16-bit PCM. */
 
+#include "sfconfig.h"
+
 #include 
 
 /* Set up for libsndfile environment: */
@@ -75,7 +77,7 @@ adpcm_decode (IMA_OKI_ADPCM * state, int code)
 	s = ((state->steps [state->step_index] * s) >> 3) & state->mask ;
 
 	if (code & 8)
-    	s = -s ;
+		s = -s ;
 	s += state->last_output ;
 
 	if (s < MIN_SAMPLE || s > MAX_SAMPLE)
@@ -137,7 +139,7 @@ ima_oki_adpcm_encode_block (IMA_OKI_ADPCM * state)
 
 	/*
 	**	The codec expects an even number of input samples.
-	**	
+	**
 	**	Samples should always be passed in even length blocks. If the last block to
 	**	be encoded is odd length, extend that block by one zero valued sample.
 	*/
diff --git a/libs/libsndfile/src/ima_oki_adpcm.h b/libs/libsndfile/src/ima_oki_adpcm.h
index 52d348647f..86241e7a2c 100644
--- a/libs/libsndfile/src/ima_oki_adpcm.h
+++ b/libs/libsndfile/src/ima_oki_adpcm.h
@@ -1,6 +1,6 @@
 /*
+** Copyright (C) 2007-2011 Erik de Castro Lopo 
 ** Copyright (c) 2007 
-** Copyright (C) 2007-2009 Erik de Castro Lopo 
 **
 ** This library is free software; you can redistribute it and/or modify it
 ** under the terms of the GNU Lesser General Public License as published by
diff --git a/libs/libsndfile/src/interleave.c b/libs/libsndfile/src/interleave.c
index 30578ba24f..5f799444c6 100644
--- a/libs/libsndfile/src/interleave.c
+++ b/libs/libsndfile/src/interleave.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2002-2009 Erik de Castro Lopo 
+** Copyright (C) 2002-2013 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -53,7 +53,7 @@ int
 interleave_init	(SF_PRIVATE *psf)
 {	INTERLEAVE_DATA *pdata ;
 
-	if (psf->mode != SFM_READ)
+	if (psf->file.mode != SFM_READ)
 		return SFE_INTERLEAVE_MODE ;
 
 	if (psf->interleave)
@@ -287,9 +287,8 @@ interleave_read_double	(SF_PRIVATE *psf, double *ptr, sf_count_t len)
 */
 
 static sf_count_t
-interleave_seek	(SF_PRIVATE *psf, int mode, sf_count_t samples_from_start)
-{	psf = psf ;	mode = mode ;
-
+interleave_seek	(SF_PRIVATE * UNUSED (psf), int UNUSED (mode), sf_count_t samples_from_start)
+{
 	/*
 	** Do nothing here. This is a place holder to prevent the default
 	** seek function from being called.
diff --git a/libs/libsndfile/src/ircam.c b/libs/libsndfile/src/ircam.c
index 4bae7015bd..6a6c7fc606 100644
--- a/libs/libsndfile/src/ircam.c
+++ b/libs/libsndfile/src/ircam.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2001-2009 Erik de Castro Lopo 
+** Copyright (C) 2001-2012 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -80,14 +80,14 @@ ircam_open	(SF_PRIVATE *psf)
 {	int		subformat ;
 	int		error = SFE_NO_ERROR ;
 
-	if (psf->mode == SFM_READ || (psf->mode == SFM_RDWR && psf->filelength > 0))
+	if (psf->file.mode == SFM_READ || (psf->file.mode == SFM_RDWR && psf->filelength > 0))
 	{	if ((error = ircam_read_header (psf)))
 			return error ;
 		} ;
 
 	subformat = SF_CODEC (psf->sf.format) ;
 
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{	if ((SF_CONTAINER (psf->sf.format)) != SF_FORMAT_IRCAM)
 			return	SFE_BAD_OPEN_FORMAT ;
 
@@ -95,7 +95,7 @@ ircam_open	(SF_PRIVATE *psf)
 		if (psf->endian == 0 || psf->endian == SF_ENDIAN_CPU)
 			psf->endian = (CPU_IS_BIG_ENDIAN) ? SF_ENDIAN_BIG : SF_ENDIAN_LITTLE ;
 
-	 	psf->dataoffset = IRCAM_DATA_OFFSET ;
+		psf->dataoffset = IRCAM_DATA_OFFSET ;
 
 		if ((error = ircam_write_header (psf, SF_FALSE)))
 			return error ;
@@ -163,9 +163,10 @@ ircam_read_header	(SF_PRIVATE *psf)
 
 	psf->sf.samplerate = (int) samplerate ;
 
-	psf_log_printf (psf, "  Sample Rate : %d\n"
-						 "  Channels    : %d\n"
-						 "  Encoding    : %X => %s\n", psf->sf.samplerate, psf->sf.channels, encoding, get_encoding_str (encoding)) ;
+	psf_log_printf (psf,	"  Sample Rate : %d\n"
+							"  Channels    : %d\n"
+							"  Encoding    : %X => %s\n",
+						psf->sf.samplerate, psf->sf.channels, encoding, get_encoding_str (encoding)) ;
 
 	switch (encoding)
 	{	case IRCAM_PCM_16 :
diff --git a/libs/libsndfile/src/libsndfile-1.def b/libs/libsndfile/src/libsndfile-1.def
index 7b144538fc..93cab02d98 100644
--- a/libs/libsndfile/src/libsndfile-1.def
+++ b/libs/libsndfile/src/libsndfile-1.def
@@ -33,7 +33,9 @@ sf_write_double      @40
 sf_strerror          @50
 sf_get_string        @60
 sf_set_string        @61
+sf_version_string    @68
 sf_open_fd           @70
+sf_wchar_open        @71
 sf_open_virtual      @80
 sf_write_sync        @90
 
diff --git a/libs/libsndfile/src/macbinary3.c b/libs/libsndfile/src/macbinary3.c
index d9b1ad43a4..3ad71e68b8 100644
--- a/libs/libsndfile/src/macbinary3.c
+++ b/libs/libsndfile/src/macbinary3.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2003-2009 Erik de Castro Lopo 
+** Copyright (C) 2003-2012 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,7 @@
 #include	"sfendian.h"
 #include	"common.h"
 
-#if (OS_IS_MACOSX == 1)
+#if (OSX_DARWIN_VERSION >= 1)
 
 int
 macbinary3_open (SF_PRIVATE * UNUSED (psf))
@@ -41,5 +41,5 @@ macbinary3_open (SF_PRIVATE * UNUSED (psf))
 	return 0 ;
 } /* macbinary3_open */
 
-#endif /* OS_IS_MACOSX */
+#endif /* OSX_DARWIN_VERSION */
 
diff --git a/libs/libsndfile/src/macos.c b/libs/libsndfile/src/macos.c
index cbedb890cf..5f6c53191c 100644
--- a/libs/libsndfile/src/macos.c
+++ b/libs/libsndfile/src/macos.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2003-2009 Erik de Castro Lopo 
+** Copyright (C) 2003-2011 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
diff --git a/libs/libsndfile/src/make-static-lib-hidden-privates.sh b/libs/libsndfile/src/make-static-lib-hidden-privates.sh
new file mode 100644
index 0000000000..5bfd485d26
--- /dev/null
+++ b/libs/libsndfile/src/make-static-lib-hidden-privates.sh
@@ -0,0 +1,14 @@
+#!/bin/bash -e
+
+# This script takes a static library and removes all non-public symbols.
+# Ie, it makes a static lib whose symbols are far less likely to clash with
+# the symbols of another shared or static library.
+
+grep sf_ Symbols.gnu-binutils | sed -e "s/[ ;]//g" > Symbols.static
+
+ld -r --whole-archive .libs/libsndfile.a -o libsndfile_a.o
+
+objcopy --keep-global-symbols=Symbols.static libsndfile_a.o libsndfile.o
+
+rm -f libsndfile.a
+ar cru libsndfile.a libsndfile.o
diff --git a/libs/libsndfile/src/mat4.c b/libs/libsndfile/src/mat4.c
index a4919a4668..77ece264b1 100644
--- a/libs/libsndfile/src/mat4.c
+++ b/libs/libsndfile/src/mat4.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2002-2009 Erik de Castro Lopo 
+** Copyright (C) 2002-2013 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -76,7 +76,7 @@ int
 mat4_open	(SF_PRIVATE *psf)
 {	int		subformat, error = 0 ;
 
-	if (psf->mode == SFM_READ || (psf->mode == SFM_RDWR && psf->filelength > 0))
+	if (psf->file.mode == SFM_READ || (psf->file.mode == SFM_RDWR && psf->filelength > 0))
 	{	if ((error = mat4_read_header (psf)))
 			return error ;
 		} ;
@@ -86,7 +86,7 @@ mat4_open	(SF_PRIVATE *psf)
 
 	subformat = SF_CODEC (psf->sf.format) ;
 
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{	if (psf->is_pipe)
 			return SFE_NO_PIPE_WRITE ;
 
@@ -135,7 +135,7 @@ mat4_open	(SF_PRIVATE *psf)
 static int
 mat4_close	(SF_PRIVATE *psf)
 {
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 		mat4_write_header (psf, SF_TRUE) ;
 
 	return 0 ;
@@ -206,8 +206,9 @@ mat4_write_header (SF_PRIVATE *psf, int calc_length)
 
 static int
 mat4_read_header (SF_PRIVATE *psf)
-{	int		marker, rows, cols, imag ;
-	unsigned namesize ;
+{	char	buffer [256] ;
+	uint32_t marker, namesize ;
+	int		rows, cols, imag ;
 	double	value ;
 	const char *marker_str ;
 	char	name [64] ;
@@ -244,8 +245,8 @@ mat4_read_header (SF_PRIVATE *psf)
 
 	psf_binheader_readf (psf, "d", &value) ;
 
-	snprintf (psf->u.cbuf, sizeof (psf->u.cbuf), " Value : %f\n", value) ;
-	psf_log_printf (psf, psf->u.cbuf) ;
+	snprintf (buffer, sizeof (buffer), " Value : %f\n", value) ;
+	psf_log_printf (psf, buffer) ;
 
 	if ((rows != 1) || (cols != 1))
 		return SFE_MAT4_NO_SAMPLERATE ;
diff --git a/libs/libsndfile/src/mat5.c b/libs/libsndfile/src/mat5.c
index 40ffe0a73f..164fb29a21 100644
--- a/libs/libsndfile/src/mat5.c
+++ b/libs/libsndfile/src/mat5.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2002-2009 Erik de Castro Lopo 
+** Copyright (C) 2002-2012 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -86,7 +86,7 @@ int
 mat5_open	(SF_PRIVATE *psf)
 {	int		subformat, error = 0 ;
 
-	if (psf->mode == SFM_READ || (psf->mode == SFM_RDWR && psf->filelength > 0))
+	if (psf->file.mode == SFM_READ || (psf->file.mode == SFM_RDWR && psf->filelength > 0))
 	{	if ((error = mat5_read_header (psf)))
 			return error ;
 		} ;
@@ -96,7 +96,7 @@ mat5_open	(SF_PRIVATE *psf)
 
 	subformat = SF_CODEC (psf->sf.format) ;
 
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{	if (psf->is_pipe)
 			return SFE_NO_PIPE_WRITE ;
 
@@ -143,7 +143,7 @@ mat5_open	(SF_PRIVATE *psf)
 static int
 mat5_close	(SF_PRIVATE *psf)
 {
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 		mat5_write_header (psf, SF_TRUE) ;
 
 	return 0 ;
@@ -157,6 +157,7 @@ mat5_write_header (SF_PRIVATE *psf, int calc_length)
 {	static const char	*filename = "MATLAB 5.0 MAT-file, written by " PACKAGE "-" VERSION ", " ;
 	static const char	*sr_name = "samplerate\0\0\0\0\0\0\0\0\0\0\0" ;
 	static const char	*wd_name = "wavedata\0" ;
+	char		buffer [256] ;
 	sf_count_t	current, datasize ;
 	int			encoding ;
 
@@ -204,11 +205,11 @@ mat5_write_header (SF_PRIVATE *psf, int calc_length)
 	psf->headindex = 0 ;
 	psf_fseek (psf, 0, SEEK_SET) ;
 
-	psf_get_date_str (psf->u.cbuf, sizeof (psf->u.scbuf)) ;
-	psf_binheader_writef (psf, "bb", filename, strlen (filename), psf->u.cbuf, strlen (psf->u.cbuf) + 1) ;
+	psf_get_date_str (buffer, sizeof (buffer)) ;
+	psf_binheader_writef (psf, "bb", filename, strlen (filename), buffer, strlen (buffer) + 1) ;
 
-	memset (psf->u.scbuf, ' ', 124 - psf->headindex) ;
-	psf_binheader_writef (psf, "b", psf->u.scbuf, make_size_t (124 - psf->headindex)) ;
+	memset (buffer, ' ', 124 - psf->headindex) ;
+	psf_binheader_writef (psf, "b", buffer, make_size_t (124 - psf->headindex)) ;
 
 	psf->rwf_endian = psf->endian ;
 
@@ -257,38 +258,39 @@ mat5_write_header (SF_PRIVATE *psf, int calc_length)
 
 static int
 mat5_read_header (SF_PRIVATE *psf)
-{	char	name [32] ;
+{	char	buffer [256], name [32] ;
 	short	version, endian ;
 	int		type, flags1, flags2, rows, cols ;
 	unsigned size ;
+	int		have_samplerate = 1 ;
 
-	psf_binheader_readf (psf, "pb", 0, psf->u.cbuf, 124) ;
+	psf_binheader_readf (psf, "pb", 0, buffer, 124) ;
 
-	psf->u.scbuf [125] = 0 ;
+	buffer [125] = 0 ;
 
-	if (strlen (psf->u.cbuf) >= 124)
+	if (strlen (buffer) >= 124)
 		return SFE_UNIMPLEMENTED ;
 
-	if (strstr (psf->u.cbuf, "MATLAB 5.0 MAT-file") == psf->u.cbuf)
-		psf_log_printf (psf, "%s\n", psf->u.scbuf) ;
+	if (strstr (buffer, "MATLAB 5.0 MAT-file") == buffer)
+		psf_log_printf (psf, "%s\n", buffer) ;
 
 
 	psf_binheader_readf (psf, "E22", &version, &endian) ;
 
 	if (endian == MI_MARKER)
 	{	psf->endian = psf->rwf_endian = SF_ENDIAN_BIG ;
-		if (CPU_IS_LITTLE_ENDIAN) version = ENDSWAP_SHORT (version) ;
+		if (CPU_IS_LITTLE_ENDIAN) version = ENDSWAP_16 (version) ;
 		}
 	else if (endian == IM_MARKER)
 	{	psf->endian = psf->rwf_endian = SF_ENDIAN_LITTLE ;
-		if (CPU_IS_BIG_ENDIAN) version = ENDSWAP_SHORT (version) ;
+		if (CPU_IS_BIG_ENDIAN) version = ENDSWAP_16 (version) ;
 		}
 	else
 		return SFE_MAT5_BAD_ENDIAN ;
 
 	if ((CPU_IS_LITTLE_ENDIAN && endian == IM_MARKER) ||
 			(CPU_IS_BIG_ENDIAN && endian == MI_MARKER))
-		version = ENDSWAP_SHORT (version) ;
+		version = ENDSWAP_16 (version) ;
 
 	psf_log_printf (psf, "Version : 0x%04X\n", version) ;
 	psf_log_printf (psf, "Endian  : 0x%04X => %s\n", endian,
@@ -317,11 +319,13 @@ mat5_read_header (SF_PRIVATE *psf)
 		return SFE_MAT5_NO_BLOCK ;
 
 	psf_binheader_readf (psf, "44", &rows, &cols) ;
-	psf_log_printf (psf, "    Rows : %X    Cols : %d\n", rows, cols) ;
+	psf_log_printf (psf, "    Rows : %d    Cols : %d\n", rows, cols) ;
 
 	if (rows != 1 || cols != 1)
-		return SFE_MAT5_SAMPLE_RATE ;
-
+	{	if (psf->sf.samplerate == 0)
+			psf->sf.samplerate = 44100 ;
+		have_samplerate = 0 ;
+		}
 	psf_binheader_readf (psf, "4", &type) ;
 
 	if (type == MAT5_TYPE_SCHAR)
@@ -355,6 +359,9 @@ mat5_read_header (SF_PRIVATE *psf)
 
 	psf_binheader_readf (psf, "44", &type, &size) ;
 
+	if (!have_samplerate)
+		goto skip_samplerate ;
+
 	switch (type)
 	{	case MAT5_TYPE_DOUBLE :
 				{	double	samplerate ;
@@ -445,6 +452,7 @@ mat5_read_header (SF_PRIVATE *psf)
 	psf_binheader_readf (psf, "44", &type, &size) ;
 	psf_log_printf (psf, "    Type : %X    Size : %d\n", type, size) ;
 
+skip_samplerate :
 	/*++++++++++++++++++++++++++++++++++++++++++++++++++*/
 
 	if (rows == 0 && cols == 0)
diff --git a/libs/libsndfile/src/mpc2k.c b/libs/libsndfile/src/mpc2k.c
index ad782ed6e0..0170f7ccfb 100644
--- a/libs/libsndfile/src/mpc2k.c
+++ b/libs/libsndfile/src/mpc2k.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2008-2009 Erik de Castro Lopo 
+** Copyright (C) 2008-2011 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -38,7 +38,7 @@
 **	1 byte: loopMode (0 no loop, 1 forward looping)
 **	1 byte: number of beat in loop
 **	1 uint16: sampleRate
-**	
+**
 **	DATA
 **	Data are always non compressed 16 bits interleaved
 */
@@ -63,10 +63,9 @@ static int		mpc2k_read_header (SF_PRIVATE *psf) ;
 
 int
 mpc2k_open	(SF_PRIVATE *psf)
-{	int		subformat ;
-	int		error = 0 ;
+{	int		error = 0 ;
 
-	if (psf->mode == SFM_READ || (psf->mode == SFM_RDWR && psf->filelength > 0))
+	if (psf->file.mode == SFM_READ || (psf->file.mode == SFM_RDWR && psf->filelength > 0))
 	{	if ((error = mpc2k_read_header (psf)))
 			return error ;
 		} ;
@@ -74,9 +73,7 @@ mpc2k_open	(SF_PRIVATE *psf)
 	if ((SF_CONTAINER (psf->sf.format)) != SF_FORMAT_MPC2K)
 		return	SFE_BAD_OPEN_FORMAT ;
 
-	subformat = SF_CODEC (psf->sf.format) ;
-
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{	if (mpc2k_write_header (psf, SF_FALSE))
 			return psf->error ;
 
@@ -98,7 +95,7 @@ mpc2k_open	(SF_PRIVATE *psf)
 static int
 mpc2k_close	(SF_PRIVATE *psf)
 {
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 		mpc2k_write_header (psf, SF_TRUE) ;
 
 	return 0 ;
@@ -134,7 +131,7 @@ mpc2k_write_header (SF_PRIVATE *psf, int calc_length)
 	if (psf->is_pipe == SF_FALSE)
 		psf_fseek (psf, 0, SEEK_SET) ;
 
-	snprintf (sample_name, sizeof (sample_name), "%s                    ", psf->filename) ;
+	snprintf (sample_name, sizeof (sample_name), "%s                    ", psf->file.name.c) ;
 
 	psf_binheader_writef (psf, "e11b", 1, 4, sample_name, make_size_t (HEADER_NAME_LEN)) ;
 	psf_binheader_writef (psf, "e111", 100, 0, (psf->sf.channels - 1) & 1) ;
diff --git a/libs/libsndfile/src/ms_adpcm.c b/libs/libsndfile/src/ms_adpcm.c
index f276c602c1..1643ddf443 100644
--- a/libs/libsndfile/src/ms_adpcm.c
+++ b/libs/libsndfile/src/ms_adpcm.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2013 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -44,11 +44,7 @@ typedef struct
 	sf_count_t		samplecount ;
 	short			*samples ;
 	unsigned char	*block ;
-#if HAVE_FLEXIBLE_ARRAY
 	short			dummydata [] ; /* ISO C99 struct flexible array. */
-#else
-	short			dummydata [0] ; /* This is a hack an might not work. */
-#endif
 } MSADPCM_PRIVATE ;
 
 /*============================================================================================
@@ -137,15 +133,14 @@ wav_w64_msadpcm_init	(SF_PRIVATE *psf, int blockalign, int samplesperblock)
 		return SFE_INTERNAL ;
 		} ;
 
-	if (psf->mode == SFM_WRITE)
+	if (psf->file.mode == SFM_WRITE)
 		samplesperblock = 2 + 2 * (blockalign - 7 * psf->sf.channels) / psf->sf.channels ;
 
 	pmssize = sizeof (MSADPCM_PRIVATE) + blockalign + 3 * psf->sf.channels * samplesperblock ;
 
-	if (! (psf->codec_data = malloc (pmssize)))
+	if (! (psf->codec_data = calloc (1, pmssize)))
 		return SFE_MALLOC_FAILED ;
 	pms = (MSADPCM_PRIVATE*) psf->codec_data ;
-	memset (pms, 0, pmssize) ;
 
 	pms->samples	= pms->dummydata ;
 	pms->block		= (unsigned char*) (pms->dummydata + psf->sf.channels * samplesperblock) ;
@@ -159,8 +154,8 @@ wav_w64_msadpcm_init	(SF_PRIVATE *psf, int blockalign, int samplesperblock)
 		return SFE_INTERNAL ;
 		} ;
 
-	if (psf->mode == SFM_READ)
-	{	pms->dataremaining	 = psf->datalength ;
+	if (psf->file.mode == SFM_READ)
+	{	pms->dataremaining = psf->datalength ;
 
 		if (psf->datalength % pms->blocksize)
 			pms->blocks = psf->datalength / pms->blocksize + 1 ;
@@ -185,7 +180,7 @@ wav_w64_msadpcm_init	(SF_PRIVATE *psf, int blockalign, int samplesperblock)
 		psf->read_double	= msadpcm_read_d ;
 		} ;
 
-	if (psf->mode == SFM_WRITE)
+	if (psf->file.mode == SFM_WRITE)
 	{	pms->samples = pms->dummydata ;
 
 		pms->samplecount = 0 ;
@@ -207,9 +202,9 @@ msadpcm_decode_block	(SF_PRIVATE *psf, MSADPCM_PRIVATE *pms)
 {	int		chan, k, blockindx, sampleindx ;
 	short	bytecode, bpred [2], chan_idelta [2] ;
 
-    int predict ;
-    int current ;
-    int idelta ;
+	int predict ;
+	int current ;
+	int idelta ;
 
 	pms->blockcount ++ ;
 	pms->samplecount = 0 ;
@@ -278,7 +273,7 @@ msadpcm_decode_block	(SF_PRIVATE *psf, MSADPCM_PRIVATE *pms)
 	sampleindx = 2 * pms->channels ;
 	while (blockindx < pms->blocksize)
 	{	bytecode = pms->block [blockindx++] ;
-  		pms->samples [sampleindx++] = (bytecode >> 4) & 0x0F ;
+		pms->samples [sampleindx++] = (bytecode >> 4) & 0x0F ;
 		pms->samples [sampleindx++] = bytecode & 0x0F ;
 		} ;
 
@@ -297,7 +292,7 @@ msadpcm_decode_block	(SF_PRIVATE *psf, MSADPCM_PRIVATE *pms)
 		if (bytecode & 0x8)
 			bytecode -= 0x10 ;
 
-    	predict = ((pms->samples [k - pms->channels] * AdaptCoeff1 [bpred [chan]])
+		predict = ((pms->samples [k - pms->channels] * AdaptCoeff1 [bpred [chan]])
 					+ (pms->samples [k - 2 * pms->channels] * AdaptCoeff2 [bpred [chan]])) >> 8 ; /* => / 256 => FIXED_POINT_COEFF_BASE == 256 */
 		current = (bytecode * idelta) + predict ;
 
@@ -364,6 +359,7 @@ msadpcm_read_s	(SF_PRIVATE *psf, short *ptr, sf_count_t len)
 static sf_count_t
 msadpcm_read_i	(SF_PRIVATE *psf, int *ptr, sf_count_t len)
 {	MSADPCM_PRIVATE *pms ;
+	BUF_UNION	ubuf ;
 	short		*sptr ;
 	int			k, bufferlen, readcount = 0, count ;
 	sf_count_t	total = 0 ;
@@ -372,8 +368,8 @@ msadpcm_read_i	(SF_PRIVATE *psf, int *ptr, sf_count_t len)
 		return 0 ;
 	pms = (MSADPCM_PRIVATE*) psf->codec_data ;
 
-	sptr = psf->u.sbuf ;
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	sptr = ubuf.sbuf ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 	while (len > 0)
 	{	readcount = (len >= bufferlen) ? bufferlen : len ;
 		count = msadpcm_read_block (psf, pms, sptr, readcount) ;
@@ -390,6 +386,7 @@ msadpcm_read_i	(SF_PRIVATE *psf, int *ptr, sf_count_t len)
 static sf_count_t
 msadpcm_read_f	(SF_PRIVATE *psf, float *ptr, sf_count_t len)
 {	MSADPCM_PRIVATE *pms ;
+	BUF_UNION	ubuf ;
 	short		*sptr ;
 	int			k, bufferlen, readcount = 0, count ;
 	sf_count_t	total = 0 ;
@@ -400,8 +397,8 @@ msadpcm_read_f	(SF_PRIVATE *psf, float *ptr, sf_count_t len)
 	pms = (MSADPCM_PRIVATE*) psf->codec_data ;
 
 	normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x8000) : 1.0 ;
-	sptr = psf->u.sbuf ;
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	sptr = ubuf.sbuf ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 	while (len > 0)
 	{	readcount = (len >= bufferlen) ? bufferlen : len ;
 		count = msadpcm_read_block (psf, pms, sptr, readcount) ;
@@ -418,6 +415,7 @@ msadpcm_read_f	(SF_PRIVATE *psf, float *ptr, sf_count_t len)
 static sf_count_t
 msadpcm_read_d	(SF_PRIVATE *psf, double *ptr, sf_count_t len)
 {	MSADPCM_PRIVATE *pms ;
+	BUF_UNION	ubuf ;
 	short		*sptr ;
 	int			k, bufferlen, readcount = 0, count ;
 	sf_count_t	total = 0 ;
@@ -429,8 +427,8 @@ msadpcm_read_d	(SF_PRIVATE *psf, double *ptr, sf_count_t len)
 		return 0 ;
 	pms = (MSADPCM_PRIVATE*) psf->codec_data ;
 
-	sptr = psf->u.sbuf ;
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	sptr = ubuf.sbuf ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 	while (len > 0)
 	{	readcount = (len >= bufferlen) ? bufferlen : len ;
 		count = msadpcm_read_block (psf, pms, sptr, readcount) ;
@@ -674,6 +672,7 @@ msadpcm_write_s	(SF_PRIVATE *psf, const short *ptr, sf_count_t len)
 static sf_count_t
 msadpcm_write_i	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
 {	MSADPCM_PRIVATE *pms ;
+	BUF_UNION	ubuf ;
 	short		*sptr ;
 	int			k, bufferlen, writecount, count ;
 	sf_count_t	total = 0 ;
@@ -682,8 +681,8 @@ msadpcm_write_i	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
 		return 0 ;
 	pms = (MSADPCM_PRIVATE*) psf->codec_data ;
 
-	sptr = psf->u.sbuf ;
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	sptr = ubuf.sbuf ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : len ;
 		for (k = 0 ; k < writecount ; k++)
@@ -700,6 +699,7 @@ msadpcm_write_i	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
 static sf_count_t
 msadpcm_write_f	(SF_PRIVATE *psf, const float *ptr, sf_count_t len)
 {	MSADPCM_PRIVATE *pms ;
+	BUF_UNION	ubuf ;
 	short		*sptr ;
 	int			k, bufferlen, writecount, count ;
 	sf_count_t	total = 0 ;
@@ -711,8 +711,8 @@ msadpcm_write_f	(SF_PRIVATE *psf, const float *ptr, sf_count_t len)
 
 	normfact = (psf->norm_float == SF_TRUE) ? (1.0 * 0x7FFF) : 1.0 ;
 
-	sptr = psf->u.sbuf ;
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	sptr = ubuf.sbuf ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : len ;
 		for (k = 0 ; k < writecount ; k++)
@@ -729,6 +729,7 @@ msadpcm_write_f	(SF_PRIVATE *psf, const float *ptr, sf_count_t len)
 static sf_count_t
 msadpcm_write_d	(SF_PRIVATE *psf, const double *ptr, sf_count_t len)
 {	MSADPCM_PRIVATE *pms ;
+	BUF_UNION	ubuf ;
 	short		*sptr ;
 	int			k, bufferlen, writecount, count ;
 	sf_count_t	total = 0 ;
@@ -740,8 +741,8 @@ msadpcm_write_d	(SF_PRIVATE *psf, const double *ptr, sf_count_t len)
 		return 0 ;
 	pms = (MSADPCM_PRIVATE*) psf->codec_data ;
 
-	sptr = psf->u.sbuf ;
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	sptr = ubuf.sbuf ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : len ;
 		for (k = 0 ; k < writecount ; k++)
@@ -764,7 +765,7 @@ msadpcm_close	(SF_PRIVATE *psf)
 
 	pms = (MSADPCM_PRIVATE*) psf->codec_data ;
 
-	if (psf->mode == SFM_WRITE)
+	if (psf->file.mode == SFM_WRITE)
 	{	/*  Now we know static int for certain the length of the file we can
 		**  re-write the header.
 		*/
diff --git a/libs/libsndfile/src/new.c b/libs/libsndfile/src/new.c
new file mode 100644
index 0000000000..23f3087f12
--- /dev/null
+++ b/libs/libsndfile/src/new.c
@@ -0,0 +1,116 @@
+/*
+** Copyright (C) 2002-2011 Erik de Castro Lopo 
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU Lesser General Public License as published by
+** the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
+**
+** You should have received a copy of the GNU Lesser 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	"sfconfig.h"
+
+#include	
+#include	
+#include	
+#include	
+
+#include	"sndfile.h"
+#include	"sfendian.h"
+#include	"common.h"
+
+#if (ENABLE_EXPERIMENTAL_CODE == 0)
+
+int
+new_open	(SF_PRIVATE *psf)
+{	if (psf)
+		return SFE_UNIMPLEMENTED ;
+	return (psf && 0) ;
+} /* new_open */
+
+#else
+
+/*------------------------------------------------------------------------------
+** Macros to handle big/little endian issues.
+*/
+
+/*------------------------------------------------------------------------------
+** Typedefs.
+*/
+
+/*------------------------------------------------------------------------------
+** Private static functions.
+*/
+
+static int	new_read_header (SF_PRIVATE *psf) ;
+
+/*------------------------------------------------------------------------------
+** Public function.
+*/
+
+int
+new_open (SF_PRIVATE *psf)
+{	int	subformat, error = 0 ;
+
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
+		return SFE_UNIMPLEMENTED ;
+
+	if ((error = new_read_header (psf)))
+			return error ;
+
+	if ((SF_CONTAINER (psf->sf.format)) != SF_FORMAT_WVE)
+		return	SFE_BAD_OPEN_FORMAT ;
+
+	subformat = SF_CODEC (psf->sf.format) ;
+
+	return error ;
+} /* new_open */
+
+/*------------------------------------------------------------------------------
+*/
+
+static int
+new_read_header (SF_PRIVATE *psf)
+{	int marker ;
+
+	/* Set position to start of file to begin reading header. */
+	psf_binheader_readf (psf, "pm", 0, &marker) ;
+	if (marker != ALAW_MARKER)
+		return SFE_WVE_NOT_WVE ;
+
+	psf_binheader_readf (psf, "m", &marker) ;
+	if (marker != SOUN_MARKER)
+		return SFE_WVE_NOT_WVE ;
+
+	psf_binheader_readf (psf, "m", &marker) ;
+	if (marker != DFIL_MARKER)
+		return SFE_WVE_NOT_WVE ;
+
+	psf_log_printf (psf, "Read only : Psion Alaw\n"
+			"  Sample Rate : 8000\n"
+			"  Channels    : 1\n"
+			"  Encoding    : A-law\n") ;
+
+	psf->dataoffset = 0x20 ;
+	psf->datalength = psf->filelength - psf->dataoffset ;
+
+	psf->sf.format		= SF_FORMAT_WVE | SF_FORMAT_ALAW ;
+	psf->sf.samplerate	= 8000 ;
+	psf->sf.frames		= psf->datalength ;
+	psf->sf.channels	= 1 ;
+
+	return alaw_init (psf) ;
+} /* new_read_header */
+
+/*------------------------------------------------------------------------------
+*/
+
+#endif
diff --git a/libs/libsndfile/src/nist.c b/libs/libsndfile/src/nist.c
index 1993f00b3e..2aa679e55c 100644
--- a/libs/libsndfile/src/nist.c
+++ b/libs/libsndfile/src/nist.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2012 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -54,12 +54,12 @@ int
 nist_open	(SF_PRIVATE *psf)
 {	int error ;
 
-	if (psf->mode == SFM_READ || (psf->mode == SFM_RDWR && psf->filelength > 0))
+	if (psf->file.mode == SFM_READ || (psf->file.mode == SFM_RDWR && psf->filelength > 0))
 	{	if ((error = nist_read_header (psf)))
 			return error ;
 		} ;
 
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{	if (psf->is_pipe)
 			return SFE_NO_PIPE_WRITE ;
 
@@ -118,15 +118,12 @@ static char bad_header [] =
 
 	static int
 nist_read_header (SF_PRIVATE *psf)
-{	char	*psf_header ;
-	int		bitwidth = 0, bytes = 0, count, encoding ;
+{	char	psf_header [NIST_HEADER_LENGTH + 2] ;
+	int		bitwidth = 0, count, encoding ;
+	unsigned bytes = 0 ;
 	char 	str [64], *cptr ;
 	long	samples ;
 
-	psf->sf.format = SF_FORMAT_NIST ;
-
-	psf_header = psf->u.cbuf ;
-
 	if (sizeof (psf->header) <= NIST_HEADER_LENGTH)
 		return SFE_INTERNAL ;
 
@@ -164,7 +161,9 @@ nist_read_header (SF_PRIVATE *psf)
 	{	sscanf (cptr, "sample_coding -s%d %63s", &count, str) ;
 
 		if (strcmp (str, "pcm") == 0)
+		{	/* Correct this later when we find out the bitwidth. */
 			encoding = SF_FORMAT_PCM_U8 ;
+			}
 		else if (strcmp (str, "alaw") == 0)
 			encoding = SF_FORMAT_ALAW ;
 		else if ((strcmp (str, "ulaw") == 0) || (strcmp (str, "mu-law") == 0))
@@ -193,19 +192,23 @@ nist_read_header (SF_PRIVATE *psf)
 	psf->endian = (CPU_IS_BIG_ENDIAN) ? SF_ENDIAN_BIG : SF_ENDIAN_LITTLE ;
 
 	/* This is where we figure out endian-ness. */
-	if ((cptr = strstr (psf_header, "sample_byte_format -s")))
-	{	sscanf (cptr, "sample_byte_format -s%d %8s", &bytes, str) ;
+	if ((cptr = strstr (psf_header, "sample_byte_format -s"))
+		&& sscanf (cptr, "sample_byte_format -s%u %8s", &bytes, str) == 2)
+	{
+		if (bytes != strlen (str))
+			psf_log_printf (psf, "Weird sample_byte_format : strlen '%s' != %d\n", str, bytes) ;
+
 		if (bytes > 1)
 		{	if (psf->bytewidth == 0)
 				psf->bytewidth = bytes ;
-			else if (psf->bytewidth != bytes)
+			else if (psf->bytewidth - bytes != 0)
 			{	psf_log_printf (psf, "psf->bytewidth (%d) != bytes (%d)\n", psf->bytewidth, bytes) ;
 				return SFE_NIST_BAD_ENCODING ;
 				} ;
 
-			if (strstr (str, "01") == str)
+			if (strcmp (str, "01") == 0)
 				psf->endian = SF_ENDIAN_LITTLE ;
-			else if (strstr (str, "10"))
+			else if (strcmp (str, "10") == 0)
 				psf->endian = SF_ENDIAN_BIG ;
 			else
 			{	psf_log_printf (psf, "Weird endian-ness : %s\n", str) ;
@@ -255,13 +258,26 @@ nist_read_header (SF_PRIVATE *psf)
 	else
 		return SFE_UNIMPLEMENTED ;
 
+	/* Sanitize psf->sf.format. */
+	switch (SF_CODEC (psf->sf.format))
+	{	case SF_FORMAT_ULAW :
+		case SF_FORMAT_ALAW :
+		case SF_FORMAT_PCM_U8 :
+			/* Blank out endian bits. */
+			psf->sf.format = SF_FORMAT_NIST | SF_CODEC (psf->sf.format) ;
+			break ;
+
+		default :
+			break ;
+		} ;
+
 	return 0 ;
 } /* nist_read_header */
 
 static int
 nist_close	(SF_PRIVATE *psf)
 {
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 		nist_write_header (psf, SF_TRUE) ;
 
 	return 0 ;
diff --git a/libs/libsndfile/src/ogg.c b/libs/libsndfile/src/ogg.c
index 50484ac60c..7bc4b31f9f 100644
--- a/libs/libsndfile/src/ogg.c
+++ b/libs/libsndfile/src/ogg.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2002-2009 Erik de Castro Lopo 
+** Copyright (C) 2002-2012 Erik de Castro Lopo 
 ** Copyright (C) 2007 John ffitch
 **
 ** This program is free software ; you can redistribute it and/or modify
@@ -17,39 +17,6 @@
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-/*
-**  Much of this code is based on the examples in libvorbis from the
-** XIPHOPHORUS Company http://www.xiph.org/ which has a BSD-style Licence
-** Copyright (c) 2002, Xiph.org Foundation
-**
-** 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 "sfconfig.h"
 
 #include 
@@ -69,85 +36,89 @@
 
 #if HAVE_EXTERNAL_LIBS
 
-#include 
-#include 
+#include 
 
-typedef int convert_func (int, void *, int, int, float **) ;
+#include "ogg.h"
 
-static int	ogg_read_header (SF_PRIVATE *psf, int log_data) ;
-static int	ogg_write_header (SF_PRIVATE *psf, int calc_length) ;
 static int	ogg_close (SF_PRIVATE *psf) ;
-static int	ogg_command (SF_PRIVATE *psf, int command, void *data, int datasize) ;
-static sf_count_t	ogg_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) ;
-static sf_count_t	ogg_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len) ;
-static sf_count_t	ogg_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) ;
-static sf_count_t	ogg_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) ;
-static sf_count_t	ogg_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) ;
-static sf_count_t	ogg_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len) ;
-static sf_count_t	ogg_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) ;
-static sf_count_t	ogg_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) ;
-static sf_count_t	ogg_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) ;
-static sf_count_t	ogg_read_sample (SF_PRIVATE *psf, void *ptr, sf_count_t lens, convert_func *transfn) ;
-static sf_count_t	ogg_length (SF_PRIVATE *psf) ;
+static int	ogg_stream_classify (SF_PRIVATE *psf, OGG_PRIVATE * odata) ;
+static int	ogg_page_classify (SF_PRIVATE * psf, const ogg_page * og) ;
 
-typedef struct
-{	int id ;
-	const char *name ;
-} STR_PAIRS ;
+int
+ogg_open (SF_PRIVATE *psf)
+{	OGG_PRIVATE* odata = calloc (1, sizeof (OGG_PRIVATE)) ;
+	sf_count_t pos = psf_ftell (psf) ;
+	int	error = 0 ;
 
-static STR_PAIRS vorbis_metatypes [] =
-{	{	SF_STR_TITLE,		"Title" },
-	{	SF_STR_COPYRIGHT,	"Copyright" },
-	{	SF_STR_SOFTWARE,	"Software" },
-	{	SF_STR_ARTIST,		"Artist" },
-	{	SF_STR_COMMENT,		"Comment" },
-	{	SF_STR_DATE,		"Date" },
-	{	SF_STR_ALBUM,		"Album" },
-	{	SF_STR_LICENSE,		"License" },
-} ;
+	psf->container_data = odata ;
+	psf->container_close = ogg_close ;
 
-typedef struct
-{	/* Sync and verify incoming physical bitstream */
-	ogg_sync_state oy ;
-	/* Take physical pages, weld into a logical stream of packets */
-	ogg_stream_state os ;
-	/* One Ogg bitstream page.  Vorbis packets are inside */
-	ogg_page og ;
-	/* One raw packet of data for decode */
-	ogg_packet op ;
-	int eos ;
-} OGG_PRIVATE ;
+	if (psf->file.mode == SFM_RDWR)
+		return SFE_BAD_MODE_RW ;
 
-typedef struct
-{	/* Count current location */
-	sf_count_t loc ;
-	/* Struct that stores all the static vorbis bitstream settings */
-	vorbis_info	vi ;
-	/* Struct that stores all the bitstream user comments */
-	vorbis_comment vc ;
-	/* Ventral working state for the packet->PCM decoder */
-	vorbis_dsp_state vd ;
-	/* Local working space for packet->PCM decode */
-	vorbis_block vb ;
+	if (psf->file.mode == SFM_READ)
+		if ((error = ogg_stream_classify (psf, odata)) != 0)
+			return error ;
+
+	/* Reset everything to an initial state. */
+	ogg_sync_clear (&odata->osync) ;
+	ogg_stream_clear (&odata->ostream) ;
+	psf_fseek (psf, pos, SEEK_SET) ;
+
+	if (SF_ENDIAN (psf->sf.format) != 0)
+		return SFE_BAD_ENDIAN ;
+
+	switch (psf->sf.format)
+	{	case SF_FORMAT_OGG | SF_FORMAT_VORBIS :
+			return ogg_vorbis_open (psf) ;
+
+		case SF_FORMAT_OGGFLAC :
+			free (psf->container_data) ;
+			psf->container_data = NULL ;
+			psf->container_close = NULL ;
+			return flac_open (psf) ;
+
+#if ENABLE_EXPERIMENTAL_CODE
+		case SF_FORMAT_OGG | SF_FORMAT_SPEEX :
+			return ogg_speex_open (psf) ;
+
+		case SF_FORMAT_OGG | SF_FORMAT_PCM_16 :
+		case SF_FORMAT_OGG | SF_FORMAT_PCM_24 :
+			return ogg_pcm_open (psf) ;
+#endif
+
+		default :
+			break ;
+		} ;
+
+	psf_log_printf (psf, "%s : bad psf->sf.format 0x%x.\n", __func__, psf->sf.format) ;
+	return SFE_INTERNAL ;
+} /* ogg_open */
 
-	/* Encoding quality in range [0.0, 1.0]. */
-	double quality ;
-} VORBIS_PRIVATE ;
 
 static int
-ogg_read_header (SF_PRIVATE *psf, int log_data)
-{
-	OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ;
-	VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ;
-	char *buffer ;
-	int	 bytes ;
-	int i, nn ;
+ogg_close (SF_PRIVATE *psf)
+{	OGG_PRIVATE* odata = psf->container_data ;
+
+	ogg_sync_clear (&odata->osync) ;
+	ogg_stream_clear (&odata->ostream) ;
+
+	return 0 ;
+} /* ogg_close */
+
+static int
+ogg_stream_classify (SF_PRIVATE *psf, OGG_PRIVATE* odata)
+{	char *buffer ;
+	int	bytes, nn ;
+
+	/* Call this here so it only gets called once, so no memory is leaked. */
+	ogg_sync_init (&odata->osync) ;
 
 	odata->eos = 0 ;
 
 	/* Weird stuff happens if these aren't called. */
-	ogg_stream_reset (&odata->os) ;
-	ogg_sync_reset (&odata->oy) ;
+	ogg_stream_reset (&odata->ostream) ;
+	ogg_sync_reset (&odata->osync) ;
 
 	/*
 	**	Grab some data at the head of the stream.  We want the first page
@@ -157,7 +128,7 @@ ogg_read_header (SF_PRIVATE *psf, int log_data)
 	*/
 
 	/* Expose the buffer */
-	buffer = ogg_sync_buffer (&odata->oy, 4096L) ;
+	buffer = ogg_sync_buffer (&odata->osync, 4096L) ;
 
 	/* Grab the part of the header that has already been read. */
 	memcpy (buffer, psf->header, psf->headindex) ;
@@ -165,10 +136,10 @@ ogg_read_header (SF_PRIVATE *psf, int log_data)
 
 	/* Submit a 4k block to libvorbis' Ogg layer */
 	bytes += psf_fread (buffer + psf->headindex, 1, 4096 - psf->headindex, psf) ;
-	ogg_sync_wrote (&odata->oy, bytes) ;
+	ogg_sync_wrote (&odata->osync, bytes) ;
 
 	/* Get the first page. */
-	if ((nn = ogg_sync_pageout (&odata->oy, &odata->og)) != 1)
+	if ((nn = ogg_sync_pageout (&odata->osync, &odata->opage)) != 1)
 	{
 		/* Have we simply run out of data?  If so, we're done. */
 		if (bytes < 4096)
@@ -183,968 +154,92 @@ ogg_read_header (SF_PRIVATE *psf, int log_data)
 	**	Get the serial number and set up the rest of decode.
 	**	Serialno first ; use it to set up a logical stream.
 	*/
-	ogg_stream_clear (&odata->os) ;
-	ogg_stream_init (&odata->os, ogg_page_serialno (&odata->og)) ;
+	ogg_stream_clear (&odata->ostream) ;
+	ogg_stream_init (&odata->ostream, ogg_page_serialno (&odata->opage)) ;
 
-	/*
-	**	This function (ogg_read_header) gets called multiple times, so the OGG
-	**	and vorbis structs have to be cleared every time we pass through to
-	**	prevent memory leaks.
-	*/
-	vorbis_block_clear (&vdata->vb) ;
-	vorbis_dsp_clear (&vdata->vd) ;
-	vorbis_comment_clear (&vdata->vc) ;
-	vorbis_info_clear (&vdata->vi) ;
-
-	/*
-	**	Extract the initial header from the first page and verify that the
-	**	Ogg bitstream is in fact Vorbis data.
-	**
-	**	I handle the initial header first instead of just having the code
-	**	read all three Vorbis headers at once because reading the initial
-	**	header is an easy way to identify a Vorbis bitstream and it's
-	**	useful to see that functionality seperated out.
-	*/
-	vorbis_info_init (&vdata->vi) ;
-	vorbis_comment_init (&vdata->vc) ;
-
-	if (ogg_stream_pagein (&odata->os, &odata->og) < 0)
+	if (ogg_stream_pagein (&odata->ostream, &odata->opage) < 0)
 	{	/* Error ; stream version mismatch perhaps. */
 		psf_log_printf (psf, "Error reading first page of Ogg bitstream data\n") ;
 		return SFE_MALFORMED_FILE ;
 		} ;
 
-	if (ogg_stream_packetout (&odata->os, &odata->op) != 1)
+	if (ogg_stream_packetout (&odata->ostream, &odata->opacket) != 1)
 	{	/* No page? must not be vorbis. */
 		psf_log_printf (psf, "Error reading initial header packet.\n") ;
 		return SFE_MALFORMED_FILE ;
 		} ;
 
-	if (vorbis_synthesis_headerin (&vdata->vi, &vdata->vc, &odata->op) < 0)
-	{	/* Error case ; not a vorbis header. */
-		psf_log_printf (psf, "This Ogg bitstream does not contain Vorbis audio data.\n") ;
-		return SFE_MALFORMED_FILE ;
-		} ;
+	odata->codec = ogg_page_classify (psf, &odata->opage) ;
 
-	/*
-	**	Common Ogg metadata fields?
-	**	TITLE, VERSION, ALBUM, TRACKNUMBER, ARTIST, PERFORMER, COPYRIGHT, LICENSE,
-	**	ORGANIZATION, DESCRIPTION, GENRE, DATE, LOCATION, CONTACT, ISRC,
-	*/
+	switch (odata->codec)
+	{	case OGG_VORBIS :
+			psf->sf.format = SF_FORMAT_OGG | SF_FORMAT_VORBIS ;
+			return 0 ;
 
-	if (log_data)
-	{	int k ;
+		case OGG_FLAC :
+		case OGG_FLAC0 :
+			psf->sf.format = SF_FORMAT_OGGFLAC ;
+			return 0 ;
 
-		for (k = 0 ; k < ARRAY_LEN (vorbis_metatypes) ; k++)
-		{	char *dd ;
+		case OGG_SPEEX :
+			psf->sf.format = SF_FORMAT_OGG | SF_FORMAT_SPEEX ;
+			return 0 ;
 
-			dd = vorbis_comment_query (&vdata->vc, vorbis_metatypes [k].name, 0) ;
-			if (dd == NULL)
-				continue ;
-			psf_store_string (psf, vorbis_metatypes [k].id, dd) ;
-			} ;
-		} ;
-
-	/*
-	**	At this point, we're sure we're Vorbis.	We've set up the logical (Ogg)
-	**	bitstream decoder. Get the comment and codebook headers and set up the
-	**	Vorbis decoder.
-	**
-	**	The next two packets in order are the comment and codebook headers.
-	**	They're likely large and may span multiple pages.  Thus we reead
-	**	and submit data until we get our two pacakets, watching that no
-	**	pages are missing.  If a page is missing, error out ; losing a
-	**	header page is the only place where missing data is fatal.
-	*/
-
-	i = 0 ;			 /* Count of number of packets read */
-	while (i < 2)
-	{	int result = ogg_sync_pageout (&odata->oy, &odata->og) ;
-		if (result == 0)
-		{	/* Need more data */
-			buffer = ogg_sync_buffer (&odata->oy, 4096) ;
-			bytes = psf_fread (buffer, 1, 4096, psf) ;
-
-			if (bytes == 0 && i < 2)
-			{	psf_log_printf (psf, "End of file before finding all Vorbis headers!\n") ;
-				return SFE_MALFORMED_FILE ;
-				} ;
-			nn = ogg_sync_wrote (&odata->oy, bytes) ;
-			}
-		else if (result == 1)
-		{	/*
-			**	Don't complain about missing or corrupt data yet. We'll
-			**	catch it at the packet output phase.
-			**
-			**	We can ignore any errors here as they'll also become apparent
-			**	at packetout.
-			*/
-			nn = ogg_stream_pagein (&odata->os, &odata->og) ;
-			while (i < 2)
-			{	result = ogg_stream_packetout (&odata->os, &odata->op) ;
-				if (result == 0)
-					break ;
-				if (result < 0)
-				{	/*	Uh oh ; data at some point was corrupted or missing!
-					**	We can't tolerate that in a header. Die. */
-					psf_log_printf (psf, "Corrupt secondary header.	Exiting.\n") ;
-					return SFE_MALFORMED_FILE ;
-					} ;
-
-				vorbis_synthesis_headerin (&vdata->vi, &vdata->vc, &odata->op) ;
-				i++ ;
-				} ;
-			} ;
-		} ;
-
-	if (log_data)
-	{	int printed_metadata_msg = 0 ;
-		int k ;
-
-		psf_log_printf (psf, "\nBitstream is %d channel, %D Hz\n", vdata->vi.channels, vdata->vi.rate) ;
-		psf_log_printf (psf, "Encoded by: %s\n", vdata->vc.vendor) ;
-
-		/* Throw the comments plus a few lines about the bitstream we're decoding. */
-		for (k = 0 ; k < ARRAY_LEN (vorbis_metatypes) ; k++)
-		{	char *dd ;
-
-			dd = vorbis_comment_query (&vdata->vc, vorbis_metatypes [k].name, 0) ;
-			if (dd == NULL)
-				continue ;
-
-			if (printed_metadata_msg == 0)
-			{	psf_log_printf (psf, "Metadata :\n") ;
-				printed_metadata_msg = 1 ;
-				} ;
-
-			psf_store_string (psf, vorbis_metatypes [k].id, dd) ;
-			psf_log_printf (psf, "  %-10s : %s\n", vorbis_metatypes [k].name, dd) ;
-			} ;
-
-		psf_log_printf (psf, "End\n") ;
-		} ;
-
-	psf->sf.samplerate	= vdata->vi.rate ;
-	psf->sf.channels	= vdata->vi.channels ;
-	psf->sf.format		= SF_FORMAT_OGG | SF_FORMAT_VORBIS ;
-
-	/*	OK, got and parsed all three headers. Initialize the Vorbis
-	**	packet->PCM decoder.
-	**	Central decode state. */
-	vorbis_synthesis_init (&vdata->vd, &vdata->vi) ;
-
-	/*	Local state for most of the decode so multiple block decodes can
-	**	proceed in parallel. We could init multiple vorbis_block structures
-	**	for vd here. */
-	vorbis_block_init (&vdata->vd, &vdata->vb) ;
-
-	vdata->loc = 0 ;
-
-	return 0 ;
-} /* ogg_read_header */
-
-static int
-ogg_write_header (SF_PRIVATE *psf, int UNUSED (calc_length))
-{
-	OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ;
-	VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ;
-	int k, ret ;
-
-	vorbis_info_init (&vdata->vi) ;
-
-	/* The style of encoding should be selectable here, VBR quality mode. */
-	ret = vorbis_encode_init_vbr (&vdata->vi, psf->sf.channels, psf->sf.samplerate, vdata->quality) ;
-
-#if 0
-	ret = vorbis_encode_init (&vdata->vi, psf->sf.channels, psf->sf.samplerate, -1, 128000, -1) ; /* average bitrate mode */
-	ret = ( vorbis_encode_setup_managed (&vdata->vi, psf->sf.channels,
-						 psf->sf.samplerate, -1, 128000, -1) ||
-		vorbis_encode_ctl (&vdata->vi, OV_ECTL_RATEMANAGE_AVG, NULL) ||
-		vorbis_encode_setup_init (&vdata->vi)) ;
-#endif
-	if (ret)
-		return SFE_BAD_OPEN_FORMAT ;
-
-	vdata->loc = 0 ;
-
-	/* add a comment */
-	vorbis_comment_init (&vdata->vc) ;
-
-	vorbis_comment_add_tag (&vdata->vc, "ENCODER", "libsndfile") ;
-	for (k = 0 ; k < SF_MAX_STRINGS ; k++)
-	{	const char * name ;
-
-		if (psf->strings [k].type == 0)
-			break ;
-
-		switch (psf->strings [k].type)
-		{	case SF_STR_TITLE :		name = "TITLE" ; break ;
-			case SF_STR_COPYRIGHT : name = "COPYRIGHT" ; break ;
-			case SF_STR_SOFTWARE :	name = "SOFTWARE" ; break ;
-			case SF_STR_ARTIST :	name = "ARTIST" ; break ;
-			case SF_STR_COMMENT :	name = "COMMENT" ; break ;
-			case SF_STR_DATE :		name = "DATE" ; break ;
-			case SF_STR_ALBUM :		name = "ALBUM" ; break ;
-			case SF_STR_LICENSE :	name = "LICENSE" ; break ;
-			default : continue ;
-			} ;
-
-		vorbis_comment_add_tag (&vdata->vc, name, psf->strings [k].str) ;
-		} ;
-
-	/* set up the analysis state and auxiliary encoding storage */
-	vorbis_analysis_init (&vdata->vd, &vdata->vi) ;
-	vorbis_block_init (&vdata->vd, &vdata->vb) ;
-
-	/*
-	**	Set up our packet->stream encoder.
-	**	Pick a random serial number ; that way we can more likely build
-	**	chained streams just by concatenation.
-	*/
-
-	ogg_stream_init (&odata->os, psf_rand_int32 ()) ;
-
-	/* Vorbis streams begin with three headers ; the initial header (with
-	   most of the codec setup parameters) which is mandated by the Ogg
-	   bitstream spec.  The second header holds any comment fields.	 The
-	   third header holds the bitstream codebook.  We merely need to
-	   make the headers, then pass them to libvorbis one at a time ;
-	   libvorbis handles the additional Ogg bitstream constraints */
-
-	{	ogg_packet header ;
-		ogg_packet header_comm ;
-		ogg_packet header_code ;
-		int result ;
-
-		vorbis_analysis_headerout (&vdata->vd, &vdata->vc, &header, &header_comm, &header_code) ;
-		ogg_stream_packetin (&odata->os, &header) ; /* automatically placed in its own page */
-		ogg_stream_packetin (&odata->os, &header_comm) ;
-		ogg_stream_packetin (&odata->os, &header_code) ;
-
-		/* This ensures the actual
-		 * audio data will start on a new page, as per spec
-		 */
-		while ((result = ogg_stream_flush (&odata->os, &odata->og)) != 0)
-		{	psf_fwrite (odata->og.header, 1, odata->og.header_len, psf) ;
-			psf_fwrite (odata->og.body, 1, odata->og.body_len, psf) ;
-			} ;
-	}
-
-	return 0 ;
-} /* ogg_write_header */
-
-static int
-ogg_close (SF_PRIVATE *psf)
-{
-	OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ;
-	VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ;
-
-	if (odata == NULL || vdata == NULL)
-		return 0 ;
-
-	/*	Clean up this logical bitstream ; before exit we shuld see if we're
-	**	followed by another [chained]. */
-
-	if (psf->mode == SFM_WRITE)
-	{
-		if (psf->write_current <= 0)
-			ogg_write_header (psf, 0) ;
-
-		vorbis_analysis_wrote (&vdata->vd, 0) ;
-		while (vorbis_analysis_blockout (&vdata->vd, &vdata->vb) == 1)
-		{
-
-		/* analysis, assume we want to use bitrate management */
-			vorbis_analysis (&vdata->vb, NULL) ;
-			vorbis_bitrate_addblock (&vdata->vb) ;
-
-			while (vorbis_bitrate_flushpacket (&vdata->vd, &odata->op))
-			{	/* weld the packet into the bitstream */
-				ogg_stream_packetin (&odata->os, &odata->op) ;
-
-				/* write out pages (if any) */
-				while (!odata->eos)
-				{	int result = ogg_stream_pageout (&odata->os, &odata->og) ;
-					if (result == 0) break ;
-					psf_fwrite (odata->og.header, 1, odata->og.header_len, psf) ;
-					psf_fwrite (odata->og.body, 1, odata->og.body_len, psf) ;
-
-		/* this could be set above, but for illustrative purposes, I do
-		   it here (to show that vorbis does know where the stream ends) */
-
-					if (ogg_page_eos (&odata->og)) odata->eos = 1 ;
-				}
-			}
-		}
-	}
-
-	/* ogg_page and ogg_packet structs always point to storage in
-	   libvorbis.  They are never freed or manipulated directly */
-
-	vorbis_block_clear (&vdata->vb) ;
-	vorbis_dsp_clear (&vdata->vd) ;
-	vorbis_comment_clear (&vdata->vc) ;
-	vorbis_info_clear (&vdata->vi) ;	 /* must be called last */
-	/* should look here to reopen if chained */
-
-	/* OK, clean up the framer */
-	ogg_sync_clear (&odata->oy) ;
-	ogg_stream_clear (&odata->os) ;
-
-	return 0 ;
-} /* ogg_close */
-
-int
-ogg_open (SF_PRIVATE *psf)
-{	OGG_PRIVATE* odata = calloc (1, sizeof (OGG_PRIVATE)) ;
-	VORBIS_PRIVATE* vdata = calloc (1, sizeof (VORBIS_PRIVATE)) ;
-	int	error = 0 ;
-
-	psf->container_data = odata ;
-	psf->codec_data = vdata ;
-
-	if (psf->mode == SFM_RDWR)
-		return SFE_BAD_MODE_RW ;
-
-#if HAVE_VORBIS_VERSION_STRING
-	psf_log_printf (psf, "Vorbis library version : %s\n", vorbis_version_string ()) ;
-#endif
-
-	if (psf->mode == SFM_READ)
-	{	/* Call this here so it only gets called once, so no memory is leaked. */
-		ogg_sync_init (&odata->oy) ;
-
-		if ((error = ogg_read_header (psf, 1)))
-			return error ;
-
-		psf->read_short		= ogg_read_s ;
-		psf->read_int		= ogg_read_i ;
-		psf->read_float		= ogg_read_f ;
-		psf->read_double	= ogg_read_d ;
-		psf->sf.frames		= ogg_length (psf) ;
-		} ;
-
-	psf->container_close = ogg_close ;
-	if (psf->mode == SFM_WRITE)
-	{
-		/* Set the default vorbis quality here. */
-		vdata->quality = 0.4 ;
-
-		psf->write_header	= ogg_write_header ;
-		psf->write_short	= ogg_write_s ;
-		psf->write_int		= ogg_write_i ;
-		psf->write_float	= ogg_write_f ;
-		psf->write_double	= ogg_write_d ;
-
-		psf->sf.frames = SF_COUNT_MAX ; /* Unknown really */
-		psf->str_flags = SF_STR_ALLOW_START ;
-		} ;
-
-	psf->bytewidth = 1 ;
-	psf->blockwidth = psf->bytewidth * psf->sf.channels ;
-
-	psf->seek = ogg_seek ;
-	psf->command = ogg_command ;
-
-	/* FIXME, FIXME, FIXME : Hack these here for now and correct later. */
-	psf->sf.format = SF_FORMAT_OGG | SF_FORMAT_VORBIS ;
-	psf->sf.sections = 1 ;
-
-	psf->datalength = 1 ;
-	psf->dataoffset = 0 ;
-	/* End FIXME. */
-
-	return error ;
-} /* ogg_open */
-
-static int
-ogg_command (SF_PRIVATE *psf, int command, void * data, int datasize)
-{	VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ;
-
-	switch (command)
-	{	case SFC_SET_VBR_ENCODING_QUALITY :
-			if (data == NULL || datasize != sizeof (double))
-				return 1 ;
-
-			if (psf->have_written)
-				return 1 ;
-
-			vdata->quality = *((double *) data) ;
-
-			/* Clip range. */
-			vdata->quality = SF_MAX (0.0, SF_MIN (1.0, vdata->quality)) ;
-
-			psf_log_printf (psf, "%s : Setting SFC_SET_VBR_ENCODING_QUALITY to %f.\n", __func__, vdata->quality) ;
-			break ;
+		case OGG_PCM :
+			psf_log_printf (psf, "Detected Ogg/PCM data. This is not supported yet.\n") ;
+			return SFE_UNIMPLEMENTED ;
 
 		default :
-			return 0 ;
-		} ;
-
-	return 0 ;
-} /* ogg_command */
-
-static int
-ogg_rnull (int samples, void *UNUSED (vptr), int UNUSED (off) , int channels, float **UNUSED (pcm))
-{
-	return samples * channels ;
-} /* ogg_rnull */
-
-static int
-ogg_rshort (int samples, void *vptr, int off, int channels, float **pcm)
-{
-	short *ptr = (short*) vptr + off ;
-	int i = 0, j, n ;
-	for (j = 0 ; j < samples ; j++)
-		for (n = 0 ; n < channels ; n++)
-			ptr [i++] = lrintf (pcm [n][j] * 32767.0f) ;
-	return i ;
-} /* ogg_rshort */
-
-static int
-ogg_rint (int samples, void *vptr, int off, int channels, float **pcm)
-{
-	int *ptr = (int*) vptr + off ;
-	int i = 0, j, n ;
-
-	for (j = 0 ; j < samples ; j++)
-		for (n = 0 ; n < channels ; n++)
-			ptr [i++] = lrintf (pcm [n][j] * 2147483647.0f) ;
-	return i ;
-} /* ogg_rint */
-
-static int
-ogg_rfloat (int samples, void *vptr, int off, int channels, float **pcm)
-{
-	float *ptr = (float*) vptr + off ;
-	int i = 0, j, n ;
-	for (j = 0 ; j < samples ; j++)
-		for (n = 0 ; n < channels ; n++)
-			ptr [i++] = pcm [n][j] ;
-	return i ;
-} /* ogg_rfloat */
-
-static int
-ogg_rdouble (int samples, void *vptr, int off, int channels, float **pcm)
-{
-	double *ptr = (double*) vptr + off ;
-	int i = 0, j, n ;
-	for (j = 0 ; j < samples ; j++)
-		for (n = 0 ; n < channels ; n++)
-			ptr [i++] = pcm [n][j] ;
-	return i ;
-} /* ogg_rdouble */
-
-
-static sf_count_t
-ogg_read_sample (SF_PRIVATE *psf, void *ptr, sf_count_t lens, convert_func *transfn)
-{
-	VORBIS_PRIVATE *vdata = psf->codec_data ;
-	OGG_PRIVATE *odata = psf->container_data ;
-	int len, samples, i = 0 ;
-	float **pcm ;
-
-	len = lens / psf->sf.channels ;
-
-	while ((samples = vorbis_synthesis_pcmout (&vdata->vd, &pcm)) > 0)
-	{	if (samples > len) samples = len ;
-		i += transfn (samples, ptr, i, psf->sf.channels, pcm) ;
-		len -= samples ;
-		/* tell libvorbis how many samples we actually consumed */
-		vorbis_synthesis_read (&vdata->vd, samples) ;
-		vdata->loc += samples ;
-		if (len == 0)
-			return i ; /* Is this necessary */
-	}
-	goto start0 ;		 /* Jump into the nasty nest */
-	while (len > 0 && !odata->eos)
-	{
-		while (len > 0 && !odata->eos)
-		{	int result = ogg_sync_pageout (&odata->oy, &odata->og) ;
-			if (result == 0) break ; /* need more data */
-			if (result < 0)
-			{	/* missing or corrupt data at this page position */
-				psf_log_printf (psf, "Corrupt or missing data in bitstream ; continuing...\n") ;
-				}
-			else
-			{	/* can safely ignore errors at this point */
-				ogg_stream_pagein (&odata->os, &odata->og) ;
-			start0:
-				while (1)
-				{	result = ogg_stream_packetout (&odata->os, &odata->op) ;
-					if (result == 0)
-						break ; /* need more data */
-					if (result < 0)
-					{	/* missing or corrupt data at this page position */
-						/* no reason to complain ; already complained above */
-						}
-					else
-					{	/* we have a packet.	Decode it */
-						if (vorbis_synthesis (&vdata->vb, &odata->op) == 0) /* test for success! */
-							vorbis_synthesis_blockin (&vdata->vd, &vdata->vb) ;
-		  /*
-		  **pcm is a multichannel float vector.	 In stereo, for
-		  example, pcm [0] is left, and pcm [1] is right.	 samples is
-		  the size of each channel.	 Convert the float values
-		  (-1.<=range<=1.) to whatever PCM format and write it out */
-
-						while ((samples = vorbis_synthesis_pcmout (&vdata->vd, &pcm)) > 0)
-						{	if (samples>len) samples = len ;
-							i += transfn (samples, ptr, i, psf->sf.channels, pcm) ;
-							len -= samples ;
-							/* tell libvorbis how many samples we actually consumed */
-							vorbis_synthesis_read (&vdata->vd, samples) ;
-							vdata->loc += samples ;
-							if (len == 0)
-								return i ; /* Is this necessary */
-							} ;
-					}
-				}
-				if (ogg_page_eos (&odata->og)) odata->eos = 1 ;
-			}
-		}
-		if (!odata->eos)
-		{	char *buffer ;
-			int bytes ;
-			buffer = ogg_sync_buffer (&odata->oy, 4096) ;
-			bytes = psf_fread (buffer, 1, 4096, psf) ;
-			ogg_sync_wrote (&odata->oy, bytes) ;
-			if (bytes == 0) odata->eos = 1 ;
-		}
-	}
-	return i ;
-} /* ogg_read_sample */
-
-static sf_count_t
-ogg_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t lens)
-{	return ogg_read_sample (psf, (void*) ptr, lens, ogg_rshort) ;
-} /* ogg_read_s */
-
-static sf_count_t
-ogg_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t lens)
-{	return ogg_read_sample (psf, (void*) ptr, lens, ogg_rint) ;
-} /* ogg_read_i */
-
-static sf_count_t
-ogg_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t lens)
-{	return ogg_read_sample (psf, (void*) ptr, lens, ogg_rfloat) ;
-} /* ogg_read_f */
-
-static sf_count_t
-ogg_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t lens)
-{	return ogg_read_sample (psf, (void*) ptr, lens, ogg_rdouble) ;
-} /* ogg_read_d */
-
-/*==============================================================================
-*/
-
-static void
-ogg_write_samples (SF_PRIVATE *psf, OGG_PRIVATE *odata, VORBIS_PRIVATE *vdata, int in_frames)
-{
-	vorbis_analysis_wrote (&vdata->vd, in_frames) ;
-
-	/*
-	**	Vorbis does some data preanalysis, then divvies up blocks for
-	**	more involved (potentially parallel) processing. Get a single
-	**	block for encoding now.
-	*/
-	while (vorbis_analysis_blockout (&vdata->vd, &vdata->vb) == 1)
-	{
-		/* analysis, assume we want to use bitrate management */
-		vorbis_analysis (&vdata->vb, NULL) ;
-		vorbis_bitrate_addblock (&vdata->vb) ;
-
-		while (vorbis_bitrate_flushpacket (&vdata->vd, &odata->op))
-		{
-			/* weld the packet into the bitstream */
-			ogg_stream_packetin (&odata->os, &odata->op) ;
-
-			/* write out pages (if any) */
-			while (!odata->eos)
-			{	int result = ogg_stream_pageout (&odata->os, &odata->og) ;
-				if (result == 0)
-					break ;
-				psf_fwrite (odata->og.header, 1, odata->og.header_len, psf) ;
-				psf_fwrite (odata->og.body, 1, odata->og.body_len, psf) ;
-
-				/*	This could be set above, but for illustrative purposes, I do
-				**	it here (to show that vorbis does know where the stream ends) */
-				if (ogg_page_eos (&odata->og))
-					odata->eos = 1 ;
-				} ;
-			} ;
-		} ;
-
-	vdata->loc += in_frames ;
-} /* ogg_write_data */
-
-
-static sf_count_t
-ogg_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t lens)
-{
-	int i, m, j = 0 ;
-	OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ;
-	VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ;
-	int in_frames = lens / psf->sf.channels ;
-	float **buffer = vorbis_analysis_buffer (&vdata->vd, in_frames) ;
-	for (i = 0 ; i < in_frames ; i++)
-		for (m = 0 ; m < psf->sf.channels ; m++)
-			buffer [m][i] = (float) (ptr [j++]) / 32767.0f ;
-
-	ogg_write_samples (psf, odata, vdata, in_frames) ;
-
-	return lens ;
-} /* ogg_write_s */
-
-static sf_count_t
-ogg_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t lens)
-{	int i, m, j = 0 ;
-	OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ;
-	VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ;
-	int in_frames = lens / psf->sf.channels ;
-	float **buffer = vorbis_analysis_buffer (&vdata->vd, in_frames) ;
-	for (i = 0 ; i < in_frames ; i++)
-		for (m = 0 ; m < psf->sf.channels ; m++)
-			buffer [m][i] = (float) (ptr [j++]) / 2147483647.0f ;
-
-	ogg_write_samples (psf, odata, vdata, in_frames) ;
-
-	return lens ;
-} /* ogg_write_i */
-
-static sf_count_t
-ogg_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t lens)
-{	int i, m, j = 0 ;
-	OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ;
-	VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ;
-	int in_frames = lens / psf->sf.channels ;
-	float **buffer = vorbis_analysis_buffer (&vdata->vd, in_frames) ;
-	for (i = 0 ; i < in_frames ; i++)
-		for (m = 0 ; m < psf->sf.channels ; m++)
-			buffer [m][i] = ptr [j++] ;
-
-	ogg_write_samples (psf, odata, vdata, in_frames) ;
-
-	return lens ;
-} /* ogg_write_f */
-
-static sf_count_t
-ogg_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t lens)
-{	int i, m, j = 0 ;
-	OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ;
-	VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ;
-	int in_frames = lens / psf->sf.channels ;
-	float **buffer = vorbis_analysis_buffer (&vdata->vd, in_frames) ;
-	for (i = 0 ; i < in_frames ; i++)
-		for (m = 0 ; m < psf->sf.channels ; m++)
-			buffer [m][i] = (float) ptr [j++] ;
-
-	ogg_write_samples (psf, odata, vdata, in_frames) ;
-
-	return lens ;
-} /* ogg_write_d */
-
-static sf_count_t
-ogg_seek (SF_PRIVATE *psf, int UNUSED (mode), sf_count_t offset)
-{
-	OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ;
-	VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ;
-
-	if (odata == NULL || vdata == NULL)
-		return 0 ;
-
-	if (offset < 0)
-	{	psf->error = SFE_BAD_SEEK ;
-		return ((sf_count_t) -1) ;
-		} ;
-
-	if (psf->mode == SFM_READ)
-	{	sf_count_t target = offset - vdata->loc ;
-
-		if (target < 0)
-		{	/* 12 to allow for OggS bit */
-			psf_fseek (psf, 12, SEEK_SET) ;
-			ogg_read_header (psf, 0) ; /* Reset state */
-			target = offset ;
-			} ;
-
-		while (target > 0)
-		{	sf_count_t m = target > 4096 ? 4096 : target ;
-
-			/*
-			**	Need to multiply by channels here because the seek is done in
-			**	terms of frames and the read function is done in terms of
-			**	samples.
-			*/
-			ogg_read_sample (psf, (void *) NULL, m * psf->sf.channels, ogg_rnull) ;
-
-			target -= m ;
-			} ;
-
-		return vdata->loc ;
-		} ;
-
-	return 0 ;
-} /* ogg_seek */
-
-/*==============================================================================
-**	Most of the following code was snipped from Mike Smith's ogginfo utility
-**	which is part of vorbis-tools.
-**	Vorbis tools is released under the GPL but Mike has kindly allowed the
-**	following to be relicensed as LGPL for libsndfile.
-*/
-
-typedef struct
-{
-	int isillegal ;
-	int shownillegal ;
-	int isnew ;
-	int end ;
-
-	uint32_t serial ; /* must be 32 bit unsigned */
-	ogg_stream_state os ;
-
-	vorbis_info vi ;
-	vorbis_comment vc ;
-	sf_count_t lastgranulepos ;
-	int doneheaders ;
-} stream_processor ;
-
-typedef struct
-{
-	stream_processor *streams ;
-	int allocated ;
-	int used ;
-	int in_headers ;
-} stream_set ;
-
-static stream_set *
-create_stream_set (void)
-{	stream_set *set = calloc (1, sizeof (stream_set)) ;
-
-	set->streams = calloc (5, sizeof (stream_processor)) ;
-	set->allocated = 5 ;
-	set->used = 0 ;
-
-	return set ;
-} /* create_stream_set */
-
-static void
-vorbis_end (stream_processor *stream, sf_count_t * len)
-{	*len += stream->lastgranulepos ;
-	vorbis_comment_clear (&stream->vc) ;
-	vorbis_info_clear (&stream->vi) ;
-} /* vorbis_end */
-
-static void
-free_stream_set (stream_set *set, sf_count_t * len)
-{	int i ;
-
-	for (i = 0 ; i < set->used ; i++)
-	{	if (!set->streams [i].end)
-			vorbis_end (&set->streams [i], len) ;
-		ogg_stream_clear (&set->streams [i].os) ;
-		} ;
-
-	free (set->streams) ;
-	free (set) ;
-} /* free_stream_set */
-
-static int
-streams_open (stream_set *set)
-{	int i, res = 0 ;
-
-	for (i = 0 ; i < set->used ; i++)
-		if (!set->streams [i].end)
-			res ++ ;
-	return res ;
-} /* streams_open */
-
-static stream_processor *
-find_stream_processor (stream_set *set, ogg_page *page)
-{	uint32_t serial = ogg_page_serialno (page) ;
-	int i, found = 0 ;
-	int invalid = 0 ;
-
-	stream_processor *stream ;
-
-	for (i = 0 ; i < set->used ; i++)
-	{
-		if (serial == set->streams [i].serial)
-		{	/* We have a match! */
-			found = 1 ;
-			stream = & (set->streams [i]) ;
-
-			set->in_headers = 0 ;
-			/* if we have detected EOS, then this can't occur here. */
-			if (stream->end)
-			{	stream->isillegal = 1 ;
-				return stream ;
-				}
-
-			stream->isnew = 0 ;
-			stream->end = ogg_page_eos (page) ;
-			stream->serial = serial ;
-			return stream ;
-			} ;
-		} ;
-
-	/* If there are streams open, and we've reached the end of the
-	** headers, then we can't be starting a new stream.
-	** XXX: might this sometimes catch ok streams if EOS flag is missing,
-	** but the stream is otherwise ok?
-	*/
-	if (streams_open (set) && !set->in_headers)
-		invalid = 1 ;
-
-	set->in_headers = 1 ;
-
-	if (set->allocated < set->used)
-		stream = &set->streams [set->used] ;
-	else
-	{	set->allocated += 5 ;
-		set->streams = realloc (set->streams, sizeof (stream_processor) * set->allocated) ;
-		stream = &set->streams [set->used] ;
-		} ;
-
-	set->used++ ;
-
-	stream->isnew = 1 ;
-	stream->isillegal = invalid ;
-
-	{
-		int res ;
-		ogg_packet packet ;
-
-		/* We end up processing the header page twice, but that's ok. */
-		ogg_stream_init (&stream->os, serial) ;
-		ogg_stream_pagein (&stream->os, page) ;
-		res = ogg_stream_packetout (&stream->os, &packet) ;
-		if (res <= 0)
-			return NULL ;
-		else if (packet.bytes >= 7 && memcmp (packet.packet, "\x01vorbis", 7) == 0)
-		{
-			stream->lastgranulepos = 0 ;
-			vorbis_comment_init (&stream->vc) ;
-			vorbis_info_init (&stream->vi) ;
-			} ;
-
-		res = ogg_stream_packetout (&stream->os, &packet) ;
-
-		/* re-init, ready for processing */
-		ogg_stream_clear (&stream->os) ;
-		ogg_stream_init (&stream->os, serial) ;
-	}
-
-	stream->end = ogg_page_eos (page) ;
-	stream->serial = serial ;
-
-	return stream ;
-} /* find_stream_processor */
-
-static int
-ogg_length_get_next_page (SF_PRIVATE *psf, ogg_sync_state * osync, ogg_page *page)
-{	static const int CHUNK_SIZE = 4500 ;
-
-	while (ogg_sync_pageout (osync, page) <= 0)
-	{	char * buffer = ogg_sync_buffer (osync, CHUNK_SIZE) ;
-		int bytes = psf_fread (buffer, 1, 4096, psf) ;
-
-		if (bytes <= 0)
-		{	ogg_sync_wrote (osync, 0) ;
-			return 0 ;
-			} ;
-
-		ogg_sync_wrote (osync, bytes) ;
-		} ;
-
-	return 1 ;
-} /* ogg_length_get_next_page */
-
-static sf_count_t
-ogg_length_aux (SF_PRIVATE * psf)
-{
-	ogg_sync_state osync ;
-	ogg_page page ;
-	int gotpage = 0 ;
-	sf_count_t len = 0 ;
-	stream_set *processors ;
-
-	processors = create_stream_set () ;
-	if (processors == NULL)
-		return 0 ;	// out of memory?
-
-	ogg_sync_init (&osync) ;
-
-	while (ogg_length_get_next_page (psf, &osync, &page))
-	{
-		stream_processor *p = find_stream_processor (processors, &page) ;
-		gotpage = 1 ;
-
-		if (!p)
-		{	len = 0 ;
 			break ;
-			} ;
+		} ;
 
-		if (p->isillegal && !p->shownillegal)
-		{
-			p->shownillegal = 1 ;
-			/* If it's a new stream, we want to continue processing this page
-			** anyway to suppress additional spurious errors
-			*/
-			if (!p->isnew) continue ;
-			} ;
+	psf_log_printf (psf, "This Ogg bitstream contains some uknown data type.\n") ;
+	return SFE_UNIMPLEMENTED ;
+} /* ogg_stream_classify */
 
-		if (!p->isillegal)
-		{	ogg_packet packet ;
-			int header = 0 ;
+/*==============================================================================
+*/
 
-			ogg_stream_pagein (&p->os, &page) ;
-			if (p->doneheaders < 3)
-				header = 1 ;
+static struct
+{	const char *str, *name ;
+	int len, codec ;
+} codec_lookup [] =
+{	{	"Annodex",		"Annodex",	8, OGG_ANNODEX },
+	{	"AnxData",		"AnxData",	7, OGG_ANXDATA },
+	{	"\177FLAC",		"Flac1",	5, OGG_FLAC },
+	{	"fLaC",			"Flac0",	4, OGG_FLAC0 },
+	{	"PCM     ",		"PCM",		8, OGG_PCM },
+	{	"Speex",		"Speex",	5, OGG_SPEEX },
+	{	"\001vorbis",	"Vorbis",	7, OGG_VORBIS },
+} ;
 
-			while (ogg_stream_packetout (&p->os, &packet) > 0)
-			{
-				if (p->doneheaders < 3)
-				{	if (vorbis_synthesis_headerin (&p->vi, &p->vc, &packet) < 0)
-						continue ;
-					p->doneheaders ++ ;
-					} ;
-				} ;
-			if (!header)
-			{	sf_count_t gp = ogg_page_granulepos (&page) ;
-				if (gp > 0) p->lastgranulepos = gp ;
-				} ;
-			if (p->end)
-			{	vorbis_end (p, &len) ;
-				p->isillegal = 1 ;
-				} ;
+static int
+ogg_page_classify (SF_PRIVATE * psf, const ogg_page * og)
+{	int k, len ;
+
+	for (k = 0 ; k < ARRAY_LEN (codec_lookup) ; k++)
+	{	if (codec_lookup [k].len > og->body_len)
+			continue ;
+
+		if (memcmp (og->body, codec_lookup [k].str, codec_lookup [k].len) == 0)
+		{	psf_log_printf (psf, "Ogg stream data : %s\n", codec_lookup [k].name) ;
+			psf_log_printf (psf, "Stream serialno : %u\n", (uint32_t) ogg_page_serialno (og)) ;
+			return codec_lookup [k].codec ;
 			} ;
 		} ;
 
-	ogg_sync_clear (&osync) ;
-	free_stream_set (processors, &len) ;
+	len = og->body_len < 8 ? og->body_len : 8 ;
 
-	return len ;
-} /* ogg_length_aux */
+	psf_log_printf (psf, "Ogg_stream data : '") ;
+	for (k = 0 ; k < len ; k++)
+		psf_log_printf (psf, "%c", isprint (og->body [k]) ? og->body [k] : '.') ;
+	psf_log_printf (psf, "'     ") ;
+	for (k = 0 ; k < len ; k++)
+		psf_log_printf (psf, " %02x", og->body [k] & 0xff) ;
+	psf_log_printf (psf, "\n") ;
 
-static sf_count_t
-ogg_length (SF_PRIVATE *psf)
-{	sf_count_t length ;
-	int error ;
-
-	if (psf->sf.seekable == 0)
-		return SF_COUNT_MAX ;
-
-	psf_fseek (psf, 0, SEEK_SET) ;
-	length = ogg_length_aux (psf) ;
-
-	psf_fseek (psf, 12, SEEK_SET) ;
-	if ((error = ogg_read_header (psf, 0)) != 0)
-		psf->error = error ;
-
-	return length ;
-} /* ogg_length */
+	return 0 ;
+} /* ogg_page_classify */
 
 #else /* HAVE_EXTERNAL_LIBS */
 
diff --git a/libs/libsndfile/src/ogg.h b/libs/libsndfile/src/ogg.h
new file mode 100644
index 0000000000..88544bb141
--- /dev/null
+++ b/libs/libsndfile/src/ogg.h
@@ -0,0 +1,52 @@
+/*
+** Copyright (C) 2008-2011 Erik de Castro Lopo 
+**
+** This program is free software ; you can redistribute it and/or modify
+** it under the terms of the GNU Lesser General Public License as published by
+** the Free Software Foundation ; either version 2.1 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 Lesser General Public License for more details.
+**
+** You should have received a copy of the GNU Lesser 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 SF_SRC_OGG_H
+
+enum
+{	OGG_ANNODEX = 300,
+	OGG_ANXDATA,
+	OGG_FLAC,
+	OGG_FLAC0,
+	OGG_PCM,
+	OGG_SPEEX,
+	OGG_VORBIS,
+} ;
+
+typedef struct
+{	/* Sync and verify incoming physical bitstream */
+	ogg_sync_state osync ;
+	/* Take physical pages, weld into a logical stream of packets */
+	ogg_stream_state ostream ;
+	/* One Ogg bitstream page.  Vorbis packets are inside */
+	ogg_page opage ;
+	/* One raw packet of data for decode */
+	ogg_packet opacket ;
+	int eos ;
+	int codec ;
+} OGG_PRIVATE ;
+
+
+#define readint(buf, base) (((buf [base + 3] << 24) & 0xff000000) | \
+								((buf [base + 2] <<16) & 0xff0000) | \
+								((buf [base + 1] << 8) & 0xff00) | \
+								(buf [base] & 0xff))
+
+
+
+#endif /* SF_SRC_OGG_H */
diff --git a/libs/libsndfile/src/ogg_opus.c b/libs/libsndfile/src/ogg_opus.c
new file mode 100644
index 0000000000..0824810c0d
--- /dev/null
+++ b/libs/libsndfile/src/ogg_opus.c
@@ -0,0 +1,149 @@
+/*
+** Copyright (C) 2013 Erik de Castro Lopo 
+**
+** This program is free software ; you can redistribute it and/or modify
+** it under the terms of the GNU Lesser General Public License as published by
+** the Free Software Foundation ; either version 2.1 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 Lesser General Public License for more details.
+**
+** You should have received a copy of the GNU Lesser 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 "sfconfig.h"
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#if HAVE_UNISTD_H
+#include 
+#endif
+
+#include "sndfile.h"
+#include "sfendian.h"
+#include "common.h"
+
+#if (ENABLE_EXPERIMENTAL_CODE && HAVE_EXTERNAL_LIBS)
+
+#include 
+
+#include "ogg.h"
+
+typedef struct
+{	int32_t serialno ;
+
+
+	void * state ;
+} OPUS_PRIVATE ;
+
+static int	ogg_opus_read_header (SF_PRIVATE * psf) ;
+static int	ogg_opus_close (SF_PRIVATE *psf) ;
+
+int
+ogg_opus_open (SF_PRIVATE *psf)
+{	OGG_PRIVATE* odata = psf->container_data ;
+	OPUS_PRIVATE* oopus = calloc (1, sizeof (OPUS_PRIVATE)) ;
+	int	error = 0 ;
+
+	if (odata == NULL)
+	{	psf_log_printf (psf, "%s : odata is NULL???\n", __func__) ;
+		return SFE_INTERNAL ;
+		} ;
+
+	psf->codec_data = oopus ;
+	if (oopus == NULL)
+		return SFE_MALLOC_FAILED ;
+
+	if (psf->file.mode == SFM_RDWR)
+		return SFE_BAD_MODE_RW ;
+
+	if (psf->file.mode == SFM_READ)
+	{	/* Call this here so it only gets called once, so no memory is leaked. */
+		ogg_sync_init (&odata->osync) ;
+
+		if ((error = ogg_opus_read_header (psf)))
+			return error ;
+
+#if 0
+		psf->read_short		= ogg_opus_read_s ;
+		psf->read_int		= ogg_opus_read_i ;
+		psf->read_float		= ogg_opus_read_f ;
+		psf->read_double	= ogg_opus_read_d ;
+		psf->sf.frames		= ogg_opus_length (psf) ;
+#endif
+		} ;
+
+	psf->codec_close = ogg_opus_close ;
+
+	if (psf->file.mode == SFM_WRITE)
+	{
+#if 0
+		/* Set the default oopus quality here. */
+		vdata->quality = 0.4 ;
+
+		psf->write_header	= ogg_opus_write_header ;
+		psf->write_short	= ogg_opus_write_s ;
+		psf->write_int		= ogg_opus_write_i ;
+		psf->write_float	= ogg_opus_write_f ;
+		psf->write_double	= ogg_opus_write_d ;
+#endif
+
+		psf->sf.frames = SF_COUNT_MAX ; /* Unknown really */
+		psf->strings.flags = SF_STR_ALLOW_START ;
+		} ;
+
+	psf->bytewidth = 1 ;
+	psf->blockwidth = psf->bytewidth * psf->sf.channels ;
+
+#if 0
+	psf->seek = ogg_opus_seek ;
+	psf->command = ogg_opus_command ;
+#endif
+
+	/* FIXME, FIXME, FIXME : Hack these here for now and correct later. */
+	psf->sf.format = SF_FORMAT_OGG | SF_FORMAT_SPEEX ;
+	psf->sf.sections = 1 ;
+
+	psf->datalength = 1 ;
+	psf->dataoffset = 0 ;
+	/* End FIXME. */
+
+	return error ;
+} /* ogg_opus_open */
+
+static int
+ogg_opus_read_header (SF_PRIVATE * UNUSED (psf))
+{
+	return 0 ;
+} /* ogg_opus_read_header */
+
+static int
+ogg_opus_close (SF_PRIVATE * UNUSED (psf))
+{
+
+
+	return 0 ;
+} /* ogg_opus_close */
+
+
+#else /* ENABLE_EXPERIMENTAL_CODE && HAVE_EXTERNAL_LIBS */
+
+int
+ogg_opus_open (SF_PRIVATE *psf)
+{
+	psf_log_printf (psf, "This version of libsndfile was compiled without Ogg/Opus support.\n") ;
+	return SFE_UNIMPLEMENTED ;
+} /* ogg_opus_open */
+
+#endif
diff --git a/libs/libsndfile/src/ogg_pcm.c b/libs/libsndfile/src/ogg_pcm.c
new file mode 100644
index 0000000000..2e3b7f251c
--- /dev/null
+++ b/libs/libsndfile/src/ogg_pcm.c
@@ -0,0 +1,164 @@
+/*
+** Copyright (C) 2008-2012 Erik de Castro Lopo 
+**
+** This program is free software ; you can redistribute it and/or modify
+** it under the terms of the GNU Lesser General Public License as published by
+** the Free Software Foundation ; either version 2.1 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 Lesser General Public License for more details.
+**
+** You should have received a copy of the GNU Lesser 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 "sfconfig.h"
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#if HAVE_UNISTD_H
+#include 
+#endif
+
+#include "sndfile.h"
+#include "sfendian.h"
+#include "common.h"
+
+#if (ENABLE_EXPERIMENTAL_CODE && HAVE_EXTERNAL_LIBS)
+
+#include 
+
+#include "ogg.h"
+
+typedef struct
+{	int32_t serialno ;
+
+
+	void * state ;
+} OPCM_PRIVATE ;
+
+static int	opcm_read_header (SF_PRIVATE * psf) ;
+static int	opcm_close (SF_PRIVATE *psf) ;
+
+int
+ogg_pcm_open (SF_PRIVATE *psf)
+{	OGG_PRIVATE* odata = psf->container_data ;
+	OPCM_PRIVATE* opcm = calloc (1, sizeof (OPCM_PRIVATE)) ;
+	int	error = 0 ;
+
+	if (odata == NULL)
+	{	psf_log_printf (psf, "%s : odata is NULL???\n", __func__) ;
+		return SFE_INTERNAL ;
+		} ;
+
+	psf->codec_data = opcm ;
+	if (opcm == NULL)
+		return SFE_MALLOC_FAILED ;
+
+	if (psf->file.mode == SFM_RDWR)
+		return SFE_BAD_MODE_RW ;
+
+	if (psf->file.mode == SFM_READ)
+	{	/* Call this here so it only gets called once, so no memory is leaked. */
+		ogg_sync_init (&odata->osync) ;
+
+		if ((error = opcm_read_header (psf)))
+			return error ;
+
+#if 0
+		psf->read_short		= opcm_read_s ;
+		psf->read_int		= opcm_read_i ;
+		psf->read_float		= opcm_read_f ;
+		psf->read_double	= opcm_read_d ;
+		psf->sf.frames		= opcm_length (psf) ;
+#endif
+		} ;
+
+	psf->codec_close = opcm_close ;
+
+	if (psf->file.mode == SFM_WRITE)
+	{
+#if 0
+		/* Set the default opcm quality here. */
+		vdata->quality = 0.4 ;
+
+		psf->write_header	= opcm_write_header ;
+		psf->write_short	= opcm_write_s ;
+		psf->write_int		= opcm_write_i ;
+		psf->write_float	= opcm_write_f ;
+		psf->write_double	= opcm_write_d ;
+#endif
+
+		psf->sf.frames = SF_COUNT_MAX ; /* Unknown really */
+		psf->strings.flags = SF_STR_ALLOW_START ;
+		} ;
+
+	psf->bytewidth = 1 ;
+	psf->blockwidth = psf->bytewidth * psf->sf.channels ;
+
+#if 0
+	psf->seek = opcm_seek ;
+	psf->command = opcm_command ;
+#endif
+
+	/* FIXME, FIXME, FIXME : Hack these here for now and correct later. */
+	psf->sf.format = SF_FORMAT_OGG | SF_FORMAT_SPEEX ;
+	psf->sf.sections = 1 ;
+
+	psf->datalength = 1 ;
+	psf->dataoffset = 0 ;
+	/* End FIXME. */
+
+	return error ;
+} /* ogg_pcm_open */
+
+static int
+opcm_read_header (SF_PRIVATE * UNUSED (psf))
+{
+	return 0 ;
+} /* opcm_read_header */
+
+static int
+opcm_close (SF_PRIVATE * UNUSED (psf))
+{
+
+
+	return 0 ;
+} /* opcm_close */
+
+
+
+/*
+encoded_speex_frames = (frames_per_packet * Packets)
+                     = 1 * 272
+                     = 272
+
+audio_samples = encoded_speex_frames * frame_size
+              = 272 * 640
+              = 174080
+
+duration = audio_samples / rate
+         = 174080 / 44100
+         = 3.947
+*/
+
+#else /* ENABLE_EXPERIMENTAL_CODE && HAVE_EXTERNAL_LIBS */
+
+int
+ogg_pcm_open (SF_PRIVATE *psf)
+{
+	psf_log_printf (psf, "This version of libsndfile was compiled without Ogg/Speex support.\n") ;
+	return SFE_UNIMPLEMENTED ;
+} /* ogg_pcm_open */
+
+#endif
diff --git a/libs/libsndfile/src/ogg_speex.c b/libs/libsndfile/src/ogg_speex.c
new file mode 100644
index 0000000000..f24e242e57
--- /dev/null
+++ b/libs/libsndfile/src/ogg_speex.c
@@ -0,0 +1,425 @@
+/*
+** Copyright (C) 2008-2012 Erik de Castro Lopo 
+**
+** This program is free software ; you can redistribute it and/or modify
+** it under the terms of the GNU Lesser General Public License as published by
+** the Free Software Foundation ; either version 2.1 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 Lesser General Public License for more details.
+**
+** You should have received a copy of the GNU Lesser 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 "sfconfig.h"
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#if HAVE_UNISTD_H
+#include 
+#endif
+
+#include "sndfile.h"
+#include "sfendian.h"
+#include "common.h"
+
+#if (ENABLE_EXPERIMENTAL_CODE && HAVE_EXTERNAL_LIBS)
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+
+#include "ogg.h"
+
+#define	OGG_SPX_READ_SIZE	200
+
+typedef struct
+{	SpeexBits bits ;
+
+	int32_t serialno ;
+
+	int frame_size, granule_frame_size, nframes ;
+	int force_mode ;
+
+	SpeexStereoState stereo ;
+	SpeexHeader header ;
+
+	void * state ;
+} SPX_PRIVATE ;
+
+static int	spx_read_header (SF_PRIVATE * psf) ;
+static int	spx_close (SF_PRIVATE *psf) ;
+static void *spx_header_read (SF_PRIVATE * psf, ogg_packet *op, spx_int32_t enh_enabled, int force_mode) ;
+static void spx_print_comments (const char *comments, int length) ;
+
+int
+ogg_speex_open (SF_PRIVATE *psf)
+{	OGG_PRIVATE* odata = psf->container_data ;
+	SPX_PRIVATE* spx = calloc (1, sizeof (SPX_PRIVATE)) ;
+	int	error = 0 ;
+
+	if (odata == NULL)
+	{	psf_log_printf (psf, "%s : odata is NULL???\n", __func__) ;
+		return SFE_INTERNAL ;
+		} ;
+
+	psf->codec_data = spx ;
+	if (spx == NULL)
+		return SFE_MALLOC_FAILED ;
+
+	if (psf->file.mode == SFM_RDWR)
+		return SFE_BAD_MODE_RW ;
+
+	if (psf->file.mode == SFM_READ)
+	{	/* Call this here so it only gets called once, so no memory is leaked. */
+		ogg_sync_init (&odata->osync) ;
+
+		if ((error = spx_read_header (psf)))
+			return error ;
+
+#if 0
+		psf->read_short		= spx_read_s ;
+		psf->read_int		= spx_read_i ;
+		psf->read_float		= spx_read_f ;
+		psf->read_double	= spx_read_d ;
+		psf->sf.frames		= spx_length (psf) ;
+#endif
+		} ;
+
+	psf->codec_close = spx_close ;
+
+	if (psf->file.mode == SFM_WRITE)
+	{
+#if 0
+		/* Set the default spx quality here. */
+		vdata->quality = 0.4 ;
+
+		psf->write_header	= spx_write_header ;
+		psf->write_short	= spx_write_s ;
+		psf->write_int		= spx_write_i ;
+		psf->write_float	= spx_write_f ;
+		psf->write_double	= spx_write_d ;
+#endif
+
+		psf->sf.frames = SF_COUNT_MAX ; /* Unknown really */
+		psf->strings.flags = SF_STR_ALLOW_START ;
+		} ;
+
+	psf->bytewidth = 1 ;
+	psf->blockwidth = psf->bytewidth * psf->sf.channels ;
+
+#if 0
+	psf->seek = spx_seek ;
+	psf->command = spx_command ;
+#endif
+
+	/* FIXME, FIXME, FIXME : Hack these here for now and correct later. */
+	psf->sf.format = SF_FORMAT_OGG | SF_FORMAT_SPEEX ;
+	psf->sf.sections = 1 ;
+
+	psf->datalength = 1 ;
+	psf->dataoffset = 0 ;
+	/* End FIXME. */
+
+	return error ;
+} /* ogg_speex_open */
+
+#define le_short (x)	(x)
+
+static int
+spx_read_header (SF_PRIVATE * psf)
+{	static SpeexStereoState STEREO_INIT = SPEEX_STEREO_STATE_INIT ;
+
+	OGG_PRIVATE* odata = psf->container_data ;
+	SPX_PRIVATE* spx = psf->codec_data ;
+
+	ogg_int64_t page_granule = 0 ;
+	int stream_init = 0 ;
+	int	page_nb_packets = 0 ;
+	int packet_count = 0 ;
+	int enh_enabled = 1 ;
+	int force_mode = -1 ;
+	char * data ;
+	int nb_read ;
+	int lookahead ;
+
+printf ("%s %d\n", __func__, __LINE__) ;
+
+	psf_log_printf (psf, "Speex header\n") ;
+	odata->eos = 0 ;
+
+	/* Reset ogg stuff which has already been used in src/ogg.c. */
+	ogg_stream_reset (&odata->ostream) ;
+	ogg_sync_reset (&odata->osync) ;
+
+	/* Seek to start of stream. */
+	psf_fseek (psf, 0, SEEK_SET) ;
+
+	/* Initialize. */
+	ogg_sync_init (&odata->osync) ;
+	speex_bits_init (&spx->bits) ;
+
+	/* Set defaults. */
+	psf->sf.channels = -1 ;
+	psf->sf.samplerate = 0 ;
+	spx->stereo = STEREO_INIT ;
+
+	/* Get a pointer to the ogg buffer and read data into it. */
+	data = ogg_sync_buffer (&odata->osync, OGG_SPX_READ_SIZE) ;
+	nb_read = psf_fread (data, 1, OGG_SPX_READ_SIZE, psf) ;
+	ogg_sync_wrote (&odata->osync, nb_read) ;
+
+	/* Now we chew on Ogg packets. */
+	while (ogg_sync_pageout (&odata->osync, &odata->opage) == 1)
+	{	if (stream_init == 0)
+		{	ogg_stream_init (&odata->ostream, ogg_page_serialno (&odata->opage)) ;
+			stream_init = 1 ;
+			} ;
+
+		if (ogg_page_serialno (&odata->opage) != odata->ostream.serialno)
+		{	/* so all streams are read. */
+			ogg_stream_reset_serialno (&odata->ostream, ogg_page_serialno (&odata->opage)) ;
+			} ;
+
+		/*Add page to the bitstream*/
+		ogg_stream_pagein (&odata->ostream, &odata->opage) ;
+		page_granule = ogg_page_granulepos (&odata->opage) ;
+		page_nb_packets = ogg_page_packets (&odata->opage) ;
+
+		/*Extract all available packets*/
+		while (odata->eos == 0 && ogg_stream_packetout (&odata->ostream, &odata->opacket) == 1)
+		{	if (odata->opacket.bytes >= 8 && memcmp (odata->opacket.packet, "Speex   ", 8) == 0)
+			{	spx->serialno = odata->ostream.serialno ;
+				} ;
+
+			if (spx->serialno == -1 || odata->ostream.serialno != spx->serialno)
+				break ;
+
+			if (packet_count == 0)
+			{	spx->state = spx_header_read (psf, &odata->opacket, enh_enabled, force_mode) ;
+				if (! spx->state)
+					break ;
+
+				speex_decoder_ctl (spx->state, SPEEX_GET_LOOKAHEAD, &lookahead) ;
+				if (spx->nframes == 0)
+					spx->nframes = 1 ;
+				}
+			else if (packet_count == 1)
+			{	spx_print_comments ((const char*) odata->opacket.packet, odata->opacket.bytes) ;
+				}
+			else if (packet_count < 2 + spx->header.extra_headers)
+			{	/* Ignore extra headers */
+				}
+			packet_count ++ ;
+			} ;
+		} ;
+
+	psf_log_printf (psf, "End\n") ;
+
+	psf_log_printf (psf, "packet_count %d\n", packet_count) ;
+	psf_log_printf (psf, "page_nb_packets %d\n", page_nb_packets) ;
+	psf_log_printf (psf, "page_granule %lld\n", page_granule) ;
+
+	return 0 ;
+} /* spx_read_header */
+
+static int
+spx_close (SF_PRIVATE *psf)
+{	SPX_PRIVATE* spx = psf->codec_data ;
+
+	if (spx->state)
+		speex_decoder_destroy (spx->state) ;
+
+	if (spx)
+		speex_bits_destroy (&spx->bits) ;
+
+	return 0 ;
+} /* spx_close */
+
+
+
+static void *
+spx_header_read (SF_PRIVATE * psf, ogg_packet *op, spx_int32_t enh_enabled, int force_mode)
+{	SPX_PRIVATE* spx = psf->codec_data ;
+	void *st ;
+	const SpeexMode *mode ;
+	SpeexHeader *tmp_header ;
+	int modeID ;
+	SpeexCallback callback ;
+
+	tmp_header = speex_packet_to_header ((char*) op->packet, op->bytes) ;
+	if (tmp_header == NULL)
+	{	psf_log_printf (psf, "Cannot read Speex header\n") ;
+		return NULL ;
+		} ;
+
+	memcpy (&spx->header, tmp_header, sizeof (spx->header)) ;
+	free (tmp_header) ;
+	tmp_header = NULL ;
+
+	if (spx->header.mode >= SPEEX_NB_MODES || spx->header.mode < 0)
+	{	psf_log_printf (psf, "Mode number %d does not (yet/any longer) exist in this version\n", spx->header.mode) ;
+		return NULL ;
+		} ;
+
+	modeID = spx->header.mode ;
+	if (force_mode != -1)
+		modeID = force_mode ;
+
+	mode = speex_lib_get_mode (modeID) ;
+
+	if (spx->header.speex_version_id > 1)
+	{	psf_log_printf (psf, "This file was encoded with Speex bit-stream version %d, which I don't know how to decode\n", spx->header.speex_version_id) ;
+		return NULL ;
+		} ;
+
+	if (mode->bitstream_version < spx->header.mode_bitstream_version)
+	{	psf_log_printf (psf, "The file was encoded with a newer version of Speex. You need to upgrade in order to play it.\n") ;
+		return NULL ;
+		} ;
+
+	if (mode->bitstream_version > spx->header.mode_bitstream_version)
+	{	psf_log_printf (psf, "The file was encoded with an older version of Speex. You would need to downgrade the version in order to play it.\n") ;
+		return NULL ;
+		} ;
+
+	st = speex_decoder_init (mode) ;
+	if (!st)
+	{	psf_log_printf (psf, "Decoder initialization failed.\n") ;
+		return NULL ;
+		} ;
+
+	speex_decoder_ctl (st, SPEEX_SET_ENH, &enh_enabled) ;
+	speex_decoder_ctl (st, SPEEX_GET_FRAME_SIZE, &spx->frame_size) ;
+	spx->granule_frame_size = spx->frame_size ;
+
+	if (!psf->sf.samplerate)
+		psf->sf.samplerate = spx->header.rate ;
+	/* Adjust rate if --force-* options are used */
+	if (force_mode != -1)
+	{	if (spx->header.mode < force_mode)
+		{	psf->sf.samplerate <<= (force_mode - spx->header.mode) ;
+			spx->granule_frame_size >>= (force_mode - spx->header.mode) ;
+			} ;
+		if (spx->header.mode > force_mode)
+		{	psf->sf.samplerate >>= (spx->header.mode - force_mode) ;
+			spx->granule_frame_size <<= (spx->header.mode - force_mode) ;
+			} ;
+		} ;
+
+	speex_decoder_ctl (st, SPEEX_SET_SAMPLING_RATE, &psf->sf.samplerate) ;
+
+	spx->nframes = spx->header.frames_per_packet ;
+
+	if (psf->sf.channels == -1)
+		psf->sf.channels = spx->header.nb_channels ;
+
+	if (! (psf->sf.channels == 1))
+	{	psf->sf.channels = 2 ;
+		callback.callback_id = SPEEX_INBAND_STEREO ;
+		callback.func = speex_std_stereo_request_handler ;
+		callback.data = &spx->stereo ;
+		speex_decoder_ctl (st, SPEEX_SET_HANDLER, &callback) ;
+		} ;
+
+	spx->header.speex_version [sizeof (spx->header.speex_version) - 1] = 0 ;
+
+	psf_log_printf (psf, "  Encoder ver   : %s\n  Frames/packet : %d\n",
+					spx->header.speex_version, spx->header.frames_per_packet) ;
+
+	if (spx->header.bitrate > 0)
+		psf_log_printf (psf, "  Bit rate	  : %d\n", spx->header.bitrate) ;
+
+	psf_log_printf (psf, "  Sample rate   : %d\n  Mode		  : %s\n  VBR		   : %s\n  Channels	  : %d\n",
+					psf->sf.samplerate, mode->modeName, (spx->header.vbr ? "yes" : "no"), psf->sf.channels) ;
+
+	psf_log_printf (psf, "  Extra headers : %d\n", spx->header.extra_headers) ;
+
+	return st ;
+} /* spx_header_read */
+
+
+static void
+spx_print_comments (const char *c, int length)
+{
+	const char *end ;
+	int len, i, nb_fields ;
+
+printf ("%s %d\n", __func__, __LINE__) ;
+	if (length < 8)
+	{	fprintf (stderr, "Invalid/corrupted comments\n") ;
+		return ;
+		}
+	end = c + length ;
+	len = readint (c, 0) ;
+	c += 4 ;
+	if (len < 0 || c + len > end)
+	{	fprintf (stderr, "Invalid/corrupted comments\n") ;
+		return ;
+		}
+	(void) fwrite (c, 1, len, stderr) ;
+	c += len ;
+	fprintf (stderr, "\n") ;
+	if (c + 4 > end)
+	{	fprintf (stderr, "Invalid/corrupted comments\n") ;
+		return ;
+		}
+	nb_fields = readint (c, 0) ;
+	c += 4 ;
+	for (i = 0 ; i < nb_fields ; i++)
+	{	if (c + 4 > end)
+		{	fprintf (stderr, "Invalid/corrupted comments\n") ;
+			return ;
+			} ;
+		len = readint (c, 0) ;
+		c += 4 ;
+		if (len < 0 || c + len > end)
+		{	fprintf (stderr, "Invalid/corrupted comments\n") ;
+			return ;
+			}
+		(void) fwrite (c, 1, len, stderr) ;
+		c += len ;
+		fprintf (stderr, "\n") ;
+		} ;
+	return ;
+} /* spx_print_comments */
+
+
+/*
+encoded_speex_frames = (frames_per_packet * Packets)
+					 = 1 * 272
+					 = 272
+
+audio_samples = encoded_speex_frames * frame_size
+			  = 272 * 640
+			  = 174080
+
+duration = audio_samples / rate
+		 = 174080 / 44100
+		 = 3.947
+*/
+
+#else /* ENABLE_EXPERIMENTAL_CODE && HAVE_EXTERNAL_LIBS */
+
+int
+ogg_speex_open (SF_PRIVATE *psf)
+{
+	psf_log_printf (psf, "This version of libsndfile was compiled without Ogg/Speex support.\n") ;
+	return SFE_UNIMPLEMENTED ;
+} /* ogg_speex_open */
+
+#endif
diff --git a/libs/libsndfile/src/ogg_vorbis.c b/libs/libsndfile/src/ogg_vorbis.c
new file mode 100644
index 0000000000..4d1adef20f
--- /dev/null
+++ b/libs/libsndfile/src/ogg_vorbis.c
@@ -0,0 +1,1172 @@
+/*
+** Copyright (C) 2002-2012 Erik de Castro Lopo 
+** Copyright (C) 2002-2005 Michael Smith 
+** Copyright (C) 2007 John ffitch
+**
+** This program is free software ; you can redistribute it and/or modify
+** it under the terms of the GNU Lesser General Public License as published by
+** the Free Software Foundation ; either version 2.1 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 Lesser General Public License for more details.
+**
+** You should have received a copy of the GNU Lesser 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.
+*/
+
+/*
+**  Much of this code is based on the examples in libvorbis from the
+** XIPHOPHORUS Company http://www.xiph.org/ which has a BSD-style Licence
+** Copyright (c) 2002, Xiph.org Foundation
+**
+** 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 "sfconfig.h"
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#if HAVE_UNISTD_H
+#include 
+#endif
+
+#include "sndfile.h"
+#include "sfendian.h"
+#include "common.h"
+
+#if HAVE_EXTERNAL_LIBS
+
+#include 
+#include 
+#include 
+
+#include "ogg.h"
+
+typedef int convert_func (SF_PRIVATE *psf, int, void *, int, int, float **) ;
+
+static int	vorbis_read_header (SF_PRIVATE *psf, int log_data) ;
+static int	vorbis_write_header (SF_PRIVATE *psf, int calc_length) ;
+static int	vorbis_close (SF_PRIVATE *psf) ;
+static int	vorbis_command (SF_PRIVATE *psf, int command, void *data, int datasize) ;
+static int	vorbis_byterate (SF_PRIVATE *psf) ;
+static sf_count_t	vorbis_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) ;
+static sf_count_t	vorbis_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len) ;
+static sf_count_t	vorbis_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) ;
+static sf_count_t	vorbis_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) ;
+static sf_count_t	vorbis_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) ;
+static sf_count_t	vorbis_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len) ;
+static sf_count_t	vorbis_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) ;
+static sf_count_t	vorbis_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) ;
+static sf_count_t	vorbis_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) ;
+static sf_count_t	vorbis_read_sample (SF_PRIVATE *psf, void *ptr, sf_count_t lens, convert_func *transfn) ;
+static sf_count_t	vorbis_length (SF_PRIVATE *psf) ;
+
+typedef struct
+{	int id ;
+	const char *name ;
+} STR_PAIRS ;
+
+static STR_PAIRS vorbis_metatypes [] =
+{	{	SF_STR_TITLE,		"Title" },
+	{	SF_STR_COPYRIGHT,	"Copyright" },
+	{	SF_STR_SOFTWARE,	"Software" },
+	{	SF_STR_ARTIST,		"Artist" },
+	{	SF_STR_COMMENT,		"Comment" },
+	{	SF_STR_DATE,		"Date" },
+	{	SF_STR_ALBUM,		"Album" },
+	{	SF_STR_LICENSE,		"License" },
+} ;
+
+typedef struct
+{	/* Count current location */
+	sf_count_t loc ;
+	/* Struct that stores all the static vorbis bitstream settings */
+	vorbis_info	vinfo ;
+	/* Struct that stores all the bitstream user comments */
+	vorbis_comment vcomment ;
+	/* Ventral working state for the packet->PCM decoder */
+	vorbis_dsp_state vdsp ;
+	/* Local working space for packet->PCM decode */
+	vorbis_block vblock ;
+
+	/* Encoding quality in range [0.0, 1.0]. */
+	double quality ;
+} VORBIS_PRIVATE ;
+
+static int
+vorbis_read_header (SF_PRIVATE *psf, int log_data)
+{
+	OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ;
+	VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ;
+	char *buffer ;
+	int	bytes ;
+	int i, nn ;
+
+	odata->eos = 0 ;
+
+	/* Weird stuff happens if these aren't called. */
+	ogg_stream_reset (&odata->ostream) ;
+	ogg_sync_reset (&odata->osync) ;
+
+	/*
+	**	Grab some data at the head of the stream.  We want the first page
+	**	(which is guaranteed to be small and only contain the Vorbis
+	**	stream initial header) We need the first page to get the stream
+	**	serialno.
+	*/
+
+	/* Expose the buffer */
+	buffer = ogg_sync_buffer (&odata->osync, 4096L) ;
+
+	/* Grab the part of the header that has already been read. */
+	memcpy (buffer, psf->header, psf->headindex) ;
+	bytes = psf->headindex ;
+
+	/* Submit a 4k block to libvorbis' Ogg layer */
+	bytes += psf_fread (buffer + psf->headindex, 1, 4096 - psf->headindex, psf) ;
+	ogg_sync_wrote (&odata->osync, bytes) ;
+
+	/* Get the first page. */
+	if ((nn = ogg_sync_pageout (&odata->osync, &odata->opage)) != 1)
+	{
+		/* Have we simply run out of data?  If so, we're done. */
+		if (bytes < 4096)
+			return 0 ;
+
+		/* Error case.  Must not be Vorbis data */
+		psf_log_printf (psf, "Input does not appear to be an Ogg bitstream.\n") ;
+		return SFE_MALFORMED_FILE ;
+		} ;
+
+	/*
+	**	Get the serial number and set up the rest of decode.
+	**	Serialno first ; use it to set up a logical stream.
+	*/
+	ogg_stream_clear (&odata->ostream) ;
+	ogg_stream_init (&odata->ostream, ogg_page_serialno (&odata->opage)) ;
+
+	if (ogg_stream_pagein (&odata->ostream, &odata->opage) < 0)
+	{	/* Error ; stream version mismatch perhaps. */
+		psf_log_printf (psf, "Error reading first page of Ogg bitstream data\n") ;
+		return SFE_MALFORMED_FILE ;
+		} ;
+
+	if (ogg_stream_packetout (&odata->ostream, &odata->opacket) != 1)
+	{	/* No page? must not be vorbis. */
+		psf_log_printf (psf, "Error reading initial header packet.\n") ;
+		return SFE_MALFORMED_FILE ;
+		} ;
+
+	/*
+	**	This function (vorbis_read_header) gets called multiple times, so the OGG
+	**	and vorbis structs have to be cleared every time we pass through to
+	**	prevent memory leaks.
+	*/
+	vorbis_block_clear (&vdata->vblock) ;
+	vorbis_dsp_clear (&vdata->vdsp) ;
+	vorbis_comment_clear (&vdata->vcomment) ;
+	vorbis_info_clear (&vdata->vinfo) ;
+
+	/*
+	**	Extract the initial header from the first page and verify that the
+	**	Ogg bitstream is in fact Vorbis data.
+	**
+	**	I handle the initial header first instead of just having the code
+	**	read all three Vorbis headers at once because reading the initial
+	**	header is an easy way to identify a Vorbis bitstream and it's
+	**	useful to see that functionality seperated out.
+	*/
+	vorbis_info_init (&vdata->vinfo) ;
+	vorbis_comment_init (&vdata->vcomment) ;
+
+	if (vorbis_synthesis_headerin (&vdata->vinfo, &vdata->vcomment, &odata->opacket) < 0)
+	{	/* Error case ; not a vorbis header. */
+		psf_log_printf (psf, "Found Vorbis in stream header, but vorbis_synthesis_headerin failed.\n") ;
+		return SFE_MALFORMED_FILE ;
+		} ;
+
+	/*
+	**	Common Ogg metadata fields?
+	**	TITLE, VERSION, ALBUM, TRACKNUMBER, ARTIST, PERFORMER, COPYRIGHT, LICENSE,
+	**	ORGANIZATION, DESCRIPTION, GENRE, DATE, LOCATION, CONTACT, ISRC,
+	*/
+
+	if (log_data)
+	{	int k ;
+
+		for (k = 0 ; k < ARRAY_LEN (vorbis_metatypes) ; k++)
+		{	char *dd ;
+
+			dd = vorbis_comment_query (&vdata->vcomment, vorbis_metatypes [k].name, 0) ;
+			if (dd == NULL)
+				continue ;
+			psf_store_string (psf, vorbis_metatypes [k].id, dd) ;
+			} ;
+		} ;
+
+	/*
+	**	At this point, we're sure we're Vorbis.	We've set up the logical (Ogg)
+	**	bitstream decoder. Get the comment and codebook headers and set up the
+	**	Vorbis decoder.
+	**
+	**	The next two packets in order are the comment and codebook headers.
+	**	They're likely large and may span multiple pages.  Thus we reead
+	**	and submit data until we get our two pacakets, watching that no
+	**	pages are missing.  If a page is missing, error out ; losing a
+	**	header page is the only place where missing data is fatal.
+	*/
+
+	i = 0 ;			/* Count of number of packets read */
+	while (i < 2)
+	{	int result = ogg_sync_pageout (&odata->osync, &odata->opage) ;
+		if (result == 0)
+		{	/* Need more data */
+			buffer = ogg_sync_buffer (&odata->osync, 4096) ;
+			bytes = psf_fread (buffer, 1, 4096, psf) ;
+
+			if (bytes == 0 && i < 2)
+			{	psf_log_printf (psf, "End of file before finding all Vorbis headers!\n") ;
+				return SFE_MALFORMED_FILE ;
+				} ;
+			nn = ogg_sync_wrote (&odata->osync, bytes) ;
+			}
+		else if (result == 1)
+		{	/*
+			**	Don't complain about missing or corrupt data yet. We'll
+			**	catch it at the packet output phase.
+			**
+			**	We can ignore any errors here as they'll also become apparent
+			**	at packetout.
+			*/
+			nn = ogg_stream_pagein (&odata->ostream, &odata->opage) ;
+			while (i < 2)
+			{	result = ogg_stream_packetout (&odata->ostream, &odata->opacket) ;
+				if (result == 0)
+					break ;
+				if (result < 0)
+				{	/*	Uh oh ; data at some point was corrupted or missing!
+					**	We can't tolerate that in a header. Die. */
+					psf_log_printf (psf, "Corrupt secondary header.	Exiting.\n") ;
+					return SFE_MALFORMED_FILE ;
+					} ;
+
+				vorbis_synthesis_headerin (&vdata->vinfo, &vdata->vcomment, &odata->opacket) ;
+				i++ ;
+				} ;
+			} ;
+		} ;
+
+	if (log_data)
+	{	int printed_metadata_msg = 0 ;
+		int k ;
+
+		psf_log_printf (psf, "Bitstream is %d channel, %D Hz\n", vdata->vinfo.channels, vdata->vinfo.rate) ;
+		psf_log_printf (psf, "Encoded by : %s\n", vdata->vcomment.vendor) ;
+
+		/* Throw the comments plus a few lines about the bitstream we're decoding. */
+		for (k = 0 ; k < ARRAY_LEN (vorbis_metatypes) ; k++)
+		{	char *dd ;
+
+			dd = vorbis_comment_query (&vdata->vcomment, vorbis_metatypes [k].name, 0) ;
+			if (dd == NULL)
+				continue ;
+
+			if (printed_metadata_msg == 0)
+			{	psf_log_printf (psf, "Metadata :\n") ;
+				printed_metadata_msg = 1 ;
+				} ;
+
+			psf_store_string (psf, vorbis_metatypes [k].id, dd) ;
+			psf_log_printf (psf, "  %-10s : %s\n", vorbis_metatypes [k].name, dd) ;
+			} ;
+
+		psf_log_printf (psf, "End\n") ;
+		} ;
+
+	psf->sf.samplerate	= vdata->vinfo.rate ;
+	psf->sf.channels	= vdata->vinfo.channels ;
+	psf->sf.format		= SF_FORMAT_OGG | SF_FORMAT_VORBIS ;
+
+	/*	OK, got and parsed all three headers. Initialize the Vorbis
+	**	packet->PCM decoder.
+	**	Central decode state. */
+	vorbis_synthesis_init (&vdata->vdsp, &vdata->vinfo) ;
+
+	/*	Local state for most of the decode so multiple block decodes can
+	**	proceed in parallel. We could init multiple vorbis_block structures
+	**	for vd here. */
+	vorbis_block_init (&vdata->vdsp, &vdata->vblock) ;
+
+	vdata->loc = 0 ;
+
+	return 0 ;
+} /* vorbis_read_header */
+
+static int
+vorbis_write_header (SF_PRIVATE *psf, int UNUSED (calc_length))
+{
+	OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ;
+	VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ;
+	int k, ret ;
+
+	vorbis_info_init (&vdata->vinfo) ;
+
+	/* The style of encoding should be selectable here, VBR quality mode. */
+	ret = vorbis_encode_init_vbr (&vdata->vinfo, psf->sf.channels, psf->sf.samplerate, vdata->quality) ;
+
+#if 0
+	ret = vorbis_encode_init (&vdata->vinfo, psf->sf.channels, psf->sf.samplerate, -1, 128000, -1) ; /* average bitrate mode */
+	ret = (	vorbis_encode_setup_managed (&vdata->vinfo, psf->sf.channels, psf->sf.samplerate, -1, 128000, -1)
+			|| vorbis_encode_ctl (&vdata->vinfo, OV_ECTL_RATEMANAGE_AVG, NULL)
+			|| vorbis_encode_setup_init (&vdata->vinfo)
+			) ;
+#endif
+	if (ret)
+		return SFE_BAD_OPEN_FORMAT ;
+
+	vdata->loc = 0 ;
+
+	/* add a comment */
+	vorbis_comment_init (&vdata->vcomment) ;
+
+	vorbis_comment_add_tag (&vdata->vcomment, "ENCODER", "libsndfile") ;
+	for (k = 0 ; k < SF_MAX_STRINGS ; k++)
+	{	const char * name ;
+
+		if (psf->strings.data [k].type == 0)
+			break ;
+
+		switch (psf->strings.data [k].type)
+		{	case SF_STR_TITLE :		name = "TITLE" ; break ;
+			case SF_STR_COPYRIGHT : name = "COPYRIGHT" ; break ;
+			case SF_STR_SOFTWARE :	name = "SOFTWARE" ; break ;
+			case SF_STR_ARTIST :	name = "ARTIST" ; break ;
+			case SF_STR_COMMENT :	name = "COMMENT" ; break ;
+			case SF_STR_DATE :		name = "DATE" ; break ;
+			case SF_STR_ALBUM :		name = "ALBUM" ; break ;
+			case SF_STR_LICENSE :	name = "LICENSE" ; break ;
+			default : continue ;
+			} ;
+
+		vorbis_comment_add_tag (&vdata->vcomment, name, psf->strings.storage + psf->strings.data [k].offset) ;
+		} ;
+
+	/* set up the analysis state and auxiliary encoding storage */
+	vorbis_analysis_init (&vdata->vdsp, &vdata->vinfo) ;
+	vorbis_block_init (&vdata->vdsp, &vdata->vblock) ;
+
+	/*
+	**	Set up our packet->stream encoder.
+	**	Pick a random serial number ; that way we can more likely build
+	**	chained streams just by concatenation.
+	*/
+
+	ogg_stream_init (&odata->ostream, psf_rand_int32 ()) ;
+
+	/* Vorbis streams begin with three headers ; the initial header (with
+	   most of the codec setup parameters) which is mandated by the Ogg
+	   bitstream spec.  The second header holds any comment fields.	 The
+	   third header holds the bitstream codebook.  We merely need to
+	   make the headers, then pass them to libvorbis one at a time ;
+	   libvorbis handles the additional Ogg bitstream constraints */
+
+	{	ogg_packet header ;
+		ogg_packet header_comm ;
+		ogg_packet header_code ;
+		int result ;
+
+		vorbis_analysis_headerout (&vdata->vdsp, &vdata->vcomment, &header, &header_comm, &header_code) ;
+		ogg_stream_packetin (&odata->ostream, &header) ; /* automatically placed in its own page */
+		ogg_stream_packetin (&odata->ostream, &header_comm) ;
+		ogg_stream_packetin (&odata->ostream, &header_code) ;
+
+		/* This ensures the actual
+		 * audio data will start on a new page, as per spec
+		 */
+		while ((result = ogg_stream_flush (&odata->ostream, &odata->opage)) != 0)
+		{	psf_fwrite (odata->opage.header, 1, odata->opage.header_len, psf) ;
+			psf_fwrite (odata->opage.body, 1, odata->opage.body_len, psf) ;
+			} ;
+	}
+
+	return 0 ;
+} /* vorbis_write_header */
+
+static int
+vorbis_close (SF_PRIVATE *psf)
+{	OGG_PRIVATE* odata = psf->container_data ;
+	VORBIS_PRIVATE *vdata = psf->codec_data ;
+
+	if (odata == NULL || vdata == NULL)
+		return 0 ;
+
+	/*	Clean up this logical bitstream ; before exit we shuld see if we're
+	**	followed by another [chained]. */
+
+	if (psf->file.mode == SFM_WRITE)
+	{
+		if (psf->write_current <= 0)
+			vorbis_write_header (psf, 0) ;
+
+		vorbis_analysis_wrote (&vdata->vdsp, 0) ;
+		while (vorbis_analysis_blockout (&vdata->vdsp, &vdata->vblock) == 1)
+		{
+
+		/* analysis, assume we want to use bitrate management */
+			vorbis_analysis (&vdata->vblock, NULL) ;
+			vorbis_bitrate_addblock (&vdata->vblock) ;
+
+			while (vorbis_bitrate_flushpacket (&vdata->vdsp, &odata->opacket))
+			{	/* weld the packet into the bitstream */
+				ogg_stream_packetin (&odata->ostream, &odata->opacket) ;
+
+				/* write out pages (if any) */
+				while (!odata->eos)
+				{	int result = ogg_stream_pageout (&odata->ostream, &odata->opage) ;
+					if (result == 0) break ;
+					psf_fwrite (odata->opage.header, 1, odata->opage.header_len, psf) ;
+					psf_fwrite (odata->opage.body, 1, odata->opage.body_len, psf) ;
+
+		/* this could be set above, but for illustrative purposes, I do
+		   it here (to show that vorbis does know where the stream ends) */
+
+					if (ogg_page_eos (&odata->opage)) odata->eos = 1 ;
+				}
+			}
+		}
+	}
+
+	/* ogg_page and ogg_packet structs always point to storage in
+	   libvorbis.  They are never freed or manipulated directly */
+
+	vorbis_block_clear (&vdata->vblock) ;
+	vorbis_dsp_clear (&vdata->vdsp) ;
+	vorbis_comment_clear (&vdata->vcomment) ;
+	vorbis_info_clear (&vdata->vinfo) ;
+
+	return 0 ;
+} /* vorbis_close */
+
+int
+ogg_vorbis_open (SF_PRIVATE *psf)
+{	OGG_PRIVATE* odata = psf->container_data ;
+	VORBIS_PRIVATE* vdata = calloc (1, sizeof (VORBIS_PRIVATE)) ;
+	int	error = 0 ;
+
+	if (odata == NULL)
+	{	psf_log_printf (psf, "%s : odata is NULL???\n", __func__) ;
+		return SFE_INTERNAL ;
+		} ;
+
+	psf->codec_data = vdata ;
+
+	if (psf->file.mode == SFM_RDWR)
+		return SFE_BAD_MODE_RW ;
+
+	psf_log_printf (psf, "Vorbis library version : %s\n", vorbis_version_string ()) ;
+
+	if (psf->file.mode == SFM_READ)
+	{	/* Call this here so it only gets called once, so no memory is leaked. */
+		ogg_sync_init (&odata->osync) ;
+
+		if ((error = vorbis_read_header (psf, 1)))
+			return error ;
+
+		psf->read_short		= vorbis_read_s ;
+		psf->read_int		= vorbis_read_i ;
+		psf->read_float		= vorbis_read_f ;
+		psf->read_double	= vorbis_read_d ;
+		psf->sf.frames		= vorbis_length (psf) ;
+		} ;
+
+	psf->codec_close = vorbis_close ;
+	if (psf->file.mode == SFM_WRITE)
+	{
+		/* Set the default vorbis quality here. */
+		vdata->quality = 0.4 ;
+
+		psf->write_header	= vorbis_write_header ;
+		psf->write_short	= vorbis_write_s ;
+		psf->write_int		= vorbis_write_i ;
+		psf->write_float	= vorbis_write_f ;
+		psf->write_double	= vorbis_write_d ;
+
+		psf->sf.frames = SF_COUNT_MAX ; /* Unknown really */
+		psf->strings.flags = SF_STR_ALLOW_START ;
+		} ;
+
+	psf->seek = vorbis_seek ;
+	psf->command = vorbis_command ;
+	psf->byterate = vorbis_byterate ;
+
+	/* FIXME, FIXME, FIXME : Hack these here for now and correct later. */
+	psf->sf.format = SF_FORMAT_OGG | SF_FORMAT_VORBIS ;
+	psf->sf.sections = 1 ;
+
+	psf->datalength = 1 ;
+	psf->dataoffset = 0 ;
+	/* End FIXME. */
+
+	return error ;
+} /* ogg_vorbis_open */
+
+static int
+vorbis_command (SF_PRIVATE *psf, int command, void * data, int datasize)
+{	VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ;
+
+	switch (command)
+	{	case SFC_SET_COMPRESSION_LEVEL :
+			if (data == NULL || datasize != sizeof (double))
+				return SF_FALSE ;
+
+			if (psf->have_written)
+				return SF_FALSE ;
+
+			vdata->quality = 1.0 - *((double *) data) ;
+
+			/* Clip range. */
+			vdata->quality = SF_MAX (0.0, SF_MIN (1.0, vdata->quality)) ;
+
+			psf_log_printf (psf, "%s : Setting SFC_SET_VBR_ENCODING_QUALITY to %f.\n", __func__, vdata->quality) ;
+			return SF_TRUE ;
+
+		default :
+			return SF_FALSE ;
+		} ;
+
+	return SF_FALSE ;
+} /* vorbis_command */
+
+static int
+vorbis_rnull (SF_PRIVATE *UNUSED (psf), int samples, void *UNUSED (vptr), int UNUSED (off) , int channels, float **UNUSED (pcm))
+{
+	return samples * channels ;
+} /* vorbis_rnull */
+
+static int
+vorbis_rshort (SF_PRIVATE *psf, int samples, void *vptr, int off, int channels, float **pcm)
+{
+	short *ptr = (short*) vptr + off ;
+	int i = 0, j, n ;
+	if (psf->float_int_mult)
+	{
+		float inverse = 1.0 / psf->float_max ;
+		for (j = 0 ; j < samples ; j++)
+			for (n = 0 ; n < channels ; n++)
+				ptr [i++] = lrintf ((pcm [n][j] * inverse) * 32767.0f) ;
+	}
+	else
+	{
+		for (j = 0 ; j < samples ; j++)
+			for (n = 0 ; n < channels ; n++)
+				ptr [i++] = lrintf (pcm [n][j] * 32767.0f) ;
+	}
+	return i ;
+} /* vorbis_rshort */
+
+static int
+vorbis_rint (SF_PRIVATE *psf, int samples, void *vptr, int off, int channels, float **pcm)
+{
+	int *ptr = (int*) vptr + off ;
+	int i = 0, j, n ;
+
+	if (psf->float_int_mult)
+	{
+		float inverse = 1.0 / psf->float_max ;
+		for (j = 0 ; j < samples ; j++)
+			for (n = 0 ; n < channels ; n++)
+				ptr [i++] = lrintf ((pcm [n][j] * inverse) * 2147483647.0f) ;
+	}
+	else
+	{
+		for (j = 0 ; j < samples ; j++)
+			for (n = 0 ; n < channels ; n++)
+				ptr [i++] = lrintf (pcm [n][j] * 2147483647.0f) ;
+	}
+	return i ;
+} /* vorbis_rint */
+
+static int
+vorbis_rfloat (SF_PRIVATE *UNUSED (psf), int samples, void *vptr, int off, int channels, float **pcm)
+{
+	float *ptr = (float*) vptr + off ;
+	int i = 0, j, n ;
+	for (j = 0 ; j < samples ; j++)
+		for (n = 0 ; n < channels ; n++)
+			ptr [i++] = pcm [n][j] ;
+	return i ;
+} /* vorbis_rfloat */
+
+static int
+vorbis_rdouble (SF_PRIVATE *UNUSED (psf), int samples, void *vptr, int off, int channels, float **pcm)
+{
+	double *ptr = (double*) vptr + off ;
+	int i = 0, j, n ;
+	for (j = 0 ; j < samples ; j++)
+		for (n = 0 ; n < channels ; n++)
+			ptr [i++] = pcm [n][j] ;
+	return i ;
+} /* vorbis_rdouble */
+
+
+static sf_count_t
+vorbis_read_sample (SF_PRIVATE *psf, void *ptr, sf_count_t lens, convert_func *transfn)
+{
+	VORBIS_PRIVATE *vdata = psf->codec_data ;
+	OGG_PRIVATE *odata = psf->container_data ;
+	int len, samples, i = 0 ;
+	float **pcm ;
+
+	len = lens / psf->sf.channels ;
+
+	while ((samples = vorbis_synthesis_pcmout (&vdata->vdsp, &pcm)) > 0)
+	{	if (samples > len) samples = len ;
+		i += transfn (psf, samples, ptr, i, psf->sf.channels, pcm) ;
+		len -= samples ;
+		/* tell libvorbis how many samples we actually consumed */
+		vorbis_synthesis_read (&vdata->vdsp, samples) ;
+		vdata->loc += samples ;
+		if (len == 0)
+			return i ; /* Is this necessary */
+	}
+	goto start0 ;		/* Jump into the nasty nest */
+	while (len > 0 && !odata->eos)
+	{
+		while (len > 0 && !odata->eos)
+		{	int result = ogg_sync_pageout (&odata->osync, &odata->opage) ;
+			if (result == 0) break ; /* need more data */
+			if (result < 0)
+			{	/* missing or corrupt data at this page position */
+				psf_log_printf (psf, "Corrupt or missing data in bitstream ; continuing...\n") ;
+				}
+			else
+			{	/* can safely ignore errors at this point */
+				ogg_stream_pagein (&odata->ostream, &odata->opage) ;
+			start0:
+				while (1)
+				{	result = ogg_stream_packetout (&odata->ostream, &odata->opacket) ;
+					if (result == 0)
+						break ; /* need more data */
+					if (result < 0)
+					{	/* missing or corrupt data at this page position */
+						/* no reason to complain ; already complained above */
+						}
+					else
+					{	/* we have a packet.	Decode it */
+						if (vorbis_synthesis (&vdata->vblock, &odata->opacket) == 0) /* test for success! */
+							vorbis_synthesis_blockin (&vdata->vdsp, &vdata->vblock) ;
+						/*
+						** pcm is a multichannel float vector.	 In stereo, for
+						** example, pcm [0] is left, and pcm [1] is right.	 samples is
+						** the size of each channel.	 Convert the float values
+						** (-1.<=range<=1.) to whatever PCM format and write it out.
+						*/
+
+						while ((samples = vorbis_synthesis_pcmout (&vdata->vdsp, &pcm)) > 0)
+						{	if (samples > len) samples = len ;
+							i += transfn (psf, samples, ptr, i, psf->sf.channels, pcm) ;
+							len -= samples ;
+							/* tell libvorbis how many samples we actually consumed */
+							vorbis_synthesis_read (&vdata->vdsp, samples) ;
+							vdata->loc += samples ;
+							if (len == 0)
+								return i ; /* Is this necessary */
+							} ;
+					}
+				}
+				if (ogg_page_eos (&odata->opage)) odata->eos = 1 ;
+			}
+		}
+		if (!odata->eos)
+		{	char *buffer ;
+			int bytes ;
+			buffer = ogg_sync_buffer (&odata->osync, 4096) ;
+			bytes = psf_fread (buffer, 1, 4096, psf) ;
+			ogg_sync_wrote (&odata->osync, bytes) ;
+			if (bytes == 0) odata->eos = 1 ;
+		}
+	}
+	return i ;
+} /* vorbis_read_sample */
+
+static sf_count_t
+vorbis_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t lens)
+{	return vorbis_read_sample (psf, (void*) ptr, lens, vorbis_rshort) ;
+} /* vorbis_read_s */
+
+static sf_count_t
+vorbis_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t lens)
+{	return vorbis_read_sample (psf, (void*) ptr, lens, vorbis_rint) ;
+} /* vorbis_read_i */
+
+static sf_count_t
+vorbis_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t lens)
+{	return vorbis_read_sample (psf, (void*) ptr, lens, vorbis_rfloat) ;
+} /* vorbis_read_f */
+
+static sf_count_t
+vorbis_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t lens)
+{	return vorbis_read_sample (psf, (void*) ptr, lens, vorbis_rdouble) ;
+} /* vorbis_read_d */
+
+/*==============================================================================
+*/
+
+static void
+vorbis_write_samples (SF_PRIVATE *psf, OGG_PRIVATE *odata, VORBIS_PRIVATE *vdata, int in_frames)
+{
+	vorbis_analysis_wrote (&vdata->vdsp, in_frames) ;
+
+	/*
+	**	Vorbis does some data preanalysis, then divvies up blocks for
+	**	more involved (potentially parallel) processing. Get a single
+	**	block for encoding now.
+	*/
+	while (vorbis_analysis_blockout (&vdata->vdsp, &vdata->vblock) == 1)
+	{
+		/* analysis, assume we want to use bitrate management */
+		vorbis_analysis (&vdata->vblock, NULL) ;
+		vorbis_bitrate_addblock (&vdata->vblock) ;
+
+		while (vorbis_bitrate_flushpacket (&vdata->vdsp, &odata->opacket))
+		{
+			/* weld the packet into the bitstream */
+			ogg_stream_packetin (&odata->ostream, &odata->opacket) ;
+
+			/* write out pages (if any) */
+			while (!odata->eos)
+			{	int result = ogg_stream_pageout (&odata->ostream, &odata->opage) ;
+				if (result == 0)
+					break ;
+				psf_fwrite (odata->opage.header, 1, odata->opage.header_len, psf) ;
+				psf_fwrite (odata->opage.body, 1, odata->opage.body_len, psf) ;
+
+				/*	This could be set above, but for illustrative purposes, I do
+				**	it here (to show that vorbis does know where the stream ends) */
+				if (ogg_page_eos (&odata->opage))
+					odata->eos = 1 ;
+				} ;
+			} ;
+		} ;
+
+	vdata->loc += in_frames ;
+} /* vorbis_write_data */
+
+
+static sf_count_t
+vorbis_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t lens)
+{
+	int i, m, j = 0 ;
+	OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ;
+	VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ;
+	int in_frames = lens / psf->sf.channels ;
+	float **buffer = vorbis_analysis_buffer (&vdata->vdsp, in_frames) ;
+	for (i = 0 ; i < in_frames ; i++)
+		for (m = 0 ; m < psf->sf.channels ; m++)
+			buffer [m][i] = (float) (ptr [j++]) / 32767.0f ;
+
+	vorbis_write_samples (psf, odata, vdata, in_frames) ;
+
+	return lens ;
+} /* vorbis_write_s */
+
+static sf_count_t
+vorbis_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t lens)
+{	int i, m, j = 0 ;
+	OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ;
+	VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ;
+	int in_frames = lens / psf->sf.channels ;
+	float **buffer = vorbis_analysis_buffer (&vdata->vdsp, in_frames) ;
+	for (i = 0 ; i < in_frames ; i++)
+		for (m = 0 ; m < psf->sf.channels ; m++)
+			buffer [m][i] = (float) (ptr [j++]) / 2147483647.0f ;
+
+	vorbis_write_samples (psf, odata, vdata, in_frames) ;
+
+	return lens ;
+} /* vorbis_write_i */
+
+static sf_count_t
+vorbis_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t lens)
+{	int i, m, j = 0 ;
+	OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ;
+	VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ;
+	int in_frames = lens / psf->sf.channels ;
+	float **buffer = vorbis_analysis_buffer (&vdata->vdsp, in_frames) ;
+	for (i = 0 ; i < in_frames ; i++)
+		for (m = 0 ; m < psf->sf.channels ; m++)
+			buffer [m][i] = ptr [j++] ;
+
+	vorbis_write_samples (psf, odata, vdata, in_frames) ;
+
+	return lens ;
+} /* vorbis_write_f */
+
+static sf_count_t
+vorbis_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t lens)
+{	int i, m, j = 0 ;
+	OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ;
+	VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ;
+	int in_frames = lens / psf->sf.channels ;
+	float **buffer = vorbis_analysis_buffer (&vdata->vdsp, in_frames) ;
+	for (i = 0 ; i < in_frames ; i++)
+		for (m = 0 ; m < psf->sf.channels ; m++)
+			buffer [m][i] = (float) ptr [j++] ;
+
+	vorbis_write_samples (psf, odata, vdata, in_frames) ;
+
+	return lens ;
+} /* vorbis_write_d */
+
+static sf_count_t
+vorbis_seek (SF_PRIVATE *psf, int UNUSED (mode), sf_count_t offset)
+{
+	OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ;
+	VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ;
+
+	if (odata == NULL || vdata == NULL)
+		return 0 ;
+
+	if (offset < 0)
+	{	psf->error = SFE_BAD_SEEK ;
+		return ((sf_count_t) -1) ;
+		} ;
+
+	if (psf->file.mode == SFM_READ)
+	{	sf_count_t target = offset - vdata->loc ;
+
+		if (target < 0)
+		{	/* 12 to allow for OggS bit */
+			psf_fseek (psf, 12, SEEK_SET) ;
+			vorbis_read_header (psf, 0) ; /* Reset state */
+			target = offset ;
+			} ;
+
+		while (target > 0)
+		{	sf_count_t m = target > 4096 ? 4096 : target ;
+
+			/*
+			**	Need to multiply by channels here because the seek is done in
+			**	terms of frames and the read function is done in terms of
+			**	samples.
+			*/
+			vorbis_read_sample (psf, (void *) NULL, m * psf->sf.channels, vorbis_rnull) ;
+
+			target -= m ;
+			} ;
+
+		return vdata->loc ;
+		} ;
+
+	return 0 ;
+} /* vorbis_seek */
+
+
+static int
+vorbis_byterate (SF_PRIVATE *psf)
+{
+	if (psf->file.mode == SFM_READ)
+		return (psf->datalength * psf->sf.samplerate) / psf->sf.frames ;
+
+	return -1 ;
+} /* vorbis_byterate */
+
+/*==============================================================================
+**	Most of the following code was snipped from Mike Smith's ogginfo utility
+**	which is part of vorbis-tools.
+**	Vorbis tools is released under the GPL but Mike has kindly allowed the
+**	following to be relicensed as LGPL for libsndfile.
+*/
+
+typedef struct
+{
+	int isillegal ;
+	int shownillegal ;
+	int isnew ;
+	int end ;
+
+	uint32_t serial ; /* must be 32 bit unsigned */
+	ogg_stream_state ostream ;
+
+	vorbis_info vinfo ;
+	vorbis_comment vcomment ;
+	sf_count_t lastgranulepos ;
+	int doneheaders ;
+} stream_processor ;
+
+typedef struct
+{
+	stream_processor *streams ;
+	int allocated ;
+	int used ;
+	int in_headers ;
+} stream_set ;
+
+static stream_set *
+create_stream_set (void)
+{	stream_set *set = calloc (1, sizeof (stream_set)) ;
+
+	set->streams = calloc (5, sizeof (stream_processor)) ;
+	set->allocated = 5 ;
+	set->used = 0 ;
+
+	return set ;
+} /* create_stream_set */
+
+static void
+vorbis_end (stream_processor *stream, sf_count_t * len)
+{	*len += stream->lastgranulepos ;
+	vorbis_comment_clear (&stream->vcomment) ;
+	vorbis_info_clear (&stream->vinfo) ;
+} /* vorbis_end */
+
+static void
+free_stream_set (stream_set *set, sf_count_t * len)
+{	int i ;
+
+	for (i = 0 ; i < set->used ; i++)
+	{	if (!set->streams [i].end)
+			vorbis_end (&set->streams [i], len) ;
+		ogg_stream_clear (&set->streams [i].ostream) ;
+		} ;
+
+	free (set->streams) ;
+	free (set) ;
+} /* free_stream_set */
+
+static int
+streams_open (stream_set *set)
+{	int i, res = 0 ;
+
+	for (i = 0 ; i < set->used ; i++)
+		if (!set->streams [i].end)
+			res ++ ;
+	return res ;
+} /* streams_open */
+
+static stream_processor *
+find_stream_processor (stream_set *set, ogg_page *page)
+{	uint32_t serial = ogg_page_serialno (page) ;
+	int i, invalid = 0 ;
+
+	stream_processor *stream ;
+
+	for (i = 0 ; i < set->used ; i++)
+	{
+		if (serial == set->streams [i].serial)
+		{	/* We have a match! */
+			stream = & (set->streams [i]) ;
+
+			set->in_headers = 0 ;
+			/* if we have detected EOS, then this can't occur here. */
+			if (stream->end)
+			{	stream->isillegal = 1 ;
+				return stream ;
+				}
+
+			stream->isnew = 0 ;
+			stream->end = ogg_page_eos (page) ;
+			stream->serial = serial ;
+			return stream ;
+			} ;
+		} ;
+
+	/* If there are streams open, and we've reached the end of the
+	** headers, then we can't be starting a new stream.
+	** XXX: might this sometimes catch ok streams if EOS flag is missing,
+	** but the stream is otherwise ok?
+	*/
+	if (streams_open (set) && !set->in_headers)
+		invalid = 1 ;
+
+	set->in_headers = 1 ;
+
+	if (set->allocated < set->used)
+		stream = &set->streams [set->used] ;
+	else
+	{	set->allocated += 5 ;
+		set->streams = realloc (set->streams, sizeof (stream_processor) * set->allocated) ;
+		stream = &set->streams [set->used] ;
+		} ;
+
+	set->used++ ;
+
+	stream->isnew = 1 ;
+	stream->isillegal = invalid ;
+
+	{
+		int res ;
+		ogg_packet packet ;
+
+		/* We end up processing the header page twice, but that's ok. */
+		ogg_stream_init (&stream->ostream, serial) ;
+		ogg_stream_pagein (&stream->ostream, page) ;
+		res = ogg_stream_packetout (&stream->ostream, &packet) ;
+		if (res <= 0)
+			return NULL ;
+		else if (packet.bytes >= 7 && memcmp (packet.packet, "\x01vorbis", 7) == 0)
+		{
+			stream->lastgranulepos = 0 ;
+			vorbis_comment_init (&stream->vcomment) ;
+			vorbis_info_init (&stream->vinfo) ;
+			} ;
+
+		res = ogg_stream_packetout (&stream->ostream, &packet) ;
+
+		/* re-init, ready for processing */
+		ogg_stream_clear (&stream->ostream) ;
+		ogg_stream_init (&stream->ostream, serial) ;
+	}
+
+	stream->end = ogg_page_eos (page) ;
+	stream->serial = serial ;
+
+	return stream ;
+} /* find_stream_processor */
+
+static int
+vorbis_length_get_next_page (SF_PRIVATE *psf, ogg_sync_state * osync, ogg_page *page)
+{	static const int CHUNK_SIZE = 4500 ;
+
+	while (ogg_sync_pageout (osync, page) <= 0)
+	{	char * buffer = ogg_sync_buffer (osync, CHUNK_SIZE) ;
+		int bytes = psf_fread (buffer, 1, 4096, psf) ;
+
+		if (bytes <= 0)
+		{	ogg_sync_wrote (osync, 0) ;
+			return 0 ;
+			} ;
+
+		ogg_sync_wrote (osync, bytes) ;
+		} ;
+
+	return 1 ;
+} /* vorbis_length_get_next_page */
+
+static sf_count_t
+vorbis_length_aux (SF_PRIVATE * psf)
+{
+	ogg_sync_state osync ;
+	ogg_page page ;
+	sf_count_t len = 0 ;
+	stream_set *processors ;
+
+	processors = create_stream_set () ;
+	if (processors == NULL)
+		return 0 ;	// out of memory?
+
+	ogg_sync_init (&osync) ;
+
+	while (vorbis_length_get_next_page (psf, &osync, &page))
+	{
+		stream_processor *p = find_stream_processor (processors, &page) ;
+
+		if (!p)
+		{	len = 0 ;
+			break ;
+			} ;
+
+		if (p->isillegal && !p->shownillegal)
+		{
+			p->shownillegal = 1 ;
+			/* If it's a new stream, we want to continue processing this page
+			** anyway to suppress additional spurious errors
+			*/
+			if (!p->isnew) continue ;
+			} ;
+
+		if (!p->isillegal)
+		{	ogg_packet packet ;
+			int header = 0 ;
+
+			ogg_stream_pagein (&p->ostream, &page) ;
+			if (p->doneheaders < 3)
+				header = 1 ;
+
+			while (ogg_stream_packetout (&p->ostream, &packet) > 0)
+			{
+				if (p->doneheaders < 3)
+				{	if (vorbis_synthesis_headerin (&p->vinfo, &p->vcomment, &packet) < 0)
+						continue ;
+					p->doneheaders ++ ;
+					} ;
+				} ;
+			if (!header)
+			{	sf_count_t gp = ogg_page_granulepos (&page) ;
+				if (gp > 0) p->lastgranulepos = gp ;
+				} ;
+			if (p->end)
+			{	vorbis_end (p, &len) ;
+				p->isillegal = 1 ;
+				} ;
+			} ;
+		} ;
+
+	ogg_sync_clear (&osync) ;
+	free_stream_set (processors, &len) ;
+
+	return len ;
+} /* vorbis_length_aux */
+
+static sf_count_t
+vorbis_length (SF_PRIVATE *psf)
+{	sf_count_t length ;
+	int error ;
+
+	if (psf->sf.seekable == 0)
+		return SF_COUNT_MAX ;
+
+	psf_fseek (psf, 0, SEEK_SET) ;
+	length = vorbis_length_aux (psf) ;
+
+	psf_fseek (psf, 12, SEEK_SET) ;
+	if ((error = vorbis_read_header (psf, 0)) != 0)
+		psf->error = error ;
+
+	return length ;
+} /* vorbis_length */
+
+#else /* HAVE_EXTERNAL_LIBS */
+
+int
+ogg_vorbis_open	(SF_PRIVATE *psf)
+{
+	psf_log_printf (psf, "This version of libsndfile was compiled without Ogg/Vorbis support.\n") ;
+	return SFE_UNIMPLEMENTED ;
+} /* ogg_vorbis_open */
+
+#endif
diff --git a/libs/libsndfile/src/paf.c b/libs/libsndfile/src/paf.c
index b4737dc316..1360c33710 100644
--- a/libs/libsndfile/src/paf.c
+++ b/libs/libsndfile/src/paf.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2013 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -52,23 +52,19 @@
 typedef	struct
 {	int	version ;
 	int	endianness ;
-    int	samplerate ;
-    int	format ;
+	int	samplerate ;
+	int	format ;
 	int	channels ;
 	int	source ;
 } PAF_FMT ;
 
 typedef struct
-{	int				max_blocks, channels, samplesperblock, blocksize ;
+{	int				max_blocks, channels, blocksize ;
 	int				read_block, write_block, read_count, write_count ;
 	sf_count_t		sample_count ;
 	int				*samples ;
 	unsigned char	*block ;
-#if HAVE_FLEXIBLE_ARRAY
 	int				data [] ; /* ISO C99 struct flexible array. */
-#else
-	int				data [1] ; /* This is a hack and may not work. */
-#endif
 } PAF24_PRIVATE ;
 
 /*------------------------------------------------------------------------------
@@ -108,14 +104,14 @@ paf_open	(SF_PRIVATE *psf)
 
  	psf->dataoffset = PAF_HEADER_LENGTH ;
 
-	if (psf->mode == SFM_READ || (psf->mode == SFM_RDWR && psf->filelength > 0))
+	if (psf->file.mode == SFM_READ || (psf->file.mode == SFM_RDWR && psf->filelength > 0))
 	{	if ((error = paf_read_header (psf)))
 			return error ;
 		} ;
 
 	subformat = SF_CODEC (psf->sf.format) ;
 
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{	if ((SF_CONTAINER (psf->sf.format)) != SF_FORMAT_PAF)
 			return	SFE_BAD_OPEN_FORMAT ;
 
@@ -163,6 +159,9 @@ paf_read_header	(SF_PRIVATE *psf)
 {	PAF_FMT		paf_fmt ;
 	int			marker ;
 
+	if (psf->filelength < PAF_HEADER_LENGTH)
+		return SFE_PAF_SHORT_HEADER ;
+
 	memset (&paf_fmt, 0, sizeof (paf_fmt)) ;
 	psf_binheader_readf (psf, "pm", 0, &marker) ;
 
@@ -199,8 +198,8 @@ paf_read_header	(SF_PRIVATE *psf)
 		psf->endian = SF_ENDIAN_BIG ;
 		} ;
 
-	if (psf->filelength < PAF_HEADER_LENGTH)
-		return SFE_PAF_SHORT_HEADER ;
+	if (paf_fmt.channels < 1 || paf_fmt.channels > SF_MAX_CHANNELS)
+		return SFE_PAF_BAD_CHANNELS ;
 
 	psf->datalength = psf->filelength - psf->dataoffset ;
 
@@ -356,20 +355,18 @@ paf24_init (SF_PRIVATE *psf)
 	*/
 	psf->last_op = 0 ;
 
-	if (! (psf->codec_data = malloc (paf24size)))
+	if (! (psf->codec_data = calloc (1, paf24size)))
 		return SFE_MALLOC_FAILED ;
 
 	ppaf24 = (PAF24_PRIVATE*) psf->codec_data ;
-	memset (ppaf24, 0, paf24size) ;
 
 	ppaf24->channels	= psf->sf.channels ;
 	ppaf24->samples		= ppaf24->data ;
 	ppaf24->block		= (unsigned char*) (ppaf24->data + PAF24_SAMPLES_PER_BLOCK * ppaf24->channels) ;
 
 	ppaf24->blocksize = PAF24_BLOCK_SIZE * ppaf24->channels ;
-	ppaf24->samplesperblock = PAF24_SAMPLES_PER_BLOCK ;
 
-	if (psf->mode == SFM_READ || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_READ || psf->file.mode == SFM_RDWR)
 	{	paf24_read_block (psf, ppaf24) ;	/* Read first block. */
 
 		psf->read_short		= paf24_read_s ;
@@ -378,7 +375,7 @@ paf24_init (SF_PRIVATE *psf)
 		psf->read_double	= paf24_read_d ;
 		} ;
 
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{	psf->write_short	= paf24_write_s ;
 		psf->write_int		= paf24_write_i ;
 		psf->write_float	= paf24_write_f ;
@@ -392,7 +389,7 @@ paf24_init (SF_PRIVATE *psf)
 	psf->datalength = psf->filelength - psf->dataoffset ;
 
 	if (psf->datalength % PAF24_BLOCK_SIZE)
-	{	if (psf->mode == SFM_READ)
+	{	if (psf->file.mode == SFM_READ)
 			psf_log_printf (psf, "*** Warning : file seems to be truncated.\n") ;
 		ppaf24->max_blocks = psf->datalength / ppaf24->blocksize + 1 ;
 		}
@@ -400,12 +397,12 @@ paf24_init (SF_PRIVATE *psf)
 		ppaf24->max_blocks = psf->datalength / ppaf24->blocksize ;
 
 	ppaf24->read_block = 0 ;
-	if (psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_RDWR)
 		ppaf24->write_block = ppaf24->max_blocks ;
 	else
 		ppaf24->write_block = 0 ;
 
-	psf->sf.frames = ppaf24->samplesperblock * ppaf24->max_blocks ;
+	psf->sf.frames = PAF24_SAMPLES_PER_BLOCK * ppaf24->max_blocks ;
 	ppaf24->sample_count = psf->sf.frames ;
 
 	return 0 ;
@@ -426,8 +423,8 @@ paf24_seek (SF_PRIVATE *psf, int mode, sf_count_t offset)
 	if (mode == SFM_READ && ppaf24->write_count > 0)
 		paf24_write_block (psf, ppaf24) ;
 
-	newblock	= offset / ppaf24->samplesperblock ;
-	newsample	= offset % ppaf24->samplesperblock ;
+	newblock	= offset / PAF24_SAMPLES_PER_BLOCK ;
+	newsample	= offset % PAF24_SAMPLES_PER_BLOCK ;
 
 	switch (mode)
 	{	case SFM_READ :
@@ -460,7 +457,7 @@ paf24_seek (SF_PRIVATE *psf, int mode, sf_count_t offset)
 				return PSF_SEEK_ERROR ;
 		} ;
 
-	return newblock * ppaf24->samplesperblock + newsample ;
+	return newblock * PAF24_SAMPLES_PER_BLOCK + newsample ;
 } /* paf24_seek */
 
 static int
@@ -472,7 +469,7 @@ paf24_close (SF_PRIVATE *psf)
 
 	ppaf24 = (PAF24_PRIVATE*) psf->codec_data ;
 
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{	if (ppaf24->write_count > 0)
 			paf24_write_block (psf, ppaf24) ;
 		} ;
@@ -490,8 +487,8 @@ paf24_read_block (SF_PRIVATE *psf, PAF24_PRIVATE *ppaf24)
 	ppaf24->read_block ++ ;
 	ppaf24->read_count = 0 ;
 
-	if (ppaf24->read_block * ppaf24->samplesperblock > ppaf24->sample_count)
-	{	memset (ppaf24->samples, 0, ppaf24->samplesperblock * ppaf24->channels) ;
+	if (ppaf24->read_block * PAF24_SAMPLES_PER_BLOCK > ppaf24->sample_count)
+	{	memset (ppaf24->samples, 0, PAF24_SAMPLES_PER_BLOCK * ppaf24->channels) ;
 		return 1 ;
 		} ;
 
@@ -500,29 +497,15 @@ paf24_read_block (SF_PRIVATE *psf, PAF24_PRIVATE *ppaf24)
 		psf_log_printf (psf, "*** Warning : short read (%d != %d).\n", k, ppaf24->blocksize) ;
 
 
-	if (CPU_IS_LITTLE_ENDIAN)
-	{	/* Do endian swapping if necessary. */
-		if (psf->endian == SF_ENDIAN_BIG)
-			endswap_int_array 	(ppaf24->data, 8 * ppaf24->channels) ;
+	/* Do endian swapping if necessary. */
+	if (psf->endian == SF_ENDIAN_BIG)
+		endswap_int_array 	(ppaf24->data, 8 * ppaf24->channels) ;
 
-		/* Unpack block. */
-		for (k = 0 ; k < PAF24_SAMPLES_PER_BLOCK * ppaf24->channels ; k++)
-		{	channel = k % ppaf24->channels ;
-			cptr = ppaf24->block + PAF24_BLOCK_SIZE * channel + 3 * (k / ppaf24->channels) ;
-			ppaf24->samples [k] = (cptr [0] << 8) | (cptr [1] << 16) | (cptr [2] << 24) ;
-			} ;
-		}
-	else
-	{	/* Do endian swapping if necessary. */
-		if (psf->endian == SF_ENDIAN_BIG)
-			endswap_int_array 	(ppaf24->data, 8 * ppaf24->channels) ;
-
-		/* Unpack block. */
-		for (k = 0 ; k < PAF24_SAMPLES_PER_BLOCK * ppaf24->channels ; k++)
-		{	channel = k % ppaf24->channels ;
-			cptr = ppaf24->block + PAF24_BLOCK_SIZE * channel + 3 * (k / ppaf24->channels) ;
-			ppaf24->samples [k] = (cptr [0] << 8) | (cptr [1] << 16) | (cptr [2] << 24) ;
-			} ;
+	/* Unpack block. */
+	for (k = 0 ; k < PAF24_SAMPLES_PER_BLOCK * ppaf24->channels ; k++)
+	{	channel = k % ppaf24->channels ;
+		cptr = ppaf24->block + PAF24_BLOCK_SIZE * channel + 3 * (k / ppaf24->channels) ;
+		ppaf24->samples [k] = (cptr [0] << 8) | (cptr [1] << 16) | (cptr [2] << 24) ;
 		} ;
 
 	return 1 ;
@@ -533,15 +516,15 @@ paf24_read (SF_PRIVATE *psf, PAF24_PRIVATE *ppaf24, int *ptr, int len)
 {	int	count, total = 0 ;
 
 	while (total < len)
-	{	if (ppaf24->read_block * ppaf24->samplesperblock >= ppaf24->sample_count)
+	{	if (ppaf24->read_block * PAF24_SAMPLES_PER_BLOCK >= ppaf24->sample_count)
 		{	memset (&(ptr [total]), 0, (len - total) * sizeof (int)) ;
 			return total ;
 			} ;
 
-		if (ppaf24->read_count >= ppaf24->samplesperblock)
+		if (ppaf24->read_count >= PAF24_SAMPLES_PER_BLOCK)
 			paf24_read_block (psf, ppaf24) ;
 
-		count = (ppaf24->samplesperblock - ppaf24->read_count) * ppaf24->channels ;
+		count = (PAF24_SAMPLES_PER_BLOCK - ppaf24->read_count) * ppaf24->channels ;
 		count = (len - total > count) ? count : len - total ;
 
 		memcpy (&(ptr [total]), &(ppaf24->samples [ppaf24->read_count * ppaf24->channels]), count * sizeof (int)) ;
@@ -554,7 +537,8 @@ paf24_read (SF_PRIVATE *psf, PAF24_PRIVATE *ppaf24, int *ptr, int len)
 
 static sf_count_t
 paf24_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len)
-{	PAF24_PRIVATE 	*ppaf24 ;
+{	BUF_UNION		ubuf ;
+	PAF24_PRIVATE 	*ppaf24 ;
 	int				*iptr ;
 	int				k, bufferlen, readcount, count ;
 	sf_count_t		total = 0 ;
@@ -563,8 +547,8 @@ paf24_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len)
 		return 0 ;
 	ppaf24 = (PAF24_PRIVATE*) psf->codec_data ;
 
-	iptr = psf->u.ibuf ;
-	bufferlen = ARRAY_LEN (psf->u.ibuf) ;
+	iptr = ubuf.ibuf ;
+	bufferlen = ARRAY_LEN (ubuf.ibuf) ;
 	while (len > 0)
 	{	readcount = (len >= bufferlen) ? bufferlen : len ;
 		count = paf24_read (psf, ppaf24, iptr, readcount) ;
@@ -592,7 +576,8 @@ paf24_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len)
 
 static sf_count_t
 paf24_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
-{	PAF24_PRIVATE 	*ppaf24 ;
+{	BUF_UNION		ubuf ;
+	PAF24_PRIVATE 	*ppaf24 ;
 	int				*iptr ;
 	int				k, bufferlen, readcount, count ;
 	sf_count_t		total = 0 ;
@@ -604,8 +589,8 @@ paf24_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
 
 	normfact = (psf->norm_float == SF_TRUE) ? (1.0 / 0x80000000) : (1.0 / 0x100) ;
 
-	iptr = psf->u.ibuf ;
-	bufferlen = ARRAY_LEN (psf->u.ibuf) ;
+	iptr = ubuf.ibuf ;
+	bufferlen = ARRAY_LEN (ubuf.ibuf) ;
 	while (len > 0)
 	{	readcount = (len >= bufferlen) ? bufferlen : len ;
 		count = paf24_read (psf, ppaf24, iptr, readcount) ;
@@ -619,7 +604,8 @@ paf24_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
 
 static sf_count_t
 paf24_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
-{	PAF24_PRIVATE 	*ppaf24 ;
+{	BUF_UNION		ubuf ;
+	PAF24_PRIVATE 	*ppaf24 ;
 	int				*iptr ;
 	int				k, bufferlen, readcount, count ;
 	sf_count_t		total = 0 ;
@@ -631,8 +617,8 @@ paf24_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
 
 	normfact = (psf->norm_double == SF_TRUE) ? (1.0 / 0x80000000) : (1.0 / 0x100) ;
 
-	iptr = psf->u.ibuf ;
-	bufferlen = ARRAY_LEN (psf->u.ibuf) ;
+	iptr = ubuf.ibuf ;
+	bufferlen = ARRAY_LEN (ubuf.ibuf) ;
 	while (len > 0)
 	{	readcount = (len >= bufferlen) ? bufferlen : len ;
 		count = paf24_read (psf, ppaf24, iptr, readcount) ;
@@ -686,10 +672,10 @@ paf24_write_block (SF_PRIVATE *psf, PAF24_PRIVATE *ppaf24)
 	if ((k = psf_fwrite (ppaf24->block, 1, ppaf24->blocksize, psf)) != ppaf24->blocksize)
 		psf_log_printf (psf, "*** Warning : short write (%d != %d).\n", k, ppaf24->blocksize) ;
 
-	if (ppaf24->sample_count < ppaf24->write_block * ppaf24->samplesperblock + ppaf24->write_count)
-		ppaf24->sample_count = ppaf24->write_block * ppaf24->samplesperblock + ppaf24->write_count ;
+	if (ppaf24->sample_count < ppaf24->write_block * PAF24_SAMPLES_PER_BLOCK + ppaf24->write_count)
+		ppaf24->sample_count = ppaf24->write_block * PAF24_SAMPLES_PER_BLOCK + ppaf24->write_count ;
 
-	if (ppaf24->write_count == ppaf24->samplesperblock)
+	if (ppaf24->write_count == PAF24_SAMPLES_PER_BLOCK)
 	{	ppaf24->write_block ++ ;
 		ppaf24->write_count = 0 ;
 		} ;
@@ -702,7 +688,7 @@ paf24_write (SF_PRIVATE *psf, PAF24_PRIVATE *ppaf24, const int *ptr, int len)
 {	int		count, total = 0 ;
 
 	while (total < len)
-	{	count = (ppaf24->samplesperblock - ppaf24->write_count) * ppaf24->channels ;
+	{	count = (PAF24_SAMPLES_PER_BLOCK - ppaf24->write_count) * ppaf24->channels ;
 
 		if (count > len - total)
 			count = len - total ;
@@ -711,7 +697,7 @@ paf24_write (SF_PRIVATE *psf, PAF24_PRIVATE *ppaf24, const int *ptr, int len)
 		total += count ;
 		ppaf24->write_count += count / ppaf24->channels ;
 
-		if (ppaf24->write_count >= ppaf24->samplesperblock)
+		if (ppaf24->write_count >= PAF24_SAMPLES_PER_BLOCK)
 			paf24_write_block (psf, ppaf24) ;
 		} ;
 
@@ -720,7 +706,8 @@ paf24_write (SF_PRIVATE *psf, PAF24_PRIVATE *ppaf24, const int *ptr, int len)
 
 static sf_count_t
 paf24_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len)
-{	PAF24_PRIVATE 	*ppaf24 ;
+{	BUF_UNION		ubuf ;
+	PAF24_PRIVATE 	*ppaf24 ;
 	int				*iptr ;
 	int				k, bufferlen, writecount = 0, count ;
 	sf_count_t		total = 0 ;
@@ -729,8 +716,8 @@ paf24_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len)
 		return 0 ;
 	ppaf24 = (PAF24_PRIVATE*) psf->codec_data ;
 
-	iptr = psf->u.ibuf ;
-	bufferlen = ARRAY_LEN (psf->u.ibuf) ;
+	iptr = ubuf.ibuf ;
+	bufferlen = ARRAY_LEN (ubuf.ibuf) ;
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : len ;
 		for (k = 0 ; k < writecount ; k++)
@@ -770,7 +757,8 @@ paf24_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len)
 
 static sf_count_t
 paf24_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len)
-{	PAF24_PRIVATE 	*ppaf24 ;
+{	BUF_UNION		ubuf ;
+	PAF24_PRIVATE 	*ppaf24 ;
 	int				*iptr ;
 	int				k, bufferlen, writecount = 0, count ;
 	sf_count_t		total = 0 ;
@@ -782,8 +770,8 @@ paf24_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len)
 
 	normfact = (psf->norm_float == SF_TRUE) ? (1.0 * 0x7FFFFFFF) : (1.0 / 0x100) ;
 
-	iptr = psf->u.ibuf ;
-	bufferlen = ARRAY_LEN (psf->u.ibuf) ;
+	iptr = ubuf.ibuf ;
+	bufferlen = ARRAY_LEN (ubuf.ibuf) ;
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : len ;
 		for (k = 0 ; k < writecount ; k++)
@@ -800,7 +788,8 @@ paf24_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len)
 
 static sf_count_t
 paf24_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len)
-{	PAF24_PRIVATE 	*ppaf24 ;
+{	BUF_UNION		ubuf ;
+	PAF24_PRIVATE 	*ppaf24 ;
 	int				*iptr ;
 	int				k, bufferlen, writecount = 0, count ;
 	sf_count_t		total = 0 ;
@@ -812,8 +801,8 @@ paf24_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len)
 
 	normfact = (psf->norm_double == SF_TRUE) ? (1.0 * 0x7FFFFFFF) : (1.0 / 0x100) ;
 
-	iptr = psf->u.ibuf ;
-	bufferlen = ARRAY_LEN (psf->u.ibuf) ;
+	iptr = ubuf.ibuf ;
+	bufferlen = ARRAY_LEN (ubuf.ibuf) ;
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : len ;
 		for (k = 0 ; k < writecount ; k++)
diff --git a/libs/libsndfile/src/pcm.c b/libs/libsndfile/src/pcm.c
index 76cb58b5da..8a06858b2a 100644
--- a/libs/libsndfile/src/pcm.c
+++ b/libs/libsndfile/src/pcm.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2012 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -137,7 +137,7 @@ pcm_init (SF_PRIVATE *psf)
 	else
 		psf->data_endswap = (psf->endian == SF_ENDIAN_LITTLE) ? SF_FALSE : SF_TRUE ;
 
-	if (psf->mode == SFM_READ || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_READ || psf->file.mode == SFM_RDWR)
 	{	switch (psf->bytewidth * 0x10000 + psf->endian + chars)
 		{	case (0x10000 + SF_ENDIAN_BIG + SF_CHARS_SIGNED) :
 			case (0x10000 + SF_ENDIAN_LITTLE + SF_CHARS_SIGNED) :
@@ -198,7 +198,7 @@ pcm_init (SF_PRIVATE *psf)
 			} ;
 		} ;
 
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{	switch (psf->bytewidth * 0x10000 + psf->endian + chars)
 		{	case (0x10000 + SF_ENDIAN_BIG + SF_CHARS_SIGNED) :
 			case (0x10000 + SF_ENDIAN_LITTLE + SF_CHARS_SIGNED) :
@@ -271,7 +271,7 @@ pcm_init (SF_PRIVATE *psf)
 	else
 		psf->datalength = 0 ;
 
-	psf->sf.frames = psf->datalength / psf->blockwidth ;
+	psf->sf.frames = psf->blockwidth > 0 ? psf->datalength / psf->blockwidth : 0 ;
 
 	return 0 ;
 } /* pcm_init */
@@ -300,7 +300,7 @@ let2s_array (tribyte *src, int count, short *dest)
 	ucptr = ((unsigned char*) src) + 3 * count ;
 	while (--count >= 0)
 	{	ucptr -= 3 ;
-		dest [count] = LET2H_SHORT_PTR (ucptr) ;
+		dest [count] = LET2H_16_PTR (ucptr) ;
 		} ;
 } /* let2s_array */
 
@@ -311,7 +311,7 @@ bet2s_array (tribyte *src, int count, short *dest)
 	ucptr = ((unsigned char*) src) + 3 * count ;
 	while (--count >= 0)
 	{	ucptr -= 3 ;
-		dest [count] = BET2H_SHORT_PTR (ucptr) ;
+		dest [count] = BET2H_16_PTR (ucptr) ;
 			} ;
 } /* bet2s_array */
 
@@ -320,7 +320,7 @@ lei2s_array (int *src, int count, short *dest)
 {	int value ;
 
 	while (--count >= 0)
-	{	value = LEI2H_INT (src [count]) ;
+	{	value = LE2H_32 (src [count]) ;
 		dest [count] = value >> 16 ;
 		} ;
 } /* lei2s_array */
@@ -330,7 +330,7 @@ bei2s_array (int *src, int count, short *dest)
 {	int value ;
 
 	while (--count >= 0)
-	{	value = BEI2H_INT (src [count]) ;
+	{	value = BE2H_32 (src [count]) ;
 		dest [count] = value >> 16 ;
 		} ;
 } /* bei2s_array */
@@ -357,7 +357,7 @@ bes2i_array (short *src, int count, int *dest)
 {	short value ;
 
 	while (--count >= 0)
-	{	value = BES2H_SHORT (src [count]) ;
+	{	value = BE2H_16 (src [count]) ;
 		dest [count] = value << 16 ;
 		} ;
 } /* bes2i_array */
@@ -367,7 +367,7 @@ les2i_array (short *src, int count, int *dest)
 {	short value ;
 
 	while (--count >= 0)
-	{	value = LES2H_SHORT (src [count]) ;
+	{	value = LE2H_16 (src [count]) ;
 		dest [count] = value << 16 ;
 		} ;
 } /* les2i_array */
@@ -379,7 +379,7 @@ bet2i_array (tribyte *src, int count, int *dest)
 	ucptr = ((unsigned char*) src) + 3 * count ;
 	while (--count >= 0)
 	{	ucptr -= 3 ;
-		dest [count] = BET2H_INT_PTR (ucptr) ;
+		dest [count] = BET2H_32_PTR (ucptr) ;
 			} ;
 } /* bet2i_array */
 
@@ -390,7 +390,7 @@ let2i_array (tribyte *src, int count, int *dest)
 	ucptr = ((unsigned char*) src) + 3 * count ;
 	while (--count >= 0)
 	{	ucptr -= 3 ;
-		dest [count] = LET2H_INT_PTR (ucptr) ;
+		dest [count] = LET2H_32_PTR (ucptr) ;
 		} ;
 } /* let2i_array */
 
@@ -415,7 +415,7 @@ les2f_array (short *src, int count, float *dest, float normfact)
 
 	while (--count >= 0)
 	{	value = src [count] ;
-		value = LES2H_SHORT (value) ;
+		value = LE2H_16 (value) ;
 		dest [count] = ((float) value) * normfact ;
 		} ;
 } /* les2f_array */
@@ -426,7 +426,7 @@ bes2f_array (short *src, int count, float *dest, float normfact)
 
 	while (--count >= 0)
 	{	value = src [count] ;
-		value = BES2H_SHORT (value) ;
+		value = BE2H_16 (value) ;
 		dest [count] = ((float) value) * normfact ;
 		} ;
 } /* bes2f_array */
@@ -439,7 +439,7 @@ let2f_array (tribyte *src, int count, float *dest, float normfact)
 	ucptr = ((unsigned char*) src) + 3 * count ;
 	while (--count >= 0)
 	{	ucptr -= 3 ;
-		value = LET2H_INT_PTR (ucptr) ;
+		value = LET2H_32_PTR (ucptr) ;
 		dest [count] = ((float) value) * normfact ;
 		} ;
 } /* let2f_array */
@@ -452,7 +452,7 @@ bet2f_array (tribyte *src, int count, float *dest, float normfact)
 	ucptr = ((unsigned char*) src) + 3 * count ;
 	while (--count >= 0)
 	{	ucptr -= 3 ;
-		value = BET2H_INT_PTR (ucptr) ;
+		value = BET2H_32_PTR (ucptr) ;
 		dest [count] = ((float) value) * normfact ;
 			} ;
 } /* bet2f_array */
@@ -463,7 +463,7 @@ lei2f_array (int *src, int count, float *dest, float normfact)
 
 	while (--count >= 0)
 	{	value = src [count] ;
-		value = LEI2H_INT (value) ;
+		value = LE2H_32 (value) ;
 		dest [count] = ((float) value) * normfact ;
 		} ;
 } /* lei2f_array */
@@ -474,7 +474,7 @@ bei2f_array (int *src, int count, float *dest, float normfact)
 
 	while (--count >= 0)
 	{	value = src [count] ;
-		value = BEI2H_INT (value) ;
+		value = BE2H_32 (value) ;
 		dest [count] = ((float) value) * normfact ;
 		} ;
 } /* bei2f_array */
@@ -500,7 +500,7 @@ les2d_array (short *src, int count, double *dest, double normfact)
 
 	while (--count >= 0)
 	{	value = src [count] ;
-		value = LES2H_SHORT (value) ;
+		value = LE2H_16 (value) ;
 		dest [count] = ((double) value) * normfact ;
 		} ;
 } /* les2d_array */
@@ -511,7 +511,7 @@ bes2d_array (short *src, int count, double *dest, double normfact)
 
 	while (--count >= 0)
 	{	value = src [count] ;
-		value = BES2H_SHORT (value) ;
+		value = BE2H_16 (value) ;
 		dest [count] = ((double) value) * normfact ;
 		} ;
 } /* bes2d_array */
@@ -524,7 +524,7 @@ let2d_array (tribyte *src, int count, double *dest, double normfact)
 	ucptr = ((unsigned char*) src) + 3 * count ;
 	while (--count >= 0)
 	{	ucptr -= 3 ;
-		value = LET2H_INT_PTR (ucptr) ;
+		value = LET2H_32_PTR (ucptr) ;
 		dest [count] = ((double) value) * normfact ;
 		} ;
 } /* let2d_array */
@@ -548,7 +548,7 @@ lei2d_array (int *src, int count, double *dest, double normfact)
 
 	while (--count >= 0)
 	{	value = src [count] ;
-		value = LEI2H_INT (value) ;
+		value = LE2H_32 (value) ;
 		dest [count] = ((double) value) * normfact ;
 		} ;
 } /* lei2d_array */
@@ -559,7 +559,7 @@ bei2d_array (int *src, int count, double *dest, double normfact)
 
 	while (--count >= 0)
 	{	value = src [count] ;
-		value = BEI2H_INT (value) ;
+		value = BE2H_32 (value) ;
 		dest [count] = ((double) value) * normfact ;
 		} ;
 } /* bei2d_array */
@@ -707,16 +707,17 @@ i2bet_array (const int *src, tribyte *dest, int count)
 
 static sf_count_t
 pcm_read_sc2s (SF_PRIVATE *psf, short *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.scbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.scbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.scbuf, sizeof (signed char), bufferlen, psf) ;
-		sc2s_array (psf->u.scbuf, readcount, ptr + total) ;
+		readcount = psf_fread (ubuf.scbuf, sizeof (signed char), bufferlen, psf) ;
+		sc2s_array (ubuf.scbuf, readcount, ptr + total) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -728,16 +729,17 @@ pcm_read_sc2s (SF_PRIVATE *psf, short *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_read_uc2s (SF_PRIVATE *psf, short *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ucbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ucbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.ucbuf, sizeof (unsigned char), bufferlen, psf) ;
-		uc2s_array (psf->u.ucbuf, readcount, ptr + total) ;
+		readcount = psf_fread (ubuf.ucbuf, sizeof (unsigned char), bufferlen, psf) ;
+		uc2s_array (ubuf.ucbuf, readcount, ptr + total) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -771,16 +773,17 @@ pcm_read_les2s (SF_PRIVATE *psf, short *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_read_bet2s (SF_PRIVATE *psf, short *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = sizeof (psf->u.ucbuf) / SIZEOF_TRIBYTE ;
+	bufferlen = sizeof (ubuf.ucbuf) / SIZEOF_TRIBYTE ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ;
-		bet2s_array ((tribyte*) (psf->u.ucbuf), readcount, ptr + total) ;
+		readcount = psf_fread (ubuf.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ;
+		bet2s_array ((tribyte*) (ubuf.ucbuf), readcount, ptr + total) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -792,16 +795,17 @@ pcm_read_bet2s (SF_PRIVATE *psf, short *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_read_let2s (SF_PRIVATE *psf, short *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = sizeof (psf->u.ucbuf) / SIZEOF_TRIBYTE ;
+	bufferlen = sizeof (ubuf.ucbuf) / SIZEOF_TRIBYTE ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ;
-		let2s_array ((tribyte*) (psf->u.ucbuf), readcount, ptr + total) ;
+		readcount = psf_fread (ubuf.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ;
+		let2s_array ((tribyte*) (ubuf.ucbuf), readcount, ptr + total) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -813,16 +817,17 @@ pcm_read_let2s (SF_PRIVATE *psf, short *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_read_bei2s (SF_PRIVATE *psf, short *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ibuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ibuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.ibuf, sizeof (int), bufferlen, psf) ;
-		bei2s_array (psf->u.ibuf, readcount, ptr + total) ;
+		readcount = psf_fread (ubuf.ibuf, sizeof (int), bufferlen, psf) ;
+		bei2s_array (ubuf.ibuf, readcount, ptr + total) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -834,16 +839,17 @@ pcm_read_bei2s (SF_PRIVATE *psf, short *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_read_lei2s (SF_PRIVATE *psf, short *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ibuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ibuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.ibuf, sizeof (int), bufferlen, psf) ;
-		lei2s_array (psf->u.ibuf, readcount, ptr + total) ;
+		readcount = psf_fread (ubuf.ibuf, sizeof (int), bufferlen, psf) ;
+		lei2s_array (ubuf.ibuf, readcount, ptr + total) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -858,16 +864,17 @@ pcm_read_lei2s (SF_PRIVATE *psf, short *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_read_sc2i (SF_PRIVATE *psf, int *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.scbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.scbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.scbuf, sizeof (signed char), bufferlen, psf) ;
-		sc2i_array (psf->u.scbuf, readcount, ptr + total) ;
+		readcount = psf_fread (ubuf.scbuf, sizeof (signed char), bufferlen, psf) ;
+		sc2i_array (ubuf.scbuf, readcount, ptr + total) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -879,16 +886,17 @@ pcm_read_sc2i (SF_PRIVATE *psf, int *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_read_uc2i (SF_PRIVATE *psf, int *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ucbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ucbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.ucbuf, sizeof (unsigned char), bufferlen, psf) ;
-		uc2i_array (psf->u.ucbuf, readcount, ptr + total) ;
+		readcount = psf_fread (ubuf.ucbuf, sizeof (unsigned char), bufferlen, psf) ;
+		uc2i_array (ubuf.ucbuf, readcount, ptr + total) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -900,16 +908,17 @@ pcm_read_uc2i (SF_PRIVATE *psf, int *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_read_bes2i (SF_PRIVATE *psf, int *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.sbuf, sizeof (short), bufferlen, psf) ;
-		bes2i_array (psf->u.sbuf, readcount, ptr + total) ;
+		readcount = psf_fread (ubuf.sbuf, sizeof (short), bufferlen, psf) ;
+		bes2i_array (ubuf.sbuf, readcount, ptr + total) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -921,16 +930,17 @@ pcm_read_bes2i (SF_PRIVATE *psf, int *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_read_les2i (SF_PRIVATE *psf, int *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.sbuf, sizeof (short), bufferlen, psf) ;
-		les2i_array (psf->u.sbuf, readcount, ptr + total) ;
+		readcount = psf_fread (ubuf.sbuf, sizeof (short), bufferlen, psf) ;
+		les2i_array (ubuf.sbuf, readcount, ptr + total) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -942,16 +952,17 @@ pcm_read_les2i (SF_PRIVATE *psf, int *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_read_bet2i (SF_PRIVATE *psf, int *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = sizeof (psf->u.ucbuf) / SIZEOF_TRIBYTE ;
+	bufferlen = sizeof (ubuf.ucbuf) / SIZEOF_TRIBYTE ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ;
-		bet2i_array ((tribyte*) (psf->u.ucbuf), readcount, ptr + total) ;
+		readcount = psf_fread (ubuf.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ;
+		bet2i_array ((tribyte*) (ubuf.ucbuf), readcount, ptr + total) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -963,16 +974,17 @@ pcm_read_bet2i (SF_PRIVATE *psf, int *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_read_let2i (SF_PRIVATE *psf, int *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = sizeof (psf->u.ucbuf) / SIZEOF_TRIBYTE ;
+	bufferlen = sizeof (ubuf.ucbuf) / SIZEOF_TRIBYTE ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ;
-		let2i_array ((tribyte*) (psf->u.ucbuf), readcount, ptr + total) ;
+		readcount = psf_fread (ubuf.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ;
+		let2i_array ((tribyte*) (ubuf.ucbuf), readcount, ptr + total) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -1009,19 +1021,20 @@ pcm_read_lei2i (SF_PRIVATE *psf, int *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_read_sc2f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 	float	normfact ;
 
 	normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x80) : 1.0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.scbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.scbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.scbuf, sizeof (signed char), bufferlen, psf) ;
-		sc2f_array (psf->u.scbuf, readcount, ptr + total, normfact) ;
+		readcount = psf_fread (ubuf.scbuf, sizeof (signed char), bufferlen, psf) ;
+		sc2f_array (ubuf.scbuf, readcount, ptr + total, normfact) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -1033,19 +1046,20 @@ pcm_read_sc2f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_read_uc2f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 	float	normfact ;
 
 	normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x80) : 1.0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ucbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ucbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.ucbuf, sizeof (unsigned char), bufferlen, psf) ;
-		uc2f_array (psf->u.ucbuf, readcount, ptr + total, normfact) ;
+		readcount = psf_fread (ubuf.ucbuf, sizeof (unsigned char), bufferlen, psf) ;
+		uc2f_array (ubuf.ucbuf, readcount, ptr + total, normfact) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -1057,19 +1071,20 @@ pcm_read_uc2f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_read_bes2f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 	float	normfact ;
 
 	normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x8000) : 1.0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.sbuf, sizeof (short), bufferlen, psf) ;
-		bes2f_array (psf->u.sbuf, readcount, ptr + total, normfact) ;
+		readcount = psf_fread (ubuf.sbuf, sizeof (short), bufferlen, psf) ;
+		bes2f_array (ubuf.sbuf, readcount, ptr + total, normfact) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -1081,19 +1096,20 @@ pcm_read_bes2f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_read_les2f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 	float	normfact ;
 
 	normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x8000) : 1.0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.sbuf, sizeof (short), bufferlen, psf) ;
-		les2f_array (psf->u.sbuf, readcount, ptr + total, normfact) ;
+		readcount = psf_fread (ubuf.sbuf, sizeof (short), bufferlen, psf) ;
+		les2f_array (ubuf.sbuf, readcount, ptr + total, normfact) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -1105,20 +1121,21 @@ pcm_read_les2f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_read_bet2f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 	float	normfact ;
 
 	/* Special normfactor because tribyte value is read into an int. */
 	normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x80000000) : 1.0 / 256.0 ;
 
-	bufferlen = sizeof (psf->u.ucbuf) / SIZEOF_TRIBYTE ;
+	bufferlen = sizeof (ubuf.ucbuf) / SIZEOF_TRIBYTE ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ;
-		bet2f_array ((tribyte*) (psf->u.ucbuf), readcount, ptr + total, normfact) ;
+		readcount = psf_fread (ubuf.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ;
+		bet2f_array ((tribyte*) (ubuf.ucbuf), readcount, ptr + total, normfact) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -1130,20 +1147,21 @@ pcm_read_bet2f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_read_let2f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 	float	normfact ;
 
 	/* Special normfactor because tribyte value is read into an int. */
 	normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x80000000) : 1.0 / 256.0 ;
 
-	bufferlen = sizeof (psf->u.ucbuf) / SIZEOF_TRIBYTE ;
+	bufferlen = sizeof (ubuf.ucbuf) / SIZEOF_TRIBYTE ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ;
-		let2f_array ((tribyte*) (psf->u.ucbuf), readcount, ptr + total, normfact) ;
+		readcount = psf_fread (ubuf.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ;
+		let2f_array ((tribyte*) (ubuf.ucbuf), readcount, ptr + total, normfact) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -1155,19 +1173,20 @@ pcm_read_let2f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_read_bei2f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 	float	normfact ;
 
 	normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x80000000) : 1.0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ibuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ibuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.ibuf, sizeof (int), bufferlen, psf) ;
-		bei2f_array (psf->u.ibuf, readcount, ptr + total, normfact) ;
+		readcount = psf_fread (ubuf.ibuf, sizeof (int), bufferlen, psf) ;
+		bei2f_array (ubuf.ibuf, readcount, ptr + total, normfact) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -1179,19 +1198,20 @@ pcm_read_bei2f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_read_lei2f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 	float	normfact ;
 
 	normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x80000000) : 1.0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ibuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ibuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.ibuf, sizeof (int), bufferlen, psf) ;
-		lei2f_array (psf->u.ibuf, readcount, ptr + total, normfact) ;
+		readcount = psf_fread (ubuf.ibuf, sizeof (int), bufferlen, psf) ;
+		lei2f_array (ubuf.ibuf, readcount, ptr + total, normfact) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -1206,19 +1226,20 @@ pcm_read_lei2f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_read_sc2d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 	double		normfact ;
 
 	normfact = (psf->norm_double == SF_TRUE) ? 1.0 / ((double) 0x80) : 1.0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.scbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.scbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.scbuf, sizeof (signed char), bufferlen, psf) ;
-		sc2d_array (psf->u.scbuf, readcount, ptr + total, normfact) ;
+		readcount = psf_fread (ubuf.scbuf, sizeof (signed char), bufferlen, psf) ;
+		sc2d_array (ubuf.scbuf, readcount, ptr + total, normfact) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -1230,19 +1251,20 @@ pcm_read_sc2d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_read_uc2d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 	double		normfact ;
 
 	normfact = (psf->norm_double == SF_TRUE) ? 1.0 / ((double) 0x80) : 1.0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ucbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ucbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.ucbuf, sizeof (unsigned char), bufferlen, psf) ;
-		uc2d_array (psf->u.ucbuf, readcount, ptr + total, normfact) ;
+		readcount = psf_fread (ubuf.ucbuf, sizeof (unsigned char), bufferlen, psf) ;
+		uc2d_array (ubuf.ucbuf, readcount, ptr + total, normfact) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -1254,19 +1276,20 @@ pcm_read_uc2d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_read_bes2d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 	double		normfact ;
 
 	normfact = (psf->norm_double == SF_TRUE) ? 1.0 / ((double) 0x8000) : 1.0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.sbuf, sizeof (short), bufferlen, psf) ;
-		bes2d_array (psf->u.sbuf, readcount, ptr + total, normfact) ;
+		readcount = psf_fread (ubuf.sbuf, sizeof (short), bufferlen, psf) ;
+		bes2d_array (ubuf.sbuf, readcount, ptr + total, normfact) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -1278,19 +1301,20 @@ pcm_read_bes2d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_read_les2d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 	double		normfact ;
 
 	normfact = (psf->norm_double == SF_TRUE) ? 1.0 / ((double) 0x8000) : 1.0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.sbuf, sizeof (short), bufferlen, psf) ;
-		les2d_array (psf->u.sbuf, readcount, ptr + total, normfact) ;
+		readcount = psf_fread (ubuf.sbuf, sizeof (short), bufferlen, psf) ;
+		les2d_array (ubuf.sbuf, readcount, ptr + total, normfact) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -1302,19 +1326,20 @@ pcm_read_les2d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_read_bet2d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 	double		normfact ;
 
 	normfact = (psf->norm_double == SF_TRUE) ? 1.0 / ((double) 0x80000000) : 1.0 / 256.0 ;
 
-	bufferlen = sizeof (psf->u.ucbuf) / SIZEOF_TRIBYTE ;
+	bufferlen = sizeof (ubuf.ucbuf) / SIZEOF_TRIBYTE ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ;
-		bet2d_array ((tribyte*) (psf->u.ucbuf), readcount, ptr + total, normfact) ;
+		readcount = psf_fread (ubuf.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ;
+		bet2d_array ((tribyte*) (ubuf.ucbuf), readcount, ptr + total, normfact) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -1326,20 +1351,21 @@ pcm_read_bet2d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_read_let2d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 	double		normfact ;
 
 	/* Special normfactor because tribyte value is read into an int. */
 	normfact = (psf->norm_double == SF_TRUE) ? 1.0 / ((double) 0x80000000) : 1.0 / 256.0 ;
 
-	bufferlen = sizeof (psf->u.ucbuf) / SIZEOF_TRIBYTE ;
+	bufferlen = sizeof (ubuf.ucbuf) / SIZEOF_TRIBYTE ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ;
-		let2d_array ((tribyte*) (psf->u.ucbuf), readcount, ptr + total, normfact) ;
+		readcount = psf_fread (ubuf.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ;
+		let2d_array ((tribyte*) (ubuf.ucbuf), readcount, ptr + total, normfact) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -1351,19 +1377,20 @@ pcm_read_let2d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_read_bei2d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 	double		normfact ;
 
 	normfact = (psf->norm_double == SF_TRUE) ? 1.0 / ((double) 0x80000000) : 1.0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ibuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ibuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.ibuf, sizeof (int), bufferlen, psf) ;
-		bei2d_array (psf->u.ibuf, readcount, ptr + total, normfact) ;
+		readcount = psf_fread (ubuf.ibuf, sizeof (int), bufferlen, psf) ;
+		bei2d_array (ubuf.ibuf, readcount, ptr + total, normfact) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -1375,19 +1402,20 @@ pcm_read_bei2d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_read_lei2d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 	double		normfact ;
 
 	normfact = (psf->norm_double == SF_TRUE) ? 1.0 / ((double) 0x80000000) : 1.0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ibuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ibuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.ibuf, sizeof (int), bufferlen, psf) ;
-		lei2d_array (psf->u.ibuf, readcount, ptr + total, normfact) ;
+		readcount = psf_fread (ubuf.ibuf, sizeof (int), bufferlen, psf) ;
+		lei2d_array (ubuf.ibuf, readcount, ptr + total, normfact) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -1404,16 +1432,17 @@ pcm_read_lei2d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_write_s2sc	(SF_PRIVATE *psf, const short *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.scbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.scbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		s2sc_array (ptr + total, psf->u.scbuf, bufferlen) ;
-		writecount = psf_fwrite (psf->u.scbuf, sizeof (signed char), bufferlen, psf) ;
+		s2sc_array (ptr + total, ubuf.scbuf, bufferlen) ;
+		writecount = psf_fwrite (ubuf.scbuf, sizeof (signed char), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -1425,16 +1454,17 @@ pcm_write_s2sc	(SF_PRIVATE *psf, const short *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_write_s2uc	(SF_PRIVATE *psf, const short *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ucbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ucbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		s2uc_array (ptr + total, psf->u.ucbuf, bufferlen) ;
-		writecount = psf_fwrite (psf->u.ucbuf, sizeof (unsigned char), bufferlen, psf) ;
+		s2uc_array (ptr + total, ubuf.ucbuf, bufferlen) ;
+		writecount = psf_fwrite (ubuf.ucbuf, sizeof (unsigned char), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -1446,20 +1476,21 @@ pcm_write_s2uc	(SF_PRIVATE *psf, const short *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_write_s2bes	(SF_PRIVATE *psf, const short *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
 	if (CPU_IS_BIG_ENDIAN)
 		return psf_fwrite (ptr, sizeof (short), len, psf) ;
 	else
 
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		endswap_short_copy (psf->u.sbuf, ptr + total, bufferlen) ;
-		writecount = psf_fwrite (psf->u.sbuf, sizeof (short), bufferlen, psf) ;
+		endswap_short_copy (ubuf.sbuf, ptr + total, bufferlen) ;
+		writecount = psf_fwrite (ubuf.sbuf, sizeof (short), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -1471,19 +1502,20 @@ pcm_write_s2bes	(SF_PRIVATE *psf, const short *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_write_s2les	(SF_PRIVATE *psf, const short *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
 	if (CPU_IS_LITTLE_ENDIAN)
 		return psf_fwrite (ptr, sizeof (short), len, psf) ;
 
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		endswap_short_copy (psf->u.sbuf, ptr + total, bufferlen) ;
-		writecount = psf_fwrite (psf->u.sbuf, sizeof (short), bufferlen, psf) ;
+		endswap_short_copy (ubuf.sbuf, ptr + total, bufferlen) ;
+		writecount = psf_fwrite (ubuf.sbuf, sizeof (short), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -1495,16 +1527,17 @@ pcm_write_s2les	(SF_PRIVATE *psf, const short *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_write_s2bet	(SF_PRIVATE *psf, const short *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = sizeof (psf->u.ucbuf) / SIZEOF_TRIBYTE ;
+	bufferlen = sizeof (ubuf.ucbuf) / SIZEOF_TRIBYTE ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		s2bet_array (ptr + total, (tribyte*) (psf->u.ucbuf), bufferlen) ;
-		writecount = psf_fwrite (psf->u.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ;
+		s2bet_array (ptr + total, (tribyte*) (ubuf.ucbuf), bufferlen) ;
+		writecount = psf_fwrite (ubuf.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -1516,16 +1549,17 @@ pcm_write_s2bet	(SF_PRIVATE *psf, const short *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_write_s2let	(SF_PRIVATE *psf, const short *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = sizeof (psf->u.ucbuf) / SIZEOF_TRIBYTE ;
+	bufferlen = sizeof (ubuf.ucbuf) / SIZEOF_TRIBYTE ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		s2let_array (ptr + total, (tribyte*) (psf->u.ucbuf), bufferlen) ;
-		writecount = psf_fwrite (psf->u.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ;
+		s2let_array (ptr + total, (tribyte*) (ubuf.ucbuf), bufferlen) ;
+		writecount = psf_fwrite (ubuf.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -1537,16 +1571,17 @@ pcm_write_s2let	(SF_PRIVATE *psf, const short *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_write_s2bei	(SF_PRIVATE *psf, const short *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ibuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ibuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		s2bei_array (ptr + total, psf->u.ibuf, bufferlen) ;
-		writecount = psf_fwrite (psf->u.ibuf, sizeof (int), bufferlen, psf) ;
+		s2bei_array (ptr + total, ubuf.ibuf, bufferlen) ;
+		writecount = psf_fwrite (ubuf.ibuf, sizeof (int), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -1558,16 +1593,17 @@ pcm_write_s2bei	(SF_PRIVATE *psf, const short *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_write_s2lei	(SF_PRIVATE *psf, const short *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ibuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ibuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		s2lei_array (ptr + total, psf->u.ibuf, bufferlen) ;
-		writecount = psf_fwrite (psf->u.ibuf, sizeof (int), bufferlen, psf) ;
+		s2lei_array (ptr + total, ubuf.ibuf, bufferlen) ;
+		writecount = psf_fwrite (ubuf.ibuf, sizeof (int), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -1582,16 +1618,17 @@ pcm_write_s2lei	(SF_PRIVATE *psf, const short *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_write_i2sc	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.scbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.scbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		i2sc_array (ptr + total, psf->u.scbuf, bufferlen) ;
-		writecount = psf_fwrite (psf->u.scbuf, sizeof (signed char), bufferlen, psf) ;
+		i2sc_array (ptr + total, ubuf.scbuf, bufferlen) ;
+		writecount = psf_fwrite (ubuf.scbuf, sizeof (signed char), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -1603,16 +1640,17 @@ pcm_write_i2sc	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_write_i2uc	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ucbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ucbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		i2uc_array (ptr + total, psf->u.ucbuf, bufferlen) ;
-		writecount = psf_fwrite (psf->u.ucbuf, sizeof (signed char), bufferlen, psf) ;
+		i2uc_array (ptr + total, ubuf.ucbuf, bufferlen) ;
+		writecount = psf_fwrite (ubuf.ucbuf, sizeof (signed char), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -1624,16 +1662,17 @@ pcm_write_i2uc	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_write_i2bes	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		i2bes_array (ptr + total, psf->u.sbuf, bufferlen) ;
-		writecount = psf_fwrite (psf->u.sbuf, sizeof (short), bufferlen, psf) ;
+		i2bes_array (ptr + total, ubuf.sbuf, bufferlen) ;
+		writecount = psf_fwrite (ubuf.sbuf, sizeof (short), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -1645,16 +1684,17 @@ pcm_write_i2bes	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_write_i2les	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		i2les_array (ptr + total, psf->u.sbuf, bufferlen) ;
-		writecount = psf_fwrite (psf->u.sbuf, sizeof (short), bufferlen, psf) ;
+		i2les_array (ptr + total, ubuf.sbuf, bufferlen) ;
+		writecount = psf_fwrite (ubuf.sbuf, sizeof (short), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -1666,16 +1706,17 @@ pcm_write_i2les	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_write_i2bet	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = sizeof (psf->u.ucbuf) / SIZEOF_TRIBYTE ;
+	bufferlen = sizeof (ubuf.ucbuf) / SIZEOF_TRIBYTE ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		i2bet_array (ptr + total, (tribyte*) (psf->u.ucbuf), bufferlen) ;
-		writecount = psf_fwrite (psf->u.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ;
+		i2bet_array (ptr + total, (tribyte*) (ubuf.ucbuf), bufferlen) ;
+		writecount = psf_fwrite (ubuf.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -1687,16 +1728,17 @@ pcm_write_i2bet	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_write_i2let	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = sizeof (psf->u.ucbuf) / SIZEOF_TRIBYTE ;
+	bufferlen = sizeof (ubuf.ucbuf) / SIZEOF_TRIBYTE ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		i2let_array (ptr + total, (tribyte*) (psf->u.ucbuf), bufferlen) ;
-		writecount = psf_fwrite (psf->u.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ;
+		i2let_array (ptr + total, (tribyte*) (ubuf.ucbuf), bufferlen) ;
+		writecount = psf_fwrite (ubuf.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -1708,19 +1750,20 @@ pcm_write_i2let	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_write_i2bei	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
 	if (CPU_IS_BIG_ENDIAN)
 		return psf_fwrite (ptr, sizeof (int), len, psf) ;
 
-	bufferlen = ARRAY_LEN (psf->u.ibuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ibuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		endswap_int_copy (psf->u.ibuf, ptr + total, bufferlen) ;
-		writecount = psf_fwrite (psf->u.ibuf, sizeof (int), bufferlen, psf) ;
+		endswap_int_copy (ubuf.ibuf, ptr + total, bufferlen) ;
+		writecount = psf_fwrite (ubuf.ibuf, sizeof (int), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -1732,19 +1775,20 @@ pcm_write_i2bei	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
 
 static sf_count_t
 pcm_write_i2lei	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
 	if (CPU_IS_LITTLE_ENDIAN)
 		return psf_fwrite (ptr, sizeof (int), len, psf) ;
 
-	bufferlen = ARRAY_LEN (psf->u.ibuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ibuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		endswap_int_copy (psf->u.ibuf, ptr + total, bufferlen) ;
-		writecount = psf_fwrite (psf->u.ibuf, sizeof (int), bufferlen, psf) ;
+		endswap_int_copy (ubuf.ibuf, ptr + total, bufferlen) ;
+		writecount = psf_fwrite (ubuf.ibuf, sizeof (int), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -1793,18 +1837,19 @@ f2sc_clip_array (const float *src, signed char *dest, int count, int normalize)
 
 static sf_count_t
 pcm_write_f2sc	(SF_PRIVATE *psf, const float *ptr, sf_count_t len)
-{	void		(*convert) (const float *, signed char *, int, int) ;
+{	BUF_UNION	ubuf ;
+	void		(*convert) (const float *, signed char *, int, int) ;
 	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
 	convert = (psf->add_clipping) ? f2sc_clip_array : f2sc_array ;
-	bufferlen = ARRAY_LEN (psf->u.scbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.scbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		convert (ptr + total, psf->u.scbuf, bufferlen, psf->norm_float) ;
-		writecount = psf_fwrite (psf->u.scbuf, sizeof (signed char), bufferlen, psf) ;
+		convert (ptr + total, ubuf.scbuf, bufferlen, psf->norm_float) ;
+		writecount = psf_fwrite (ubuf.scbuf, sizeof (signed char), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -1851,18 +1896,19 @@ f2uc_clip_array	(const float *src, unsigned char *dest, int count, int normalize
 
 static sf_count_t
 pcm_write_f2uc	(SF_PRIVATE *psf, const float *ptr, sf_count_t len)
-{	void		(*convert) (const float *, unsigned char *, int, int) ;
+{	BUF_UNION	ubuf ;
+	void		(*convert) (const float *, unsigned char *, int, int) ;
 	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
 	convert = (psf->add_clipping) ? f2uc_clip_array : f2uc_array ;
-	bufferlen = ARRAY_LEN (psf->u.ucbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ucbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		convert (ptr + total, psf->u.ucbuf, bufferlen, psf->norm_float) ;
-		writecount = psf_fwrite (psf->u.ucbuf, sizeof (unsigned char), bufferlen, psf) ;
+		convert (ptr + total, ubuf.ucbuf, bufferlen, psf->norm_float) ;
+		writecount = psf_fwrite (ubuf.ucbuf, sizeof (unsigned char), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -1923,18 +1969,19 @@ f2bes_clip_array (const float *src, short *dest, int count, int normalize)
 
 static sf_count_t
 pcm_write_f2bes	(SF_PRIVATE *psf, const float *ptr, sf_count_t len)
-{	void		(*convert) (const float *, short *t, int, int) ;
+{	BUF_UNION	ubuf ;
+	void		(*convert) (const float *, short *t, int, int) ;
 	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
 	convert = (psf->add_clipping) ? f2bes_clip_array : f2bes_array ;
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		convert (ptr + total, psf->u.sbuf, bufferlen, psf->norm_float) ;
-		writecount = psf_fwrite (psf->u.sbuf, sizeof (short), bufferlen, psf) ;
+		convert (ptr + total, ubuf.sbuf, bufferlen, psf->norm_float) ;
+		writecount = psf_fwrite (ubuf.sbuf, sizeof (short), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 				break ;
@@ -1995,18 +2042,19 @@ f2les_clip_array (const float *src, short *dest, int count, int normalize)
 
 static sf_count_t
 pcm_write_f2les	(SF_PRIVATE *psf, const float *ptr, sf_count_t len)
-{	void		(*convert) (const float *, short *t, int, int) ;
+{	BUF_UNION	ubuf ;
+	void		(*convert) (const float *, short *t, int, int) ;
 	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
 	convert = (psf->add_clipping) ? f2les_clip_array : f2les_array ;
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		convert (ptr + total, psf->u.sbuf, bufferlen, psf->norm_float) ;
-		writecount = psf_fwrite (psf->u.sbuf, sizeof (short), bufferlen, psf) ;
+		convert (ptr + total, ubuf.sbuf, bufferlen, psf->norm_float) ;
+		writecount = psf_fwrite (ubuf.sbuf, sizeof (short), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -2071,18 +2119,19 @@ f2let_clip_array (const float *src, tribyte *dest, int count, int normalize)
 
 static sf_count_t
 pcm_write_f2let	(SF_PRIVATE *psf, const float *ptr, sf_count_t len)
-{	void		(*convert) (const float *, tribyte *, int, int) ;
+{	BUF_UNION	ubuf ;
+	void		(*convert) (const float *, tribyte *, int, int) ;
 	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
 	convert = (psf->add_clipping) ? f2let_clip_array : f2let_array ;
-	bufferlen = sizeof (psf->u.ucbuf) / SIZEOF_TRIBYTE ;
+	bufferlen = sizeof (ubuf.ucbuf) / SIZEOF_TRIBYTE ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		convert (ptr + total, (tribyte*) (psf->u.ucbuf), bufferlen, psf->norm_float) ;
-		writecount = psf_fwrite (psf->u.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ;
+		convert (ptr + total, (tribyte*) (ubuf.ucbuf), bufferlen, psf->norm_float) ;
+		writecount = psf_fwrite (ubuf.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -2147,18 +2196,19 @@ f2bet_clip_array (const float *src, tribyte *dest, int count, int normalize)
 
 static sf_count_t
 pcm_write_f2bet	(SF_PRIVATE *psf, const float *ptr, sf_count_t len)
-{	void		(*convert) (const float *, tribyte *, int, int) ;
+{	BUF_UNION	ubuf ;
+	void		(*convert) (const float *, tribyte *, int, int) ;
 	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
 	convert = (psf->add_clipping) ? f2bet_clip_array : f2bet_array ;
-	bufferlen = sizeof (psf->u.ucbuf) / SIZEOF_TRIBYTE ;
+	bufferlen = sizeof (ubuf.ucbuf) / SIZEOF_TRIBYTE ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		convert (ptr + total, (tribyte*) (psf->u.ucbuf), bufferlen, psf->norm_float) ;
-		writecount = psf_fwrite (psf->u.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ;
+		convert (ptr + total, (tribyte*) (ubuf.ucbuf), bufferlen, psf->norm_float) ;
+		writecount = psf_fwrite (ubuf.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -2226,18 +2276,19 @@ f2bei_clip_array (const float *src, int *dest, int count, int normalize)
 
 static sf_count_t
 pcm_write_f2bei	(SF_PRIVATE *psf, const float *ptr, sf_count_t len)
-{	void		(*convert) (const float *, int *, int, int) ;
+{	BUF_UNION	ubuf ;
+	void		(*convert) (const float *, int *, int, int) ;
 	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
 	convert = (psf->add_clipping) ? f2bei_clip_array : f2bei_array ;
-	bufferlen = ARRAY_LEN (psf->u.ibuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ibuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		convert (ptr + total, psf->u.ibuf, bufferlen, psf->norm_float) ;
-		writecount = psf_fwrite (psf->u.ibuf, sizeof (int), bufferlen, psf) ;
+		convert (ptr + total, ubuf.ibuf, bufferlen, psf->norm_float) ;
+		writecount = psf_fwrite (ubuf.ibuf, sizeof (int), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -2306,18 +2357,19 @@ f2lei_clip_array (const float *src, int *dest, int count, int normalize)
 
 static sf_count_t
 pcm_write_f2lei	(SF_PRIVATE *psf, const float *ptr, sf_count_t len)
-{	void		(*convert) (const float *, int *, int, int) ;
+{	BUF_UNION	ubuf ;
+	void		(*convert) (const float *, int *, int, int) ;
 	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
 	convert = (psf->add_clipping) ? f2lei_clip_array : f2lei_array ;
-	bufferlen = ARRAY_LEN (psf->u.ibuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ibuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		convert (ptr + total, psf->u.ibuf, bufferlen, psf->norm_float) ;
-		writecount = psf_fwrite (psf->u.ibuf, sizeof (int), bufferlen, psf) ;
+		convert (ptr + total, ubuf.ibuf, bufferlen, psf->norm_float) ;
+		writecount = psf_fwrite (ubuf.ibuf, sizeof (int), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -2364,18 +2416,19 @@ d2sc_clip_array	(const double *src, signed char *dest, int count, int normalize)
 
 static sf_count_t
 pcm_write_d2sc	(SF_PRIVATE *psf, const double *ptr, sf_count_t len)
-{	void		(*convert) (const double *, signed char *, int, int) ;
+{	BUF_UNION	ubuf ;
+	void		(*convert) (const double *, signed char *, int, int) ;
 	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
 	convert = (psf->add_clipping) ? d2sc_clip_array : d2sc_array ;
-	bufferlen = ARRAY_LEN (psf->u.scbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.scbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		convert (ptr + total, psf->u.scbuf, bufferlen, psf->norm_double) ;
-		writecount = psf_fwrite (psf->u.scbuf, sizeof (signed char), bufferlen, psf) ;
+		convert (ptr + total, ubuf.scbuf, bufferlen, psf->norm_double) ;
+		writecount = psf_fwrite (ubuf.scbuf, sizeof (signed char), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -2422,18 +2475,19 @@ d2uc_clip_array	(const double *src, unsigned char *dest, int count, int normaliz
 
 static sf_count_t
 pcm_write_d2uc	(SF_PRIVATE *psf, const double *ptr, sf_count_t len)
-{	void		(*convert) (const double *, unsigned char *, int, int) ;
+{	BUF_UNION	ubuf ;
+	void		(*convert) (const double *, unsigned char *, int, int) ;
 	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
 	convert = (psf->add_clipping) ? d2uc_clip_array : d2uc_array ;
-	bufferlen = ARRAY_LEN (psf->u.ucbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ucbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		convert (ptr + total, psf->u.ucbuf, bufferlen, psf->norm_double) ;
-		writecount = psf_fwrite (psf->u.ucbuf, sizeof (unsigned char), bufferlen, psf) ;
+		convert (ptr + total, ubuf.ucbuf, bufferlen, psf->norm_double) ;
+		writecount = psf_fwrite (ubuf.ucbuf, sizeof (unsigned char), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -2494,18 +2548,19 @@ d2bes_clip_array (const double *src, short *dest, int count, int normalize)
 
 static sf_count_t
 pcm_write_d2bes	(SF_PRIVATE *psf, const double *ptr, sf_count_t len)
-{	void		(*convert) (const double *, short *, int, int) ;
+{	BUF_UNION	ubuf ;
+	void		(*convert) (const double *, short *, int, int) ;
 	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
 	convert = (psf->add_clipping) ? d2bes_clip_array : d2bes_array ;
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		convert (ptr + total, psf->u.sbuf, bufferlen, psf->norm_double) ;
-		writecount = psf_fwrite (psf->u.sbuf, sizeof (short), bufferlen, psf) ;
+		convert (ptr + total, ubuf.sbuf, bufferlen, psf->norm_double) ;
+		writecount = psf_fwrite (ubuf.sbuf, sizeof (short), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -2566,18 +2621,19 @@ d2les_clip_array (const double *src, short *dest, int count, int normalize)
 
 static sf_count_t
 pcm_write_d2les	(SF_PRIVATE *psf, const double *ptr, sf_count_t len)
-{	void		(*convert) (const double *, short *, int, int) ;
+{	BUF_UNION	ubuf ;
+	void		(*convert) (const double *, short *, int, int) ;
 	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
 	convert = (psf->add_clipping) ? d2les_clip_array : d2les_array ;
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		convert (ptr + total, psf->u.sbuf, bufferlen, psf->norm_double) ;
-		writecount = psf_fwrite (psf->u.sbuf, sizeof (short), bufferlen, psf) ;
+		convert (ptr + total, ubuf.sbuf, bufferlen, psf->norm_double) ;
+		writecount = psf_fwrite (ubuf.sbuf, sizeof (short), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -2642,18 +2698,19 @@ d2let_clip_array (const double *src, tribyte *dest, int count, int normalize)
 
 static sf_count_t
 pcm_write_d2let	(SF_PRIVATE *psf, const double *ptr, sf_count_t len)
-{	void		(*convert) (const double *, tribyte *, int, int) ;
+{	BUF_UNION	ubuf ;
+	void		(*convert) (const double *, tribyte *, int, int) ;
 	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
 	convert = (psf->add_clipping) ? d2let_clip_array : d2let_array ;
-	bufferlen = sizeof (psf->u.ucbuf) / SIZEOF_TRIBYTE ;
+	bufferlen = sizeof (ubuf.ucbuf) / SIZEOF_TRIBYTE ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		convert (ptr + total, (tribyte*) (psf->u.ucbuf), bufferlen, psf->norm_double) ;
-		writecount = psf_fwrite (psf->u.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ;
+		convert (ptr + total, (tribyte*) (ubuf.ucbuf), bufferlen, psf->norm_double) ;
+		writecount = psf_fwrite (ubuf.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -2718,18 +2775,19 @@ d2bet_clip_array (const double *src, tribyte *dest, int count, int normalize)
 
 static sf_count_t
 pcm_write_d2bet	(SF_PRIVATE *psf, const double *ptr, sf_count_t len)
-{	void		(*convert) (const double *, tribyte *, int, int) ;
+{	BUF_UNION	ubuf ;
+	void		(*convert) (const double *, tribyte *, int, int) ;
 	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
 	convert = (psf->add_clipping) ? d2bet_clip_array : d2bet_array ;
-	bufferlen = sizeof (psf->u.ucbuf) / SIZEOF_TRIBYTE ;
+	bufferlen = sizeof (ubuf.ucbuf) / SIZEOF_TRIBYTE ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		convert (ptr + total, (tribyte*) (psf->u.ucbuf), bufferlen, psf->norm_double) ;
-		writecount = psf_fwrite (psf->u.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ;
+		convert (ptr + total, (tribyte*) (ubuf.ucbuf), bufferlen, psf->norm_double) ;
+		writecount = psf_fwrite (ubuf.ucbuf, SIZEOF_TRIBYTE, bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -2798,18 +2856,19 @@ d2bei_clip_array (const double *src, int *dest, int count, int normalize)
 
 static sf_count_t
 pcm_write_d2bei	(SF_PRIVATE *psf, const double *ptr, sf_count_t len)
-{	void		(*convert) (const double *, int *, int, int) ;
+{	BUF_UNION	ubuf ;
+	void		(*convert) (const double *, int *, int, int) ;
 	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
 	convert = (psf->add_clipping) ? d2bei_clip_array : d2bei_array ;
-	bufferlen = ARRAY_LEN (psf->u.ibuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ibuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		convert (ptr + total, psf->u.ibuf, bufferlen, psf->norm_double) ;
-		writecount = psf_fwrite (psf->u.ibuf, sizeof (int), bufferlen, psf) ;
+		convert (ptr + total, ubuf.ibuf, bufferlen, psf->norm_double) ;
+		writecount = psf_fwrite (ubuf.ibuf, sizeof (int), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -2878,18 +2937,19 @@ d2lei_clip_array (const double *src, int *dest, int count, int normalize)
 
 static sf_count_t
 pcm_write_d2lei	(SF_PRIVATE *psf, const double *ptr, sf_count_t len)
-{	void		(*convert) (const double *, int *, int, int) ;
+{	BUF_UNION	ubuf ;
+	void		(*convert) (const double *, int *, int, int) ;
 	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
 	convert = (psf->add_clipping) ? d2lei_clip_array : d2lei_array ;
-	bufferlen = ARRAY_LEN (psf->u.ibuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ibuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		convert (ptr + total, psf->u.ibuf, bufferlen, psf->norm_double) ;
-		writecount = psf_fwrite (psf->u.ibuf, sizeof (int), bufferlen, psf) ;
+		convert (ptr + total, ubuf.ibuf, bufferlen, psf->norm_double) ;
+		writecount = psf_fwrite (ubuf.ibuf, sizeof (int), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
diff --git a/libs/libsndfile/src/pvf.c b/libs/libsndfile/src/pvf.c
index 5e027cb66b..4ea24b6b68 100644
--- a/libs/libsndfile/src/pvf.c
+++ b/libs/libsndfile/src/pvf.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2002-2009 Erik de Castro Lopo 
+** Copyright (C) 2002-2011 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -51,14 +51,14 @@ pvf_open	(SF_PRIVATE *psf)
 {	int		subformat ;
 	int		error = 0 ;
 
-	if (psf->mode == SFM_READ || (psf->mode == SFM_RDWR && psf->filelength > 0))
+	if (psf->file.mode == SFM_READ || (psf->file.mode == SFM_RDWR && psf->filelength > 0))
 	{	if ((error = pvf_read_header (psf)))
 			return error ;
 		} ;
 
 	subformat = SF_CODEC (psf->sf.format) ;
 
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{	if ((SF_CONTAINER (psf->sf.format)) != SF_FORMAT_PVF)
 			return	SFE_BAD_OPEN_FORMAT ;
 
diff --git a/libs/libsndfile/src/raw.c b/libs/libsndfile/src/raw.c
index 99e19d0ebf..e5dc49e2ff 100644
--- a/libs/libsndfile/src/raw.c
+++ b/libs/libsndfile/src/raw.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2011 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
diff --git a/libs/libsndfile/src/rf64.c b/libs/libsndfile/src/rf64.c
index ad29ce347c..7f14ef89ba 100644
--- a/libs/libsndfile/src/rf64.c
+++ b/libs/libsndfile/src/rf64.c
@@ -1,5 +1,6 @@
 /*
-** Copyright (C) 2008-2009 Erik de Castro Lopo 
+** Copyright (C) 2008-2013 Erik de Castro Lopo 
+** Copyright (C) 2009      Uli Franke 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -19,6 +20,9 @@
 /*
 **	This format documented at:
 **	http://www.sr.se/utveckling/tu/bwf/prog/RF_64v1_4.pdf
+**
+**	But this may be a better reference:
+**	http://www.ebu.ch/CMSimages/en/tec_doc_t3306-2007_tcm6-42570.pdf
 */
 
 #include	"sfconfig.h"
@@ -44,6 +48,11 @@
 #define	fact_MARKER		MAKE_MARKER ('f', 'a', 'c', 't')
 #define	data_MARKER		MAKE_MARKER ('d', 'a', 't', 'a')
 
+#define bext_MARKER		MAKE_MARKER ('b', 'e', 'x', 't')
+#define cart_MARKER		MAKE_MARKER ('c', 'a', 'r', 't')
+#define OggS_MARKER		MAKE_MARKER ('O', 'g', 'g', 'S')
+#define wvpk_MARKER 	MAKE_MARKER ('w', 'v', 'p', 'k')
+
 /*------------------------------------------------------------------------------
 ** Typedefs.
 */
@@ -52,9 +61,10 @@
 ** Private static functions.
 */
 
-static int	rf64_read_header (SF_PRIVATE *psf) ;
+static int	rf64_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock) ;
 static int	rf64_write_header (SF_PRIVATE *psf, int calc_length) ;
 static int	rf64_close (SF_PRIVATE *psf) ;
+static int	rf64_command (SF_PRIVATE *psf, int command, void * UNUSED (data), int datasize) ;
 
 /*------------------------------------------------------------------------------
 ** Public function.
@@ -64,17 +74,19 @@ int
 rf64_open (SF_PRIVATE *psf)
 {	WAV_PRIVATE *wpriv ;
 	int	subformat, error = 0 ;
+	int blockalign, framesperblock ;
 
 	if ((wpriv = calloc (1, sizeof (WAV_PRIVATE))) == NULL)
 		return SFE_MALLOC_FAILED ;
 	psf->container_data = wpriv ;
+	wpriv->wavex_ambisonic = SF_AMBISONIC_NONE ;
 
 	/* All RF64 files are little endian. */
 	psf->endian = SF_ENDIAN_LITTLE ;
 
 
-	if (psf->mode == SFM_READ || (psf->mode == SFM_RDWR && psf->filelength > 0))
-	{	if ((error = rf64_read_header (psf)) != 0)
+	if (psf->file.mode == SFM_READ || (psf->file.mode == SFM_RDWR && psf->filelength > 0))
+	{	if ((error = rf64_read_header (psf, &blockalign, &framesperblock)) != 0)
 			return error ;
 		} ;
 
@@ -83,7 +95,7 @@ rf64_open (SF_PRIVATE *psf)
 
 	subformat = psf->sf.format & SF_FORMAT_SUBMASK ;
 
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{	if (psf->is_pipe)
 			return SFE_NO_PIPE_WRITE ;
 
@@ -96,6 +108,7 @@ rf64_open (SF_PRIVATE *psf)
 		} ;
 
 	psf->container_close = rf64_close ;
+	psf->command = rf64_command ;
 
 	switch (subformat)
 	{	case SF_FORMAT_PCM_U8 :
@@ -132,68 +145,162 @@ rf64_open (SF_PRIVATE *psf)
 
 /*------------------------------------------------------------------------------
 */
+enum
+{	HAVE_ds64	= 0x01,
+	HAVE_fmt	= 0x02,
+	HAVE_bext	= 0x04,
+	HAVE_data	= 0x08,
+	HAVE_cart	= 0x10
+} ;
+
+#define HAVE_CHUNK(CHUNK)	((parsestage & CHUNK) != 0)
 
 static int
-rf64_read_header (SF_PRIVATE *psf)
-{	WAV_PRIVATE *wpriv ;
-	sf_count_t riff_size, data_size ;
-	unsigned int size32 ;
-	int marker, marks [2], error, done = 0 ;
+rf64_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock)
+{	WAV_PRIVATE	*wpriv ;
+	WAV_FMT		*wav_fmt ;
+	sf_count_t riff_size = 0, frame_count = 0, ds64_datalength = 0 ;
+	uint32_t marks [2], size32, parsestage = 0 ;
+	int marker, error, done = 0, format = 0 ;
 
 	if ((wpriv = psf->container_data) == NULL)
 		return SFE_INTERNAL ;
+	wav_fmt = &wpriv->wav_fmt ;
 
 	/* Set position to start of file to begin reading header. */
 	psf_binheader_readf (psf, "pmmm", 0, &marker, marks, marks + 1) ;
-	if (marker != RF64_MARKER || marks [0] != FFFF_MARKER || marks [1] != WAVE_MARKER)
+	if (marker != RF64_MARKER || marks [1] != WAVE_MARKER)
 		return SFE_RF64_NOT_RF64 ;
 
-	psf_log_printf (psf, "%M\n  %M\n", RF64_MARKER, WAVE_MARKER) ;
+	if (marks [0] == FFFF_MARKER)
+		psf_log_printf (psf, "%M\n  %M\n", RF64_MARKER, WAVE_MARKER) ;
+	else
+		psf_log_printf (psf, "%M : 0x%x (should be 0xFFFFFFFF)\n  %M\n", RF64_MARKER, WAVE_MARKER) ;
 
-	while (! done)
+	while (NOT (done))
 	{	psf_binheader_readf (psf, "em4", &marker, &size32) ;
 
 		switch (marker)
 		{	case ds64_MARKER :
+				{	unsigned int table_len, bytesread ;
+
+					/* Read ds64 sizes (3 8-byte words). */
+					bytesread = psf_binheader_readf (psf, "888", &riff_size, &ds64_datalength, &frame_count) ;
+
+					/* Read table length. */
+					bytesread += psf_binheader_readf (psf, "4", &table_len) ;
+					/* Skip table for now. (this was "table_len + 4", why?) */
+					bytesread += psf_binheader_readf (psf, "j", table_len) ;
+
+					if (size32 == bytesread)
+						psf_log_printf (psf, "%M : %u\n", marker, size32) ;
+					else if (size32 >= bytesread + 4)
+					{	unsigned int next ;
+						psf_binheader_readf (psf, "m", &next) ;
+						if (next == fmt_MARKER)
+						{	psf_log_printf (psf, "%M : %u (should be %u)\n", marker, size32, bytesread) ;
+							psf_binheader_readf (psf, "j", -4) ;
+							}
+						else
+						{	psf_log_printf (psf, "%M : %u\n", marker, size32) ;
+							psf_binheader_readf (psf, "j", size32 - bytesread - 4) ;
+							} ;
+						} ;
+
+					if (psf->filelength != riff_size + 8)
+						psf_log_printf (psf, "  Riff size : %D (should be %D)\n", riff_size, psf->filelength - 8) ;
+					else
+						psf_log_printf (psf, "  Riff size : %D\n", riff_size) ;
+
+					psf_log_printf (psf, "  Data size : %D\n", ds64_datalength) ;
+
+					psf_log_printf (psf, "  Frames    : %D\n", frame_count) ;
+					psf_log_printf (psf, "  Table length : %u\n", table_len) ;
+
+					} ;
+				parsestage |= HAVE_ds64 ;
+				break ;
+
+			case fmt_MARKER:
 					psf_log_printf (psf, "%M : %u\n", marker, size32) ;
-
-					psf_binheader_readf (psf, "888", &riff_size, &data_size, &psf->sf.frames) ;
-					psf_log_printf (psf, "  Riff size : %D\n  Data size : %D\n  Frames    : %D\n",
-											riff_size, data_size, psf->sf.frames) ;
-
-					psf_binheader_readf (psf, "4", &size32) ;
-					psf_log_printf (psf, "  Table len : %u\n", size32) ;
-
-					psf_binheader_readf (psf, "jm4", size32 + 4, &marker, &size32) ;
-					psf_log_printf (psf, "%M : %u\n", marker, size32) ;
-
 					if ((error = wav_w64_read_fmt_chunk (psf, size32)) != 0)
 						return error ;
-					psf->sf.format = SF_FORMAT_RF64 | (psf->sf.format & SF_FORMAT_SUBMASK) ;
+					format = wav_fmt->format ;
+					parsestage |= HAVE_fmt ;
+					break ;
+
+			case bext_MARKER :
+					if ((error = wav_read_bext_chunk (psf, size32)) != 0)
+						return error ;
+					parsestage |= HAVE_bext ;
+					break ;
+
+			case cart_MARKER :
+					if ((error = wav_read_cart_chunk (psf, size32)) != 0)
+						return error ;
+					parsestage |= HAVE_cart ;
 					break ;
 
 			case data_MARKER :
-					psf_log_printf (psf, "%M : %x\n", marker, size32) ;
-					psf->dataoffset = psf->headindex ;
-					done = SF_TRUE ;
-					break ;
+				/* see wav for more sophisticated parsing -> implement state machine with parsestage */
+
+				if (HAVE_CHUNK (HAVE_ds64))
+				{	if (size32 == 0xffffffff)
+						psf_log_printf (psf, "%M : 0x%x\n", marker, size32) ;
+					else
+						psf_log_printf (psf, "%M : 0x%x (should be 0xffffffff\n", marker, size32) ;
+					psf->datalength = ds64_datalength ;
+					}
+				else
+				{	if (size32 == 0xffffffff)
+					{	psf_log_printf (psf, "%M : 0x%x\n", marker, size32) ;
+						psf_log_printf (psf, "  *** Data length not specified no 'ds64' chunk.\n") ;
+						}
+					else
+					{	psf_log_printf (psf, "%M : 0x%x\n**** Weird, RF64 file without a 'ds64' chunk and no valid 'data' size.\n", marker, size32) ;
+						psf->datalength = size32 ;
+						} ;
+					} ;
+
+				psf->dataoffset = psf_ftell (psf) ;
+
+				if (psf->dataoffset > 0)
+				{	if (size32 == 0 && riff_size == 8 && psf->filelength > 44)
+					{	psf_log_printf (psf, "  *** Looks like a WAV file which wasn't closed properly. Fixing it.\n") ;
+						psf->datalength = psf->filelength - psf->dataoffset ;
+						} ;
+
+					/* Only set dataend if there really is data at the end. */
+					if (psf->datalength + psf->dataoffset < psf->filelength)
+						psf->dataend = psf->datalength + psf->dataoffset ;
+
+					if (NOT (psf->sf.seekable) || psf->dataoffset < 0)
+						break ;
+
+					/* Seek past data and continue reading header. */
+					psf_fseek (psf, psf->datalength, SEEK_CUR) ;
+
+					if (psf_ftell (psf) != psf->datalength + psf->dataoffset)
+						psf_log_printf (psf, "  *** psf_fseek past end error ***\n") ;
+						break ;
+					} ;
+				break ;
 
 			default :
 					if (isprint ((marker >> 24) & 0xFF) && isprint ((marker >> 16) & 0xFF)
 						&& isprint ((marker >> 8) & 0xFF) && isprint (marker & 0xFF))
-					{	psf_binheader_readf (psf, "4", &size32) ;
-						psf_log_printf (psf, "*** %M : %d (unknown marker)\n", marker, size32) ;
+					{	psf_log_printf (psf, "*** %M : %d (unknown marker)\n", marker, size32) ;
 						if (size32 < 8)
 							done = SF_TRUE ;
 						psf_binheader_readf (psf, "j", size32) ;
 						break ;
 						} ;
 					if (psf_ftell (psf) & 0x03)
-					{	psf_log_printf (psf, "  Unknown chunk marker at position %d. Resynching.\n", size32 - 4) ;
+					{	psf_log_printf (psf, "  Unknown chunk marker at position 0x%x. Resynching.\n", size32 - 4) ;
 						psf_binheader_readf (psf, "j", -3) ;
 						break ;
 						} ;
-					psf_log_printf (psf, "*** Unknown chunk marker (%X) at position %D. Exiting parser.\n", marker, psf_ftell (psf) - 4) ;
+					psf_log_printf (psf, "*** Unknown chunk marker (0x%X) at position 0x%X. Exiting parser.\n", marker, psf_ftell (psf) - 4) ;
 					done = SF_TRUE ;
 				break ;
 			} ;	/* switch (marker) */
@@ -204,6 +311,99 @@ rf64_read_header (SF_PRIVATE *psf)
 			} ;
 		} ;
 
+	if (psf->dataoffset <= 0)
+		return SFE_WAV_NO_DATA ;
+
+	/* WAVs can be little or big endian */
+	psf->endian = psf->rwf_endian ;
+
+	psf_fseek (psf, psf->dataoffset, SEEK_SET) ;
+
+	if (psf->is_pipe == 0)
+	{	/*
+		** Check for 'wvpk' at the start of the DATA section. Not able to
+		** handle this.
+		*/
+		psf_binheader_readf (psf, "4", &marker) ;
+		if (marker == wvpk_MARKER || marker == OggS_MARKER)
+			return SFE_WAV_WVPK_DATA ;
+		} ;
+
+	/* Seek to start of DATA section. */
+	psf_fseek (psf, psf->dataoffset, SEEK_SET) ;
+
+	if (psf->blockwidth)
+	{	if (psf->filelength - psf->dataoffset < psf->datalength)
+			psf->sf.frames = (psf->filelength - psf->dataoffset) / psf->blockwidth ;
+		else
+			psf->sf.frames = psf->datalength / psf->blockwidth ;
+		} ;
+
+	if (frame_count != psf->sf.frames)
+		psf_log_printf (psf, "*** Calculated frame count %d does not match value from 'ds64' chunk of %d.\n", psf->sf.frames, frame_count) ;
+
+	switch (format)
+	{
+		case WAVE_FORMAT_EXTENSIBLE :
+
+			/* with WAVE_FORMAT_EXTENSIBLE the psf->sf.format field is already set. We just have to set the major to rf64 */
+			psf->sf.format = (psf->sf.format & ~SF_FORMAT_TYPEMASK) | SF_FORMAT_RF64 ;
+
+			if (psf->sf.format == (SF_FORMAT_WAVEX | SF_FORMAT_MS_ADPCM))
+			{	*blockalign = wav_fmt->msadpcm.blockalign ;
+				*framesperblock = wav_fmt->msadpcm.samplesperblock ;
+				} ;
+			break ;
+
+		case WAVE_FORMAT_PCM :
+					psf->sf.format = SF_FORMAT_RF64 | u_bitwidth_to_subformat (psf->bytewidth * 8) ;
+					break ;
+
+		case WAVE_FORMAT_MULAW :
+		case IBM_FORMAT_MULAW :
+					psf->sf.format = (SF_FORMAT_RF64 | SF_FORMAT_ULAW) ;
+					break ;
+
+		case WAVE_FORMAT_ALAW :
+		case IBM_FORMAT_ALAW :
+					psf->sf.format = (SF_FORMAT_RF64 | SF_FORMAT_ALAW) ;
+					break ;
+
+		case WAVE_FORMAT_MS_ADPCM :
+					psf->sf.format = (SF_FORMAT_RF64 | SF_FORMAT_MS_ADPCM) ;
+					*blockalign = wav_fmt->msadpcm.blockalign ;
+					*framesperblock = wav_fmt->msadpcm.samplesperblock ;
+					break ;
+
+		case WAVE_FORMAT_IMA_ADPCM :
+					psf->sf.format = (SF_FORMAT_RF64 | SF_FORMAT_IMA_ADPCM) ;
+					*blockalign = wav_fmt->ima.blockalign ;
+					*framesperblock = wav_fmt->ima.samplesperblock ;
+					break ;
+
+		case WAVE_FORMAT_GSM610 :
+					psf->sf.format = (SF_FORMAT_RF64 | SF_FORMAT_GSM610) ;
+					break ;
+
+		case WAVE_FORMAT_IEEE_FLOAT :
+					psf->sf.format = SF_FORMAT_RF64 ;
+					psf->sf.format |= (psf->bytewidth == 8) ? SF_FORMAT_DOUBLE : SF_FORMAT_FLOAT ;
+					break ;
+
+		case WAVE_FORMAT_G721_ADPCM :
+					psf->sf.format = SF_FORMAT_RF64 | SF_FORMAT_G721_32 ;
+					break ;
+
+		default : return SFE_UNIMPLEMENTED ;
+		} ;
+
+	if (wpriv->fmt_is_broken)
+		wav_w64_analyze (psf) ;
+
+	/* Only set the format endian-ness if its non-standard big-endian. */
+	if (psf->endian == SF_ENDIAN_BIG)
+		psf->sf.format |= SF_ENDIAN_BIG ;
+
 	return 0 ;
 } /* rf64_read_header */
 
@@ -242,9 +442,9 @@ static const EXT_SUBFORMAT MSGUID_SUBTYPE_AMBISONIC_B_FORMAT_IEEE_FLOAT =
 
 
 static int
-wavex_write_fmt_chunk (SF_PRIVATE *psf)
+rf64_write_fmt_chunk (SF_PRIVATE *psf)
 {	WAV_PRIVATE	*wpriv ;
-	int subformat, fmt_size, add_fact_chunk = 0 ;
+	int subformat, fmt_size ;
 
 	if ((wpriv = psf->container_data) == NULL)
 		return SFE_INTERNAL ;
@@ -281,6 +481,8 @@ wavex_write_fmt_chunk (SF_PRIVATE *psf)
 			*/
 			if (wpriv->wavex_ambisonic != SF_AMBISONIC_NONE)
 				psf_binheader_writef (psf, "4", 0) ;
+			else if (wpriv->wavex_channelmask != 0)
+				psf_binheader_writef (psf, "4", wpriv->wavex_channelmask) ;
 			else
 			{	/*
 				** Ok some liberty is taken here to use the most commonly used channel masks
@@ -345,22 +547,11 @@ wavex_write_fmt_chunk (SF_PRIVATE *psf)
 			wavex_write_guid (psf, &MSGUID_SUBTYPE_ALAW) ;
 			break ;
 
-#if 0
-		/* This is dead code due to return in previous switch statement. */
-		case SF_FORMAT_MS_ADPCM : /* todo, GUID exists */
-			wavex_write_guid (psf, &MSGUID_SUBTYPE_MS_ADPCM) ;
-			break ;
-			return SFE_UNIMPLEMENTED ;
-#endif
-
 		default : return SFE_UNIMPLEMENTED ;
 		} ;
 
-	if (add_fact_chunk)
-		psf_binheader_writef (psf, "tm48", fact_MARKER, 4, psf->sf.frames) ;
-
 	return 0 ;
-} /* wavex_write_fmt_chunk */
+} /* rf64_write_fmt_chunk */
 
 
 static int
@@ -375,7 +566,6 @@ rf64_write_header (SF_PRIVATE *psf, int calc_length)
 
 	if (calc_length)
 	{	psf->filelength = psf_get_filelen (psf) ;
-
 		psf->datalength = psf->filelength - psf->dataoffset ;
 
 		if (psf->dataend)
@@ -392,7 +582,8 @@ rf64_write_header (SF_PRIVATE *psf, int calc_length)
 
 	psf_binheader_writef (psf, "em4m", RF64_MARKER, 0xffffffff, WAVE_MARKER) ;
 
-	psf_binheader_writef (psf, "m488844", ds64_MARKER, 32, psf->filelength, psf->datalength, psf->sf.frames, 0, 0x005c0064) ;
+	/* Currently no table. */
+	psf_binheader_writef (psf, "m48884", ds64_MARKER, 28, psf->filelength - 8, psf->datalength, psf->sf.frames, 0) ;
 
 	/* WAVE and 'fmt ' markers. */
 	psf_binheader_writef (psf, "m", fmt_MARKER) ;
@@ -406,7 +597,7 @@ rf64_write_header (SF_PRIVATE *psf, int calc_length)
 
 		case SF_FORMAT_WAVEX :
 		case SF_FORMAT_RF64 :
-				if ((error = wavex_write_fmt_chunk (psf)) != 0)
+				if ((error = rf64_write_fmt_chunk (psf)) != 0)
 					return error ;
 				break ;
 
@@ -414,9 +605,14 @@ rf64_write_header (SF_PRIVATE *psf, int calc_length)
 				return SFE_UNIMPLEMENTED ;
 		} ;
 
+	if (psf->broadcast_16k != NULL)
+		wav_write_bext_chunk (psf) ;
+
+	if (psf->cart_16k != NULL)
+		wav_write_cart_chunk (psf) ;
 #if 0
 	/* The LIST/INFO chunk. */
-	if (psf->str_flags & SF_STR_LOCATE_START)
+	if (psf->strings.flags & SF_STR_LOCATE_START)
 		wav_write_strings (psf, SF_STR_LOCATE_START) ;
 
 	if (psf->peak_info != NULL && psf->peak_info->peak_loc == SF_PEAK_START)
@@ -426,8 +622,8 @@ rf64_write_header (SF_PRIVATE *psf, int calc_length)
 			psf_binheader_writef (psf, "ft8", (float) psf->peak_info->peaks [k].value, psf->peak_info->peaks [k].position) ;
 		} ;
 
-	if (psf->broadcast_info != NULL)
-		wav_write_bext_chunk (psf) ;
+//	if (psf->broadcast_info != NULL)
+//		wav_write_bext_chunk (psf) ;
 
 	if (psf->instrument != NULL)
 	{	int		tmp ;
@@ -446,7 +642,7 @@ rf64_write_header (SF_PRIVATE *psf, int calc_length)
 		{	int type ;
 
 			type = psf->instrument->loops [tmp].mode ;
-			type = (type == SF_LOOP_FORWARD ? 0 : type==SF_LOOP_BACKWARD ? 2 : type == SF_LOOP_ALTERNATING ? 1 : 32) ;
+			type = (type == SF_LOOP_FORWARD ? 0 : type == SF_LOOP_BACKWARD ? 2 : type == SF_LOOP_ALTERNATING ? 1 : 32) ;
 
 			psf_binheader_writef (psf, "44", tmp, type) ;
 			psf_binheader_writef (psf, "44", psf->instrument->loops [tmp].start, psf->instrument->loops [tmp].end) ;
@@ -475,7 +671,7 @@ rf64_write_header (SF_PRIVATE *psf, int calc_length)
 
 	psf->dataoffset = psf->headindex ;
 
-	if (! has_data)
+	if (NOT (has_data))
 		psf_fseek (psf, psf->dataoffset, SEEK_SET) ;
 	else if (current > 0)
 		psf_fseek (psf, current, SEEK_SET) ;
@@ -486,7 +682,7 @@ rf64_write_header (SF_PRIVATE *psf, int calc_length)
 static int
 rf64_close (SF_PRIVATE *psf)
 {
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{	// rf64_write_tailer (psf) ;
 
 		psf->write_header (psf, SF_TRUE) ;
@@ -494,3 +690,37 @@ rf64_close (SF_PRIVATE *psf)
 
 	return 0 ;
 } /* rf64_close */
+
+static int
+rf64_command (SF_PRIVATE *psf, int command, void * UNUSED (data), int datasize)
+{	WAV_PRIVATE	*wpriv ;
+
+	if ((wpriv = psf->container_data) == NULL)
+		return SFE_INTERNAL ;
+
+	switch (command)
+	{	case SFC_WAVEX_SET_AMBISONIC :
+			if ((SF_CONTAINER (psf->sf.format)) == SF_FORMAT_WAVEX)
+			{	if (datasize == SF_AMBISONIC_NONE)
+					wpriv->wavex_ambisonic = SF_AMBISONIC_NONE ;
+				else if (datasize == SF_AMBISONIC_B_FORMAT)
+					wpriv->wavex_ambisonic = SF_AMBISONIC_B_FORMAT ;
+				else
+					return 0 ;
+				} ;
+			return wpriv->wavex_ambisonic ;
+
+		case SFC_WAVEX_GET_AMBISONIC :
+			return wpriv->wavex_ambisonic ;
+
+		case SFC_SET_CHANNEL_MAP_INFO :
+			wpriv->wavex_channelmask = wavex_gen_channel_mask (psf->channel_map, psf->sf.channels) ;
+			return (wpriv->wavex_channelmask != 0) ;
+
+		default :
+			break ;
+	} ;
+
+	return 0 ;
+} /* rf64_command */
+
diff --git a/libs/libsndfile/src/rx2.c b/libs/libsndfile/src/rx2.c
index 429ac88133..0a730480e7 100644
--- a/libs/libsndfile/src/rx2.c
+++ b/libs/libsndfile/src/rx2.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2001-2009 Erik de Castro Lopo 
+** Copyright (C) 2001-2012 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -80,10 +80,9 @@ rx2_open	(SF_PRIVATE *psf)
 		"Additional/PencilTool", "Disabled"
 		} ;
 
+	BUF_UNION	ubuf ;
 	int error, marker, length, glob_offset, slce_count, frames ;
-
 	int sdat_length = 0, slce_total = 0 ;
-
 	int n_channels ;
 
 
@@ -119,14 +118,14 @@ rx2_open	(SF_PRIVATE *psf)
 	/* Get name length */
 	length = 0 ;
 	psf_binheader_readf (psf, "1", &length) ;
-	if (length >= SIGNED_SIZEOF (psf->u.cbuf))
+	if (length >= SIGNED_SIZEOF (ubuf.cbuf))
 	{	psf_log_printf (psf, "  Text : %d *** Error : Too sf_count_t!\n") ;
 		return -1001 ;
 		}
 
-	memset (psf->u.cbuf, 0, sizeof (psf->u.cbuf)) ;
-	psf_binheader_readf (psf, "b", psf->u.cbuf, length) ;
-	psf_log_printf (psf, " Text : \"%s\"\n", psf->u.cbuf) ;
+	memset (ubuf.cbuf, 0, sizeof (ubuf.cbuf)) ;
+	psf_binheader_readf (psf, "b", ubuf.cbuf, length) ;
+	psf_log_printf (psf, " Text : \"%s\"\n", ubuf.cbuf) ;
 
 	/* Jump to GLOB offset position. */
 	if (glob_offset & 1)
@@ -253,7 +252,7 @@ rx2_open	(SF_PRIVATE *psf)
 			break ;
 		} ;
 
-	puts (psf->logbuffer) ;
+	puts (psf->parselog.buf) ;
 	puts ("-----------------------------------") ;
 
 	printf ("SDAT length  : %d\n", sdat_length) ;
@@ -270,7 +269,7 @@ rx2_open	(SF_PRIVATE *psf)
 
 	puts (" ") ;
 
-	psf->logbuffer [0] = 0 ;
+	psf->parselog.buf [0] = 0 ;
 
 	/* OK, have the header although not too sure what it all means. */
 
@@ -306,7 +305,7 @@ rx2_open	(SF_PRIVATE *psf)
 static int
 rx2_close	(SF_PRIVATE *psf)
 {
-	if (psf->mode == SFM_WRITE)
+	if (psf->file.mode == SFM_WRITE)
 	{	/*  Now we know for certain the length of the file we can re-write
 		**	correct values for the FORM, 8SVX and BODY chunks.
 		*/
diff --git a/libs/libsndfile/src/sd2.c b/libs/libsndfile/src/sd2.c
index 1089340cbf..6be150cd57 100644
--- a/libs/libsndfile/src/sd2.c
+++ b/libs/libsndfile/src/sd2.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2001-2009 Erik de Castro Lopo 
+** Copyright (C) 2001-2013 Erik de Castro Lopo 
 ** Copyright (C) 2004 Paavo Jumppanen
 **
 ** This program is free software; you can redistribute it and/or modify
@@ -104,12 +104,12 @@ sd2_open (SF_PRIVATE *psf)
 	/* SD2 is always big endian. */
 	psf->endian = SF_ENDIAN_BIG ;
 
-	if (psf->mode == SFM_READ || (psf->mode == SFM_RDWR && psf->rsrclength > 0))
+	if (psf->file.mode == SFM_READ || (psf->file.mode == SFM_RDWR && psf->rsrclength > 0))
 	{	psf_use_rsrc (psf, SF_TRUE) ;
 		valid = psf_file_valid (psf) ;
 		psf_use_rsrc (psf, SF_FALSE) ;
 		if (! valid)
-		{	psf_log_printf (psf, "sd2_open : psf->rsrcdes < 0\n") ;
+		{	psf_log_printf (psf, "sd2_open : psf->rsrc.filedes < 0\n") ;
 			return SFE_SD2_BAD_RSRC ;
 			} ;
 
@@ -128,8 +128,9 @@ sd2_open (SF_PRIVATE *psf)
 	psf->dataoffset = 0 ;
 
 	/* Only open and write the resource in RDWR mode is its current length is zero. */
-	if (psf->mode == SFM_WRITE || (psf->mode == SFM_RDWR && psf->rsrclength == 0))
-	{	psf_open_rsrc (psf, psf->mode) ;
+	if (psf->file.mode == SFM_WRITE || (psf->file.mode == SFM_RDWR && psf->rsrclength == 0))
+	{	psf->rsrc.mode = psf->file.mode ;
+		psf_open_rsrc (psf) ;
 
 		error = sd2_write_rsrc_fork (psf, SF_FALSE) ;
 
@@ -148,6 +149,7 @@ sd2_open (SF_PRIVATE *psf)
 	{	case SF_FORMAT_PCM_S8 :	/* 8-bit linear PCM. */
 		case SF_FORMAT_PCM_16 :	/* 16-bit linear PCM. */
 		case SF_FORMAT_PCM_24 :	/* 24-bit linear PCM */
+		case SF_FORMAT_PCM_32 :	/* 32-bit linear PCM */
 				error = pcm_init (psf) ;
 				break ;
 
@@ -172,7 +174,7 @@ error_cleanup:
 static int
 sd2_close	(SF_PRIVATE *psf)
 {
-	if (psf->mode == SFM_WRITE)
+	if (psf->file.mode == SFM_WRITE)
 	{	/*  Now we know for certain the audio_length of the file we can re-write
 		**	correct values for the FORM, 8SVX and BODY chunks.
 		*/
@@ -222,7 +224,7 @@ write_marker (unsigned char * data, int offset, int value)
 } /* write_marker */
 
 static void
-write_str (unsigned char * data, int offset, char * buffer, int buffer_len)
+write_str (unsigned char * data, int offset, const char * buffer, int buffer_len)
 {	memcpy (data + offset, buffer, buffer_len) ;
 } /* write_str */
 
@@ -281,8 +283,8 @@ sd2_write_rsrc_fork (SF_PRIVATE *psf, int UNUSED (calc_length))
 	write_int (rsrc.rsrc_data, 4, rsrc.map_offset) ;
 	write_int (rsrc.rsrc_data, 8, rsrc.data_length) ;
 
-	write_char (rsrc.rsrc_data, 0x30, strlen (psf->filename)) ;
-	write_str (rsrc.rsrc_data, 0x31, psf->filename, strlen (psf->filename)) ;
+	write_char (rsrc.rsrc_data, 0x30, strlen (psf->file.name.c)) ;
+	write_str (rsrc.rsrc_data, 0x31, psf->file.name.c, strlen (psf->file.name.c)) ;
 
 	write_short (rsrc.rsrc_data, 0x50, 0) ;
 	write_marker (rsrc.rsrc_data, 0x52, Sd2f_MARKER) ;
@@ -369,44 +371,61 @@ sd2_write_rsrc_fork (SF_PRIVATE *psf, int UNUSED (calc_length))
 */
 
 static inline int
-read_char (const unsigned char * data, int offset)
-{	return data [offset] ;
-} /* read_char */
+read_rsrc_char (const SD2_RSRC *prsrc, int offset)
+{	const unsigned char * data = prsrc->rsrc_data ;
+	if (offset < 0 || offset >= prsrc->rsrc_len)
+		return 0 ;
+	return data [offset] ;
+} /* read_rsrc_char */
 
 static inline int
-read_short (const unsigned char * data, int offset)
-{	return (data [offset] << 8) + data [offset + 1] ;
-} /* read_short */
+read_rsrc_short (const SD2_RSRC *prsrc, int offset)
+{	const unsigned char * data = prsrc->rsrc_data ;
+	if (offset < 0 || offset + 1 >= prsrc->rsrc_len)
+		return 0 ;
+	return (data [offset] << 8) + data [offset + 1] ;
+} /* read_rsrc_short */
 
 static inline int
-read_int (const unsigned char * data, int offset)
-{	return (data [offset] << 24) + (data [offset + 1] << 16) + (data [offset + 2] << 8) + data [offset + 3] ;
-} /* read_int */
+read_rsrc_int (const SD2_RSRC *prsrc, int offset)
+{	const unsigned char * data = prsrc->rsrc_data ;
+	if (offset < 0 || offset + 3 >= prsrc->rsrc_len)
+		return 0 ;
+	return (data [offset] << 24) + (data [offset + 1] << 16) + (data [offset + 2] << 8) + data [offset + 3] ;
+} /* read_rsrc_int */
 
 static inline int
-read_marker (const unsigned char * data, int offset)
-{
+read_rsrc_marker (const SD2_RSRC *prsrc, int offset)
+{	const unsigned char * data = prsrc->rsrc_data ;
+
+	if (offset < 0 || offset + 3 >= prsrc->rsrc_len)
+		return 0 ;
+
 	if (CPU_IS_BIG_ENDIAN)
 		return (data [offset] << 24) + (data [offset + 1] << 16) + (data [offset + 2] << 8) + data [offset + 3] ;
-	else if (CPU_IS_LITTLE_ENDIAN)
+	if (CPU_IS_LITTLE_ENDIAN)
 		return data [offset] + (data [offset + 1] << 8) + (data [offset + 2] << 16) + (data [offset + 3] << 24) ;
-	else
-		return 0x666 ;
-} /* read_marker */
+
+	return 0 ;
+} /* read_rsrc_marker */
 
 static void
-read_str (const unsigned char * data, int offset, char * buffer, int buffer_len)
-{	int k ;
+read_rsrc_str (const SD2_RSRC *prsrc, int offset, char * buffer, int buffer_len)
+{	const unsigned char * data = prsrc->rsrc_data ;
+	int k ;
 
 	memset (buffer, 0, buffer_len) ;
 
+	if (offset < 0 || offset + buffer_len >= prsrc->rsrc_len)
+		return ;
+
 	for (k = 0 ; k < buffer_len - 1 ; k++)
-	{	if (isprint (data [offset + k]) == 0)
+	{	if (psf_isprint (data [offset + k]) == 0)
 			return ;
 		buffer [k] = data [offset + k] ;
 		} ;
 	return ;
-} /* read_str */
+} /* read_rsrc_str */
 
 static int
 sd2_parse_rsrc_fork (SF_PRIVATE *psf)
@@ -433,17 +452,17 @@ sd2_parse_rsrc_fork (SF_PRIVATE *psf)
 	/* Reset the header storage because we have changed to the rsrcdes. */
 	psf->headindex = psf->headend = rsrc.rsrc_len ;
 
-	rsrc.data_offset = read_int (rsrc.rsrc_data, 0) ;
-	rsrc.map_offset = read_int (rsrc.rsrc_data, 4) ;
-	rsrc.data_length = read_int (rsrc.rsrc_data, 8) ;
-	rsrc.map_length = read_int (rsrc.rsrc_data, 12) ;
+	rsrc.data_offset = read_rsrc_int (&rsrc, 0) ;
+	rsrc.map_offset = read_rsrc_int (&rsrc, 4) ;
+	rsrc.data_length = read_rsrc_int (&rsrc, 8) ;
+	rsrc.map_length = read_rsrc_int (&rsrc, 12) ;
 
 	if (rsrc.data_offset == 0x51607 && rsrc.map_offset == 0x20000)
 	{	psf_log_printf (psf, "Trying offset of 0x52 bytes.\n") ;
-		rsrc.data_offset = read_int (rsrc.rsrc_data, 0x52 + 0) + 0x52 ;
-		rsrc.map_offset = read_int (rsrc.rsrc_data, 0x52 + 4) + 0x52 ;
-		rsrc.data_length = read_int (rsrc.rsrc_data, 0x52 + 8) ;
-		rsrc.map_length = read_int (rsrc.rsrc_data, 0x52 + 12) ;
+		rsrc.data_offset = read_rsrc_int (&rsrc, 0x52 + 0) + 0x52 ;
+		rsrc.map_offset = read_rsrc_int (&rsrc, 0x52 + 4) + 0x52 ;
+		rsrc.data_length = read_rsrc_int (&rsrc, 0x52 + 8) ;
+		rsrc.map_length = read_rsrc_int (&rsrc, 0x52 + 12) ;
 		} ;
 
 	psf_log_printf (psf, "  data offset : 0x%04X\n  map  offset : 0x%04X\n"
@@ -486,7 +505,7 @@ sd2_parse_rsrc_fork (SF_PRIVATE *psf)
 		goto parse_rsrc_fork_cleanup ;
 		} ;
 
-	rsrc.string_offset = rsrc.map_offset + read_short (rsrc.rsrc_data, rsrc.map_offset + 26) ;
+	rsrc.string_offset = rsrc.map_offset + read_rsrc_short (&rsrc, rsrc.map_offset + 26) ;
 	if (rsrc.string_offset > rsrc.rsrc_len)
 	{	psf_log_printf (psf, "Bad string offset (%d).\n", rsrc.string_offset) ;
 		error = SFE_SD2_BAD_RSRC ;
@@ -495,7 +514,7 @@ sd2_parse_rsrc_fork (SF_PRIVATE *psf)
 
 	rsrc.type_offset = rsrc.map_offset + 30 ;
 
-	rsrc.type_count = read_short (rsrc.rsrc_data, rsrc.map_offset + 28) + 1 ;
+	rsrc.type_count = read_rsrc_short (&rsrc, rsrc.map_offset + 28) + 1 ;
 	if (rsrc.type_count < 1)
 	{	psf_log_printf (psf, "Bad type count.\n") ;
 		error = SFE_SD2_BAD_RSRC ;
@@ -511,11 +530,11 @@ sd2_parse_rsrc_fork (SF_PRIVATE *psf)
 
 	rsrc.str_index = -1 ;
 	for (k = 0 ; k < rsrc.type_count ; k ++)
-	{	marker = read_marker (rsrc.rsrc_data, rsrc.type_offset + k * 8) ;
+	{	marker = read_rsrc_marker (&rsrc, rsrc.type_offset + k * 8) ;
 
 		if (marker == STR_MARKER)
 		{	rsrc.str_index = k ;
-			rsrc.str_count = read_short (rsrc.rsrc_data, rsrc.type_offset + k * 8 + 4) + 1 ;
+			rsrc.str_count = read_rsrc_short (&rsrc, rsrc.type_offset + k * 8 + 4) + 1 ;
 			error = parse_str_rsrc (psf, &rsrc) ;
 			goto parse_rsrc_fork_cleanup ;
 			} ;
@@ -547,26 +566,26 @@ parse_str_rsrc (SF_PRIVATE *psf, SD2_RSRC * rsrc)
 	for (k = 0 ; data_offset + data_len < rsrc->rsrc_len ; k++)
 	{	int slen ;
 
-		slen = read_char (rsrc->rsrc_data, str_offset) ;
-		read_str (rsrc->rsrc_data, str_offset + 1, name, SF_MIN (SIGNED_SIZEOF (name), slen + 1)) ;
+		slen = read_rsrc_char (rsrc, str_offset) ;
+		read_rsrc_str (rsrc, str_offset + 1, name, SF_MIN (SIGNED_SIZEOF (name), slen + 1)) ;
 		str_offset += slen + 1 ;
 
-		rsrc_id = read_short (rsrc->rsrc_data, rsrc->item_offset + k * 12) ;
+		rsrc_id = read_rsrc_short (rsrc, rsrc->item_offset + k * 12) ;
 
-		data_offset = rsrc->data_offset + read_int (rsrc->rsrc_data, rsrc->item_offset + k * 12 + 4) ;
+		data_offset = rsrc->data_offset + read_rsrc_int (rsrc, rsrc->item_offset + k * 12 + 4) ;
 		if (data_offset < 0 || data_offset > rsrc->rsrc_len)
 		{	psf_log_printf (psf, "Exiting parser on data offset of %d.\n", data_offset) ;
 			break ;
 			} ;
 
-		data_len = read_int (rsrc->rsrc_data, data_offset) ;
+		data_len = read_rsrc_int (rsrc, data_offset) ;
 		if (data_len < 0 || data_len > rsrc->rsrc_len)
 		{	psf_log_printf (psf, "Exiting parser on data length of %d.\n", data_len) ;
 			break ;
 			} ;
 
-		slen = read_char (rsrc->rsrc_data, data_offset + 4) ;
-		read_str (rsrc->rsrc_data, data_offset + 5, value, SF_MIN (SIGNED_SIZEOF (value), slen + 1)) ;
+		slen = read_rsrc_char (rsrc, data_offset + 4) ;
+		read_rsrc_str (rsrc, data_offset + 5, value, SF_MIN (SIGNED_SIZEOF (value), slen + 1)) ;
 
 		psf_log_printf (psf, "  0x%04x     %4d     %4d     %3d    '%s'\n", data_offset, rsrc_id, data_len, slen, value) ;
 
@@ -619,6 +638,10 @@ parse_str_rsrc (SF_PRIVATE *psf, SD2_RSRC * rsrc)
 			psf->sf.format = SF_FORMAT_SD2 | SF_FORMAT_PCM_24 ;
 			break ;
 
+		case 4 :
+			psf->sf.format = SF_FORMAT_SD2 | SF_FORMAT_PCM_32 ;
+			break ;
+
 		default :
 			psf_log_printf (psf, "Bad sample size (%d)\n", rsrc->sample_size) ;
 			return SFE_SD2_BAD_SAMPLE_SIZE ;
diff --git a/libs/libsndfile/src/sds.c b/libs/libsndfile/src/sds.c
index 2c2c9fc44d..7dd1d9d27e 100644
--- a/libs/libsndfile/src/sds.c
+++ b/libs/libsndfile/src/sds.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2002-2009 Erik de Castro Lopo 
+** Copyright (C) 2002-2012 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -56,6 +56,7 @@ typedef struct tag_SDS_PRIVATE
 	int	read_samples [SDS_BLOCK_SIZE / 2] ; /* Maximum samples per block */
 
 	int write_block, write_count ;
+	int total_written ;
 	unsigned char write_data [SDS_BLOCK_SIZE] ;
 	int	write_samples [SDS_BLOCK_SIZE / 2] ; /* Maximum samples per block */
 } SDS_PRIVATE ;
@@ -82,6 +83,7 @@ static sf_count_t sds_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len
 static sf_count_t sds_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) ;
 
 static sf_count_t sds_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) ;
+static int sds_byterate (SF_PRIVATE * psf) ;
 
 static int sds_2byte_read (SF_PRIVATE *psf, SDS_PRIVATE *psds) ;
 static int sds_3byte_read (SF_PRIVATE *psf, SDS_PRIVATE *psds) ;
@@ -111,7 +113,7 @@ sds_open	(SF_PRIVATE *psf)
 		return SFE_MALLOC_FAILED ;
 	psf->codec_data = psds ;
 
-	if (psf->mode == SFM_READ || (psf->mode == SFM_RDWR && psf->filelength > 0))
+	if (psf->file.mode == SFM_READ || (psf->file.mode == SFM_RDWR && psf->filelength > 0))
 	{	if ((error = sds_read_header (psf, psds)))
 			return error ;
 		} ;
@@ -119,7 +121,7 @@ sds_open	(SF_PRIVATE *psf)
 	if ((SF_CONTAINER (psf->sf.format)) != SF_FORMAT_SDS)
 		return	SFE_BAD_OPEN_FORMAT ;
 
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{	if (sds_write_header (psf, SF_FALSE))
 			return psf->error ;
 
@@ -131,8 +133,9 @@ sds_open	(SF_PRIVATE *psf)
 	if ((error = sds_init (psf, psds)) != 0)
 		return error ;
 
-	psf->seek = sds_seek ;
 	psf->container_close = sds_close ;
+	psf->seek = sds_seek ;
+	psf->byterate = sds_byterate ;
 
 	psf->blockwidth = 0 ;
 
@@ -145,7 +148,7 @@ sds_open	(SF_PRIVATE *psf)
 static int
 sds_close	(SF_PRIVATE *psf)
 {
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{	SDS_PRIVATE *psds ;
 
 		if ((psds = (SDS_PRIVATE *) psf->codec_data) == NULL)
@@ -186,7 +189,7 @@ sds_init (SF_PRIVATE *psf, SDS_PRIVATE *psds)
 		psds->samplesperblock = SDS_AUDIO_BYTES_PER_BLOCK / 4 ;
 		} ;
 
-	if (psf->mode == SFM_READ || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_READ || psf->file.mode == SFM_RDWR)
 	{	psf->read_short		= sds_read_s ;
 		psf->read_int		= sds_read_i ;
 		psf->read_float		= sds_read_f ;
@@ -196,7 +199,7 @@ sds_init (SF_PRIVATE *psf, SDS_PRIVATE *psds)
 		psds->reader (psf, psds) ;
 		} ;
 
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{	psf->write_short	= sds_write_s ;
 		psf->write_int		= sds_write_i ;
 		psf->write_float	= sds_write_f ;
@@ -219,26 +222,47 @@ sds_read_header (SF_PRIVATE *psf, SDS_PRIVATE *psds)
 	if (marker != 0xF07E || byte != 0x01)
 		return SFE_SDS_NOT_SDS ;
 
-	psf_log_printf (psf, "Midi Sample Dump Standard (.sds)\nF07E\n Midi Channel  : %d\n", channel) ;
-
-	bytesread += psf_binheader_readf (psf, "e213", &sample_no, &bitwidth, &samp_period) ;
-
+	bytesread += psf_binheader_readf (psf, "e2", &sample_no) ;
 	sample_no = SDS_3BYTE_TO_INT_DECODE (sample_no) ;
+
+	psf_log_printf (psf, "Midi Sample Dump Standard (.sds)\nF07E\n"
+						" Midi Channel  : %d\n Sample Number : %d\n",
+						channel, sample_no) ;
+
+	bytesread += psf_binheader_readf (psf, "e13", &bitwidth, &samp_period) ;
+
 	samp_period = SDS_3BYTE_TO_INT_DECODE (samp_period) ;
 
 	psds->bitwidth = bitwidth ;
 
-	psf->sf.samplerate = 1000000000 / samp_period ;
+	if (psds->bitwidth > 1)
+		psf_log_printf (psf, " Bit Width     : %d\n", psds->bitwidth) ;
+	else
+	{	psf_log_printf (psf, " Bit Width     : %d (should be > 1)\n", psds->bitwidth) ;
+		return SFE_SDS_BAD_BIT_WIDTH ;
+		} ;
 
-	psf_log_printf (psf, 	" Sample Number : %d\n"
-							" Bit Width     : %d\n"
+	if (samp_period > 0)
+	{	psf->sf.samplerate = 1000000000 / samp_period ;
+
+		psf_log_printf (psf, " Sample Period : %d\n"
 							" Sample Rate   : %d\n",
-			sample_no, psds->bitwidth, psf->sf.samplerate) ;
+							samp_period, psf->sf.samplerate) ;
+		}
+	else
+	{	psf->sf.samplerate = 16000 ;
+
+		psf_log_printf (psf, " Sample Period : %d (should be > 0)\n"
+							" Sample Rate   : %d (guessed)\n",
+							samp_period, psf->sf.samplerate) ;
+		} ;
 
 	bytesread += psf_binheader_readf (psf, "e3331", &data_length, &sustain_loop_start, &sustain_loop_end, &loop_type) ;
 
 	data_length = SDS_3BYTE_TO_INT_DECODE (data_length) ;
 
+	psf->sf.frames = psds->frames = data_length ;
+
 	sustain_loop_start = SDS_3BYTE_TO_INT_DECODE (sustain_loop_start) ;
 	sustain_loop_end = SDS_3BYTE_TO_INT_DECODE (sustain_loop_end) ;
 
@@ -251,13 +275,6 @@ sds_read_header (SF_PRIVATE *psf, SDS_PRIVATE *psds)
 	psf->dataoffset = SDS_DATA_OFFSET ;
 	psf->datalength = psf->filelength - psf->dataoffset ;
 
-	if (data_length != psf->filelength - psf->dataoffset)
-	{	psf_log_printf (psf, " Datalength     : %d (truncated data??? %d)\n", data_length, psf->filelength - psf->dataoffset) ;
-		data_length = psf->filelength - psf->dataoffset ;
-		}
-	else
-		psf_log_printf (psf, " Datalength     : %d\n", data_length) ;
-
 	bytesread += psf_binheader_readf (psf, "1", &byte) ;
 	if (byte != 0xF7)
 		psf_log_printf (psf, "bad end : %X\n", byte & 0xFF) ;
@@ -281,9 +298,6 @@ sds_read_header (SF_PRIVATE *psf, SDS_PRIVATE *psds)
 
 	psf_log_printf (psf, "Frames         : %d\n", blockcount * psds->samplesperblock) ;
 
-	psf->sf.frames = blockcount * psds->samplesperblock ;
-	psds->frames = blockcount * psds->samplesperblock ;
-
 	/* Always Mono */
 	psf->sf.channels = 1 ;
 	psf->sf.sections = 1 ;
@@ -337,7 +351,7 @@ sds_write_header (SF_PRIVATE *psf, int calc_length)
 	current = psf_ftell (psf) ;
 
 	if (calc_length)
-		psf->sf.frames = psds->total_blocks * psds->samplesperblock + psds->write_count ;
+		psf->sf.frames = psds->total_written ;
 
 	if (psds->write_count > 0)
 	{	int current_count = psds->write_count ;
@@ -378,9 +392,9 @@ sds_write_header (SF_PRIVATE *psf, int calc_length)
 
 	psf_binheader_writef (psf, "e213", 0, psds->bitwidth, samp_period) ;
 
-	data_length			= SDS_INT_TO_3BYTE_ENCODE (psds->total_blocks * SDS_BLOCK_SIZE) ;
+	data_length			= SDS_INT_TO_3BYTE_ENCODE (psds->total_written) ;
 	sustain_loop_start	= SDS_INT_TO_3BYTE_ENCODE (0) ;
-	sustain_loop_end	= SDS_INT_TO_3BYTE_ENCODE (psf->sf.frames) ;
+	sustain_loop_end	= SDS_INT_TO_3BYTE_ENCODE (0) ;
 
 	psf_binheader_writef (psf, "e33311", data_length, sustain_loop_start, sustain_loop_end, loop_type, 0xF7) ;
 
@@ -429,7 +443,7 @@ sds_2byte_read (SF_PRIVATE *psf, SDS_PRIVATE *psds)
 	{	printf ("Error 1 : %02X\n", checksum & 0xFF) ;
 		}
 
-	for (k = 2 ; k < SDS_BLOCK_SIZE - 3 ; k ++)
+	for (k = 2 ; k <= SDS_BLOCK_SIZE - 3 ; k ++)
 		checksum ^= psds->read_data [k] ;
 
 	checksum &= 0x7F ;
@@ -473,7 +487,7 @@ sds_3byte_read (SF_PRIVATE *psf, SDS_PRIVATE *psds)
 	{	printf ("Error 1 : %02X\n", checksum & 0xFF) ;
 		}
 
-	for (k = 2 ; k < SDS_BLOCK_SIZE - 3 ; k ++)
+	for (k = 2 ; k <= SDS_BLOCK_SIZE - 3 ; k ++)
 		checksum ^= psds->read_data [k] ;
 
 	checksum &= 0x7F ;
@@ -517,7 +531,7 @@ sds_4byte_read (SF_PRIVATE *psf, SDS_PRIVATE *psds)
 	{	printf ("Error 1 : %02X\n", checksum & 0xFF) ;
 		}
 
-	for (k = 2 ; k < SDS_BLOCK_SIZE - 3 ; k ++)
+	for (k = 2 ; k <= SDS_BLOCK_SIZE - 3 ; k ++)
 		checksum ^= psds->read_data [k] ;
 
 	checksum &= 0x7F ;
@@ -538,7 +552,8 @@ sds_4byte_read (SF_PRIVATE *psf, SDS_PRIVATE *psds)
 
 static sf_count_t
 sds_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len)
-{	SDS_PRIVATE	*psds ;
+{	BUF_UNION	ubuf ;
+	SDS_PRIVATE	*psds ;
 	int			*iptr ;
 	int			k, bufferlen, readcount, count ;
 	sf_count_t	total = 0 ;
@@ -547,8 +562,8 @@ sds_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len)
 		return 0 ;
 	psds = (SDS_PRIVATE*) psf->codec_data ;
 
-	iptr = psf->u.ibuf ;
-	bufferlen = ARRAY_LEN (psf->u.ibuf) ;
+	iptr = ubuf.ibuf ;
+	bufferlen = ARRAY_LEN (ubuf.ibuf) ;
 	while (len > 0)
 	{	readcount = (len >= bufferlen) ? bufferlen : len ;
 		count = sds_read (psf, psds, iptr, readcount) ;
@@ -577,7 +592,8 @@ sds_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len)
 
 static sf_count_t
 sds_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
-{	SDS_PRIVATE	*psds ;
+{	BUF_UNION	ubuf ;
+	SDS_PRIVATE	*psds ;
 	int			*iptr ;
 	int			k, bufferlen, readcount, count ;
 	sf_count_t	total = 0 ;
@@ -592,8 +608,8 @@ sds_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
 	else
 		normfact = 1.0 / (1 << psds->bitwidth) ;
 
-	iptr = psf->u.ibuf ;
-	bufferlen = ARRAY_LEN (psf->u.ibuf) ;
+	iptr = ubuf.ibuf ;
+	bufferlen = ARRAY_LEN (ubuf.ibuf) ;
 	while (len > 0)
 	{	readcount = (len >= bufferlen) ? bufferlen : len ;
 		count = sds_read (psf, psds, iptr, readcount) ;
@@ -608,7 +624,8 @@ sds_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
 
 static sf_count_t
 sds_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
-{	SDS_PRIVATE	*psds ;
+{	BUF_UNION	ubuf ;
+	SDS_PRIVATE	*psds ;
 	int			*iptr ;
 	int			k, bufferlen, readcount, count ;
 	sf_count_t	total = 0 ;
@@ -623,8 +640,8 @@ sds_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
 	else
 		normfact = 1.0 / (1 << psds->bitwidth) ;
 
-	iptr = psf->u.ibuf ;
-	bufferlen = ARRAY_LEN (psf->u.ibuf) ;
+	iptr = ubuf.ibuf ;
+	bufferlen = ARRAY_LEN (ubuf.ibuf) ;
 	while (len > 0)
 	{	readcount = (len >= bufferlen) ? bufferlen : len ;
 		count = sds_read (psf, psds, iptr, readcount) ;
@@ -737,6 +754,15 @@ sds_seek (SF_PRIVATE *psf, int mode, sf_count_t seek_from_start)
 	return seek_from_start ;
 } /* sds_seek */
 
+static int
+sds_byterate (SF_PRIVATE * psf)
+{
+	if (psf->file.mode == SFM_READ)
+		return (psf->datalength * psf->sf.samplerate) / psf->sf.frames ;
+
+	return -1 ;
+} /* sds_byterate */
+
 /*==============================================================================
 */
 
@@ -749,7 +775,8 @@ sds_2byte_write (SF_PRIVATE *psf, SDS_PRIVATE *psds)
 	psds->write_data [0] = 0xF0 ;
 	psds->write_data [1] = 0x7E ;
 	psds->write_data [2] = 0 ;							/* Channel number */
-	psds->write_data [3] = psds->write_block & 0x7F ;	/* Packet number */
+	psds->write_data [3] = 2 ;
+	psds->write_data [4] = psds->write_block & 0x7F ;	/* Packet number */
 
 	ucptr = psds->write_data + 5 ;
 	for (k = 0 ; k < 120 ; k += 2)
@@ -760,7 +787,7 @@ sds_2byte_write (SF_PRIVATE *psf, SDS_PRIVATE *psds)
 		} ;
 
 	checksum = psds->write_data [1] ;
-	for (k = 2 ; k < SDS_BLOCK_SIZE - 3 ; k ++)
+	for (k = 2 ; k <= SDS_BLOCK_SIZE - 3 ; k ++)
 		checksum ^= psds->write_data [k] ;
 	checksum &= 0x7F ;
 
@@ -789,7 +816,8 @@ sds_3byte_write (SF_PRIVATE *psf, SDS_PRIVATE *psds)
 	psds->write_data [0] = 0xF0 ;
 	psds->write_data [1] = 0x7E ;
 	psds->write_data [2] = 0 ;							/* Channel number */
-	psds->write_data [3] = psds->write_block & 0x7F ;	/* Packet number */
+	psds->write_data [3] = 2 ;
+	psds->write_data [4] = psds->write_block & 0x7F ;	/* Packet number */
 
 	ucptr = psds->write_data + 5 ;
 	for (k = 0 ; k < 120 ; k += 3)
@@ -801,7 +829,7 @@ sds_3byte_write (SF_PRIVATE *psf, SDS_PRIVATE *psds)
 		} ;
 
 	checksum = psds->write_data [1] ;
-	for (k = 2 ; k < SDS_BLOCK_SIZE - 3 ; k ++)
+	for (k = 2 ; k <= SDS_BLOCK_SIZE - 3 ; k ++)
 		checksum ^= psds->write_data [k] ;
 	checksum &= 0x7F ;
 
@@ -830,7 +858,8 @@ sds_4byte_write (SF_PRIVATE *psf, SDS_PRIVATE *psds)
 	psds->write_data [0] = 0xF0 ;
 	psds->write_data [1] = 0x7E ;
 	psds->write_data [2] = 0 ;							/* Channel number */
-	psds->write_data [3] = psds->write_block & 0x7F ;	/* Packet number */
+	psds->write_data [3] = 2 ;
+	psds->write_data [4] = psds->write_block & 0x7F ;	/* Packet number */
 
 	ucptr = psds->write_data + 5 ;
 	for (k = 0 ; k < 120 ; k += 4)
@@ -843,7 +872,7 @@ sds_4byte_write (SF_PRIVATE *psf, SDS_PRIVATE *psds)
 		} ;
 
 	checksum = psds->write_data [1] ;
-	for (k = 2 ; k < SDS_BLOCK_SIZE - 3 ; k ++)
+	for (k = 2 ; k <= SDS_BLOCK_SIZE - 3 ; k ++)
 		checksum ^= psds->write_data [k] ;
 	checksum &= 0x7F ;
 
@@ -865,7 +894,8 @@ sds_4byte_write (SF_PRIVATE *psf, SDS_PRIVATE *psds)
 
 static sf_count_t
 sds_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len)
-{	SDS_PRIVATE	*psds ;
+{	BUF_UNION	ubuf ;
+	SDS_PRIVATE	*psds ;
 	int			*iptr ;
 	int			k, bufferlen, writecount, count ;
 	sf_count_t	total = 0 ;
@@ -873,9 +903,10 @@ sds_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len)
 	if (psf->codec_data == NULL)
 		return 0 ;
 	psds = (SDS_PRIVATE*) psf->codec_data ;
+	psds->total_written += len ;
 
-	iptr = psf->u.ibuf ;
-	bufferlen = ARRAY_LEN (psf->u.ibuf) ;
+	iptr = ubuf.ibuf ;
+	bufferlen = ARRAY_LEN (ubuf.ibuf) ;
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : len ;
 		for (k = 0 ; k < writecount ; k++)
@@ -896,6 +927,7 @@ sds_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len)
 	if (psf->codec_data == NULL)
 		return 0 ;
 	psds = (SDS_PRIVATE*) psf->codec_data ;
+	psds->total_written += len ;
 
 	total = sds_write (psf, psds, ptr, len) ;
 
@@ -904,7 +936,8 @@ sds_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len)
 
 static sf_count_t
 sds_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len)
-{	SDS_PRIVATE	*psds ;
+{	BUF_UNION	ubuf ;
+	SDS_PRIVATE	*psds ;
 	int			*iptr ;
 	int			k, bufferlen, writecount, count ;
 	sf_count_t	total = 0 ;
@@ -913,14 +946,15 @@ sds_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len)
 	if (psf->codec_data == NULL)
 		return 0 ;
 	psds = (SDS_PRIVATE*) psf->codec_data ;
+	psds->total_written += len ;
 
 	if (psf->norm_float == SF_TRUE)
 		normfact = 1.0 * 0x80000000 ;
 	else
 		normfact = 1.0 * (1 << psds->bitwidth) ;
 
-	iptr = psf->u.ibuf ;
-	bufferlen = ARRAY_LEN (psf->u.ibuf) ;
+	iptr = ubuf.ibuf ;
+	bufferlen = ARRAY_LEN (ubuf.ibuf) ;
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : len ;
 		for (k = 0 ; k < writecount ; k++)
@@ -935,7 +969,8 @@ sds_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len)
 
 static sf_count_t
 sds_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len)
-{	SDS_PRIVATE	*psds ;
+{	BUF_UNION	ubuf ;
+	SDS_PRIVATE	*psds ;
 	int			*iptr ;
 	int			k, bufferlen, writecount, count ;
 	sf_count_t	total = 0 ;
@@ -944,14 +979,15 @@ sds_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len)
 	if (psf->codec_data == NULL)
 		return 0 ;
 	psds = (SDS_PRIVATE*) psf->codec_data ;
+	psds->total_written += len ;
 
 	if (psf->norm_double == SF_TRUE)
 		normfact = 1.0 * 0x80000000 ;
 	else
 		normfact = 1.0 * (1 << psds->bitwidth) ;
 
-	iptr = psf->u.ibuf ;
-	bufferlen = ARRAY_LEN (psf->u.ibuf) ;
+	iptr = ubuf.ibuf ;
+	bufferlen = ARRAY_LEN (ubuf.ibuf) ;
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : len ;
 		for (k = 0 ; k < writecount ; k++)
diff --git a/libs/libsndfile/src/sf_unistd.h b/libs/libsndfile/src/sf_unistd.h
index 1d71f62604..9fca68eff2 100644
--- a/libs/libsndfile/src/sf_unistd.h
+++ b/libs/libsndfile/src/sf_unistd.h
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2002-2009 Erik de Castro Lopo 
+** Copyright (C) 2002-2011 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -34,15 +34,17 @@
 #define		S_IXUSR	0000100	/* execute/search permission, owner */
 #endif
 
-#define	S_IRWXG		0000070	/* rwx, group */
-#define		S_IRGRP	0000040	/* read permission, group */
-#define		S_IWGRP	0000020	/* write permission, grougroup */
-#define		S_IXGRP	0000010	/* execute/search permission, group */
+/* Windows doesn't have group permissions so set all these to zero. */
+#define	S_IRWXG		0	/* rwx, group */
+#define		S_IRGRP	0	/* read permission, group */
+#define		S_IWGRP	0	/* write permission, grougroup */
+#define		S_IXGRP	0	/* execute/search permission, group */
 
-#define	S_IRWXO		0000007	/* rwx, other */
-#define		S_IROTH	0000004	/* read permission, other */
-#define		S_IWOTH	0000002	/* write permission, other */
-#define		S_IXOTH	0000001	/* execute/search permission, other */
+/* Windows doesn't have others permissions so set all these to zero. */
+#define	S_IRWXO		0	/* rwx, other */
+#define		S_IROTH	0	/* read permission, other */
+#define		S_IWOTH	0	/* write permission, other */
+#define		S_IXOTH	0	/* execute/search permission, other */
 
 #ifndef S_ISFIFO
 #define S_ISFIFO(mode)	(((mode) & _S_IFMT) == _S_IFIFO)
diff --git a/libs/libsndfile/src/sfconfig.h b/libs/libsndfile/src/sfconfig.h
index 1884b09a41..b9b2dbda0d 100644
--- a/libs/libsndfile/src/sfconfig.h
+++ b/libs/libsndfile/src/sfconfig.h
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2005-2009 Erik de Castro Lopo 
+** Copyright (C) 2005-2013 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -53,6 +53,10 @@
 #define HAVE_ENDIAN_H 0
 #endif
 
+#ifndef HAVE_FSTAT64
+#define HAVE_FSTAT64 0
+#endif
+
 #ifndef HAVE_FSYNC
 #define HAVE_FSYNC 0
 #endif
@@ -73,14 +77,6 @@
 #define HAVE_MMAP 0
 #endif
 
-#ifndef HAVE_PREAD
-#define HAVE_PREAD 0
-#endif
-
-#ifndef HAVE_PWRITE
-#define HAVE_PWRITE 0
-#endif
-
 #ifndef HAVE_SETLOCALE
 #define HAVE_SETLOCALE 0
 #endif
@@ -93,9 +89,27 @@
 #define HAVE_STDINT_H 0
 #endif
 
+#ifndef HAVE_SYS_WAIT_H
+#define HAVE_SYS_WAIT_H 0
+#endif
+
 #ifndef HAVE_UNISTD_H
 #define HAVE_UNISTD_H 0
 #endif
 
+#ifndef HAVE_PIPE
+#define HAVE_PIPE 0
 #endif
 
+#ifndef HAVE_WAITPID
+#define	HAVE_WAITPID 0
+#endif
+
+#ifndef HAVE_X86INTRIN_H
+#define HAVE_X86INTRIN_H 0
+#endif
+
+#define CPU_IS_X86		(defined __i486__ || defined __i586__ || defined __i686__ || defined __x86_64__)
+#define CPU_IS_X86_64	(defined __x86_64__)
+
+#endif
diff --git a/libs/libsndfile/src/sfendian.h b/libs/libsndfile/src/sfendian.h
index 2c8a908c58..044fa3a77f 100644
--- a/libs/libsndfile/src/sfendian.h
+++ b/libs/libsndfile/src/sfendian.h
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2013 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -21,38 +21,72 @@
 
 #include "sfconfig.h"
 
-#if HAVE_STDINT_H
 #include 
-#elif HAVE_INTTYPES_H
+#ifndef WIN32
 #include 
 #endif
 
-#if (defined (SIZEOF_INT64_T) && (SIZEOF_INT64_T == 8))
-/* Good, we have int64_t. */
-#elif (defined (SIZEOF_LONG_LONG) && (SIZEOF_LONG_LONG == 8))
-typedef long long int64_t ;
-#elif (defined (SIZEOF_LONG) && (SIZEOF_LONG == 8))
-typedef long int64_t ;
-#elif (defined (WIN32) || defined (_WIN32))
-typedef __int64 int64_t ;
-#else
-#error "No 64 bit integer type."
+
+#if COMPILER_IS_GCC && CPU_IS_X86
+
+static inline int16_t
+ENDSWAP_16 (int16_t x)
+{	int16_t y ;
+	__asm__ ("rorw $8, %w0" : "=r" (y) : "0" (x) : "cc") ;
+	return y ;
+} /* ENDSWAP_16 */
+
+static inline int32_t
+ENDSWAP_32 (int32_t x)
+{	int32_t y ;
+	__asm__ ("bswap %0" : "=r" (y) : "0" (x)) ;
+	return y ;
+} /* ENDSWAP_32 */
+
+#if CPU_IS_X86_64
+
+static inline int64_t
+ENDSWAP_64X (int64_t x)
+{	int64_t y ;
+	__asm__ ("bswap %q0" : "=r" (y) : "0" (x)) ;
+	return y ;
+} /* ENDSWAP_64X */
+
+#define ENDSWAP_64 ENDSWAP_64X
+
 #endif
 
-#if HAVE_BYTESWAP_H
-
+#elif HAVE_BYTESWAP_H			/* Linux, any CPU */
 #include 
 
-#define	ENDSWAP_SHORT(x)	((short) bswap_16 (x))
-#define	ENDSWAP_INT(x)		((int) bswap_32 (x))
+#define	ENDSWAP_16(x)		(bswap_16 (x))
+#define	ENDSWAP_32(x)		(bswap_32 (x))
+#define	ENDSWAP_64(x)		(bswap_64 (x))
 
 #else
 
-#define	ENDSWAP_SHORT(x)	((((x) >> 8) & 0xFF) + (((x) & 0xFF) << 8))
-#define	ENDSWAP_INT(x)		((((x) >> 24) & 0xFF) + (((x) >> 8) & 0xFF00) + (((x) & 0xFF00) << 8) + (((x) & 0xFF) << 24))
+#define	ENDSWAP_16(x)		((((x) >> 8) & 0xFF) + (((x) & 0xFF) << 8))
+#define	ENDSWAP_32(x)		((((x) >> 24) & 0xFF) + (((x) >> 8) & 0xFF00) + (((x) & 0xFF00) << 8) + (((x) & 0xFF) << 24))
 
 #endif
 
+#ifndef ENDSWAP_64
+static inline uint64_t
+ENDSWAP_64 (uint64_t x)
+{	union
+	{	uint32_t parts [2] ;
+		uint64_t whole ;
+	} u ;
+	uint32_t temp ;
+
+	u.whole = x ;
+	temp = u.parts [0] ;
+	u.parts [0] = ENDSWAP_32 (u.parts [1]) ;
+	u.parts [1] = ENDSWAP_32 (temp) ;
+	return u.whole ;
+}
+#endif
+
 /*
 ** Many file types (ie WAV, AIFF) use sets of four consecutive bytes as a
 ** marker indicating different sections of the file.
@@ -61,9 +95,9 @@ typedef __int64 int64_t ;
 */
 
 #if (CPU_IS_LITTLE_ENDIAN == 1)
-	#define	MAKE_MARKER(a,b,c,d)	((a) | ((b) << 8) | ((c) << 16) | ((d) << 24))
+	#define	MAKE_MARKER(a, b, c, d)		((uint32_t) ((a) | ((b) << 8) | ((c) << 16) | (((uint32_t) (d)) << 24)))
 #elif (CPU_IS_BIG_ENDIAN == 1)
-	#define	MAKE_MARKER(a,b,c,d)	(((a) << 24) | ((b) << 16) | ((c) << 8) | (d))
+	#define	MAKE_MARKER(a, b, c, d)		((uint32_t) ((((uint32_t) (a)) << 24) | ((b) << 16) | ((c) << 8) | (d)))
 #else
 	#error "Target CPU endian-ness unknown. May need to hand edit src/sfconfig.h"
 #endif
@@ -76,34 +110,102 @@ typedef __int64 int64_t ;
 */
 
 #if (CPU_IS_LITTLE_ENDIAN == 1)
-	#define LES2H_SHORT(x)			(x)
-	#define LEI2H_INT(x)			(x)
+	#define LE2H_16(x)			(x)
+	#define LE2H_32(x)			(x)
 
-	#define BES2H_SHORT(x)			ENDSWAP_SHORT (x)
-	#define BEI2H_INT(x)			ENDSWAP_INT (x)
+	#define BE2H_16(x)			ENDSWAP_16 (x)
+	#define BE2H_32(x)			ENDSWAP_32 (x)
+	#define BE2H_64(x)			ENDSWAP_64 (x)
 
-	#define H2BE_SHORT(x)			ENDSWAP_SHORT (x)
-	#define H2BE_INT(x)				ENDSWAP_INT (x)
+	#define H2BE_16(x)			ENDSWAP_16 (x)
+	#define H2BE_32(x)			ENDSWAP_32 (x)
 
 #elif (CPU_IS_BIG_ENDIAN == 1)
-	#define LES2H_SHORT(x)			ENDSWAP_SHORT (x)
-	#define LEI2H_INT(x)			ENDSWAP_INT (x)
+	#define LE2H_16(x)			ENDSWAP_16 (x)
+	#define LE2H_32(x)			ENDSWAP_32 (x)
 
-	#define BES2H_SHORT(x)			(x)
-	#define BEI2H_INT(x)			(x)
+	#define BE2H_16(x)			(x)
+	#define BE2H_32(x)			(x)
+	#define	BE2H_64(x)			(x)
 
-	#define H2LE_SHORT(x)			ENDSWAP_SHORT (x)
-	#define H2LE_INT(x)				ENDSWAP_INT (x)
+	#define H2BE_16(x)			(x)
+	#define H2BE_32(x)			(x)
+
+	#define H2LE_16(x)			ENDSWAP_16 (x)
+	#define H2LE_32(x)			ENDSWAP_32 (x)
 
 #else
 	#error "Target CPU endian-ness unknown. May need to hand edit src/sfconfig.h"
 #endif
 
-#define LET2H_SHORT_PTR(x)		((x) [1] + ((x) [2] << 8))
-#define LET2H_INT_PTR(x)		(((x) [0] << 8) + ((x) [1] << 16) + ((x) [2] << 24))
+#define LET2H_16_PTR(x)			((x) [1] + ((x) [2] << 8))
+#define LET2H_32_PTR(x)			(((x) [0] << 8) + ((x) [1] << 16) + ((x) [2] << 24))
 
-#define BET2H_SHORT_PTR(x)		(((x) [0] << 8) + (x) [1])
-#define BET2H_INT_PTR(x)		(((x) [0] << 24) + ((x) [1] << 16) + ((x) [2] << 8))
+#define BET2H_16_PTR(x)			(((x) [0] << 8) + (x) [1])
+#define BET2H_32_PTR(x)			(((x) [0] << 24) + ((x) [1] << 16) + ((x) [2] << 8))
+
+static inline void
+psf_put_be64 (uint8_t *ptr, int offset, int64_t value)
+{
+	ptr [offset] = value >> 56 ;
+	ptr [offset + 1] = value >> 48 ;
+	ptr [offset + 2] = value >> 40 ;
+	ptr [offset + 3] = value >> 32 ;
+	ptr [offset + 4] = value >> 24 ;
+	ptr [offset + 5] = value >> 16 ;
+	ptr [offset + 6] = value >> 8 ;
+	ptr [offset + 7] = value ;
+} /* psf_put_be64 */
+
+static inline void
+psf_put_be32 (uint8_t *ptr, int offset, int32_t value)
+{
+	ptr [offset] = value >> 24 ;
+	ptr [offset + 1] = value >> 16 ;
+	ptr [offset + 2] = value >> 8 ;
+	ptr [offset + 3] = value ;
+} /* psf_put_be32 */
+
+static inline void
+psf_put_be16 (uint8_t *ptr, int offset, int16_t value)
+{
+	ptr [offset] = value >> 8 ;
+	ptr [offset + 1] = value ;
+} /* psf_put_be16 */
+
+static inline int64_t
+psf_get_be64 (uint8_t *ptr, int offset)
+{	int64_t value ;
+
+	value = ptr [offset] << 24 ;
+	value += ptr [offset + 1] << 16 ;
+	value += ptr [offset + 2] << 8 ;
+	value += ptr [offset + 3] ;
+
+	value <<= 32 ;
+
+	value += ptr [offset + 4] << 24 ;
+	value += ptr [offset + 5] << 16 ;
+	value += ptr [offset + 6] << 8 ;
+	value += ptr [offset + 7] ;
+	return value ;
+} /* psf_get_be64 */
+
+static inline int32_t
+psf_get_be32 (uint8_t *ptr, int offset)
+{	int32_t value ;
+
+	value = ptr [offset] << 24 ;
+	value += ptr [offset + 1] << 16 ;
+	value += ptr [offset + 2] << 8 ;
+	value += ptr [offset + 3] ;
+	return value ;
+} /* psf_get_be32 */
+
+static inline int16_t
+psf_get_be16 (uint8_t *ptr, int offset)
+{	return (ptr [offset] << 8) + ptr [offset + 1] ;
+} /* psf_get_be16 */
 
 /*-----------------------------------------------------------------------------------------------
 ** Generic functions for performing endian swapping on integer arrays.
@@ -115,7 +217,7 @@ endswap_short_array (short *ptr, int len)
 
 	while (--len >= 0)
 	{	temp = ptr [len] ;
-		ptr [len] = ENDSWAP_SHORT (temp) ;
+		ptr [len] = ENDSWAP_16 (temp) ;
 		} ;
 } /* endswap_short_array */
 
@@ -123,7 +225,7 @@ static inline void
 endswap_short_copy (short *dest, const short *src, int len)
 {
 	while (--len >= 0)
-	{	dest [len] = ENDSWAP_SHORT (src [len]) ;
+	{	dest [len] = ENDSWAP_16 (src [len]) ;
 		} ;
 } /* endswap_short_copy */
 
@@ -133,7 +235,7 @@ endswap_int_array (int *ptr, int len)
 
 	while (--len >= 0)
 	{	temp = ptr [len] ;
-		ptr [len] = ENDSWAP_INT (temp) ;
+		ptr [len] = ENDSWAP_32 (temp) ;
 		} ;
 } /* endswap_int_array */
 
@@ -141,22 +243,20 @@ static inline void
 endswap_int_copy (int *dest, const int *src, int len)
 {
 	while (--len >= 0)
-	{	dest [len] = ENDSWAP_INT (src [len]) ;
+	{	dest [len] = ENDSWAP_32 (src [len]) ;
 		} ;
 } /* endswap_int_copy */
 
 /*========================================================================================
 */
 
-#if	(HAVE_BYTESWAP_H && defined (SIZEOF_INT64_T) && (SIZEOF_INT64_T == 8))
-
 static inline void
 endswap_int64_t_array (int64_t *ptr, int len)
 {	int64_t value ;
 
 	while (--len >= 0)
 	{	value = ptr [len] ;
-		ptr [len] = bswap_64 (value) ;
+		ptr [len] = ENDSWAP_64 (value) ;
 		} ;
 } /* endswap_int64_t_array */
 
@@ -166,78 +266,20 @@ endswap_int64_t_copy (int64_t *dest, const int64_t *src, int len)
 
 	while (--len >= 0)
 	{	value = src [len] ;
-		dest [len] = bswap_64 (value) ;
+		dest [len] = ENDSWAP_64 (value) ;
 		} ;
 } /* endswap_int64_t_copy */
 
-#else
-
-static inline void
-endswap_int64_t_array (int64_t *ptr, int len)
-{	unsigned char *ucptr, temp ;
-
-	ucptr = (unsigned char *) ptr ;
-	ucptr += 8 * len ;
-	while (--len >= 0)
-	{	ucptr -= 8 ;
-
-		temp = ucptr [0] ;
-		ucptr [0] = ucptr [7] ;
-		ucptr [7] = temp ;
-
-		temp = ucptr [1] ;
-		ucptr [1] = ucptr [6] ;
-		ucptr [6] = temp ;
-
-		temp = ucptr [2] ;
-		ucptr [2] = ucptr [5] ;
-		ucptr [5] = temp ;
-
-		temp = ucptr [3] ;
-		ucptr [3] = ucptr [4] ;
-		ucptr [4] = temp ;
-		} ;
-} /* endswap_int64_t_array */
-
-static inline void
-endswap_int64_t_copy (int64_t *dest, const int64_t *src, int len)
-{	const unsigned char *psrc ;
-	unsigned char *pdest ;
-
-	if (dest == src)
-	{	endswap_int64_t_array (dest, len) ;
-		return ;
-		} ;
-
-	psrc = ((const unsigned char *) src) + 8 * len ;
-	pdest = ((unsigned char *) dest) + 8 * len ;
-	while (--len >= 0)
-	{	psrc -= 8 ;
-		pdest -= 8 ;
-
-		pdest [0] = psrc [7] ;
-		pdest [2] = psrc [5] ;
-		pdest [4] = psrc [3] ;
-		pdest [6] = psrc [1] ;
-		pdest [7] = psrc [0] ;
-		pdest [1] = psrc [6] ;
-		pdest [3] = psrc [4] ;
-		pdest [5] = psrc [2] ;
-		} ;
-} /* endswap_int64_t_copy */
-
-#endif
-
 /* A couple of wrapper functions. */
 
 static inline void
 endswap_float_array (float *ptr, int len)
-{	endswap_int_array ((void *) ptr, len) ;
+{	endswap_int_array ((int *) ptr, len) ;
 } /* endswap_float_array */
 
 static inline void
 endswap_double_array (double *ptr, int len)
-{	endswap_int64_t_array ((void *) ptr, len) ;
+{	endswap_int64_t_array ((int64_t *) ptr, len) ;
 } /* endswap_double_array */
 
 static inline void
diff --git a/libs/libsndfile/src/sndfile.c b/libs/libsndfile/src/sndfile.c
index 13a641b3b8..cfe75ac4d9 100644
--- a/libs/libsndfile/src/sndfile.c
+++ b/libs/libsndfile/src/sndfile.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2013 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -21,6 +21,7 @@
 #include	
 #include	
 #include	
+#include	
 
 #include	"sndfile.h"
 #include	"sfendian.h"
@@ -57,14 +58,14 @@ ErrorStruct SndfileErrors [] =
 {
 	/* Public error values and their associated strings. */
 	{	SF_ERR_NO_ERROR				, "No Error." },
-	{	SF_ERR_UNRECOGNISED_FORMAT	, "File opened for read. Format not recognised." },
+	{	SF_ERR_UNRECOGNISED_FORMAT	, "Format not recognised." },
 	{	SF_ERR_SYSTEM				, "System error." /* Often replaced. */ 	},
 	{	SF_ERR_MALFORMED_FILE		, "Supported file format but file is malformed." },
 	{	SF_ERR_UNSUPPORTED_ENCODING	, "Supported file format but unsupported encoding." },
 
 	/* Private error values and their associated strings. */
 	{	SFE_ZERO_MAJOR_FORMAT	, "Error : major format is 0." },
-	{	SFE_ZERO_MINOR_FORMAT	, "Error : major format is 0." },
+	{	SFE_ZERO_MINOR_FORMAT	, "Error : minor format is 0." },
 	{	SFE_BAD_FILE			, "File does not exist or is not a regular file (possibly a pipe?)." },
 	{	SFE_BAD_FILE_READ		, "File exists but no data could be read." },
 	{	SFE_OPEN_FAILED			, "Could not open file." },
@@ -74,6 +75,7 @@ ErrorStruct SndfileErrors [] =
 	{	SFE_BAD_FILE_PTR		, "Bad FILE pointer." },
 	{	SFE_BAD_INT_PTR			, "Internal error, Bad pointer." },
 	{	SFE_BAD_STAT_SIZE		, "Error : software was misconfigured at compile time (sizeof statbuf.st_size)." },
+	{	SFE_NO_TEMP_DIR			, "Error : Could not file temp dir." },
 
 	{	SFE_MALLOC_FAILED		, "Internal malloc () failed." },
 	{	SFE_UNIMPLEMENTED		, "File contains data in an unimplemented format." },
@@ -89,8 +91,12 @@ ErrorStruct SndfileErrors [] =
 	{	SFE_NO_EMBEDDED_RDWR	, "Error : cannot open embedded file read/write." },
 	{	SFE_NO_PIPE_WRITE		, "Error : this file format does not support pipe write." },
 	{	SFE_BAD_VIRTUAL_IO		, "Error : bad pointer on SF_VIRTUAL_IO struct." },
-	{	SFE_BAD_BROADCAST_INFO_SIZE, "Error : badd SF_BROADCAST_INFO_SIZE." },
-
+	{	SFE_BAD_BROADCAST_INFO_SIZE
+								, "Error : bad coding_history_size in SF_BROADCAST_INFO struct." },
+	{	SFE_BAD_BROADCAST_INFO_TOO_BIG
+								, "Error : SF_BROADCAST_INFO struct too large." },
+	{	SFE_BAD_CART_INFO_SIZE				, "Error: SF_CART_INFO struct too large." },
+	{	SFE_BAD_CART_INFO_TOO_BIG			, "Error: bag tag_text_size in SF_CART_INFO struct." },
 	{	SFE_INTERLEAVE_MODE		, "Attempt to write to file with non-interleaved data." },
 	{	SFE_INTERLEAVE_SEEK		, "Bad karma in seek during interleave read operation." },
 	{	SFE_INTERLEAVE_READ		, "Bad karma in read during interleave read operation." },
@@ -108,7 +114,7 @@ ErrorStruct SndfileErrors [] =
 	{	SFE_SEEK_FAILED			, "Error : parameters OK, but psf_seek() failed." },
 
 	{	SFE_BAD_OPEN_MODE		, "Error : bad mode parameter for file open." },
-	{	SFE_OPEN_PIPE_RDWR		, "Error : attempt toopen a pipe in read/write mode." },
+	{	SFE_OPEN_PIPE_RDWR		, "Error : attempt to open a pipe in read/write mode." },
 	{	SFE_RDWR_POSITION		, "Error on RDWR position (cryptic)." },
 	{	SFE_RDWR_BAD_HEADER		, "Error : Cannot open file in read/write mode due to string data in header." },
 	{	SFE_CMD_HAS_DATA		, "Error : Command fails because file already has audio data." },
@@ -161,8 +167,7 @@ ErrorStruct SndfileErrors [] =
 	{	SFE_AU_EMBED_BAD_LEN	, "Embedded AU file with unknown length." },
 
 	{	SFE_RAW_READ_BAD_SPEC	, "Error while opening RAW file for read. Must specify format and channels.\n"
-									"Possibly trying to open unsupported format."
-									 },
+									"Possibly trying to open unsupported format." },
 	{	SFE_RAW_BAD_BITWIDTH	, "Error. RAW file bitwidth must be a multiple of 8." },
 	{	SFE_RAW_BAD_FORMAT		, "Error. Bad format field in SF_INFO struct when openning a RAW file for read." },
 
@@ -170,6 +175,7 @@ ErrorStruct SndfileErrors [] =
 	{	SFE_PAF_VERSION			, "Error in PAF file, bad version." },
 	{	SFE_PAF_UNKNOWN_FORMAT	, "Error in PAF file, unknown format." },
 	{	SFE_PAF_SHORT_HEADER	, "Error in PAF file. File shorter than minimal header." },
+	{	SFE_PAF_BAD_CHANNELS	, "Error in PAF file. Bad channel count." },
 
 	{	SFE_SVX_NO_FORM			, "Error in 8SVX / 16SV file, no 'FORM' marker." },
 	{	SFE_SVX_NO_BODY			, "Error in 8SVX / 16SV file, no 'BODY' marker." },
@@ -237,7 +243,7 @@ ErrorStruct SndfileErrors [] =
 	{	SFE_FLAC_INIT_DECODER	, "Error : problem while initialization of the flac decoder." },
 	{	SFE_FLAC_LOST_SYNC		, "Error : flac decoder lost sync." },
 	{	SFE_FLAC_BAD_SAMPLE_RATE, "Error : flac does not support this sample rate." },
-	{	SFE_FLAC_UNKOWN_ERROR	, "Error : unkown error in flac decoder." },
+	{	SFE_FLAC_UNKOWN_ERROR	, "Error : unknown error in flac decoder." },
 
 	{	SFE_WVE_NOT_WVE			, "Error : not a WVE file." },
 	{	SFE_WVE_NO_PIPE			, "Error : not able to operate on WVE files over a pipe." },
@@ -248,6 +254,13 @@ ErrorStruct SndfileErrors [] =
 	{	SFE_VORBIS_ENCODER_BUG	, "Error : Sample rate chosen is known to trigger a Vorbis encoder bug on this CPU." },
 
 	{	SFE_RF64_NOT_RF64		, "Error : Not an RF64 file." },
+	{	SFE_ALAC_FAIL_TMPFILE	, "Error : Failed to open tmp file for ALAC encoding." },
+
+	{	SFE_BAD_CHUNK_PTR		, "Error : Bad SF_CHUNK_INFO pointer." },
+	{	SFE_UNKNOWN_CHUNK		, "Error : Unknown chunk marker." },
+	{	SFE_BAD_CHUNK_FORMAT	, "Error : Reading/writing chunks from this file format is not supported." },
+	{	SFE_BAD_CHUNK_MARKER	, "Error : Bad chunk marker." },
+	{	SFE_BAD_CHUNK_DATA_PTR	, "Error : Bad data pointer in SF_CHUNK_INFO struct." },
 
 	{	SFE_MAX_ERROR			, "Maximum error number." },
 	{	SFE_MAX_ERROR + 1		, NULL }
@@ -263,22 +276,21 @@ static int	validate_psf (SF_PRIVATE *psf) ;
 static void	save_header_info (SF_PRIVATE *psf) ;
 static void	copy_filename (SF_PRIVATE *psf, const char *path) ;
 static int	psf_close (SF_PRIVATE *psf) ;
-static SNDFILE * psf_open_file (SF_PRIVATE *psf, int mode, SF_INFO *sfinfo) ;
 
-static int	try_resource_fork (SF_PRIVATE * psf, int mode) ;
+static int	try_resource_fork (SF_PRIVATE * psf) ;
 
 /*------------------------------------------------------------------------------
 ** Private (static) variables.
 */
 
-static int	sf_errno = 0 ;
-static char	sf_logbuffer [SF_BUFFER_LEN] = { 0 } ;
+int	sf_errno = 0 ;
+static char	sf_parselog [SF_BUFFER_LEN] = { 0 } ;
 static char	sf_syserr [SF_SYSERR_LEN] = { 0 } ;
 
 /*------------------------------------------------------------------------------
 */
 
-#define	VALIDATE_SNDFILE_AND_ASSIGN_PSF(a,b,c)		\
+#define	VALIDATE_SNDFILE_AND_ASSIGN_PSF(a, b, c)	\
 		{	if ((a) == NULL)						\
 			{	sf_errno = SFE_BAD_SNDFILE_PTR ;	\
 				return 0 ;							\
@@ -304,24 +316,27 @@ SNDFILE*
 sf_open	(const char *path, int mode, SF_INFO *sfinfo)
 {	SF_PRIVATE 	*psf ;
 
+	/* Ultimate sanity check. */
+	assert (sizeof (sf_count_t) == 8) ;
+
 	if ((psf = calloc (1, sizeof (SF_PRIVATE))) == NULL)
 	{	sf_errno = SFE_MALLOC_FAILED ;
 		return	NULL ;
 		} ;
 
-	memset (psf, 0, sizeof (SF_PRIVATE)) ;
 	psf_init_files (psf) ;
 
 	psf_log_printf (psf, "File : %s\n", path) ;
 
 	copy_filename (psf, path) ;
 
+	psf->file.mode = mode ;
 	if (strcmp (path, "-") == 0)
-		psf->error = psf_set_stdio (psf, mode) ;
+		psf->error = psf_set_stdio (psf) ;
 	else
-		psf->error = psf_fopen (psf, path, mode) ;
+		psf->error = psf_fopen (psf) ;
 
-	return psf_open_file (psf, mode, sfinfo) ;
+	return psf_open_file (psf, sfinfo) ;
 } /* sf_open */
 
 SNDFILE*
@@ -339,15 +354,17 @@ sf_open_fd	(int fd, int mode, SF_INFO *sfinfo, int close_desc)
 		} ;
 
 	psf_init_files (psf) ;
+	copy_filename (psf, "") ;
 
+	psf->file.mode = mode ;
 	psf_set_file (psf, fd) ;
 	psf->is_pipe = psf_is_pipe (psf) ;
 	psf->fileoffset = psf_ftell (psf) ;
 
 	if (! close_desc)
-		psf->do_not_close_descriptor = SF_TRUE ;
+		psf->file.do_not_close_descriptor = SF_TRUE ;
 
-	return psf_open_file (psf, mode, sfinfo) ;
+	return psf_open_file (psf, sfinfo) ;
 } /* sf_open_fd */
 
 SNDFILE*
@@ -357,19 +374,19 @@ sf_open_virtual	(SF_VIRTUAL_IO *sfvirtual, int mode, SF_INFO *sfinfo, void *user
 	/* Make sure we have a valid set ot virtual pointers. */
 	if (sfvirtual->get_filelen == NULL || sfvirtual->seek == NULL || sfvirtual->tell == NULL)
 	{	sf_errno = SFE_BAD_VIRTUAL_IO ;
-		snprintf (sf_logbuffer, sizeof (sf_logbuffer), "Bad vio_get_filelen / vio_seek / vio_tell in SF_VIRTUAL_IO struct.\n") ;
+		snprintf (sf_parselog, sizeof (sf_parselog), "Bad vio_get_filelen / vio_seek / vio_tell in SF_VIRTUAL_IO struct.\n") ;
 		return NULL ;
 		} ;
 
 	if ((mode == SFM_READ || mode == SFM_RDWR) && sfvirtual->read == NULL)
 	{	sf_errno = SFE_BAD_VIRTUAL_IO ;
-		snprintf (sf_logbuffer, sizeof (sf_logbuffer), "Bad vio_read in SF_VIRTUAL_IO struct.\n") ;
+		snprintf (sf_parselog, sizeof (sf_parselog), "Bad vio_read in SF_VIRTUAL_IO struct.\n") ;
 		return NULL ;
 		} ;
 
 	if ((mode == SFM_WRITE || mode == SFM_RDWR) && sfvirtual->write == NULL)
 	{	sf_errno = SFE_BAD_VIRTUAL_IO ;
-		snprintf (sf_logbuffer, sizeof (sf_logbuffer), "Bad vio_write in SF_VIRTUAL_IO struct.\n") ;
+		snprintf (sf_parselog, sizeof (sf_parselog), "Bad vio_write in SF_VIRTUAL_IO struct.\n") ;
 		return NULL ;
 		} ;
 
@@ -384,9 +401,9 @@ sf_open_virtual	(SF_VIRTUAL_IO *sfvirtual, int mode, SF_INFO *sfinfo, void *user
 	psf->vio = *sfvirtual ;
 	psf->vio_user_data = user_data ;
 
-	psf->mode = mode ;
+	psf->file.mode = mode ;
 
-	return psf_open_file (psf, mode, sfinfo) ;
+	return psf_open_file (psf, sfinfo) ;
 } /* sf_open_virtual */
 
 int
@@ -537,7 +554,7 @@ sf_format_check	(const SF_INFO *info)
 	** Return 0 on failure, 1 ons success.
 	*/
 
-	if (info->channels < 1 || info->channels > 256)
+	if (info->channels < 1 || info->channels > SF_MAX_CHANNELS)
 		return 0 ;
 
 	if (info->samplerate < 0)
@@ -545,7 +562,6 @@ sf_format_check	(const SF_INFO *info)
 
 	switch (SF_CONTAINER (info->format))
 	{	case SF_FORMAT_WAV :
-		case SF_FORMAT_WAVEX :
 				/* WAV now allows both endian, RIFF or RIFX (little or big respectively) */
 				if (subformat == SF_FORMAT_PCM_U8 || subformat == SF_FORMAT_PCM_16)
 					return 1 ;
@@ -563,12 +579,25 @@ sf_format_check	(const SF_INFO *info)
 					return 1 ;
 				break ;
 
+		case SF_FORMAT_WAVEX :
+				if (endian == SF_ENDIAN_BIG || endian == SF_ENDIAN_CPU)
+					return 0 ;
+				if (subformat == SF_FORMAT_PCM_U8 || subformat == SF_FORMAT_PCM_16)
+					return 1 ;
+				if (subformat == SF_FORMAT_PCM_24 || subformat == SF_FORMAT_PCM_32)
+					return 1 ;
+				if (subformat == SF_FORMAT_ULAW || subformat == SF_FORMAT_ALAW)
+					return 1 ;
+				if (subformat == SF_FORMAT_FLOAT || subformat == SF_FORMAT_DOUBLE)
+					return 1 ;
+				break ;
+
 		case SF_FORMAT_AIFF :
 				/* AIFF does allow both endian-nesses for PCM data.*/
 				if (subformat == SF_FORMAT_PCM_16 || subformat == SF_FORMAT_PCM_24 || subformat == SF_FORMAT_PCM_32)
 					return 1 ;
-				/* Other encodings. Check for endian-ness. */
-				if (endian == SF_ENDIAN_LITTLE || endian == SF_ENDIAN_CPU)
+				/* For other encodings reject any endian-ness setting. */
+				if (endian != 0)
 					return 0 ;
 				if (subformat == SF_FORMAT_PCM_U8 || subformat == SF_FORMAT_PCM_S8)
 					return 1 ;
@@ -609,6 +638,10 @@ sf_format_check	(const SF_INFO *info)
 					return 1 ;
 				if (subformat == SF_FORMAT_ULAW || subformat == SF_FORMAT_ALAW)
 					return 1 ;
+				if (subformat == SF_FORMAT_ALAC_16 || subformat == SF_FORMAT_ALAC_20)
+					return 1 ;
+				if (subformat == SF_FORMAT_ALAC_24 || subformat == SF_FORMAT_ALAC_32)
+					return 1 ;
 				if (subformat == SF_FORMAT_FLOAT || subformat == SF_FORMAT_DOUBLE)
 					return 1 ;
 				break ;
@@ -632,23 +665,19 @@ sf_format_check	(const SF_INFO *info)
 				break ;
 
 		case SF_FORMAT_PAF :
-				if (subformat == SF_FORMAT_PCM_S8 || subformat == SF_FORMAT_PCM_16)
-					return 1 ;
-				if (subformat == SF_FORMAT_PCM_24 || subformat == SF_FORMAT_PCM_32)
+				if (subformat == SF_FORMAT_PCM_S8 || subformat == SF_FORMAT_PCM_16 || subformat == SF_FORMAT_PCM_24)
 					return 1 ;
 				break ;
 
 		case SF_FORMAT_SVX :
-				/* SVX currently does not support more than one channel for write.
-				** Read will allow more than one channel but only allow one here.
-				*/
-				if (info->channels != 1)
+				/* SVX only supports writing mono SVX files. */
+				if (info->channels > 1)
 					return 0 ;
 				/* Always big endian. */
 				if (endian == SF_ENDIAN_LITTLE || endian == SF_ENDIAN_CPU)
 					return 0 ;
 
-				if ((subformat == SF_FORMAT_PCM_S8 || subformat == SF_FORMAT_PCM_16) && info->channels == 1)
+				if (subformat == SF_FORMAT_PCM_S8 || subformat == SF_FORMAT_PCM_16)
 					return 1 ;
 				break ;
 
@@ -662,7 +691,7 @@ sf_format_check	(const SF_INFO *info)
 				break ;
 
 		case SF_FORMAT_IRCAM :
-				if (subformat == SF_FORMAT_PCM_16 || subformat == SF_FORMAT_PCM_24 || subformat == SF_FORMAT_PCM_32)
+				if (subformat == SF_FORMAT_PCM_16 || subformat == SF_FORMAT_PCM_32)
 					return 1 ;
 				if (subformat == SF_FORMAT_ULAW || subformat == SF_FORMAT_ALAW || subformat == SF_FORMAT_FLOAT)
 					return 1 ;
@@ -756,6 +785,8 @@ sf_format_check	(const SF_INFO *info)
 				/* FLAC can't do more than 8 channels. */
 				if (info->channels > 8)
 					return 0 ;
+				if (endian != SF_ENDIAN_FILE)
+					return 0 ;
 				if (subformat == SF_FORMAT_PCM_S8 || subformat == SF_FORMAT_PCM_16 || subformat == SF_FORMAT_PCM_24)
 					return 1 ;
 				break ;
@@ -764,7 +795,7 @@ sf_format_check	(const SF_INFO *info)
 				/* SD2 is strictly big endian. */
 				if (endian == SF_ENDIAN_LITTLE || endian == SF_ENDIAN_CPU)
 					return 0 ;
-				if (subformat == SF_FORMAT_PCM_S8 || subformat == SF_FORMAT_PCM_16 || subformat == SF_FORMAT_PCM_24)
+				if (subformat == SF_FORMAT_PCM_S8 || subformat == SF_FORMAT_PCM_16 || subformat == SF_FORMAT_PCM_24 || subformat == SF_FORMAT_PCM_32)
 					return 1 ;
 				break ;
 
@@ -779,6 +810,8 @@ sf_format_check	(const SF_INFO *info)
 				break ;
 
 		case SF_FORMAT_OGG :
+				if (endian != SF_ENDIAN_FILE)
+					return 0 ;
 				if (subformat == SF_FORMAT_VORBIS)
 					return 1 ;
 				break ;
@@ -811,12 +844,27 @@ sf_format_check	(const SF_INFO *info)
 	return 0 ;
 } /* sf_format_check */
 
+/*------------------------------------------------------------------------------
+*/
+
+const char *
+sf_version_string (void)
+{
+#if	ENABLE_EXPERIMENTAL_CODE
+	return PACKAGE_NAME "-" PACKAGE_VERSION "-exp" ;
+#else
+	return PACKAGE_NAME "-" PACKAGE_VERSION ;
+#endif
+}
+
+
 /*------------------------------------------------------------------------------
 */
 
 int
 sf_command	(SNDFILE *sndfile, int command, void *data, int datasize)
 {	SF_PRIVATE *psf = (SF_PRIVATE *) sndfile ;
+	double quality ;
 	int old_value ;
 
 	/* This set of commands do not need the sndfile parameter. */
@@ -827,10 +875,7 @@ sf_command	(SNDFILE *sndfile, int command, void *data, int datasize)
 					psf->error = SFE_BAD_COMMAND_PARAM ;
 				return SFE_BAD_COMMAND_PARAM ;
 				} ;
-			if (ENABLE_EXPERIMENTAL_CODE)
-				snprintf (data, datasize, "%s-%s-exp", PACKAGE_NAME, PACKAGE_VERSION) ;
-			else
-				snprintf (data, datasize, "%s-%s", PACKAGE_NAME, PACKAGE_VERSION) ;
+			snprintf (data, datasize, "%s", sf_version_string ()) ;
 			return strlen (data) ;
 
 		case SFC_GET_SIMPLE_FORMAT_COUNT :
@@ -874,8 +919,8 @@ sf_command	(SNDFILE *sndfile, int command, void *data, int datasize)
 
 	if (sndfile == NULL && command == SFC_GET_LOG_INFO)
 	{	if (data == NULL)
-			return (psf->error = SFE_BAD_COMMAND_PARAM) ;
-		snprintf (data, datasize, "%s", sf_logbuffer) ;
+			return (sf_errno = SFE_BAD_COMMAND_PARAM) ;
+		snprintf (data, datasize, "%s", sf_parselog) ;
 		return strlen (data) ;
 		} ;
 
@@ -921,8 +966,16 @@ sf_command	(SNDFILE *sndfile, int command, void *data, int datasize)
 			{	int format = SF_CONTAINER (psf->sf.format) ;
 
 				/* Only WAV and AIFF support the PEAK chunk. */
-				if (format != SF_FORMAT_WAV && format != SF_FORMAT_WAVEX && format != SF_FORMAT_AIFF)
-					return SF_FALSE ;
+				switch (format)
+				{	case SF_FORMAT_AIFF :
+					case SF_FORMAT_CAF :
+					case SF_FORMAT_WAV :
+					case SF_FORMAT_WAVEX :
+						break ;
+
+					default :
+						return SF_FALSE ;
+					} ;
 
 				format = SF_CODEC (psf->sf.format) ;
 
@@ -932,7 +985,7 @@ sf_command	(SNDFILE *sndfile, int command, void *data, int datasize)
 
 				} ;
 			/* Can only do this is in SFM_WRITE mode. */
-			if (psf->mode != SFM_WRITE && psf->mode != SFM_RDWR)
+			if (psf->file.mode != SFM_WRITE && psf->file.mode != SFM_RDWR)
 				return SF_FALSE ;
 			/* If data has already been written this must fail. */
 			if (psf->have_written)
@@ -960,7 +1013,7 @@ sf_command	(SNDFILE *sndfile, int command, void *data, int datasize)
 		case SFC_GET_LOG_INFO :
 			if (data == NULL)
 				return SFE_BAD_COMMAND_PARAM ;
-			snprintf (data, datasize, "%s", psf->logbuffer) ;
+			snprintf (data, datasize, "%s", psf->parselog.buf) ;
 			break ;
 
 		case SFC_CALC_SIGNAL_MAX :
@@ -1022,7 +1075,7 @@ sf_command	(SNDFILE *sndfile, int command, void *data, int datasize)
 			if (data == NULL || datasize != SIGNED_SIZEOF (SF_DITHER_INFO))
 				return (psf->error = SFE_BAD_COMMAND_PARAM) ;
 			memcpy (&psf->write_dither, data, sizeof (psf->write_dither)) ;
-			if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+			if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 				dither_init (psf, SFM_WRITE) ;
 			break ;
 
@@ -1030,15 +1083,20 @@ sf_command	(SNDFILE *sndfile, int command, void *data, int datasize)
 			if (data == NULL || datasize != SIGNED_SIZEOF (SF_DITHER_INFO))
 				return (psf->error = SFE_BAD_COMMAND_PARAM) ;
 			memcpy (&psf->read_dither, data, sizeof (psf->read_dither)) ;
-			if (psf->mode == SFM_READ || psf->mode == SFM_RDWR)
+			if (psf->file.mode == SFM_READ || psf->file.mode == SFM_RDWR)
 				dither_init (psf, SFM_READ) ;
 			break ;
 
 		case SFC_FILE_TRUNCATE :
-			if (psf->mode != SFM_WRITE && psf->mode != SFM_RDWR)
+			if (psf->file.mode != SFM_WRITE && psf->file.mode != SFM_RDWR)
 				return SF_TRUE ;
 			if (datasize != sizeof (sf_count_t))
 				return SF_TRUE ;
+			if (data == NULL || datasize != sizeof (sf_count_t))
+			{	psf->error = SFE_BAD_COMMAND_PARAM ;
+				return SF_FALSE ;
+				}
+			else
 			{	sf_count_t position ;
 
 				position = *((sf_count_t*) data) ;
@@ -1105,29 +1163,22 @@ sf_command	(SNDFILE *sndfile, int command, void *data, int datasize)
 		case SFC_SET_BROADCAST_INFO :
 			{	int format = SF_CONTAINER (psf->sf.format) ;
 
-				/* Only WAV supports the BEXT (Broadcast) chunk. */
-				if (format != SF_FORMAT_WAV && format != SF_FORMAT_WAVEX)
+				/* Only WAV and RF64 supports the BEXT (Broadcast) chunk. */
+				if (format != SF_FORMAT_WAV && format != SF_FORMAT_WAVEX && format != SF_FORMAT_RF64)
 					return SF_FALSE ;
 				} ;
 
 			/* Only makes sense in SFM_WRITE or SFM_RDWR mode. */
-			if ((psf->mode != SFM_WRITE) && (psf->mode != SFM_RDWR))
+			if ((psf->file.mode != SFM_WRITE) && (psf->file.mode != SFM_RDWR))
 				return SF_FALSE ;
 			/* If data has already been written this must fail. */
-			if (psf->broadcast_var == NULL && psf->have_written)
+			if (psf->broadcast_16k == NULL && psf->have_written)
 			{	psf->error = SFE_CMD_HAS_DATA ;
 				return SF_FALSE ;
 				} ;
 
-#if 0
-			if (psf->broadcast_info == NULL)
-				psf->broadcast_info = broadcast_info_alloc () ;
-
-			broadcast_info_copy (psf->broadcast_info, data) ;
-			broadcast_add_coding_history (psf->broadcast_info, psf->sf.channels, psf->sf.samplerate, psf->sf.format) ;
-#else
-			broadcast_var_set (psf, data, datasize) ;
-#endif
+			if (NOT (broadcast_var_set (psf, data, datasize)))
+				return SF_FALSE ;
 
 			if (psf->write_header)
 				psf->write_header (psf, SF_TRUE) ;
@@ -1138,13 +1189,35 @@ sf_command	(SNDFILE *sndfile, int command, void *data, int datasize)
 			{	psf->error = SFE_BAD_COMMAND_PARAM ;
 				return SF_FALSE ;
 				} ;
-#if 0
-			if (psf->broadcast_info == NULL)
-				return SF_FALSE ;
-			return broadcast_info_copy (data, psf->broadcast_info) ;
-#else
 			return broadcast_var_get (psf, data, datasize) ;
-#endif
+
+		case SFC_SET_CART_INFO :
+			{	int format = SF_CONTAINER (psf->sf.format) ;
+				/* Only WAV and RF64 support cart chunk format */
+				if (format != SF_FORMAT_WAV && format != SF_FORMAT_RF64)
+					return SF_FALSE ;
+				} ;
+
+			/* Only makes sense in SFM_WRITE or SFM_RDWR mode */
+			if ((psf->file.mode != SFM_WRITE) && (psf->file.mode != SFM_RDWR))
+				return SF_FALSE ;
+			/* If data has already been written this must fail. */
+			if (psf->cart_16k == NULL && psf->have_written)
+			{	psf->error = SFE_CMD_HAS_DATA ;
+				return SF_FALSE ;
+				} ;
+			if (NOT (cart_var_set (psf, data, datasize)))
+				return SF_FALSE ;
+			if (psf->write_header)
+				psf->write_header (psf, SF_TRUE) ;
+			return SF_TRUE ;
+
+		case SFC_GET_CART_INFO :
+			if (data == NULL)
+			{	psf->error = SFE_BAD_COMMAND_PARAM ;
+				return SF_FALSE ;
+				} ;
+			return cart_var_get (psf, data, datasize) ;
 
 		case SFC_GET_INSTRUMENT :
 			if (datasize != sizeof (SF_INSTRUMENT) || data == NULL)
@@ -1177,6 +1250,63 @@ sf_command	(SNDFILE *sndfile, int command, void *data, int datasize)
 		case SFC_RAW_DATA_NEEDS_ENDSWAP :
 			return psf->data_endswap ;
 
+		case SFC_GET_CHANNEL_MAP_INFO :
+			if (psf->channel_map == NULL)
+				return SF_FALSE ;
+
+			if (data == NULL || datasize != SIGNED_SIZEOF (psf->channel_map [0]) * psf->sf.channels)
+			{	psf->error = SFE_BAD_COMMAND_PARAM ;
+				return SF_FALSE ;
+				} ;
+
+			memcpy (data, psf->channel_map, datasize) ;
+			return SF_TRUE ;
+
+		case SFC_SET_CHANNEL_MAP_INFO :
+			if (psf->have_written)
+			{	psf->error = SFE_CMD_HAS_DATA ;
+				return SF_FALSE ;
+				} ;
+			if (data == NULL || datasize != SIGNED_SIZEOF (psf->channel_map [0]) * psf->sf.channels)
+			{	psf->error = SFE_BAD_COMMAND_PARAM ;
+				return SF_FALSE ;
+				} ;
+
+			{	int *iptr ;
+
+				for (iptr = data ; iptr < (int*) data + psf->sf.channels ; iptr++)
+				{	if (*iptr <= SF_CHANNEL_MAP_INVALID || *iptr >= SF_CHANNEL_MAP_MAX)
+					{	psf->error = SFE_BAD_COMMAND_PARAM ;
+						return SF_FALSE ;
+						} ;
+					} ;
+				} ;
+
+			free (psf->channel_map) ;
+			if ((psf->channel_map = malloc (datasize)) == NULL)
+			{	psf->error = SFE_MALLOC_FAILED ;
+				return SF_FALSE ;
+				} ;
+
+			memcpy (psf->channel_map, data, datasize) ;
+
+			/*
+			**	Pass the command down to the container's command handler.
+			**	Don't pass user data, use validated psf->channel_map data instead.
+			*/
+			if (psf->command)
+				return psf->command (psf, command, NULL, 0) ;
+			return SF_FALSE ;
+
+		case SFC_SET_VBR_ENCODING_QUALITY :
+			if (data == NULL || datasize != sizeof (double))
+				return SF_FALSE ;
+
+			quality = *((double *) data) ;
+			quality = 1.0 - SF_MAX (0.0, SF_MIN (1.0, quality)) ;
+			return sf_command (sndfile, SFC_SET_COMPRESSION_LEVEL, &quality, sizeof (quality)) ;
+
+
 		default :
 			/* Must be a file specific command. Pass it on. */
 			if (psf->command)
@@ -1207,8 +1337,8 @@ sf_seek	(SNDFILE *sndfile, sf_count_t offset, int whence)
 	/* If the whence parameter has a mode ORed in, check to see that
 	** it makes sense.
 	*/
-	if (((whence & SFM_MASK) == SFM_WRITE && psf->mode == SFM_READ) ||
-			((whence & SFM_MASK) == SFM_READ && psf->mode == SFM_WRITE))
+	if (((whence & SFM_MASK) == SFM_WRITE && psf->file.mode == SFM_READ) ||
+			((whence & SFM_MASK) == SFM_READ && psf->file.mode == SFM_WRITE))
 	{	psf->error = SFE_WRONG_SEEK ;
 		return PSF_SEEK_ERROR ;
 		} ;
@@ -1228,14 +1358,14 @@ sf_seek	(SNDFILE *sndfile, sf_count_t offset, int whence)
 		/* The SEEK_CUR is a little more tricky. */
 		case SEEK_CUR :
 				if (offset == 0)
-				{	if (psf->mode == SFM_READ)
+				{	if (psf->file.mode == SFM_READ)
 						return psf->read_current ;
-					if (psf->mode == SFM_WRITE)
+					if (psf->file.mode == SFM_WRITE)
 						return psf->write_current ;
 					} ;
-				if (psf->mode == SFM_READ)
+				if (psf->file.mode == SFM_READ)
 					seek_from_start = psf->read_current + offset ;
-				else if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+				else if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 					seek_from_start = psf->write_current + offset ;
 				else
 					psf->error = SFE_AMBIGUOUS_SEEK ;
@@ -1268,7 +1398,7 @@ sf_seek	(SNDFILE *sndfile, sf_count_t offset, int whence)
 	if (psf->error)
 		return PSF_SEEK_ERROR ;
 
-	if (psf->mode == SFM_RDWR || psf->mode == SFM_WRITE)
+	if (psf->file.mode == SFM_RDWR || psf->file.mode == SFM_WRITE)
 	{	if (seek_from_start < 0)
 		{	psf->error = SFE_BAD_SEEK ;
 			return PSF_SEEK_ERROR ;
@@ -1280,7 +1410,7 @@ sf_seek	(SNDFILE *sndfile, sf_count_t offset, int whence)
 		} ;
 
 	if (psf->seek)
-	{	int new_mode = (whence & SFM_MASK) ? (whence & SFM_MASK) : psf->mode ;
+	{	int new_mode = (whence & SFM_MASK) ? (whence & SFM_MASK) : psf->file.mode ;
 
 		retval = psf->seek (psf, new_mode, seek_from_start) ;
 
@@ -1331,6 +1461,50 @@ sf_set_string (SNDFILE *sndfile, int str_type, const char* str)
 	return psf_set_string (psf, str_type, str) ;
 } /* sf_get_string */
 
+/*------------------------------------------------------------------------------
+*/
+
+int
+sf_current_byterate (SNDFILE *sndfile)
+{	SF_PRIVATE 	*psf ;
+
+	if ((psf = (SF_PRIVATE*) sndfile) == NULL)
+		return -1 ;
+	if (psf->Magick != SNDFILE_MAGICK)
+		return -1 ;
+
+	/* This should cover all PCM and floating point formats. */
+	if (psf->bytewidth)
+		return psf->sf.samplerate * psf->sf.channels * psf->bytewidth ;
+
+	if (psf->byterate)
+		return psf->byterate (psf) ;
+
+	switch (SF_CODEC (psf->sf.format))
+	{	case SF_FORMAT_IMA_ADPCM :
+		case SF_FORMAT_MS_ADPCM :
+		case SF_FORMAT_VOX_ADPCM :
+			return (psf->sf.samplerate * psf->sf.channels) / 2 ;
+
+		case SF_FORMAT_GSM610 :
+			return (psf->sf.samplerate * psf->sf.channels * 13000) / 8000 ;
+
+		case SF_FORMAT_G721_32 :	/* 32kbs G721 ADPCM encoding. */
+			return (psf->sf.samplerate * psf->sf.channels) / 2 ;
+
+		case SF_FORMAT_G723_24 :	/* 24kbs G723 ADPCM encoding. */
+			return (psf->sf.samplerate * psf->sf.channels * 3) / 8 ;
+
+		case SF_FORMAT_G723_40 :	/* 40kbs G723 ADPCM encoding. */
+			return (psf->sf.samplerate * psf->sf.channels * 5) / 8 ;
+
+		default :
+			break ;
+		} ;
+
+	return -1 ;
+} /* sf_current_byterate */
+
 /*==============================================================================
 */
 
@@ -1345,12 +1519,12 @@ sf_read_raw		(SNDFILE *sndfile, void *ptr, sf_count_t bytes)
 	bytewidth = (psf->bytewidth > 0) ? psf->bytewidth : 1 ;
 	blockwidth = (psf->blockwidth > 0) ? psf->blockwidth : 1 ;
 
-	if (psf->mode == SFM_WRITE)
+	if (psf->file.mode == SFM_WRITE)
 	{	psf->error = SFE_NOT_READMODE ;
 		return	0 ;
 		} ;
 
-	if (bytes < 0 || psf->read_current >= psf->datalength)
+	if (bytes < 0 || psf->read_current >= psf->sf.frames)
 	{	psf_memset (ptr, 0, bytes) ;
 		return 0 ;
 		} ;
@@ -1360,6 +1534,10 @@ sf_read_raw		(SNDFILE *sndfile, void *ptr, sf_count_t bytes)
 		return 0 ;
 		} ;
 
+	if (psf->last_op != SFM_READ)
+		if (psf->seek (psf, SFM_READ, psf->read_current) < 0)
+			return 0 ;
+
 	count = psf_fread (ptr, 1, bytes, psf) ;
 
 	if (psf->read_current + count / blockwidth <= psf->sf.frames)
@@ -1386,7 +1564,7 @@ sf_read_short	(SNDFILE *sndfile, short *ptr, sf_count_t len)
 
 	VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
 
-	if (psf->mode == SFM_WRITE)
+	if (psf->file.mode == SFM_WRITE)
 	{	psf->error = SFE_NOT_READMODE ;
 		return 0 ;
 		} ;
@@ -1433,7 +1611,7 @@ sf_readf_short		(SNDFILE *sndfile, short *ptr, sf_count_t frames)
 
 	VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
 
-	if (psf->mode == SFM_WRITE)
+	if (psf->file.mode == SFM_WRITE)
 	{	psf->error = SFE_NOT_READMODE ;
 		return 0 ;
 		} ;
@@ -1478,7 +1656,7 @@ sf_read_int		(SNDFILE *sndfile, int *ptr, sf_count_t len)
 
 	VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
 
-	if (psf->mode == SFM_WRITE)
+	if (psf->file.mode == SFM_WRITE)
 	{	psf->error = SFE_NOT_READMODE ;
 		return 0 ;
 		} ;
@@ -1525,7 +1703,7 @@ sf_readf_int	(SNDFILE *sndfile, int *ptr, sf_count_t frames)
 
 	VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
 
-	if (psf->mode == SFM_WRITE)
+	if (psf->file.mode == SFM_WRITE)
 	{	psf->error = SFE_NOT_READMODE ;
 		return 0 ;
 		} ;
@@ -1570,7 +1748,7 @@ sf_read_float	(SNDFILE *sndfile, float *ptr, sf_count_t len)
 
 	VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
 
-	if (psf->mode == SFM_WRITE)
+	if (psf->file.mode == SFM_WRITE)
 	{	psf->error = SFE_NOT_READMODE ;
 		return 0 ;
 		} ;
@@ -1617,7 +1795,7 @@ sf_readf_float	(SNDFILE *sndfile, float *ptr, sf_count_t frames)
 
 	VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
 
-	if (psf->mode == SFM_WRITE)
+	if (psf->file.mode == SFM_WRITE)
 	{	psf->error = SFE_NOT_READMODE ;
 		return 0 ;
 		} ;
@@ -1662,7 +1840,7 @@ sf_read_double	(SNDFILE *sndfile, double *ptr, sf_count_t len)
 
 	VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
 
-	if (psf->mode == SFM_WRITE)
+	if (psf->file.mode == SFM_WRITE)
 	{	psf->error = SFE_NOT_READMODE ;
 		return 0 ;
 		} ;
@@ -1709,7 +1887,7 @@ sf_readf_double	(SNDFILE *sndfile, double *ptr, sf_count_t frames)
 
 	VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
 
-	if (psf->mode == SFM_WRITE)
+	if (psf->file.mode == SFM_WRITE)
 	{	psf->error = SFE_NOT_READMODE ;
 		return 0 ;
 		} ;
@@ -1758,7 +1936,7 @@ sf_write_raw	(SNDFILE *sndfile, const void *ptr, sf_count_t len)
 	bytewidth = (psf->bytewidth > 0) ? psf->bytewidth : 1 ;
 	blockwidth = (psf->blockwidth > 0) ? psf->blockwidth : 1 ;
 
-	if (psf->mode == SFM_READ)
+	if (psf->file.mode == SFM_READ)
 	{	psf->error = SFE_NOT_WRITEMODE ;
 		return 0 ;
 		} ;
@@ -1768,6 +1946,10 @@ sf_write_raw	(SNDFILE *sndfile, const void *ptr, sf_count_t len)
 		return 0 ;
 		} ;
 
+	if (psf->last_op != SFM_WRITE)
+		if (psf->seek (psf, SFM_WRITE, psf->write_current) < 0)
+			return 0 ;
+
 	if (psf->have_written == SF_FALSE && psf->write_header != NULL)
 		psf->write_header (psf, SF_FALSE) ;
 	psf->have_written = SF_TRUE ;
@@ -1776,11 +1958,16 @@ sf_write_raw	(SNDFILE *sndfile, const void *ptr, sf_count_t len)
 
 	psf->write_current += count / blockwidth ;
 
-	if (psf->write_current > psf->sf.frames)
-		psf->sf.frames = psf->write_current ;
-
 	psf->last_op = SFM_WRITE ;
 
+	if (psf->write_current > psf->sf.frames)
+	{	psf->sf.frames = psf->write_current ;
+		psf->dataend = 0 ;
+		} ;
+
+	if (psf->auto_header && psf->write_header != NULL)
+		psf->write_header (psf, SF_TRUE) ;
+
 	return count ;
 } /* sf_write_raw */
 
@@ -1794,7 +1981,7 @@ sf_write_short	(SNDFILE *sndfile, const short *ptr, sf_count_t len)
 
 	VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
 
-	if (psf->mode == SFM_READ)
+	if (psf->file.mode == SFM_READ)
 	{	psf->error = SFE_NOT_WRITEMODE ;
 		return 0 ;
 		} ;
@@ -1823,12 +2010,14 @@ sf_write_short	(SNDFILE *sndfile, const short *ptr, sf_count_t len)
 
 	psf->last_op = SFM_WRITE ;
 
+	if (psf->write_current > psf->sf.frames)
+	{	psf->sf.frames = psf->write_current ;
+		psf->dataend = 0 ;
+		} ;
+
 	if (psf->auto_header && psf->write_header != NULL)
 		psf->write_header (psf, SF_TRUE) ;
 
-	if (psf->write_current > psf->sf.frames)
-		psf->sf.frames = psf->write_current ;
-
 	return count ;
 } /* sf_write_short */
 
@@ -1839,7 +2028,7 @@ sf_writef_short	(SNDFILE *sndfile, const short *ptr, sf_count_t frames)
 
 	VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
 
-	if (psf->mode == SFM_READ)
+	if (psf->file.mode == SFM_READ)
 	{	psf->error = SFE_NOT_WRITEMODE ;
 		return 0 ;
 		} ;
@@ -1863,12 +2052,14 @@ sf_writef_short	(SNDFILE *sndfile, const short *ptr, sf_count_t frames)
 
 	psf->last_op = SFM_WRITE ;
 
+	if (psf->write_current > psf->sf.frames)
+	{	psf->sf.frames = psf->write_current ;
+		psf->dataend = 0 ;
+		} ;
+
 	if (psf->auto_header && psf->write_header != NULL)
 		psf->write_header (psf, SF_TRUE) ;
 
-	if (psf->write_current > psf->sf.frames)
-		psf->sf.frames = psf->write_current ;
-
 	return count / psf->sf.channels ;
 } /* sf_writef_short */
 
@@ -1882,7 +2073,7 @@ sf_write_int	(SNDFILE *sndfile, const int *ptr, sf_count_t len)
 
 	VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
 
-	if (psf->mode == SFM_READ)
+	if (psf->file.mode == SFM_READ)
 	{	psf->error = SFE_NOT_WRITEMODE ;
 		return 0 ;
 		} ;
@@ -1911,12 +2102,14 @@ sf_write_int	(SNDFILE *sndfile, const int *ptr, sf_count_t len)
 
 	psf->last_op = SFM_WRITE ;
 
+	if (psf->write_current > psf->sf.frames)
+	{	psf->sf.frames = psf->write_current ;
+		psf->dataend = 0 ;
+		} ;
+
 	if (psf->auto_header && psf->write_header != NULL)
 		psf->write_header (psf, SF_TRUE) ;
 
-	if (psf->write_current > psf->sf.frames)
-		psf->sf.frames = psf->write_current ;
-
 	return count ;
 } /* sf_write_int */
 
@@ -1927,7 +2120,7 @@ sf_writef_int	(SNDFILE *sndfile, const int *ptr, sf_count_t frames)
 
 	VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
 
-	if (psf->mode == SFM_READ)
+	if (psf->file.mode == SFM_READ)
 	{	psf->error = SFE_NOT_WRITEMODE ;
 		return 0 ;
 		} ;
@@ -1951,12 +2144,14 @@ sf_writef_int	(SNDFILE *sndfile, const int *ptr, sf_count_t frames)
 
 	psf->last_op = SFM_WRITE ;
 
+	if (psf->write_current > psf->sf.frames)
+	{	psf->sf.frames = psf->write_current ;
+		psf->dataend = 0 ;
+		} ;
+
 	if (psf->auto_header && psf->write_header != NULL)
 		psf->write_header (psf, SF_TRUE) ;
 
-	if (psf->write_current > psf->sf.frames)
-		psf->sf.frames = psf->write_current ;
-
 	return count / psf->sf.channels ;
 } /* sf_writef_int */
 
@@ -1970,7 +2165,7 @@ sf_write_float	(SNDFILE *sndfile, const float *ptr, sf_count_t len)
 
 	VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
 
-	if (psf->mode == SFM_READ)
+	if (psf->file.mode == SFM_READ)
 	{	psf->error = SFE_NOT_WRITEMODE ;
 		return 0 ;
 		} ;
@@ -1999,12 +2194,14 @@ sf_write_float	(SNDFILE *sndfile, const float *ptr, sf_count_t len)
 
 	psf->last_op = SFM_WRITE ;
 
+	if (psf->write_current > psf->sf.frames)
+	{	psf->sf.frames = psf->write_current ;
+		psf->dataend = 0 ;
+		} ;
+
 	if (psf->auto_header && psf->write_header != NULL)
 		psf->write_header (psf, SF_TRUE) ;
 
-	if (psf->write_current > psf->sf.frames)
-		psf->sf.frames = psf->write_current ;
-
 	return count ;
 } /* sf_write_float */
 
@@ -2015,7 +2212,7 @@ sf_writef_float	(SNDFILE *sndfile, const float *ptr, sf_count_t frames)
 
 	VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
 
-	if (psf->mode == SFM_READ)
+	if (psf->file.mode == SFM_READ)
 	{	psf->error = SFE_NOT_WRITEMODE ;
 		return 0 ;
 		} ;
@@ -2039,12 +2236,14 @@ sf_writef_float	(SNDFILE *sndfile, const float *ptr, sf_count_t frames)
 
 	psf->last_op = SFM_WRITE ;
 
+	if (psf->write_current > psf->sf.frames)
+	{	psf->sf.frames = psf->write_current ;
+		psf->dataend = 0 ;
+		} ;
+
 	if (psf->auto_header && psf->write_header != NULL)
 		psf->write_header (psf, SF_TRUE) ;
 
-	if (psf->write_current > psf->sf.frames)
-		psf->sf.frames = psf->write_current ;
-
 	return count / psf->sf.channels ;
 } /* sf_writef_float */
 
@@ -2058,7 +2257,7 @@ sf_write_double	(SNDFILE *sndfile, const double *ptr, sf_count_t len)
 
 	VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
 
-	if (psf->mode == SFM_READ)
+	if (psf->file.mode == SFM_READ)
 	{	psf->error = SFE_NOT_WRITEMODE ;
 		return 0 ;
 		} ;
@@ -2087,12 +2286,14 @@ sf_write_double	(SNDFILE *sndfile, const double *ptr, sf_count_t len)
 
 	psf->last_op = SFM_WRITE ;
 
+	if (psf->write_current > psf->sf.frames)
+	{	psf->sf.frames = psf->write_current ;
+		psf->dataend = 0 ;
+		} ;
+
 	if (psf->auto_header && psf->write_header != NULL)
 		psf->write_header (psf, SF_TRUE) ;
 
-	if (psf->write_current > psf->sf.frames)
-		psf->sf.frames = psf->write_current ;
-
 	return count ;
 } /* sf_write_double */
 
@@ -2103,7 +2304,7 @@ sf_writef_double	(SNDFILE *sndfile, const double *ptr, sf_count_t frames)
 
 	VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
 
-	if (psf->mode == SFM_READ)
+	if (psf->file.mode == SFM_READ)
 	{	psf->error = SFE_NOT_WRITEMODE ;
 		return 0 ;
 		} ;
@@ -2127,12 +2328,14 @@ sf_writef_double	(SNDFILE *sndfile, const double *ptr, sf_count_t frames)
 
 	psf->last_op = SFM_WRITE ;
 
+	if (psf->write_current > psf->sf.frames)
+	{	psf->sf.frames = psf->write_current ;
+		psf->dataend = 0 ;
+		} ;
+
 	if (psf->auto_header && psf->write_header != NULL)
 		psf->write_header (psf, SF_TRUE) ;
 
-	if (psf->write_current > psf->sf.frames)
-		psf->sf.frames = psf->write_current ;
-
 	return count / psf->sf.channels ;
 } /* sf_writef_double */
 
@@ -2141,13 +2344,18 @@ sf_writef_double	(SNDFILE *sndfile, const double *ptr, sf_count_t frames)
 */
 
 static int
-try_resource_fork (SF_PRIVATE * psf, int mode)
-{
-	if (psf_open_rsrc (psf, mode) != 0)
+try_resource_fork (SF_PRIVATE * psf)
+{	int old_error = psf->error ;
+
+	/* Set READ mode now, to see if resource fork exists. */
+	psf->rsrc.mode = SFM_READ ;
+	if (psf_open_rsrc (psf) != 0)
+	{	psf->error = old_error ;
 		return 0 ;
+		} ;
 
 	/* More checking here. */
-	psf_log_printf (psf, "Resource fork : %s\n", psf->rsrcpath) ;
+	psf_log_printf (psf, "Resource fork : %s\n", psf->rsrc.path.c) ;
 
 	return SF_FORMAT_SD2 ;
 } /* try_resource_fork */
@@ -2158,14 +2366,14 @@ format_from_extension (SF_PRIVATE *psf)
 	char buffer [16] ;
 	int format = 0 ;
 
-	if ((cptr = strrchr (psf->filename, '.')) == NULL)
+	if ((cptr = strrchr (psf->file.name.c, '.')) == NULL)
 		return 0 ;
 
 	cptr ++ ;
 	if (strlen (cptr) > sizeof (buffer) - 1)
 		return 0 ;
 
-	strncpy (buffer, cptr, sizeof (buffer)) ;
+	psf_strlcpy (buffer, sizeof (buffer), cptr) ;
 	buffer [sizeof (buffer) - 1] = 0 ;
 
 	/* Convert everything in the buffer to lower case. */
@@ -2213,7 +2421,7 @@ format_from_extension (SF_PRIVATE *psf)
 
 static int
 guess_file_type (SF_PRIVATE *psf)
-{	int buffer [3], format ;
+{	uint32_t buffer [3], format ;
 
 	if (psf_binheader_readf (psf, "b", &buffer, SIGNED_SIZEOF (buffer)) != SIGNED_SIZEOF (buffer))
 	{	psf->error = SFE_BAD_FILE_READ ;
@@ -2299,30 +2507,38 @@ guess_file_type (SF_PRIVATE *psf)
 		return 0 /*-SF_FORMAT_WMA-*/ ;
 
 	/* HMM (Hidden Markov Model) Tool Kit. */
-	if (2 * BEI2H_INT (buffer [0]) + 12 == psf->filelength && buffer [2] == MAKE_MARKER (0, 2, 0, 0))
+	if (2 * BE2H_32 (buffer [0]) + 12 == psf->filelength && buffer [2] == MAKE_MARKER (0, 2, 0, 0))
 		return SF_FORMAT_HTK ;
 
 	if (buffer [0] == MAKE_MARKER ('f', 'L', 'a', 'C'))
 		return SF_FORMAT_FLAC ;
 
-	/* Turtle Beach SMP 16-bit */
-	if (buffer [0] == MAKE_MARKER ('S', 'O', 'U', 'N') && buffer [1] == MAKE_MARKER ('D', ' ', 'S', 'A'))
-		return 0 ;
-
-	if (buffer [0] == MAKE_MARKER ('S', 'Y', '8', '0') || buffer [0] == MAKE_MARKER ('S', 'Y', '8', '5'))
-		return 0 ;
-
-	if (buffer [0] == MAKE_MARKER ('a', 'j', 'k', 'g'))
-		return 0 /*-SF_FORMAT_SHN-*/ ;
-
 	if (buffer [0] == MAKE_MARKER ('2', 'B', 'I', 'T'))
 		return SF_FORMAT_AVR ;
 
 	if (buffer [0] == MAKE_MARKER ('R', 'F', '6', '4') && buffer [2] == MAKE_MARKER ('W', 'A', 'V', 'E'))
 		return SF_FORMAT_RF64 ;
 
-	/* This must be the second last one. */
-	if (psf->filelength > 0 && (format = try_resource_fork (psf, SFM_READ)) != 0)
+	if (buffer [0] == MAKE_MARKER ('I', 'D', '3', 3))
+	{	psf_log_printf (psf, "Found 'ID3' marker.\n") ;
+		if (id3_skip (psf))
+			return guess_file_type (psf) ;
+		return 0 ;
+		} ;
+
+	/* Turtle Beach SMP 16-bit */
+	if (buffer [0] == MAKE_MARKER ('S', 'O', 'U', 'N') && buffer [1] == MAKE_MARKER ('D', ' ', 'S', 'A'))
+		return 0 ;
+
+	/* Yamaha sampler format. */
+	if (buffer [0] == MAKE_MARKER ('S', 'Y', '8', '0') || buffer [0] == MAKE_MARKER ('S', 'Y', '8', '5'))
+		return 0 ;
+
+	if (buffer [0] == MAKE_MARKER ('a', 'j', 'k', 'g'))
+		return 0 /*-SF_FORMAT_SHN-*/ ;
+
+	/* This must be the last one. */
+	if (psf->filelength > 0 && (format = try_resource_fork (psf)) != 0)
 		return format ;
 
 	return 0 ;
@@ -2367,7 +2583,7 @@ validate_psf (SF_PRIVATE *psf)
 
 static void
 save_header_info (SF_PRIVATE *psf)
-{	snprintf (sf_logbuffer, sizeof (sf_logbuffer), "%s", psf->logbuffer) ;
+{	snprintf (sf_parselog, sizeof (sf_parselog), "%s", psf->parselog.buf) ;
 } /* save_header_info */
 
 static void
@@ -2375,20 +2591,20 @@ copy_filename (SF_PRIVATE *psf, const char *path)
 {	const char *ccptr ;
 	char *cptr ;
 
-	snprintf (psf->filepath, sizeof (psf->filepath), "%s", path) ;
+	snprintf (psf->file.path.c, sizeof (psf->file.path.c), "%s", path) ;
 	if ((ccptr = strrchr (path, '/')) || (ccptr = strrchr (path, '\\')))
 		ccptr ++ ;
 	else
 		ccptr = path ;
 
-	snprintf (psf->filename, sizeof (psf->filename), "%s", ccptr) ;
+	snprintf (psf->file.name.c, sizeof (psf->file.name.c), "%s", ccptr) ;
 
 	/* Now grab the directory. */
-	snprintf (psf->directory, sizeof (psf->directory), "%s", path) ;
-	if ((cptr = strrchr (psf->directory, '/')) || (cptr = strrchr (psf->directory, '\\')))
+	snprintf (psf->file.dir.c, sizeof (psf->file.dir.c), "%s", path) ;
+	if ((cptr = strrchr (psf->file.dir.c, '/')) || (cptr = strrchr (psf->file.dir.c, '\\')))
 		cptr [1] = 0 ;
 	else
-		psf->directory [0] = 0 ;
+		psf->file.dir.c [0] = 0 ;
 
 	return ;
 } /* copy_filename */
@@ -2398,47 +2614,41 @@ copy_filename (SF_PRIVATE *psf, const char *path)
 
 static int
 psf_close (SF_PRIVATE *psf)
-{	int	error = 0 ;
+{	uint32_t k ;
+	int	error = 0 ;
 
 	if (psf->codec_close)
-		error = psf->codec_close (psf) ;
+	{	error = psf->codec_close (psf) ;
+		/* To prevent it being called in psf->container_close(). */
+		psf->codec_close = NULL ;
+		} ;
+
 	if (psf->container_close)
 		error = psf->container_close (psf) ;
 
 	error = psf_fclose (psf) ;
 	psf_close_rsrc (psf) ;
 
-	if (psf->container_data)
-		free (psf->container_data) ;
+	/* For an ISO C compliant implementation it is ok to free a NULL pointer. */
+	free (psf->container_data) ;
+	free (psf->codec_data) ;
+	free (psf->interleave) ;
+	free (psf->dither) ;
+	free (psf->peak_info) ;
+	free (psf->broadcast_16k) ;
+	free (psf->loop_info) ;
+	free (psf->instrument) ;
+	free (psf->channel_map) ;
+	free (psf->format_desc) ;
+	free (psf->strings.storage) ;
 
-	if (psf->codec_data)
-		free (psf->codec_data) ;
-
-	if (psf->interleave)
-		free (psf->interleave) ;
-
-	if (psf->dither)
-		free (psf->dither) ;
-
-	if (psf->peak_info)
-		free (psf->peak_info) ;
-
-	if (psf->broadcast_var)
-		free (psf->broadcast_var) ;
-
-	if (psf->loop_info)
-		free (psf->loop_info) ;
-
-	if (psf->instrument)
-		free (psf->instrument) ;
-
-	if (psf->channel_map)
-		free (psf->channel_map) ;
-
-	if (psf->format_desc)
-	{	psf->format_desc [0] = 0 ;
-		free (psf->format_desc) ;
-		} ;
+	if (psf->wchunks.chunks)
+		for (k = 0 ; k < psf->wchunks.used ; k++)
+			free (psf->wchunks.chunks [k].data) ;
+	free (psf->rchunks.chunks) ;
+	free (psf->wchunks.chunks) ;
+	free (psf->iterator) ;
+	free (psf->cart_16k) ;
 
 	memset (psf, 0, sizeof (SF_PRIVATE)) ;
 	free (psf) ;
@@ -2446,19 +2656,19 @@ psf_close (SF_PRIVATE *psf)
 	return error ;
 } /* psf_close */
 
-static SNDFILE *
-psf_open_file (SF_PRIVATE *psf, int mode, SF_INFO *sfinfo)
+SNDFILE *
+psf_open_file (SF_PRIVATE *psf, SF_INFO *sfinfo)
 {	int		error, format ;
 
 	sf_errno = error = 0 ;
-	sf_logbuffer [0] = 0 ;
+	sf_parselog [0] = 0 ;
 
 	if (psf->error)
 	{	error = psf->error ;
 		goto error_exit ;
 		} ;
 
-	if (mode != SFM_READ && mode != SFM_WRITE && mode != SFM_RDWR)
+	if (psf->file.mode != SFM_READ && psf->file.mode != SFM_WRITE && psf->file.mode != SFM_RDWR)
 	{	error = SFE_BAD_OPEN_MODE ;
 		goto error_exit ;
 		} ;
@@ -2473,7 +2683,7 @@ psf_open_file (SF_PRIVATE *psf, int mode, SF_INFO *sfinfo)
 	sfinfo->sections = 0 ;
 	sfinfo->seekable = 0 ;
 
-	if (mode == SFM_READ)
+	if (psf->file.mode == SFM_READ)
 	{	if ((SF_CONTAINER (sfinfo->format)) == SF_FORMAT_RAW)
 		{	if (sf_format_check (sfinfo) == 0)
 			{	error = SFE_RAW_BAD_FORMAT ;
@@ -2484,12 +2694,11 @@ psf_open_file (SF_PRIVATE *psf, int mode, SF_INFO *sfinfo)
 			memset (sfinfo, 0, sizeof (SF_INFO)) ;
 		} ;
 
-	memcpy (&(psf->sf), sfinfo, sizeof (SF_INFO)) ;
+	memcpy (&psf->sf, sfinfo, sizeof (SF_INFO)) ;
 
 	psf->Magick 		= SNDFILE_MAGICK ;
 	psf->norm_float 	= SF_TRUE ;
 	psf->norm_double	= SF_TRUE ;
-	psf->mode 			= mode ;
 	psf->dataoffset		= -1 ;
 	psf->datalength		= -1 ;
 	psf->read_current	= -1 ;
@@ -2519,7 +2728,7 @@ psf_open_file (SF_PRIVATE *psf, int mode, SF_INFO *sfinfo)
 		} ;
 
 	if (psf->fileoffset > 0)
-	{	switch (psf->mode)
+	{	switch (psf->file.mode)
 		{	case SFM_READ :
 				if (psf->filelength < 44)
 				{	psf_log_printf (psf, "Short filelength: %D (fileoffset: %D)\n", psf->filelength, psf->fileoffset) ;
@@ -2547,7 +2756,7 @@ psf_open_file (SF_PRIVATE *psf, int mode, SF_INFO *sfinfo)
 	else
 		psf_log_printf (psf, "Length : %D\n", psf->filelength) ;
 
-	if (mode == SFM_WRITE || (mode == SFM_RDWR && psf->filelength == 0))
+	if (psf->file.mode == SFM_WRITE || (psf->file.mode == SFM_RDWR && psf->filelength == 0))
 	{	/* If the file is being opened for write or RDWR and the file is currently
 		** empty, then the SF_INFO struct must contain valid data.
 		*/
@@ -2555,12 +2764,12 @@ psf_open_file (SF_PRIVATE *psf, int mode, SF_INFO *sfinfo)
 		{	error = SFE_ZERO_MAJOR_FORMAT ;
 			goto error_exit ;
 			} ;
-		if ((SF_CONTAINER (psf->sf.format)) == 0)
+		if ((SF_CODEC (psf->sf.format)) == 0)
 		{	error = SFE_ZERO_MINOR_FORMAT ;
 			goto error_exit ;
 			} ;
 
-		if (sf_format_check (&(psf->sf)) == 0)
+		if (sf_format_check (&psf->sf) == 0)
 		{	error = SFE_BAD_OPEN_FORMAT ;
 			goto error_exit ;
 			} ;
@@ -2574,7 +2783,7 @@ psf_open_file (SF_PRIVATE *psf, int mode, SF_INFO *sfinfo)
 		} ;
 
 	/* Prevent unnecessary seeks */
-	psf->last_op = psf->mode ;
+	psf->last_op = psf->file.mode ;
 
 	/* Set bytewidth if known. */
 	switch (SF_CODEC (psf->sf.format))
@@ -2728,23 +2937,34 @@ psf_open_file (SF_PRIVATE *psf, int mode, SF_INFO *sfinfo)
 
 	/* For now, check whether embedding is supported. */
 	format = SF_CONTAINER (psf->sf.format) ;
-	if (psf->fileoffset > 0 &&
-			(format != SF_FORMAT_WAV) && (format != SF_FORMAT_WAVEX) &&
-			(format != SF_FORMAT_AIFF) && (format != SF_FORMAT_AU)
-			)
-	{	error = SFE_NO_EMBED_SUPPORT ;
-		goto error_exit ;
+	if (psf->fileoffset > 0)
+	{	switch (format)
+		{	case SF_FORMAT_WAV :
+			case SF_FORMAT_WAVEX :
+			case SF_FORMAT_AIFF :
+			case SF_FORMAT_AU :
+				/* Actual embedded files. */
+				break ;
+
+			case SF_FORMAT_FLAC :
+				/* Flac with an ID3v2 header? */
+				break ;
+
+			default :
+				error = SFE_NO_EMBED_SUPPORT ;
+				goto error_exit ;
+			} ;
 		} ;
 
 	if (psf->fileoffset > 0)
 		psf_log_printf (psf, "Embedded file length : %D\n", psf->filelength) ;
 
-	if (mode == SFM_RDWR && sf_format_check (&(psf->sf)) == 0)
+	if (psf->file.mode == SFM_RDWR && sf_format_check (&psf->sf) == 0)
 	{	error = SFE_BAD_MODE_RW ;
 		goto error_exit ;
 		} ;
 
-	if (validate_sfinfo (&(psf->sf)) == 0)
+	if (validate_sfinfo (&psf->sf) == 0)
 	{	psf_log_SF_INFO (psf) ;
 		save_header_info (psf) ;
 		error = SFE_BAD_SF_INFO ;
@@ -2759,14 +2979,12 @@ psf_open_file (SF_PRIVATE *psf, int mode, SF_INFO *sfinfo)
 
 	psf->read_current = 0 ;
 	psf->write_current = 0 ;
-	if (psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_RDWR)
 	{	psf->write_current = psf->sf.frames ;
 		psf->have_written = psf->sf.frames > 0 ? SF_TRUE : SF_FALSE ;
 		} ;
 
-	memcpy (sfinfo, &(psf->sf), sizeof (SF_INFO)) ;
-
-	memcpy (sfinfo, &(psf->sf), sizeof (SF_INFO)) ;
+	memcpy (sfinfo, &psf->sf, sizeof (SF_INFO)) ;
 
 	return (SNDFILE *) psf ;
 
@@ -2775,7 +2993,7 @@ error_exit :
 
 	if (error == SFE_SYSTEM)
 		snprintf (sf_syserr, sizeof (sf_syserr), "%s", psf->syserr) ;
-	snprintf (sf_logbuffer, sizeof (sf_logbuffer), "%s", psf->logbuffer) ;
+	snprintf (sf_parselog, sizeof (sf_parselog), "%s", psf->parselog.buf) ;
 
 	switch (error)
 	{	case SF_ERR_SYSTEM :
@@ -2787,7 +3005,7 @@ error_exit :
 			break ;
 
 		default :
-			if (psf->mode == SFM_READ)
+			if (psf->file.mode == SFM_READ)
 			{	psf_log_printf (psf, "Parse error : %s\n", sf_error_number (error)) ;
 				error = SF_ERR_MALFORMED_FILE ;
 				} ;
@@ -2797,3 +3015,79 @@ error_exit :
 	return NULL ;
 } /* psf_open_file */
 
+/*==============================================================================
+** Chunk getting and setting.
+*/
+
+int
+sf_set_chunk (SNDFILE * sndfile, const SF_CHUNK_INFO * chunk_info)
+{	SF_PRIVATE 	*psf ;
+
+	VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
+
+	if (chunk_info == NULL || chunk_info->data == NULL)
+		return SFE_BAD_CHUNK_PTR ;
+
+	if (psf->set_chunk)
+		return psf->set_chunk (psf, chunk_info) ;
+
+	return SFE_BAD_CHUNK_FORMAT ;
+} /* sf_set_chunk */
+
+SF_CHUNK_ITERATOR *
+sf_get_chunk_iterator (SNDFILE * sndfile, const SF_CHUNK_INFO * chunk_info)
+{	SF_PRIVATE 	*psf ;
+
+	VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
+
+	if (chunk_info)
+		return psf_get_chunk_iterator (psf, chunk_info->id) ;
+
+	return psf_get_chunk_iterator (psf, NULL) ;
+} /* sf_get_chunk_iterator */
+
+SF_CHUNK_ITERATOR *
+sf_next_chunk_iterator (SF_CHUNK_ITERATOR * iterator)
+{	SF_PRIVATE 	*psf ;
+	SNDFILE	*sndfile = iterator ? iterator->sndfile : NULL ;
+
+	VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
+
+	if (psf->next_chunk_iterator)
+		return psf->next_chunk_iterator (psf, iterator) ;
+
+	return NULL ;
+} /* sf_get_chunk_iterator_next */
+
+int
+sf_get_chunk_size (const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info)
+{	SF_PRIVATE 	*psf ;
+	SNDFILE	*sndfile = iterator ? iterator->sndfile : NULL ;
+
+	VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
+
+	if (chunk_info == NULL)
+		return SFE_BAD_CHUNK_PTR ;
+
+	if (psf->get_chunk_size)
+		return psf->get_chunk_size (psf, iterator, chunk_info) ;
+
+	return SFE_BAD_CHUNK_FORMAT ;
+	return 0 ;
+} /* sf_get_chunk_size */
+
+int
+sf_get_chunk_data (const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info)
+{	SF_PRIVATE	*psf ;
+	SNDFILE	*sndfile = iterator ? iterator->sndfile : NULL ;
+
+	VALIDATE_SNDFILE_AND_ASSIGN_PSF (sndfile, psf, 1) ;
+
+	if (chunk_info == NULL || chunk_info->data == NULL)
+		return SFE_BAD_CHUNK_PTR ;
+
+	if (psf->get_chunk_data)
+		return psf->get_chunk_data (psf, iterator, chunk_info) ;
+
+	return SFE_BAD_CHUNK_FORMAT ;
+} /* sf_get_chunk_data */
diff --git a/libs/libsndfile/src/sndfile.h.in b/libs/libsndfile/src/sndfile.h.in
index 0682740da6..b1e32d7f21 100644
--- a/libs/libsndfile/src/sndfile.h.in
+++ b/libs/libsndfile/src/sndfile.h.in
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2013 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -30,6 +30,7 @@
 #define	SNDFILE_1
 
 #include 
+#include 
 #include 
 
 #ifdef __cplusplus
@@ -105,6 +106,11 @@ enum
 
 	SF_FORMAT_VORBIS		= 0x0060,		/* Xiph Vorbis encoding. */
 
+	SF_FORMAT_ALAC_16		= 0x0070,		/* Apple Lossless Audio Codec (16 bit). */
+	SF_FORMAT_ALAC_20		= 0x0071,		/* Apple Lossless Audio Codec (20 bit). */
+	SF_FORMAT_ALAC_24		= 0x0072,		/* Apple Lossless Audio Codec (24 bit). */
+	SF_FORMAT_ALAC_32		= 0x0073,		/* Apple Lossless Audio Codec (32 bit). */
+
 	/* Endian-ness options. */
 
 	SF_ENDIAN_FILE			= 0x00000000,	/* Default file endian-ness. */
@@ -192,6 +198,11 @@ enum
 	SFC_WAVEX_GET_AMBISONIC			= 0x1201,
 
 	SFC_SET_VBR_ENCODING_QUALITY	= 0x1300,
+	SFC_SET_COMPRESSION_LEVEL		= 0x1301,
+
+	/* Cart Chunk support */
+	SFC_SET_CART_INFO				= 0x1400,
+	SFC_GET_CART_INFO				= 0x1401,
 
 	/* Following commands for testing only. */
 	SFC_TEST_IEEE_FLOAT_REPLACE		= 0x6001,
@@ -199,7 +210,7 @@ enum
 	/*
 	** SFC_SET_ADD_* values are deprecated and will disappear at some
 	** time in the future. They are guaranteed to be here up to and
-	** including version 1.0.8 to avoid breakage of existng software.
+	** including version 1.0.8 to avoid breakage of existing software.
 	** They currently do nothing and will continue to do nothing.
 	*/
 	SFC_SET_ADD_DITHER_ON_WRITE		= 0x1070,
@@ -221,7 +232,9 @@ enum
 	SF_STR_COMMENT					= 0x05,
 	SF_STR_DATE						= 0x06,
 	SF_STR_ALBUM					= 0x07,
-	SF_STR_LICENSE					= 0x08
+	SF_STR_LICENSE					= 0x08,
+	SF_STR_TRACKNUMBER				= 0x09,
+	SF_STR_GENRE					= 0x10
 } ;
 
 /*
@@ -230,7 +243,7 @@ enum
 */
 
 #define	SF_STR_FIRST	SF_STR_TITLE
-#define	SF_STR_LAST		SF_STR_LICENSE
+#define	SF_STR_LAST		SF_STR_GENRE
 
 enum
 {	/* True and false */
@@ -267,27 +280,34 @@ enum
 enum
 {	SF_CHANNEL_MAP_INVALID = 0,
 	SF_CHANNEL_MAP_MONO = 1,
-	SF_CHANNEL_MAP_LEFT,
-	SF_CHANNEL_MAP_RIGHT,
-	SF_CHANNEL_MAP_CENTER,
+	SF_CHANNEL_MAP_LEFT,					/* Apple calls this 'Left' */
+	SF_CHANNEL_MAP_RIGHT,					/* Apple calls this 'Right' */
+	SF_CHANNEL_MAP_CENTER,					/* Apple calls this 'Center' */
 	SF_CHANNEL_MAP_FRONT_LEFT,
 	SF_CHANNEL_MAP_FRONT_RIGHT,
 	SF_CHANNEL_MAP_FRONT_CENTER,
-	SF_CHANNEL_MAP_REAR_CENTER,
-	SF_CHANNEL_MAP_REAR_LEFT,
-	SF_CHANNEL_MAP_REAR_RIGHT,
-	SF_CHANNEL_MAP_LFE,
-	SF_CHANNEL_MAP_FRONT_LEFT_OF_CENTER,
-	SF_CHANNEL_MAP_FRONT_RIGHT_OF_CENTER,
-	SF_CHANNEL_MAP_SIDE_LEFT,
-	SF_CHANNEL_MAP_SIDE_RIGHT,
-	SF_CHANNEL_MAP_TOP_CENTER,
-	SF_CHANNEL_MAP_TOP_FRONT_LEFT,
-	SF_CHANNEL_MAP_TOP_FRONT_RIGHT,
-	SF_CHANNEL_MAP_TOP_FRONT_CENTER,
-	SF_CHANNEL_MAP_TOP_REAR_LEFT,
-	SF_CHANNEL_MAP_TOP_REAR_RIGHT,
-	SF_CHANNEL_MAP_TOP_REAR_CENTER
+	SF_CHANNEL_MAP_REAR_CENTER,				/* Apple calls this 'Center Surround', Msft calls this 'Back Center' */
+	SF_CHANNEL_MAP_REAR_LEFT,				/* Apple calls this 'Left Surround', Msft calls this 'Back Left' */
+	SF_CHANNEL_MAP_REAR_RIGHT,				/* Apple calls this 'Right Surround', Msft calls this 'Back Right' */
+	SF_CHANNEL_MAP_LFE,						/* Apple calls this 'LFEScreen', Msft calls this 'Low Frequency'  */
+	SF_CHANNEL_MAP_FRONT_LEFT_OF_CENTER,	/* Apple calls this 'Left Center' */
+	SF_CHANNEL_MAP_FRONT_RIGHT_OF_CENTER,	/* Apple calls this 'Right Center */
+	SF_CHANNEL_MAP_SIDE_LEFT,				/* Apple calls this 'Left Surround Direct' */
+	SF_CHANNEL_MAP_SIDE_RIGHT,				/* Apple calls this 'Right Surround Direct' */
+	SF_CHANNEL_MAP_TOP_CENTER,				/* Apple calls this 'Top Center Surround' */
+	SF_CHANNEL_MAP_TOP_FRONT_LEFT,			/* Apple calls this 'Vertical Height Left' */
+	SF_CHANNEL_MAP_TOP_FRONT_RIGHT,			/* Apple calls this 'Vertical Height Right' */
+	SF_CHANNEL_MAP_TOP_FRONT_CENTER,		/* Apple calls this 'Vertical Height Center' */
+	SF_CHANNEL_MAP_TOP_REAR_LEFT,			/* Apple and MS call this 'Top Back Left' */
+	SF_CHANNEL_MAP_TOP_REAR_RIGHT,			/* Apple and MS call this 'Top Back Right' */
+	SF_CHANNEL_MAP_TOP_REAR_CENTER,			/* Apple and MS call this 'Top Back Center' */
+
+	SF_CHANNEL_MAP_AMBISONIC_B_W,
+	SF_CHANNEL_MAP_AMBISONIC_B_X,
+	SF_CHANNEL_MAP_AMBISONIC_B_Y,
+	SF_CHANNEL_MAP_AMBISONIC_B_Z,
+
+	SF_CHANNEL_MAP_MAX
 } ;
 
 
@@ -296,13 +316,14 @@ enum
 typedef	struct SNDFILE_tag	SNDFILE ;
 
 /* The following typedef is system specific and is defined when libsndfile is
-** compiled. sf_count_t can be one of loff_t (Linux), off_t (*BSD), off64_t 
-** (Solaris), __int64_t (Win32) etc. On windows, we need to allow the same
-** header file to be compiler by both GCC and the microsoft compiler.
+** compiled. sf_count_t will be a 64 bit value when the underlying OS allows
+** 64 bit file offsets.
+** On windows, we need to allow the same header file to be compiler by both GCC
+** and the Microsoft compiler.
 */
 
-#ifdef _MSCVER
-typedef __int64_t	sf_count_t ;
+#if (defined (_MSCVER) || defined (_MSC_VER))
+typedef __int64		sf_count_t ;
 #define SF_COUNT_MAX		0x7fffffffffffffffi64
 #else
 typedef @TYPEOF_SF_COUNT_T@	sf_count_t ;
@@ -310,9 +331,9 @@ typedef @TYPEOF_SF_COUNT_T@	sf_count_t ;
 #endif
 
 
-/* A pointer to a SF_INFO structure is passed to sf_open_read () and filled in.
+/* A pointer to a SF_INFO structure is passed to sf_open () and filled in.
 ** On write, the SF_INFO structure is filled in by the user and passed into
-** sf_open_write ().
+** sf_open ().
 */
 
 struct SF_INFO
@@ -396,9 +417,9 @@ typedef struct
 
 	struct
 	{	int mode ;
-		unsigned int start ;
-		unsigned int end ;
-		unsigned int count ;
+		uint32_t start ;
+		uint32_t end ;
+		uint32_t count ;
 	} loops [16] ; /* make variable in a sensible way */
 } SF_INSTRUMENT ;
 
@@ -416,7 +437,7 @@ typedef struct
 							/* a full bar of 7/8 is 7 beats */
 
 	float	bpm ;			/* suggestion, as it can be calculated using other fields:*/
-							/* file's lenght, file's sampleRate and our time_sig_den*/
+							/* file's length, file's sampleRate and our time_sig_den*/
 							/* -> bpms are always the amount of _quarter notes_ per minute */
 
 	int	root_key ;			/* MIDI note, or -1 for None */
@@ -429,23 +450,56 @@ typedef struct
 */
 #define	SF_BROADCAST_INFO_VAR(coding_hist_size) \
 			struct \
-			{	char			description [256] ; \
-				char			originator [32] ; \
-				char			originator_reference [32] ; \
-				char			origination_date [10] ; \
-				char			origination_time [8] ; \
-				unsigned int	time_reference_low ; \
-				unsigned int	time_reference_high ; \
-				short			version ; \
-				char			umid [64] ; \
-				char			reserved [190] ; \
-				unsigned int	coding_history_size ; \
-				char			coding_history [coding_hist_size] ; \
+			{	char		description [256] ; \
+				char		originator [32] ; \
+				char		originator_reference [32] ; \
+				char		origination_date [10] ; \
+				char		origination_time [8] ; \
+				uint32_t	time_reference_low ; \
+				uint32_t	time_reference_high ; \
+				short		version ; \
+				char		umid [64] ; \
+				char		reserved [190] ; \
+				uint32_t	coding_history_size ; \
+				char		coding_history [coding_hist_size] ; \
 			}
 
 /* SF_BROADCAST_INFO is the above struct with coding_history field of 256 bytes. */
 typedef SF_BROADCAST_INFO_VAR (256) SF_BROADCAST_INFO ;
 
+struct SF_CART_TIMER
+{	char	usage[4] ;
+	int32_t	value ;
+} ;
+
+typedef struct SF_CART_TIMER SF_CART_TIMER ;
+
+#define	SF_CART_INFO_VAR(p_tag_text_size) \
+			struct \
+			{	char		version [4] ; \
+				char		title [64] ; \
+				char		artist [64] ; \
+				char		cut_id [64] ; \
+				char		client_id [64] ; \
+				char		category [64] ; \
+				char		classification [64] ; \
+				char		out_cue [64] ; \
+				char		start_date [10] ; \
+				char		start_time [8] ; \
+				char		end_date [10] ; \
+				char		end_time [8] ; \
+				char		producer_app_id [64] ; \
+				char		producer_app_version [64] ; \
+				char		user_def [64] ; \
+				int32_t		level_reference ; \
+				SF_CART_TIMER	post_timers [8] ; \
+				char		reserved [276] ; \
+				char		url [1024] ; \
+				uint32_t	tag_text_size ; \
+				char		tag_text[p_tag_text_size] ; \
+			}
+
+typedef SF_CART_INFO_VAR (256) SF_CART_INFO ;
 
 /*	Virtual I/O functionality. */
 
@@ -465,6 +519,7 @@ struct SF_VIRTUAL_IO
 
 typedef	struct SF_VIRTUAL_IO SF_VIRTUAL_IO ;
 
+
 /* Open the specified file for read, write or both. On error, this will
 ** return a NULL pointer. To find the error number, pass a NULL SNDFILE
 ** to sf_strerror ().
@@ -473,9 +528,10 @@ typedef	struct SF_VIRTUAL_IO SF_VIRTUAL_IO ;
 
 SNDFILE* 	sf_open		(const char *path, int mode, SF_INFO *sfinfo) ;
 
+
 /* Use the existing file descriptor to create a SNDFILE object. If close_desc
 ** is TRUE, the file descriptor will be closed when sf_close() is called. If
-** it is FALSE, the descritor will not be closed.
+** it is FALSE, the descriptor will not be closed.
 ** When passed a descriptor like this, the library will assume that the start
 ** of file header is at the current file offset. This allows sound files within
 ** larger container files to be read and/or written.
@@ -489,18 +545,21 @@ SNDFILE* 	sf_open_fd	(int fd, int mode, SF_INFO *sfinfo, int close_desc) ;
 
 SNDFILE* 	sf_open_virtual	(SF_VIRTUAL_IO *sfvirtual, int mode, SF_INFO *sfinfo, void *user_data) ;
 
+
 /* sf_error () returns a error number which can be translated to a text
 ** string using sf_error_number().
 */
 
 int		sf_error		(SNDFILE *sndfile) ;
 
+
 /* sf_strerror () returns to the caller a pointer to the current error message for
 ** the given SNDFILE.
 */
 
 const char* sf_strerror (SNDFILE *sndfile) ;
 
+
 /* sf_error_number () allows the retrieval of the error string for each internal
 ** error number.
 **
@@ -508,8 +567,9 @@ const char* sf_strerror (SNDFILE *sndfile) ;
 
 const char*	sf_error_number	(int errnum) ;
 
+
 /* The following two error functions are deprecated but they will remain in the
-** library for the forseeable future. The function sf_strerror() should be used
+** library for the foreseeable future. The function sf_strerror() should be used
 ** in their place.
 */
 
@@ -521,10 +581,12 @@ int		sf_error_str	(SNDFILE *sndfile, char* str, size_t len) ;
 
 int		sf_command	(SNDFILE *sndfile, int command, void *data, int datasize) ;
 
+
 /* Return TRUE if fields of the SF_INFO struct are a valid combination of values. */
 
 int		sf_format_check	(const SF_INFO *info) ;
 
+
 /* Seek within the waveform data chunk of the SNDFILE. sf_seek () uses
 ** the same values for whence (SEEK_SET, SEEK_CUR and SEEK_END) as
 ** stdio.h function fseek ().
@@ -537,8 +599,15 @@ int		sf_format_check	(const SF_INFO *info) ;
 ** On error all of these functions return -1.
 */
 
+enum
+{	SF_SEEK_SET = SEEK_SET,
+	SF_SEEK_CUR = SEEK_CUR,
+	SF_SEEK_END = SEEK_END
+} ;
+
 sf_count_t	sf_seek 		(SNDFILE *sndfile, sf_count_t frames, int whence) ;
 
+
 /* Functions for retrieving and setting string data within sound files.
 ** Not all file types support this features; AIFF and WAV do. For both
 ** functions, the str_type parameter must be one of the SF_STR_* values
@@ -551,12 +620,31 @@ int sf_set_string (SNDFILE *sndfile, int str_type, const char* str) ;
 
 const char* sf_get_string (SNDFILE *sndfile, int str_type) ;
 
+
+/* Return the library version string. */
+
+const char * sf_version_string (void) ;
+
+/* Return the current byterate at this point in the file. The byte rate in this
+** case is the number of bytes per second of audio data. For instance, for a
+** stereo, 18 bit PCM encoded file with an 16kHz sample rate, the byte rate
+** would be 2 (stereo) * 2 (two bytes per sample) * 16000 => 64000 bytes/sec.
+** For some file formats the returned value will be accurate and exact, for some
+** it will be a close approximation, for some it will be the average bitrate for
+** the whole file and for some it will be a time varying value that was accurate
+** when the file was most recently read or written.
+** To get the bitrate, multiple this value by 8.
+** Returns -1 for unknown.
+*/
+int sf_current_byterate (SNDFILE *sndfile) ;
+
 /* Functions for reading/writing the waveform data of a sound file.
 */
 
 sf_count_t	sf_read_raw		(SNDFILE *sndfile, void *ptr, sf_count_t bytes) ;
 sf_count_t	sf_write_raw 	(SNDFILE *sndfile, const void *ptr, sf_count_t bytes) ;
 
+
 /* Functions for reading and writing the data chunk in terms of frames.
 ** The number of items actually read/written = frames * number of channels.
 **     sf_xxxx_raw		read/writes the raw data bytes from/to the file
@@ -579,6 +667,7 @@ sf_count_t	sf_writef_float	(SNDFILE *sndfile, const float *ptr, sf_count_t frame
 sf_count_t	sf_readf_double		(SNDFILE *sndfile, double *ptr, sf_count_t frames) ;
 sf_count_t	sf_writef_double	(SNDFILE *sndfile, const double *ptr, sf_count_t frames) ;
 
+
 /* Functions for reading and writing the data chunk in terms of items.
 ** Otherwise similar to above.
 ** All of these read/write function return number of items read/written.
@@ -596,6 +685,7 @@ sf_count_t	sf_write_float	(SNDFILE *sndfile, const float *ptr, sf_count_t items)
 sf_count_t	sf_read_double	(SNDFILE *sndfile, double *ptr, sf_count_t items) ;
 sf_count_t	sf_write_double	(SNDFILE *sndfile, const double *ptr, sf_count_t items) ;
 
+
 /* Close the SNDFILE and clean up all memory allocations associated with this
 ** file.
 ** Returns 0 on success, or an error number.
@@ -603,6 +693,7 @@ sf_count_t	sf_write_double	(SNDFILE *sndfile, const double *ptr, sf_count_t item
 
 int		sf_close		(SNDFILE *sndfile) ;
 
+
 /* If the file is opened SFM_WRITE or SFM_RDWR, call fsync() on the file
 ** to force the writing of data to disk. If the file is opened SFM_READ
 ** no action is taken.
@@ -610,8 +701,124 @@ int		sf_close		(SNDFILE *sndfile) ;
 
 void	sf_write_sync	(SNDFILE *sndfile) ;
 
+
+
+/* The function sf_wchar_open() is Windows Only!
+** Open a file passing in a Windows Unicode filename. Otherwise, this is
+** the same as sf_open().
+**
+** In order for this to work, you need to do the following:
+**
+**		#include 
+**		#define ENABLE_SNDFILE_WINDOWS_PROTOTYPES 1
+**		#including 
+*/
+
+#if (defined (ENABLE_SNDFILE_WINDOWS_PROTOTYPES) && ENABLE_SNDFILE_WINDOWS_PROTOTYPES)
+SNDFILE* sf_wchar_open (LPCWSTR wpath, int mode, SF_INFO *sfinfo) ;
+#endif
+
+
+
+
+/* Getting and setting of chunks from within a sound file.
+**
+** These functions allow the getting and setting of chunks within a sound file
+** (for those formats which allow it).
+**
+** These functions fail safely. Specifically, they will not allow you to overwrite
+** existing chunks or add extra versions of format specific reserved chunks but
+** should allow you to retrieve any and all chunks (may not be implemented for
+** all chunks or all file formats).
+*/
+
+struct SF_CHUNK_INFO
+{	char		id [64] ;	/* The chunk identifier. */
+	unsigned	id_size ;	/* The size of the chunk identifier. */
+	unsigned	datalen ;	/* The size of that data. */
+	void		*data ;		/* Pointer to the data. */
+} ;
+
+typedef struct SF_CHUNK_INFO SF_CHUNK_INFO ;
+
+/* Set the specified chunk info (must be done before any audio data is written
+** to the file). This will fail for format specific reserved chunks.
+** The chunk_info->data pointer must be valid until the file is closed.
+** Returns SF_ERR_NO_ERROR on success or non-zero on failure.
+*/
+int sf_set_chunk (SNDFILE * sndfile, const SF_CHUNK_INFO * chunk_info) ;
+
+/*
+** An opaque structure to an iterator over the all chunks of a given id
+*/
+typedef	struct SF_CHUNK_ITERATOR SF_CHUNK_ITERATOR ;
+
+/* Get an iterator for all chunks matching chunk_info.
+** The iterator will point to the first chunk matching chunk_info.
+** Chunks are matching, if (chunk_info->id) matches the first
+**     (chunk_info->id_size) bytes of a chunk found in the SNDFILE* handle.
+** If chunk_info is NULL, an iterator to all chunks in the SNDFILE* handle
+**     is returned.
+** The values of chunk_info->datalen and chunk_info->data are ignored.
+** If no matching chunks are found in the sndfile, NULL is returned.
+** The returned iterator will stay valid until one of the following occurs:
+**     a) The sndfile is closed.
+**     b) A new chunk is added using sf_set_chunk().
+**     c) Another chunk iterator function is called on the same SNDFILE* handle
+**        that causes the iterator to be modified.
+** The memory for the iterator belongs to the SNDFILE* handle and is freed when
+** sf_close() is called.
+*/
+SF_CHUNK_ITERATOR *
+sf_get_chunk_iterator (SNDFILE * sndfile, const SF_CHUNK_INFO * chunk_info) ;
+
+/* Iterate through chunks by incrementing the iterator.
+** Increments the iterator and returns a handle to the new one.
+** After this call, iterator will no longer be valid, and you must use the
+**      newly returned handle from now on.
+** The returned handle can be used to access the next chunk matching
+**      the criteria as defined in sf_get_chunk_iterator().
+** If iterator points to the last chunk, this will free all resources
+**      associated with iterator and return NULL.
+** The returned iterator will stay valid until sf_get_chunk_iterator_next
+**      is called again, the sndfile is closed or a new chunk us added.
+*/
+SF_CHUNK_ITERATOR *
+sf_next_chunk_iterator (SF_CHUNK_ITERATOR * iterator) ;
+
+
+/* Get the size of the specified chunk.
+** If the specified chunk exists, the size will be returned in the
+**      datalen field of the SF_CHUNK_INFO struct.
+**      Additionally, the id of the chunk will be copied to the id
+**      field of the SF_CHUNK_INFO struct and it's id_size field will
+**      be updated accordingly.
+** If the chunk doesn't exist chunk_info->datalen will be zero, and the
+**      id and id_size fields will be undefined.
+** The function will return SF_ERR_NO_ERROR on success or non-zero on
+** failure.
+*/
+int
+sf_get_chunk_size (const SF_CHUNK_ITERATOR * it, SF_CHUNK_INFO * chunk_info) ;
+
+/* Get the specified chunk data.
+** If the specified chunk exists, up to chunk_info->datalen bytes of
+**      the chunk data will be copied into the chunk_info->data buffer
+**      (allocated by the caller) and the chunk_info->datalen field
+**      updated to reflect the size of the data. The id and id_size
+**      field will be updated according to the retrieved chunk
+** If the chunk doesn't exist chunk_info->datalen will be zero, and the
+**      id and id_size fields will be undefined.
+** The function will return SF_ERR_NO_ERROR on success or non-zero on
+** failure.
+*/
+int
+sf_get_chunk_data (const SF_CHUNK_ITERATOR * it, SF_CHUNK_INFO * chunk_info) ;
+
+
 #ifdef __cplusplus
 }		/* extern "C" */
 #endif	/* __cplusplus */
 
 #endif	/* SNDFILE_H */
+
diff --git a/libs/libsndfile/src/sndfile.hh b/libs/libsndfile/src/sndfile.hh
index e84054b557..0a0c62d7f6 100644
--- a/libs/libsndfile/src/sndfile.hh
+++ b/libs/libsndfile/src/sndfile.hh
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2005-2007 Erik de Castro Lopo 
+** Copyright (C) 2005-2012 Erik de Castro Lopo 
 **
 ** All rights reserved.
 **
@@ -77,6 +77,16 @@ class SndfileHandle
 							int format = 0, int channels = 0, int samplerate = 0) ;
 			SndfileHandle (std::string const & path, int mode = SFM_READ,
 							int format = 0, int channels = 0, int samplerate = 0) ;
+			SndfileHandle (int fd, bool close_desc, int mode = SFM_READ,
+							int format = 0, int channels = 0, int samplerate = 0) ;
+			SndfileHandle (SF_VIRTUAL_IO &sfvirtual, void *user_data, int mode = SFM_READ,
+							int format = 0, int channels = 0, int samplerate = 0) ;
+
+#ifdef ENABLE_SNDFILE_WINDOWS_PROTOTYPES
+			SndfileHandle (LPCWSTR wpath, int mode = SFM_READ,
+							int format = 0, int channels = 0, int samplerate = 0) ;
+#endif
+
 			~SndfileHandle (void) ;
 
 			SndfileHandle (const SndfileHandle &orig) ;
@@ -132,6 +142,11 @@ class SndfileHandle
 		sf_count_t	readRaw		(void *ptr, sf_count_t bytes) ;
 		sf_count_t	writeRaw	(const void *ptr, sf_count_t bytes) ;
 
+		/**< Raw access to the handle. SndfileHandle keeps ownership. */
+		SNDFILE * rawHandle (void) ;
+
+		/**< Take ownership of handle, if reference count is 1. */
+		SNDFILE * takeOwnership (void) ;
 } ;
 
 /*==============================================================================
@@ -191,6 +206,53 @@ SndfileHandle::SndfileHandle (std::string const & path, int mode, int fmt, int c
 	return ;
 } /* SndfileHandle std::string constructor */
 
+inline
+SndfileHandle::SndfileHandle (int fd, bool close_desc, int mode, int fmt, int chans, int srate)
+: p (NULL)
+{
+	if (fd < 0)
+		return ;
+
+	p = new (std::nothrow) SNDFILE_ref () ;
+
+	if (p != NULL)
+	{	p->ref = 1 ;
+
+		p->sfinfo.frames = 0 ;
+		p->sfinfo.channels = chans ;
+		p->sfinfo.format = fmt ;
+		p->sfinfo.samplerate = srate ;
+		p->sfinfo.sections = 0 ;
+		p->sfinfo.seekable = 0 ;
+
+		p->sf = sf_open_fd (fd, mode, &p->sfinfo, close_desc) ;
+		} ;
+
+	return ;
+} /* SndfileHandle fd constructor */
+
+inline
+SndfileHandle::SndfileHandle (SF_VIRTUAL_IO &sfvirtual, void *user_data, int mode, int fmt, int chans, int srate)
+: p (NULL)
+{
+	p = new (std::nothrow) SNDFILE_ref () ;
+
+	if (p != NULL)
+	{	p->ref = 1 ;
+
+		p->sfinfo.frames = 0 ;
+		p->sfinfo.channels = chans ;
+		p->sfinfo.format = fmt ;
+		p->sfinfo.samplerate = srate ;
+		p->sfinfo.sections = 0 ;
+		p->sfinfo.seekable = 0 ;
+
+		p->sf = sf_open_virtual (&sfvirtual, mode, &p->sfinfo, user_data) ;
+		} ;
+
+	return ;
+} /* SndfileHandle std::string constructor */
+
 inline
 SndfileHandle::~SndfileHandle (void)
 {	if (p != NULL && --p->ref == 0)
@@ -249,7 +311,7 @@ SndfileHandle::getString (int str_type) const
 {	return sf_get_string (p->sf, str_type) ; }
 
 inline int
-SndfileHandle::formatCheck(int fmt, int chans, int srate)
+SndfileHandle::formatCheck (int fmt, int chans, int srate)
 {
 	SF_INFO sfinfo ;
 
@@ -337,6 +399,48 @@ inline sf_count_t
 SndfileHandle::writeRaw (const void *ptr, sf_count_t bytes)
 {	return sf_write_raw (p->sf, ptr, bytes) ; }
 
+inline SNDFILE *
+SndfileHandle::rawHandle (void)
+{	return (p ? p->sf : NULL) ; }
+
+inline SNDFILE *
+SndfileHandle::takeOwnership (void)
+{
+	if (p == NULL || (p->ref != 1))
+		return NULL ;
+
+	SNDFILE * sf = p->sf ;
+	p->sf = NULL ;
+	delete p ;
+	p = NULL ;
+	return sf ;
+}
+
+#ifdef ENABLE_SNDFILE_WINDOWS_PROTOTYPES
+
+inline
+SndfileHandle::SndfileHandle (LPCWSTR wpath, int mode, int fmt, int chans, int srate)
+: p (NULL)
+{
+	p = new (std::nothrow) SNDFILE_ref () ;
+
+	if (p != NULL)
+	{	p->ref = 1 ;
+
+		p->sfinfo.frames = 0 ;
+		p->sfinfo.channels = chans ;
+		p->sfinfo.format = fmt ;
+		p->sfinfo.samplerate = srate ;
+		p->sfinfo.sections = 0 ;
+		p->sfinfo.seekable = 0 ;
+
+		p->sf = sf_wchar_open (wpath, mode, &p->sfinfo) ;
+		} ;
+
+	return ;
+} /* SndfileHandle const wchar_t * constructor */
+
+#endif
 
 #endif	/* SNDFILE_HH */
 
diff --git a/libs/libsndfile/src/strings.c b/libs/libsndfile/src/strings.c
index c6c4c10386..c587e9b736 100644
--- a/libs/libsndfile/src/strings.c
+++ b/libs/libsndfile/src/strings.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2001-2009 Erik de Castro Lopo 
+** Copyright (C) 2001-2012 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -32,9 +32,9 @@ static void hexdump (void *data, int len) ;
 
 int
 psf_store_string (SF_PRIVATE *psf, int str_type, const char *str)
-{	static char lsf_name [] = PACKAGE "-" VERSION ;
-	static char bracket_name [] = " (" PACKAGE "-" VERSION ")" ;
-	int		k, str_len, len_remaining, str_flags, str_type_replace = 0 ;
+{	char	new_str [128] ;
+	size_t	str_len ;
+	int		k, str_flags ;
 
 	if (str == NULL)
 		return SFE_STR_BAD_STRING ;
@@ -42,10 +42,10 @@ psf_store_string (SF_PRIVATE *psf, int str_type, const char *str)
 	str_len = strlen (str) ;
 
 	/* A few extra checks for write mode. */
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
-	{	if ((psf->str_flags & SF_STR_ALLOW_START) == 0)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
+	{	if ((psf->strings.flags & SF_STR_ALLOW_START) == 0)
 			return SFE_STR_NO_SUPPORT ;
-		if (psf->have_written && (psf->str_flags & SF_STR_ALLOW_END) == 0)
+		if (psf->have_written && (psf->strings.flags & SF_STR_ALLOW_END) == 0)
 			return SFE_STR_NO_SUPPORT ;
 		/* Only allow zero length strings for software. */
 		if (str_type != SF_STR_SOFTWARE && str_len == 0)
@@ -55,17 +55,17 @@ psf_store_string (SF_PRIVATE *psf, int str_type, const char *str)
 	/* Find the next free slot in table. */
 	for (k = 0 ; k < SF_MAX_STRINGS ; k++)
 	{	/* If we find a matching entry clear it. */
-		if (psf->strings [k].type == str_type)
-			psf->strings [k].type = -1 ;
+		if (psf->strings.data [k].type == str_type)
+			psf->strings.data [k].type = -1 ;
 
-		if (psf->strings [k].type == 0)
+		if (psf->strings.data [k].type == 0)
 			break ;
 		} ;
 
 	/* Determine flags */
 	str_flags = SF_STR_LOCATE_START ;
-	if (psf->mode == SFM_RDWR || psf->have_written || str_type_replace)
-	{	if ((psf->str_flags & SF_STR_ALLOW_END) == 0)
+	if (psf->file.mode == SFM_RDWR || psf->have_written)
+	{	if ((psf->strings.flags & SF_STR_ALLOW_END) == 0)
 			return SFE_STR_NO_ADD_END ;
 		str_flags = SF_STR_LOCATE_END ;
 		} ;
@@ -74,54 +74,40 @@ psf_store_string (SF_PRIVATE *psf, int str_type, const char *str)
 	if (k >= SF_MAX_STRINGS)
 		return SFE_STR_MAX_COUNT ;
 
-	if (k == 0 && psf->str_end != NULL)
-	{	psf_log_printf (psf, "SFE_STR_WEIRD : k == 0 && psf->str_end != NULL\n") ;
+	if (k == 0 && psf->strings.storage_used != 0)
+	{	psf_log_printf (psf, "SFE_STR_WEIRD : k == 0 && psf->strings.storage_used != 0\n") ;
 		return SFE_STR_WEIRD ;
 		} ;
 
-	if (k != 0 && psf->str_end == NULL)
-	{	psf_log_printf (psf, "SFE_STR_WEIRD : k != 0 && psf->str_end == NULL\n") ;
+	if (k != 0 && psf->strings.storage_used == 0)
+	{	psf_log_printf (psf, "SFE_STR_WEIRD : k != 0 && psf->strings.storage_used == 0\n") ;
 		return SFE_STR_WEIRD ;
 		} ;
 
 	/* Special case for the first string. */
 	if (k == 0)
-		psf->str_end = psf->str_storage ;
-
-	len_remaining = SIGNED_SIZEOF (psf->str_storage) - (psf->str_end - psf->str_storage) ;
-
-	if (len_remaining < str_len + 2)
-		return SFE_STR_MAX_DATA ;
+		psf->strings.storage_used = 0 ;
 
 	switch (str_type)
 	{	case SF_STR_SOFTWARE :
 				/* In write mode, want to append libsndfile-version to string. */
-				if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
-				{	psf->strings [k].type = str_type ;
-					psf->strings [k].str = psf->str_end ;
-					psf->strings [k].flags = str_flags ;
-
-					memcpy (psf->str_end, str, str_len + 1) ;
-					psf->str_end += str_len ;
-
-					/*
-					** If the supplied string does not already contain a
-					** libsndfile-X.Y.Z component, then add it.
-					*/
-					if (strstr (str, PACKAGE) == NULL && len_remaining > (int) (strlen (bracket_name) + str_len + 2))
-					{	if (strlen (str) == 0)
-							strncat (psf->str_end, lsf_name, len_remaining) ;
+				if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
+				{	if (strstr (str, PACKAGE) == NULL)
+					{	/*
+						** If the supplied string does not already contain a
+						** libsndfile-X.Y.Z component, then add it.
+						*/
+						if (strlen (str) == 0)
+							snprintf (new_str, sizeof (new_str), "%s-%s", PACKAGE, VERSION) ;
 						else
-							strncat (psf->str_end, bracket_name, len_remaining) ;
-						psf->str_end += strlen (psf->str_end) ;
-						} ;
+							snprintf (new_str, sizeof (new_str), "%s (%s-%s)", str, PACKAGE, VERSION) ;
+						}
+					else
+						snprintf (new_str, sizeof (new_str), "%s", str) ;
 
-					/* Plus one to catch string terminator. */
-					psf->str_end += 1 ;
-					break ;
+					str = new_str ;
 					} ;
-
-				/* Fall though if not write mode. */
+				break ;
 
 		case SF_STR_TITLE :
 		case SF_STR_COPYRIGHT :
@@ -130,13 +116,8 @@ psf_store_string (SF_PRIVATE *psf, int str_type, const char *str)
 		case SF_STR_DATE :
 		case SF_STR_ALBUM :
 		case SF_STR_LICENSE :
-				psf->strings [k].type = str_type ;
-				psf->strings [k].str = psf->str_end ;
-				psf->strings [k].flags = str_flags ;
-
-				/* Plus one to catch string terminator. */
-				memcpy (psf->str_end, str, str_len + 1) ;
-				psf->str_end += str_len + 1 ;
+		case SF_STR_TRACKNUMBER :
+		case SF_STR_GENRE :
 				break ;
 
 		default :
@@ -144,16 +125,39 @@ psf_store_string (SF_PRIVATE *psf, int str_type, const char *str)
 			return SFE_STR_BAD_TYPE ;
 		} ;
 
-	psf->str_flags |= str_flags ;
+	/* Plus one to catch string terminator. */
+	str_len = strlen (str) + 1 ;
+
+	if (psf->strings.storage_used + str_len + 1 > psf->strings.storage_len)
+	{	char * temp = psf->strings.storage ;
+		size_t newlen = 2 * psf->strings.storage_len + str_len + 1 ;
+
+		newlen = newlen < 256 ? 256 : newlen ;
+
+		if ((psf->strings.storage = realloc (temp, newlen)) == NULL)
+		{	psf->strings.storage = temp ;
+			return SFE_MALLOC_FAILED ;
+			} ;
+
+		psf->strings.storage_len = newlen ;
+		} ;
+
+	psf->strings.data [k].type = str_type ;
+	psf->strings.data [k].offset = psf->strings.storage_used ;
+	psf->strings.data [k].flags = str_flags ;
+
+	memcpy (psf->strings.storage + psf->strings.storage_used, str, str_len) ;
+	psf->strings.storage_used += str_len ;
+
+	psf->strings.flags |= str_flags ;
 
 #if STRINGS_DEBUG
-	psf_log_printf (psf, "str_storage          : %X\n", (int) psf->str_storage) ;
-	psf_log_printf (psf, "str_end              : %X\n", (int) psf->str_end) ;
-	psf_log_printf (psf, "sizeof (str_storage) : %d\n", SIGNED_SIZEOF (psf->str_storage)) ;
-	psf_log_printf (psf, "used                 : %d\n", (int ) (psf->str_end - psf->str_storage)) ;
-	psf_log_printf (psf, "remaining            : %d\n", SIGNED_SIZEOF (psf->str_storage) - (psf->str_end - psf->str_storage)) ;
+	psf_log_printf (psf, "str_storage          : %p\n", psf->strings.storage) ;
+	psf_log_printf (psf, "storage_used             : %u\n", psf->strings.storage_used) ;
+	psf_log_printf (psf, "used                 : %d\n", psf->strings.storage_used) ;
+	psf_log_printf (psf, "remaining            : %d\n", psf->strings.storage_len - psf->strings.storage_used ;
 
-	hexdump (psf->str_storage, 300) ;
+	hexdump (psf->strings.storage, 300) ;
 #endif
 
 	return 0 ;
@@ -161,7 +165,7 @@ psf_store_string (SF_PRIVATE *psf, int str_type, const char *str)
 
 int
 psf_set_string (SF_PRIVATE *psf, int str_type, const char *str)
-{	if (psf->mode == SFM_READ)
+{	if (psf->file.mode == SFM_READ)
 		return SFE_STR_NOT_WRITE ;
 
 	return psf_store_string (psf, str_type, str) ;
@@ -172,8 +176,8 @@ psf_get_string (SF_PRIVATE *psf, int str_type)
 {	int k ;
 
 	for (k = 0 ; k < SF_MAX_STRINGS ; k++)
-		if (str_type == psf->strings [k].type)
-			return psf->strings [k].str ;
+		if (str_type == psf->strings.data [k].type)
+			return psf->strings.storage + psf->strings.data [k].offset ;
 
 	return NULL ;
 } /* psf_get_string */
@@ -183,7 +187,7 @@ psf_location_string_count (const SF_PRIVATE * psf, int location)
 {	int k, count = 0 ;
 
 	for (k = 0 ; k < SF_MAX_STRINGS ; k++)
-		if (psf->strings [k].type > 0 && psf->strings [k].flags & location)
+		if (psf->strings.data [k].type > 0 && psf->strings.data [k].flags & location)
 			count ++ ;
 
 	return count ;
@@ -208,7 +212,7 @@ hexdump (void *data, int len)
 			printf ("%02X ", ptr [k] & 0xFF) ;
 		printf ("   ") ;
 		for (k = 0 ; k < 16 ; k++)
-			printf ("%c", isprint (ptr [k]) ? ptr [k] : '.') ;
+			printf ("%c", psf_isprint (ptr [k]) ? ptr [k] : '.') ;
 		puts ("") ;
 		ptr += 16 ;
 		len -= 16 ;
diff --git a/libs/libsndfile/src/svx.c b/libs/libsndfile/src/svx.c
index 70dbdd6689..b611f760af 100644
--- a/libs/libsndfile/src/svx.c
+++ b/libs/libsndfile/src/svx.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2011 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -82,7 +82,7 @@ int
 svx_open	(SF_PRIVATE *psf)
 {	int error ;
 
-	if (psf->mode == SFM_READ || (psf->mode == SFM_RDWR && psf->filelength > 0))
+	if (psf->file.mode == SFM_READ || (psf->file.mode == SFM_RDWR && psf->filelength > 0))
 	{	if ((error = svx_read_header (psf)))
 			return error ;
 
@@ -95,7 +95,7 @@ svx_open	(SF_PRIVATE *psf)
 		psf_fseek (psf, psf->dataoffset, SEEK_SET) ;
 		} ;
 
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{	if (psf->is_pipe)
 			return SFE_NO_PIPE_WRITE ;
 
@@ -140,7 +140,7 @@ svx_read_header	(SF_PRIVATE *psf)
 	memset (&vhdr, 0, sizeof (vhdr)) ;
 	psf_binheader_readf (psf, "p", 0) ;
 
-	/* Set default number of channels. Currently can't handle stereo SVX files. */
+	/* Set default number of channels. Modify later if necessary */
 	psf->sf.channels = 1 ;
 
 	psf->sf.format = SF_FORMAT_SVX ;
@@ -252,12 +252,12 @@ svx_read_header	(SF_PRIVATE *psf)
 
 					psf_log_printf (psf, " %M : %d\n", marker, dword) ;
 
-					if (strlen (psf->filename) != dword)
-					{	if (dword > sizeof (psf->filename) - 1)
+					if (strlen (psf->file.name.c) != dword)
+					{	if (dword > sizeof (psf->file.name.c) - 1)
 							return SFE_SVX_BAD_NAME_LENGTH ;
 
-						psf_binheader_readf (psf, "b", psf->filename, dword) ;
-						psf->filename [dword] = 0 ;
+						psf_binheader_readf (psf, "b", psf->file.name.c, dword) ;
+						psf->file.name.c [dword] = 0 ;
 						}
 					else
 						psf_binheader_readf (psf, "j", dword) ;
@@ -283,9 +283,15 @@ svx_read_header	(SF_PRIVATE *psf)
 					psf_log_printf (psf, " %M : %d\n", marker, dword) ;
 
 					bytecount += psf_binheader_readf (psf, "E4", &channels) ;
-					psf->sf.channels = channels ;
 
-					psf_log_printf (psf, "  Channels : %d\n", channels) ;
+					if (channels == 2 || channels == 4)
+						psf_log_printf (psf, "  Channels : %d => mono\n", channels) ;
+					else if (channels == 6)
+					{	psf->sf.channels = 2 ;
+						psf_log_printf (psf, "  Channels : %d => stereo\n", channels) ;
+						}
+					else
+						psf_log_printf (psf, "  Channels : %d *** assuming mono\n", channels) ;
 
 					psf_binheader_readf (psf, "j", dword - bytecount) ;
 					break ;
@@ -304,8 +310,8 @@ svx_read_header	(SF_PRIVATE *psf)
 					break ;
 
 			default :
-					if (isprint ((marker >> 24) & 0xFF) && isprint ((marker >> 16) & 0xFF)
-						&& isprint ((marker >> 8) & 0xFF) && isprint (marker & 0xFF))
+					if (psf_isprint ((marker >> 24) & 0xFF) && psf_isprint ((marker >> 16) & 0xFF)
+						&& psf_isprint ((marker >> 8) & 0xFF) && psf_isprint (marker & 0xFF))
 					{	psf_binheader_readf (psf, "E4", &dword) ;
 
 						psf_log_printf (psf, "%M : %d (unknown marker)\n", marker, dword) ;
@@ -342,7 +348,7 @@ svx_read_header	(SF_PRIVATE *psf)
 static int
 svx_close (SF_PRIVATE *psf)
 {
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 		svx_write_header (psf, SF_TRUE) ;
 
 	return 0 ;
@@ -385,8 +391,11 @@ svx_write_header (SF_PRIVATE *psf, int calc_length)
 	/* VHDR : volume */
 	psf_binheader_writef (psf, "E4", (psf->bytewidth == 1) ? 0xFF : 0xFFFF) ;
 
+	if (psf->sf.channels == 2)
+		psf_binheader_writef (psf, "Em44", CHAN_MARKER, 4, 6) ;
+
 	/* Filename and annotation strings. */
-	psf_binheader_writef (psf, "Emsms", NAME_MARKER, psf->filename, ANNO_MARKER, annotation) ;
+	psf_binheader_writef (psf, "Emsms", NAME_MARKER, psf->file.name.c, ANNO_MARKER, annotation) ;
 
 	/* BODY marker and size. */
 	psf_binheader_writef (psf, "Etm8", BODY_MARKER, (psf->datalength < 0) ?
diff --git a/libs/libsndfile/src/test_audio_detect.c b/libs/libsndfile/src/test_audio_detect.c
index 63257cc15c..9706249eae 100644
--- a/libs/libsndfile/src/test_audio_detect.c
+++ b/libs/libsndfile/src/test_audio_detect.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2007-2009 Erik de Castro Lopo 
+** Copyright (C) 2007-2011 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -88,8 +88,7 @@ test_audio_detect (void)
 	ad.endianness = SF_ENDIAN_LITTLE ;
 	ad.channels = 1 ;
 	if (audio_detect (&psf, &ad, float_le_mono, sizeof (float_le_mono)) != SF_FORMAT_FLOAT)
-	{	if (errors == 0) puts ("\nFailed tests :\n") ;
-		puts ("    float_le_mono") ;
+	{	puts ("    float_le_mono") ;
 		errors ++ ;
 		} ;
 
diff --git a/libs/libsndfile/src/test_broadcast_var.c b/libs/libsndfile/src/test_broadcast_var.c
new file mode 100644
index 0000000000..dbea943124
--- /dev/null
+++ b/libs/libsndfile/src/test_broadcast_var.c
@@ -0,0 +1,119 @@
+/*
+** Copyright (C) 2010-2012 Erik de Castro Lopo 
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU Lesser General Public License as published by
+** the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
+**
+** You should have received a copy of the GNU Lesser 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 "sfconfig.h"
+
+#include 
+#include 
+#include 
+
+#include "common.h"
+
+#include "test_main.h"
+
+#define	BCAST_MAX	512
+
+typedef SF_BROADCAST_INFO_VAR (BCAST_MAX) SF_BROADCAST_INFO_512 ;
+
+static void
+fill_coding_history (SF_BROADCAST_INFO_512 * bi)
+{	static const char *lines [] =
+	{	"Lorem ipsum dolor sit amet,\nconsectetur adipiscing elit.",
+		"Donec dignissim erat\nvehicula libero condimentum\ndictum porta augue faucibus.",
+		"Maecenas nec turpis\nsit amet quam\nfaucibus adipiscing.",
+		"Mauris aliquam,\nlectus interdum\ntincidunt luctus.",
+		"\n\n\n\n\n\n\n\n\n\n\n\n",
+		"In auctor lorem\nvel est euismod\ncondimentum.",
+		"\n\n\n\n\n\n\n\n\n\n\n\n",
+		"Ut vitae magna\nid dui placerat vehicula\nin id lectus.",
+		"\n\n\n\n\n\n\n\n\n\n\n\n",
+		"Sed lacus leo,\nmolestie et luctus ac,\ntincidunt sit amet nisi.",
+		"\n\n\n\n\n\n\n\n\n\n\n\n",
+		"Sed ligula neque,\ngravida semper vulputate laoreet,\ngravida eu tellus.",
+		"Donec dolor dolor,\nscelerisque in consequat ornare,\ntempor nec nisl."
+	} ;
+	int k ;
+
+	bi->coding_history [0] = 0 ;
+
+	for (k = 0 ; strlen (bi->coding_history) < bi->coding_history_size - 1 ; k ++)
+		append_snprintf (bi->coding_history, bi->coding_history_size, "%s\n", lines [k % ARRAY_LEN (lines)]) ;
+
+	return ;
+} /* fill_coding_listory */
+
+static void
+test_broadcast_var_set (void)
+{	SF_PRIVATE	sf_private, *psf ;
+	int k ;
+
+	psf = &sf_private ;
+	memset (psf, 0, sizeof (sf_private)) ;
+
+	print_test_name ("Testing broadcast_var_set ") ;
+
+	for (k = 64 ; k < BCAST_MAX ; k++)
+	{
+		SF_BROADCAST_INFO_512 bi ;
+
+		memset (&bi, 0, sizeof (bi)) ;
+
+		bi.coding_history_size = k ;
+		fill_coding_history (&bi) ;
+		bi.coding_history_size -- ;
+
+		broadcast_var_set (psf, (SF_BROADCAST_INFO*) &bi, sizeof (bi)) ;
+		} ;
+
+	if (psf->broadcast_16k != NULL)
+		free (psf->broadcast_16k) ;
+
+	puts ("ok") ;
+} /* test_broadcast_var_set */
+
+static void
+test_broadcast_var_zero (void)
+{	SF_PRIVATE	sf_private, *psf ;
+	SF_BROADCAST_INFO_VAR (0) bi ;
+
+	psf = &sf_private ;
+	memset (psf, 0, sizeof (sf_private)) ;
+	psf->file.mode = SFM_RDWR ;
+
+	print_test_name ("Testing broadcast_var_zero ") ;
+
+	memset (&bi, 0, sizeof (bi)) ;
+
+	broadcast_var_set (psf, (SF_BROADCAST_INFO*) &bi, sizeof (bi)) ;
+
+	if (psf->broadcast_16k->coding_history_size != 0)
+	{	printf ("\n\nLine %d: coding_history_size %d should be zero.\n\n", __LINE__, psf->broadcast_16k->coding_history_size) ;
+		exit (1) ;
+		} ;
+
+	if (psf->broadcast_16k != NULL)
+		free (psf->broadcast_16k) ;
+
+	puts ("ok") ;
+} /* test_broadcast_var_zero */
+
+void
+test_broadcast_var (void)
+{	test_broadcast_var_set () ;
+	test_broadcast_var_zero () ;
+} /* test_broadcast_var */
diff --git a/libs/libsndfile/src/test_cart_var.c b/libs/libsndfile/src/test_cart_var.c
new file mode 100644
index 0000000000..532a755876
--- /dev/null
+++ b/libs/libsndfile/src/test_cart_var.c
@@ -0,0 +1,91 @@
+/*
+** Copyright (C) 2010-2013 Erik de Castro Lopo 
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU Lesser General Public License as published by
+** the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
+**
+** You should have received a copy of the GNU Lesser 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 "sfconfig.h"
+
+#include 
+#include 
+#include 
+
+#include "common.h"
+
+#include "test_main.h"
+
+#define	CART_MAX	512
+
+typedef SF_CART_INFO_VAR (CART_MAX) SF_CART_INFO_512 ;
+
+static void
+fill_tag_text (SF_CART_INFO_512 * ci)
+{	static const char *lines [] =
+	{	"Lorem ipsum dolor sit amet,\nconsectetur adipiscing elit.",
+		"Donec dignissim erat\nvehicula libero condimentum\ndictum porta augue faucibus.",
+		"Maecenas nec turpis\nsit amet quam\nfaucibus adipiscing.",
+		"Mauris aliquam,\nlectus interdum\ntincidunt luctus.",
+		"\n\n\n\n\n\n\n\n\n\n\n\n",
+		"In auctor lorem\nvel est euismod\ncondimentum.",
+		"\n\n\n\n\n\n\n\n\n\n\n\n",
+		"Ut vitae magna\nid dui placerat vehicula\nin id lectus.",
+		"\n\n\n\n\n\n\n\n\n\n\n\n",
+		"Sed lacus leo,\nmolestie et luctus ac,\ntincidunt sit amet nisi.",
+		"\n\n\n\n\n\n\n\n\n\n\n\n",
+		"Sed ligula neque,\ngravida semper vulputate laoreet,\ngravida eu tellus.",
+		"Donec dolor dolor,\nscelerisque in consequat ornare,\ntempor nec nisl."
+	} ;
+	int k ;
+
+	ci->tag_text [0] = 0 ;
+
+	for (k = 0 ; strlen (ci->tag_text) < ci->tag_text_size - 1 ; k ++)
+		append_snprintf (ci->tag_text, ci->tag_text_size, "%s\n", lines [k % ARRAY_LEN (lines)]) ;
+
+	return ;
+} /* fill_tag_text */
+
+void
+test_cart_var (void)
+{	SF_PRIVATE	sf_private, *psf ;
+	SF_CART_TIMER timer ;
+	int k ;
+
+	psf = &sf_private ;
+	memset (psf, 0, sizeof (sf_private)) ;
+
+	print_test_name ("Testing cart_var_set ") ;
+
+	for (k = 64 ; k < CART_MAX ; k++)
+	{
+		SF_CART_INFO_512 ci ;
+
+		memset (&ci, 0, sizeof (ci)) ;
+
+		memset (&timer, 0, sizeof (timer)) ;
+		memcpy (ci.post_timers, &timer, sizeof (timer)) ;
+
+		ci.tag_text_size = k ;
+		fill_tag_text (&ci) ;
+		ci.tag_text_size -- ;
+
+		cart_var_set (psf, (SF_CART_INFO*) &ci, sizeof (ci)) ;
+		} ;
+
+	if (psf->cart_16k != NULL)
+		free (psf->cart_16k) ;
+
+	puts ("ok") ;
+} /* test_cart_var */
diff --git a/libs/libsndfile/src/test_conversions.c b/libs/libsndfile/src/test_conversions.c
index dc9ee7293f..7e8c2edee0 100644
--- a/libs/libsndfile/src/test_conversions.c
+++ b/libs/libsndfile/src/test_conversions.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2006-2009 Erik de Castro Lopo 
+** Copyright (C) 2006-2012 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -20,7 +20,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -34,7 +33,7 @@
 ** This is a bit rough, but it is the nicest way to do it.
 */
 
-#define cmp_test(line,ival,tval,str) \
+#define cmp_test(line, ival, tval, str) \
 	if (ival != tval) \
 	{	printf (str, line, ival, tval) ; \
 		exit (1) ; \
@@ -62,7 +61,10 @@ conversion_test (char endian)
 	psf = &sf_private ;
 	memset (psf, 0, sizeof (sf_private)) ;
 
-	if (psf_fopen (psf, filename, SFM_WRITE) != 0)
+	psf->file.mode = SFM_WRITE ;
+	snprintf (psf->file.path.c, sizeof (psf->file.path.c), "%s", filename) ;
+
+	if (psf_fopen (psf) != 0)
 	{	printf ("\n\nError : failed to open file '%s' for write.\n\n", filename) ;
 		exit (1) ;
 		} ;
@@ -72,7 +74,11 @@ conversion_test (char endian)
 	psf_fclose (psf) ;
 
 	memset (psf, 0, sizeof (sf_private)) ;
-	if (psf_fopen (psf, filename, SFM_READ) != 0)
+
+	psf->file.mode = SFM_READ ;
+	snprintf (psf->file.path.c, sizeof (psf->file.path.c), "%s", filename) ;
+
+	if (psf_fopen (psf) != 0)
 	{	printf ("\n\nError : failed to open file '%s' for read.\n\n", filename) ;
 		exit (1) ;
 		} ;
diff --git a/libs/libsndfile/src/test_endswap.c b/libs/libsndfile/src/test_endswap.c
index ccf9fcfc17..4931650c87 100644
--- a/libs/libsndfile/src/test_endswap.c
+++ b/libs/libsndfile/src/test_endswap.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2002-2009 Erik de Castro Lopo 
+** Copyright (C) 2002-2011 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
diff --git a/libs/libsndfile/src/test_endswap.def b/libs/libsndfile/src/test_endswap.def
index c817322c99..9516e4d67c 100644
--- a/libs/libsndfile/src/test_endswap.def
+++ b/libs/libsndfile/src/test_endswap.def
@@ -18,3 +18,23 @@ int_type = {
 	format		= FMT_INT64 ;
 	} ;
 
+int_size = {
+	name		= 16 ;
+	typename	= int16_t ;
+	value		= 0x4142 ;
+	strval		= "AB" ;
+	} ;
+
+int_size = {
+	name		= 32 ;
+	typename	= int32_t ;
+	value		= 0x30313233 ;
+	strval		= "0123" ;
+	} ;
+
+int_size = {
+	name		= 64 ;
+	typename	= int64_t ;
+	value		= 0x3031323334353637 ;
+	strval		= "01234567" ;
+	} ;
diff --git a/libs/libsndfile/src/test_endswap.tpl b/libs/libsndfile/src/test_endswap.tpl
index 70ea721b33..89b7d1473a 100644
--- a/libs/libsndfile/src/test_endswap.tpl
+++ b/libs/libsndfile/src/test_endswap.tpl
@@ -1,6 +1,6 @@
 [+ AutoGen5 template c +]
 /*
-** Copyright (C) 2002-2005 Erik de Castro Lopo 
+** Copyright (C) 2002-2013 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -105,6 +105,34 @@ test_endswap_[+ (get "name") +] (void)
 [+ ENDFOR int_type
 +]
 
+[+ FOR int_size +]
+static void
+test_psf_put_be[+ (get "name") +] (void)
+{	const char *test = "[+ (get "strval") +]" ;
+	uint8_t array [32] ;
+	int k ;
+
+	printf ("    %-40s : ", __func__) ;
+	fflush (stdout) ;
+
+	for (k = 0 ; k < 10 ; k++)
+	{	memset (array, 0, sizeof (array)) ;
+
+		psf_put_be[+ (get "name") +] (array, k, [+ (get "value") +]) ;
+		if (memcmp (array + k, test, sizeof ([+ (get "typename") +])) != 0)
+		{	printf ("\n\nLine %d : Put failed at index %d.\n", __LINE__, k) ;
+			exit (1) ;
+			} ;
+		if (psf_get_be[+ (get "name") +] (array, k) != [+ (get "value") +])
+		{	printf ("\n\nLine %d : Get failed at index %d.\n", __LINE__, k) ;
+			exit (1) ;
+			} ;
+		} ;
+
+	puts ("ok") ;
+} /* test_psf_put_be[+ (get "name") +] */
+[+ ENDFOR int_size
++]
 
 void
 test_endswap (void)
@@ -113,5 +141,11 @@ test_endswap (void)
 +]	test_endswap_[+ (get "name") +] () ;
 [+ ENDFOR int_type
 +]
+
+[+ FOR int_size
++]	test_psf_put_be[+ (get "name") +] () ;
+[+ ENDFOR int_endsize
++]
+
 } /* test_endswap */
 
diff --git a/libs/libsndfile/src/test_file_io.c b/libs/libsndfile/src/test_file_io.c
index 9108f2a768..08fccebd21 100644
--- a/libs/libsndfile/src/test_file_io.c
+++ b/libs/libsndfile/src/test_file_io.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2002-2009 Erik de Castro Lopo 
+** Copyright (C) 2002-2011 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -27,6 +27,7 @@
 
 #include 
 #include 
+#include 
 
 #include "common.h"
 
@@ -68,10 +69,11 @@ file_open_test (const char *filename)
 		exit (1) ;
 		} ;
 
-	snprintf (psf->filename, sizeof (psf->filename), "%s", filename) ;
+	psf->file.mode = SFM_READ ;
+	snprintf (psf->file.path.c, sizeof (psf->file.path.c), "%s", filename) ;
 
 	/* Test that open for read fails if the file doesn't exist. */
-	error = psf_fopen (psf, psf->filename, SFM_READ) ;
+	error = psf_fopen (psf) ;
 	if (error == 0)
 	{	printf ("\n\nLine %d: psf_fopen() should have failed.\n\n", __LINE__) ;
 		exit (1) ;
@@ -81,26 +83,26 @@ file_open_test (const char *filename)
 	psf->error = SFE_NO_ERROR ;
 
 	/* Test file open in write mode. */
-	psf->mode = SFM_WRITE ;
+	psf->file.mode = SFM_WRITE ;
 	test_open_or_die (psf, __LINE__) ;
 
 	test_close_or_die (psf, __LINE__) ;
 
-	unlink (psf->filename) ;
+	unlink (psf->file.path.c) ;
 
 	/* Test file open in read/write mode for a non-existant file. */
-	psf->mode = SFM_RDWR ;
+	psf->file.mode = SFM_RDWR ;
 	test_open_or_die (psf, __LINE__) ;
 
 	test_close_or_die (psf, __LINE__) ;
 
 	/* Test file open in read/write mode for an existing file. */
-	psf->mode = SFM_RDWR ;
+	psf->file.mode = SFM_RDWR ;
 	test_open_or_die (psf, __LINE__) ;
 
 	test_close_or_die (psf, __LINE__) ;
 
-	unlink (psf->filename) ;
+	unlink (psf->file.path.c) ;
 	puts ("ok") ;
 } /* file_open_test */
 
@@ -121,17 +123,17 @@ file_read_write_test (const char *filename)
 
 	memset (&sf_data, 0, sizeof (sf_data)) ;
 	psf = &sf_data ;
-	snprintf (psf->filename, sizeof (psf->filename), "%s", filename) ;
+	snprintf (psf->file.path.c, sizeof (psf->file.path.c), "%s", filename) ;
 
 	/* Test file open in write mode. */
-	psf->mode = SFM_WRITE ;
+	psf->file.mode = SFM_WRITE ;
 	test_open_or_die (psf, __LINE__) ;
 
 	make_data (data_out, ARRAY_LEN (data_out), 1) ;
 	test_write_or_die (psf, data_out, sizeof (data_out [0]), ARRAY_LEN (data_out), sizeof (data_out), __LINE__) ;
 
 	if ((retval = psf_get_filelen (psf)) != sizeof (data_out))
-	{	printf ("\n\nLine %d: file length after write is not correct (%ld should be %d).\n\n", __LINE__, (long) retval, (int) sizeof (data_out)) ;
+	{	printf ("\n\nLine %d: file length after write is not correct (%" PRId64 " should be %zd).\n\n", __LINE__, retval, sizeof (data_out)) ;
 		if (retval == 0)
 			printf ("An fsync() may be necessary before fstat() in psf_get_filelen().\n\n") ;
 		exit (1) ;
@@ -141,7 +143,7 @@ file_read_write_test (const char *filename)
 	test_write_or_die (psf, data_out, ARRAY_LEN (data_out), sizeof (data_out [0]), 2 * sizeof (data_out), __LINE__) ;
 
 	if ((retval = psf_get_filelen (psf)) != 2 * sizeof (data_out))
-	{	printf ("\n\nLine %d: file length after write is not correct. (%ld should be %d)\n\n", __LINE__, (long) retval, 2 * ((int) sizeof (data_out))) ;
+	{	printf ("\n\nLine %d: file length after write is not correct. (%" PRId64 " should be %zd)\n\n", __LINE__, retval, 2 * sizeof (data_out)) ;
 		exit (1) ;
 		} ;
 
@@ -156,7 +158,7 @@ file_read_write_test (const char *filename)
 	print_test_name ("Testing file read") ;
 
 	/* Test file open in write mode. */
-	psf->mode = SFM_READ ;
+	psf->file.mode = SFM_READ ;
 	test_open_or_die (psf, __LINE__) ;
 
 	make_data (data_out, ARRAY_LEN (data_out), 1) ;
@@ -180,7 +182,7 @@ file_read_write_test (const char *filename)
 	print_test_name ("Testing file seek") ;
 
 	/* Test file open in read/write mode. */
-	psf->mode = SFM_RDWR ;
+	psf->file.mode = SFM_RDWR ;
 	test_open_or_die (psf, __LINE__) ;
 
 	test_seek_or_die (psf, 0, SEEK_SET, 0, __LINE__) ;
@@ -218,12 +220,12 @@ file_read_write_test (const char *filename)
 	print_test_name ("Testing file offset") ;
 
 	/* Test file open in read/write mode. */
-	psf->mode = SFM_RDWR ;
+	psf->file.mode = SFM_RDWR ;
 	psf->fileoffset = sizeof (data_out [0]) * ARRAY_LEN (data_out) ;
 	test_open_or_die (psf, __LINE__) ;
 
 	if ((retval = psf_get_filelen (psf)) != 3 * sizeof (data_out))
-	{	printf ("\n\nLine %d: file length after write is not correct. (%ld should be %d)\n\n", __LINE__, (long) retval, 3 * ((int) sizeof (data_out))) ;
+	{	printf ("\n\nLine %d: file length after write is not correct. (%" PRId64 " should be %zd)\n\n", __LINE__, retval, 3 * sizeof (data_out)) ;
 		exit (1) ;
 		} ;
 
@@ -234,12 +236,12 @@ file_read_write_test (const char *filename)
 
 	/* final test with psf->fileoffset == 0. */
 
-	psf->mode = SFM_RDWR ;
+	psf->file.mode = SFM_RDWR ;
 	psf->fileoffset = 0 ;
 	test_open_or_die (psf, __LINE__) ;
 
 	if ((retval = psf_get_filelen (psf)) != 3 * sizeof (data_out))
-	{	printf ("\n\nLine %d: file length after write is not correct. (%ld should be %d)\n\n", __LINE__, (long) retval, 3 * ((int) sizeof (data_out))) ;
+	{	printf ("\n\nLine %d: file length after write is not correct. (%" PRId64 " should be %zd)\n\n", __LINE__, retval, 3 * sizeof (data_out)) ;
 		exit (1) ;
 		} ;
 
@@ -277,20 +279,20 @@ file_truncate_test (const char *filename)
 	memset (buffer, 0xEE, sizeof (buffer)) ;
 
 	psf = &sf_data ;
-	snprintf (psf->filename, sizeof (psf->filename), "%s", filename) ;
+	snprintf (psf->file.path.c, sizeof (psf->file.path.c), "%s", filename) ;
 
 	/*
 	** Open the file write mode, write 0xEE data and then extend the file
 	** using truncate (the extended data should be 0x00).
 	*/
-	psf->mode = SFM_WRITE ;
+	psf->file.mode = SFM_WRITE ;
 	test_open_or_die (psf, __LINE__) ;
 	test_write_or_die (psf, buffer, sizeof (buffer) / 2, 1, sizeof (buffer) / 2, __LINE__) ;
 	psf_ftruncate (psf, sizeof (buffer)) ;
 	test_close_or_die (psf, __LINE__) ;
 
 	/* Open the file in read mode and check the data. */
-	psf->mode = SFM_READ ;
+	psf->file.mode = SFM_READ ;
 	test_open_or_die (psf, __LINE__) ;
 	test_read_or_die (psf, buffer, sizeof (buffer), 1, sizeof (buffer), __LINE__) ;
 	test_close_or_die (psf, __LINE__) ;
@@ -308,13 +310,13 @@ file_truncate_test (const char *filename)
 			} ;
 
 	/* Open the file in read/write and shorten the file using truncate. */
-	psf->mode = SFM_RDWR ;
+	psf->file.mode = SFM_RDWR ;
 	test_open_or_die (psf, __LINE__) ;
 	psf_ftruncate (psf, sizeof (buffer) / 4) ;
 	test_close_or_die (psf, __LINE__) ;
 
 	/* Check the file length. */
-	psf->mode = SFM_READ ;
+	psf->file.mode = SFM_READ ;
 	test_open_or_die (psf, __LINE__) ;
 	test_seek_or_die (psf, 0, SEEK_END, SIGNED_SIZEOF (buffer) / 4, __LINE__) ;
 	test_close_or_die (psf, __LINE__) ;
@@ -331,7 +333,7 @@ test_open_or_die (SF_PRIVATE *psf, int linenum)
 {	int		error ;
 
 	/* Test that open for read fails if the file doesn't exist. */
-	error = psf_fopen (psf, psf->filename, psf->mode) ;
+	error = psf_fopen (psf) ;
 	if (error)
 	{	printf ("\n\nLine %d: psf_fopen() failed : %s\n\n", linenum, strerror (errno)) ;
 		exit (1) ;
@@ -344,7 +346,7 @@ test_close_or_die (SF_PRIVATE *psf, int linenum)
 {
 	psf_fclose (psf) ;
 	if (psf_file_valid (psf))
-	{	printf ("\n\nLine %d: psf->filedes should not be valid.\n\n", linenum) ;
+	{	printf ("\n\nLine %d: psf->file.filedes should not be valid.\n\n", linenum) ;
 		exit (1) ;
 		} ;
 
@@ -356,12 +358,12 @@ test_write_or_die (SF_PRIVATE *psf, void *data, sf_count_t bytes, sf_count_t ite
 
 	retval = psf_fwrite (data, bytes, items, psf) ;
 	if (retval != items)
-	{	printf ("\n\nLine %d: psf_write() returned %ld (should be %ld)\n\n", linenum, (long) retval, (long) items) ;
+	{	printf ("\n\nLine %d: psf_write() returned %" PRId64 " (should be %" PRId64 ")\n\n", linenum, retval, items) ;
 		exit (1) ;
 		} ;
 
 	if ((retval = psf_ftell (psf)) != new_position)
-	{	printf ("\n\nLine %d: file length after write is not correct. (%ld should be %ld)\n\n", linenum, (long) retval, (long) new_position) ;
+	{	printf ("\n\nLine %d: file length after write is not correct. (%" PRId64 " should be %" PRId64 ")\n\n", linenum, retval, new_position) ;
 		exit (1) ;
 		} ;
 
@@ -374,12 +376,12 @@ test_read_or_die (SF_PRIVATE *psf, void *data, sf_count_t bytes, sf_count_t item
 
 	retval = psf_fread (data, bytes, items, psf) ;
 	if (retval != items)
-	{	printf ("\n\nLine %d: psf_write() returned %ld (should be %ld)\n\n", linenum, (long) retval, (long) items) ;
+	{	printf ("\n\nLine %d: psf_write() returned %" PRId64 " (should be %" PRId64 ")\n\n", linenum, retval, items) ;
 		exit (1) ;
 		} ;
 
 	if ((retval = psf_ftell (psf)) != new_position)
-	{	printf ("\n\nLine %d: file length after write is not correct. (%ld should be %ld)\n\n", linenum, (long) retval, (long) new_position) ;
+	{	printf ("\n\nLine %d: file length after write is not correct. (%" PRId64 " should be %" PRId64 ")\n\n", linenum, retval, new_position) ;
 		exit (1) ;
 		} ;
 
@@ -393,8 +395,8 @@ test_seek_or_die (SF_PRIVATE *psf, sf_count_t offset, int whence, sf_count_t new
 	retval = psf_fseek (psf, offset, whence) ;
 
 	if (retval != new_position)
-	{	printf ("\n\nLine %d: psf_fseek() failed. New position is %ld (should be %ld).\n\n",
-			linenum, (long) retval, (long) new_position) ;
+	{	printf ("\n\nLine %d: psf_fseek() failed. New position is %" PRId64 " (should be %" PRId64 ").\n\n",
+			linenum, retval, new_position) ;
 		exit (1) ;
 		} ;
 
diff --git a/libs/libsndfile/src/test_float.c b/libs/libsndfile/src/test_float.c
index 5d47747b59..07879896e5 100644
--- a/libs/libsndfile/src/test_float.c
+++ b/libs/libsndfile/src/test_float.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2006-2009 Erik de Castro Lopo 
+** Copyright (C) 2006-2012 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -48,7 +48,7 @@ test_float_convert (void)
 		test = float32_le_read (bytes) ;
 
 		if (fabs (data [k] - test) > 1e-20)
-		{	printf ("\n\nLine %d : Test %d, little endian error %.15g -> %.15g.\n\n", __LINE__, k, data [k], test ) ;
+		{	printf ("\n\nLine %d : Test %d, little endian error %.15g -> %.15g.\n\n", __LINE__, k, data [k], test) ;
 			exit (1) ;
 			} ;
 
@@ -85,7 +85,7 @@ test_double_convert (void)
 		test = double64_le_read (bytes) ;
 
 		if (fabs (data [k] - test) > 1e-20)
-		{	printf ("\n\nLine %d : Test %d, little endian error %.15g -> %.15g.\n\n", __LINE__, k, data [k], test ) ;
+		{	printf ("\n\nLine %d : Test %d, little endian error %.15g -> %.15g.\n\n", __LINE__, k, data [k], test) ;
 			exit (1) ;
 			} ;
 
diff --git a/libs/libsndfile/src/test_ima_oki_adpcm.c b/libs/libsndfile/src/test_ima_oki_adpcm.c
index 40754994ca..6c937d1173 100644
--- a/libs/libsndfile/src/test_ima_oki_adpcm.c
+++ b/libs/libsndfile/src/test_ima_oki_adpcm.c
@@ -1,6 +1,6 @@
 /*
+** Copyright (C) 2007-2011 Erik de Castro Lopo 
 ** Copyright (c) 2007 
-** Copyright (C) 2007-2009 Erik de Castro Lopo 
 **
 ** This library is free software; you can redistribute it and/or modify it
 ** under the terms of the GNU Lesser General Public License as published by
@@ -17,6 +17,8 @@
 ** Fifth Floor, 51 Franklin Street, Boston, MA 02111-1301, USA.
 */
 
+#include "sfconfig.h"
+
 #include 
 
 #include "test_main.h"
@@ -71,7 +73,7 @@ test_oki_adpcm (void)
 	print_test_name ("Testing ima/oki decoder") ;
 
 	ima_oki_adpcm_init (&adpcm, IMA_OKI_ADPCM_TYPE_OKI) ;
-	for (i = 0 ; i < ARRAY_LEN (test_pcm) - 1 ; i += j)
+	for (i = 0 ; i < ARRAY_LEN (test_pcm) - 1 ; i += 2)
 	{	code = adpcm_encode (&adpcm, test_pcm [i]) ;
 		code = (code << 4) | adpcm_encode (&adpcm, test_pcm [i + 1]) ;
 		if (code != test_codes [i / 2])
diff --git a/libs/libsndfile/src/test_log_printf.c b/libs/libsndfile/src/test_log_printf.c
index 3b3f485c83..e1806a1484 100644
--- a/libs/libsndfile/src/test_log_printf.c
+++ b/libs/libsndfile/src/test_log_printf.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2003-2009 Erik de Castro Lopo 
+** Copyright (C) 2003-2012 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -28,39 +28,39 @@
 
 #include "test_main.h"
 
-#define	CMP_0_ARGS(line,err,fmt)	\
-	{	psf->logindex = 0 ;			\
+#define	CMP_0_ARGS(line, err, fmt)	\
+	{	psf->parselog.indx = 0 ;			\
 		snprintf (buffer, sizeof (buffer), (fmt)) ;	\
 		psf_log_printf (psf, (fmt)) ;				\
-		err += compare_strings_or_die (line, fmt, buffer, psf->logbuffer) ;	\
+		err += compare_strings_or_die (line, fmt, buffer, psf->parselog.buf) ;	\
 		}
 
-#define	CMP_2_ARGS(line,err,fmt,a)	\
-	{	psf->logindex = 0 ;			\
+#define	CMP_2_ARGS(line, err, fmt, a)	\
+	{	psf->parselog.indx = 0 ;				\
 		snprintf (buffer, sizeof (buffer), (fmt), (a), (a)) ;	\
 		psf_log_printf (psf, (fmt), (a), (a)) ;					\
-		err += compare_strings_or_die (line, fmt, buffer, psf->logbuffer) ;	\
+		err += compare_strings_or_die (line, fmt, buffer, psf->parselog.buf) ;	\
 		}
 
-#define	CMP_4_ARGS(line,err,fmt,a)	\
-	{	psf->logindex = 0 ;			\
+#define	CMP_4_ARGS(line, err, fmt, a)	\
+	{	psf->parselog.indx = 0 ;				\
 		snprintf (buffer, sizeof (buffer), (fmt), (a), (a), (a), (a)) ;	\
 		psf_log_printf (psf, (fmt), (a), (a), (a), (a)) ;				\
-		err += compare_strings_or_die (line, fmt, buffer, psf->logbuffer) ;	\
+		err += compare_strings_or_die (line, fmt, buffer, psf->parselog.buf) ;	\
 		}
 
-#define	CMP_5_ARGS(line,err,fmt,a)	\
-	{	psf->logindex = 0 ;			\
+#define	CMP_5_ARGS(line, err, fmt, a)	\
+	{	psf->parselog.indx = 0 ;				\
 		snprintf (buffer, sizeof (buffer), (fmt), (a), (a), (a), (a), (a)) ;	\
 		psf_log_printf (psf, (fmt), (a), (a), (a), (a), (a)) ;					\
-		err += compare_strings_or_die (line, fmt, buffer, psf->logbuffer) ;		\
+		err += compare_strings_or_die (line, fmt, buffer, psf->parselog.buf) ;		\
 		}
 
-#define	CMP_6_ARGS(line,err,fmt,a)	\
-	{	psf->logindex = 0 ;			\
+#define	CMP_6_ARGS(line, err, fmt, a)	\
+	{	psf->parselog.indx = 0 ;				\
 		snprintf (buffer, sizeof (buffer), (fmt), (a), (a), (a), (a), (a), (a)) ;	\
 		psf_log_printf (psf, (fmt), (a), (a), (a), (a), (a), (a)) ;					\
-		err += compare_strings_or_die (line, fmt, buffer, psf->logbuffer) ;			\
+		err += compare_strings_or_die (line, fmt, buffer, psf->parselog.buf) ;			\
 		}
 
 static int
diff --git a/libs/libsndfile/src/test_main.c b/libs/libsndfile/src/test_main.c
index e46d6c106d..f51f7c9ee6 100644
--- a/libs/libsndfile/src/test_main.c
+++ b/libs/libsndfile/src/test_main.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2008-2009 Erik de Castro Lopo 
+** Copyright (C) 2008-2011 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -40,6 +40,10 @@ main (void)
 	test_audio_detect () ;
 	test_ima_oki_adpcm () ;
 
+	test_psf_strlcpy_crlf () ;
+	test_broadcast_var () ;
+	test_cart_var () ;
+
 	return 0 ;
 } /* main */
 
diff --git a/libs/libsndfile/src/test_main.h b/libs/libsndfile/src/test_main.h
index 2d0dcd79b5..6b2f28f4cd 100644
--- a/libs/libsndfile/src/test_main.h
+++ b/libs/libsndfile/src/test_main.h
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2008-2009 Erik de Castro Lopo 
+** Copyright (C) 2008-2011 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -34,3 +34,8 @@ void test_double_convert (void) ;
 
 void test_audio_detect (void) ;
 void test_ima_oki_adpcm (void) ;
+
+void test_psf_strlcpy_crlf (void) ;
+void test_broadcast_var (void) ;
+
+void test_cart_var (void) ;
diff --git a/libs/libsndfile/src/test_strncpy_crlf.c b/libs/libsndfile/src/test_strncpy_crlf.c
new file mode 100644
index 0000000000..774ced1083
--- /dev/null
+++ b/libs/libsndfile/src/test_strncpy_crlf.c
@@ -0,0 +1,56 @@
+/*
+** Copyright (C) 2010-2012 Erik de Castro Lopo 
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU Lesser General Public License as published by
+** the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
+**
+** You should have received a copy of the GNU Lesser 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 "sfconfig.h"
+
+#include 
+#include 
+
+#include "common.h"
+
+#include "test_main.h"
+
+void
+test_psf_strlcpy_crlf (void)
+{	const char *src = "a\nb\nc\n" ;
+	char *dest ;
+	int dest_len ;
+
+	print_test_name ("Testing psf_strlcpy_crlf") ;
+
+	for (dest_len = 3 ; dest_len < 30 ; dest_len++)
+	{	dest = calloc (1, dest_len + 1) ;
+		if (dest == NULL)
+		{	printf ("\n\nLine %d: calloc failed!\n\n", __LINE__) ;
+			exit (1) ;
+			} ;
+
+		dest [dest_len] = '\xea' ;
+
+		psf_strlcpy_crlf (dest, src, dest_len, sizeof (*src)) ;
+
+		if (dest [dest_len] != '\xea')
+		{	printf ("\n\nLine %d: buffer overrun for dest_len == %d\n\n", __LINE__, dest_len) ;
+			exit (1) ;
+			} ;
+
+		free (dest) ;
+		} ;
+
+	puts ("ok") ;
+} /* test_psf_strlcpy_crlf */
diff --git a/libs/libsndfile/src/txw.c b/libs/libsndfile/src/txw.c
index edc9751674..16525dfe29 100644
--- a/libs/libsndfile/src/txw.c
+++ b/libs/libsndfile/src/txw.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2002-2009 Erik de Castro Lopo 
+** Copyright (C) 2002-2012 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -51,8 +51,8 @@ txw_open	(SF_PRIVATE *psf)
 
 #define TXW_DATA_OFFSET		32
 
-#define	TXW_LOOPED		 	0x49
-#define	TXW_NO_LOOP		 	0xC9
+#define	TXW_LOOPED			0x49
+#define	TXW_NO_LOOP			0xC9
 
 /*------------------------------------------------------------------------------
 ** Private static functions.
@@ -100,7 +100,7 @@ int
 txw_open	(SF_PRIVATE *psf)
 {	int error ;
 
-	if (psf->mode != SFM_READ)
+	if (psf->file.mode != SFM_READ)
 		return SFE_UNIMPLEMENTED ;
 
 	if ((error = txw_read_header (psf)))
@@ -124,14 +124,15 @@ txw_open	(SF_PRIVATE *psf)
 
 static int
 txw_read_header	(SF_PRIVATE *psf)
-{	TXW_HEADER txwh ;
+{	BUF_UNION	ubuf ;
+	TXW_HEADER txwh ;
 	const char	*strptr ;
 
 	memset (&txwh, 0, sizeof (txwh)) ;
-	memset (psf->u.cbuf, 0, sizeof (psf->u.cbuf)) ;
-	psf_binheader_readf (psf, "pb", 0, psf->u.cbuf, 16) ;
+	memset (ubuf.cbuf, 0, sizeof (ubuf.cbuf)) ;
+	psf_binheader_readf (psf, "pb", 0, ubuf.cbuf, 16) ;
 
-	if (memcmp (psf->u.cbuf, "LM8953\0\0\0\0\0\0\0\0\0\0", 16) != 0)
+	if (memcmp (ubuf.cbuf, "LM8953\0\0\0\0\0\0\0\0\0\0", 16) != 0)
 		return ERROR_666 ;
 
 	psf_log_printf (psf, "Read only : Yamaha TX-16 Sampler (.txw)\nLM8953\n") ;
@@ -235,18 +236,19 @@ txw_read_header	(SF_PRIVATE *psf)
 
 static sf_count_t
 txw_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len)
-{	unsigned char	*ucptr ;
+{	BUF_UNION		ubuf ;
+	unsigned char	*ucptr ;
 	short			sample ;
 	int				k, bufferlen, readcount, count ;
 	sf_count_t		total = 0 ;
 
-	bufferlen = sizeof (psf->u.cbuf) / 3 ;
+	bufferlen = sizeof (ubuf.cbuf) / 3 ;
 	bufferlen -= (bufferlen & 1) ;
 	while (len > 0)
 	{	readcount = (len >= bufferlen) ? bufferlen : len ;
-		count = psf_fread (psf->u.cbuf, 3, readcount, psf) ;
+		count = psf_fread (ubuf.cbuf, 3, readcount, psf) ;
 
-		ucptr = psf->u.ucbuf ;
+		ucptr = ubuf.ucbuf ;
 		for (k = 0 ; k < readcount ; k += 2)
 		{	sample = (ucptr [0] << 8) | (ucptr [1] & 0xF0) ;
 			ptr [total + k] = sample ;
@@ -264,18 +266,19 @@ txw_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len)
 
 static sf_count_t
 txw_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len)
-{	unsigned char	*ucptr ;
+{	BUF_UNION		ubuf ;
+	unsigned char	*ucptr ;
 	short			sample ;
 	int				k, bufferlen, readcount, count ;
 	sf_count_t		total = 0 ;
 
-	bufferlen = sizeof (psf->u.cbuf) / 3 ;
+	bufferlen = sizeof (ubuf.cbuf) / 3 ;
 	bufferlen -= (bufferlen & 1) ;
 	while (len > 0)
 	{	readcount = (len >= bufferlen) ? bufferlen : len ;
-		count = psf_fread (psf->u.cbuf, 3, readcount, psf) ;
+		count = psf_fread (ubuf.cbuf, 3, readcount, psf) ;
 
-		ucptr = psf->u.ucbuf ;
+		ucptr = ubuf.ucbuf ;
 		for (k = 0 ; k < readcount ; k += 2)
 		{	sample = (ucptr [0] << 8) | (ucptr [1] & 0xF0) ;
 			ptr [total + k] = sample << 16 ;
@@ -293,7 +296,8 @@ txw_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len)
 
 static sf_count_t
 txw_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
-{	unsigned char	*ucptr ;
+{	BUF_UNION		ubuf ;
+	unsigned char	*ucptr ;
 	short			sample ;
 	int				k, bufferlen, readcount, count ;
 	sf_count_t		total = 0 ;
@@ -304,13 +308,13 @@ txw_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
 	else
 		normfact = 1.0 / 0x10 ;
 
-	bufferlen = sizeof (psf->u.cbuf) / 3 ;
+	bufferlen = sizeof (ubuf.cbuf) / 3 ;
 	bufferlen -= (bufferlen & 1) ;
 	while (len > 0)
 	{	readcount = (len >= bufferlen) ? bufferlen : len ;
-		count = psf_fread (psf->u.cbuf, 3, readcount, psf) ;
+		count = psf_fread (ubuf.cbuf, 3, readcount, psf) ;
 
-		ucptr = psf->u.ucbuf ;
+		ucptr = ubuf.ucbuf ;
 		for (k = 0 ; k < readcount ; k += 2)
 		{	sample = (ucptr [0] << 8) | (ucptr [1] & 0xF0) ;
 			ptr [total + k] = normfact * sample ;
@@ -328,7 +332,8 @@ txw_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
 
 static sf_count_t
 txw_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
-{	unsigned char	*ucptr ;
+{	BUF_UNION		ubuf ;
+	unsigned char	*ucptr ;
 	short			sample ;
 	int				k, bufferlen, readcount, count ;
 	sf_count_t		total = 0 ;
@@ -339,13 +344,13 @@ txw_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
 	else
 		normfact = 1.0 / 0x10 ;
 
-	bufferlen = sizeof (psf->u.cbuf) / 3 ;
+	bufferlen = sizeof (ubuf.cbuf) / 3 ;
 	bufferlen -= (bufferlen & 1) ;
 	while (len > 0)
 	{	readcount = (len >= bufferlen) ? bufferlen : len ;
-		count = psf_fread (psf->u.cbuf, 3, readcount, psf) ;
+		count = psf_fread (ubuf.cbuf, 3, readcount, psf) ;
 
-		ucptr = psf->u.ucbuf ;
+		ucptr = ubuf.ucbuf ;
 		for (k = 0 ; k < readcount ; k += 2)
 		{	sample = (ucptr [0] << 8) | (ucptr [1] & 0xF0) ;
 			ptr [total + k] = normfact * sample ;
diff --git a/libs/libsndfile/src/ulaw.c b/libs/libsndfile/src/ulaw.c
index 638903bb04..ded46e929c 100644
--- a/libs/libsndfile/src/ulaw.c
+++ b/libs/libsndfile/src/ulaw.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2012 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -36,14 +36,14 @@ static sf_count_t ulaw_write_d2ulaw (SF_PRIVATE *psf, const double *ptr, sf_coun
 int
 ulaw_init (SF_PRIVATE *psf)
 {
-	if (psf->mode == SFM_READ || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_READ || psf->file.mode == SFM_RDWR)
 	{	psf->read_short		= ulaw_read_ulaw2s ;
 		psf->read_int		= ulaw_read_ulaw2i ;
 		psf->read_float		= ulaw_read_ulaw2f ;
 		psf->read_double	= ulaw_read_ulaw2d ;
 		} ;
 
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{	psf->write_short	= ulaw_write_s2ulaw ;
 		psf->write_int		= ulaw_write_i2ulaw ;
 		psf->write_float	= ulaw_write_f2ulaw ;
@@ -59,7 +59,7 @@ ulaw_init (SF_PRIVATE *psf)
 	else
 		psf->datalength = 0 ;
 
-	psf->sf.frames = psf->datalength / psf->blockwidth ;
+	psf->sf.frames = psf->blockwidth > 0 ? psf->datalength / psf->blockwidth : 0 ;
 
 	return 0 ;
 } /* ulaw_init */
@@ -787,7 +787,7 @@ unsigned char ulaw_encode [8193] =
 	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
 	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
 	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80
 } ;
 
 static inline void
@@ -859,16 +859,17 @@ d2ulaw_array (const double *ptr, int count, unsigned char *buffer, double normfa
 
 static sf_count_t
 ulaw_read_ulaw2s (SF_PRIVATE *psf, short *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ucbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ucbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.ucbuf, 1, bufferlen, psf) ;
-		ulaw2s_array (psf->u.ucbuf, readcount, ptr + total) ;
+		readcount = psf_fread (ubuf.ucbuf, 1, bufferlen, psf) ;
+		ulaw2s_array (ubuf.ucbuf, readcount, ptr + total) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -880,16 +881,17 @@ ulaw_read_ulaw2s (SF_PRIVATE *psf, short *ptr, sf_count_t len)
 
 static sf_count_t
 ulaw_read_ulaw2i (SF_PRIVATE *psf, int *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ucbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ucbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.ucbuf, 1, bufferlen, psf) ;
-		ulaw2i_array (psf->u.ucbuf, readcount, ptr + total) ;
+		readcount = psf_fread (ubuf.ucbuf, 1, bufferlen, psf) ;
+		ulaw2i_array (ubuf.ucbuf, readcount, ptr + total) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -901,19 +903,20 @@ ulaw_read_ulaw2i (SF_PRIVATE *psf, int *ptr, sf_count_t len)
 
 static sf_count_t
 ulaw_read_ulaw2f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 	float	normfact ;
 
 	normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x8000) : 1.0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ucbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ucbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.ucbuf, 1, bufferlen, psf) ;
-		ulaw2f_array (psf->u.ucbuf, readcount, ptr + total, normfact) ;
+		readcount = psf_fread (ubuf.ucbuf, 1, bufferlen, psf) ;
+		ulaw2f_array (ubuf.ucbuf, readcount, ptr + total, normfact) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -925,18 +928,19 @@ ulaw_read_ulaw2f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
 
 static sf_count_t
 ulaw_read_ulaw2d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
-{	int			bufferlen, readcount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 	double	normfact ;
 
 	normfact = (psf->norm_double) ? 1.0 / ((double) 0x8000) : 1.0 ;
-	bufferlen = ARRAY_LEN (psf->u.ucbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ucbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.ucbuf, 1, bufferlen, psf) ;
-		ulaw2d_array (psf->u.ucbuf, readcount, ptr + total, normfact) ;
+		readcount = psf_fread (ubuf.ucbuf, 1, bufferlen, psf) ;
+		ulaw2d_array (ubuf.ucbuf, readcount, ptr + total, normfact) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -951,16 +955,17 @@ ulaw_read_ulaw2d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
 
 static sf_count_t
 ulaw_write_s2ulaw	(SF_PRIVATE *psf, const short *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ucbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ucbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		s2ulaw_array (ptr + total, bufferlen, psf->u.ucbuf) ;
-		writecount = psf_fwrite (psf->u.ucbuf, 1, bufferlen, psf) ;
+		s2ulaw_array (ptr + total, bufferlen, ubuf.ucbuf) ;
+		writecount = psf_fwrite (ubuf.ucbuf, 1, bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -972,16 +977,17 @@ ulaw_write_s2ulaw	(SF_PRIVATE *psf, const short *ptr, sf_count_t len)
 
 static sf_count_t
 ulaw_write_i2ulaw	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ucbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ucbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		i2ulaw_array (ptr + total, bufferlen, psf->u.ucbuf) ;
-		writecount = psf_fwrite (psf->u.ucbuf, 1, bufferlen, psf) ;
+		i2ulaw_array (ptr + total, bufferlen, ubuf.ucbuf) ;
+		writecount = psf_fwrite (ubuf.ucbuf, 1, bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -993,20 +999,21 @@ ulaw_write_i2ulaw	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
 
 static sf_count_t
 ulaw_write_f2ulaw	(SF_PRIVATE *psf, const float *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 	float	normfact ;
 
 	/* Factor in a divide by 4. */
 	normfact = (psf->norm_float == SF_TRUE) ? (0.25 * 0x7FFF) : 0.25 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ucbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ucbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		f2ulaw_array (ptr + total, bufferlen, psf->u.ucbuf, normfact) ;
-		writecount = psf_fwrite (psf->u.ucbuf, 1, bufferlen, psf) ;
+		f2ulaw_array (ptr + total, bufferlen, ubuf.ucbuf, normfact) ;
+		writecount = psf_fwrite (ubuf.ucbuf, 1, bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -1018,20 +1025,21 @@ ulaw_write_f2ulaw	(SF_PRIVATE *psf, const float *ptr, sf_count_t len)
 
 static sf_count_t
 ulaw_write_d2ulaw	(SF_PRIVATE *psf, const double *ptr, sf_count_t len)
-{	int			bufferlen, writecount ;
+{	BUF_UNION	ubuf ;
+	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 	double	normfact ;
 
 	/* Factor in a divide by 4. */
 	normfact = (psf->norm_double) ? (0.25 * 0x7FFF) : 0.25 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ucbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ucbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		d2ulaw_array (ptr + total, bufferlen, psf->u.ucbuf, normfact) ;
-		writecount = psf_fwrite (psf->u.ucbuf, 1, bufferlen, psf) ;
+		d2ulaw_array (ptr + total, bufferlen, ubuf.ucbuf, normfact) ;
+		writecount = psf_fwrite (ubuf.ucbuf, 1, bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
diff --git a/libs/libsndfile/src/version-metadata.rc.in b/libs/libsndfile/src/version-metadata.rc.in
new file mode 100644
index 0000000000..ed79b22ad1
--- /dev/null
+++ b/libs/libsndfile/src/version-metadata.rc.in
@@ -0,0 +1,32 @@
+#include 
+
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS
+1 VERSIONINFO
+	FILEVERSION		@WIN_RC_VERSION@,0
+	PRODUCTVERSION	@WIN_RC_VERSION@,0
+	FILEOS			VOS__WINDOWS32
+	FILETYPE		VFT_DLL
+	FILESUBTYPE		VFT2_UNKNOWN
+	FILEFLAGSMASK	0x00000000
+	FILEFLAGS		0x00000000
+{
+	BLOCK "StringFileInfo"
+	{
+		BLOCK "040904e4"
+		{
+			VALUE "FileDescription", "A library for reading and writing audio files."
+			VALUE "FileVersion", "@CLEAN_VERSION@.0\0"
+			VALUE "Full Version", "@PACKAGE_VERSION@"
+			VALUE "InternalName", "libsndfile"
+			VALUE "LegalCopyright", "Copyright (C) 1999-2012, Licensed LGPL"
+			VALUE "OriginalFilename", "libsndfile-1.dll"
+			VALUE "ProductName", "libsndfile-1 DLL"
+			VALUE "ProductVersion", "@CLEAN_VERSION@.0\0"
+			VALUE "Language", "Language Neutral"
+		}
+	}
+	BLOCK "VarFileInfo"
+	{
+		VALUE "Translation", 0x0409, 0x04E4
+	}
+}
diff --git a/libs/libsndfile/src/voc.c b/libs/libsndfile/src/voc.c
index c7380c3880..d13b03311b 100644
--- a/libs/libsndfile/src/voc.c
+++ b/libs/libsndfile/src/voc.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2001-2009 Erik de Castro Lopo 
+** Copyright (C) 2001-2011 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -107,14 +107,14 @@ voc_open	(SF_PRIVATE *psf)
 	if (psf->is_pipe)
 		return SFE_VOC_NO_PIPE ;
 
-	if (psf->mode == SFM_READ || (psf->mode == SFM_RDWR && psf->filelength > 0))
+	if (psf->file.mode == SFM_READ || (psf->file.mode == SFM_RDWR && psf->filelength > 0))
 	{	if ((error = voc_read_header (psf)))
 			return error ;
 		} ;
 
 	subformat = SF_CODEC (psf->sf.format) ;
 
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{	if ((SF_CONTAINER (psf->sf.format)) != SF_FORMAT_VOC)
 			return	SFE_BAD_OPEN_FORMAT ;
 
@@ -199,7 +199,7 @@ voc_read_header	(SF_PRIVATE *psf)
 	psf->endian = SF_ENDIAN_LITTLE ;
 
 	while (1)
-	{	int size ;
+	{	unsigned size ;
 		short count ;
 
 		block_type = 0 ;
@@ -211,9 +211,14 @@ voc_read_header	(SF_PRIVATE *psf)
 
 					psf_log_printf (psf, " ASCII : %d\n", size) ;
 
-					offset += psf_binheader_readf (psf, "b", psf->header, size) ;
-					psf->header [size] = 0 ;
-					psf_log_printf (psf, "  text : %s\n", psf->header) ;
+					if (size < sizeof (psf->header) - 1)
+					{	offset += psf_binheader_readf (psf, "b", psf->header, size) ;
+						psf->header [size] = 0 ;
+						psf_log_printf (psf, "  text : %s\n", psf->header) ;
+						continue ;
+						}
+
+					offset += psf_binheader_readf (psf, "j", size) ;
 					continue ;
 
 			case VOC_REPEAT :
@@ -523,11 +528,11 @@ voc_write_header (SF_PRIVATE *psf, int calc_length)
 static int
 voc_close	(SF_PRIVATE *psf)
 {
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{	/*  Now we know for certain the length of the file we can re-write
 		**	correct values for the FORM, 8SVX and BODY chunks.
 		*/
-		unsigned byte = VOC_TERMINATOR ;
+		unsigned char byte = VOC_TERMINATOR ;
 
 
 		psf_fseek (psf, 0, SEEK_END) ;
diff --git a/libs/libsndfile/src/vox_adpcm.c b/libs/libsndfile/src/vox_adpcm.c
index 64ebd4d0dd..9abd42b0d7 100644
--- a/libs/libsndfile/src/vox_adpcm.c
+++ b/libs/libsndfile/src/vox_adpcm.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2002-2009 Erik de Castro Lopo 
+** Copyright (C) 2002-2012 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -71,10 +71,10 @@ int
 vox_adpcm_init (SF_PRIVATE *psf)
 {	IMA_OKI_ADPCM *pvox = NULL ;
 
-	if (psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_RDWR)
 		return SFE_BAD_MODE_RW ;
 
-	if (psf->mode == SFM_WRITE && psf->sf.channels != 1)
+	if (psf->file.mode == SFM_WRITE && psf->sf.channels != 1)
 		return SFE_CHANNEL_COUNT ;
 
 	if ((pvox = malloc (sizeof (IMA_OKI_ADPCM))) == NULL)
@@ -83,7 +83,7 @@ vox_adpcm_init (SF_PRIVATE *psf)
 	psf->codec_data = (void*) pvox ;
 	memset (pvox, 0, sizeof (IMA_OKI_ADPCM)) ;
 
-	if (psf->mode == SFM_WRITE)
+	if (psf->file.mode == SFM_WRITE)
 	{	psf->write_short	= vox_write_s ;
 		psf->write_int		= vox_write_i ;
 		psf->write_float	= vox_write_f ;
@@ -174,6 +174,7 @@ vox_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len)
 static sf_count_t
 vox_read_i	(SF_PRIVATE *psf, int *ptr, sf_count_t len)
 {	IMA_OKI_ADPCM *pvox ;
+	BUF_UNION	ubuf ;
 	short		*sptr ;
 	int			k, bufferlen, readcount, count ;
 	sf_count_t	total = 0 ;
@@ -182,8 +183,8 @@ vox_read_i	(SF_PRIVATE *psf, int *ptr, sf_count_t len)
 		return 0 ;
 	pvox = (IMA_OKI_ADPCM*) psf->codec_data ;
 
-	sptr = psf->u.sbuf ;
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	sptr = ubuf.sbuf ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 	while (len > 0)
 	{	readcount = (len >= bufferlen) ? bufferlen : (int) len ;
 		count = vox_read_block (psf, pvox, sptr, readcount) ;
@@ -201,6 +202,7 @@ vox_read_i	(SF_PRIVATE *psf, int *ptr, sf_count_t len)
 static sf_count_t
 vox_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
 {	IMA_OKI_ADPCM *pvox ;
+	BUF_UNION	ubuf ;
 	short		*sptr ;
 	int			k, bufferlen, readcount, count ;
 	sf_count_t	total = 0 ;
@@ -212,8 +214,8 @@ vox_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
 
 	normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x8000) : 1.0 ;
 
-	sptr = psf->u.sbuf ;
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	sptr = ubuf.sbuf ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 	while (len > 0)
 	{	readcount = (len >= bufferlen) ? bufferlen : (int) len ;
 		count = vox_read_block (psf, pvox, sptr, readcount) ;
@@ -231,6 +233,7 @@ vox_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
 static sf_count_t
 vox_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
 {	IMA_OKI_ADPCM *pvox ;
+	BUF_UNION	ubuf ;
 	short		*sptr ;
 	int			k, bufferlen, readcount, count ;
 	sf_count_t	total = 0 ;
@@ -242,8 +245,8 @@ vox_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
 
 	normfact = (psf->norm_double == SF_TRUE) ? 1.0 / ((double) 0x8000) : 1.0 ;
 
-	sptr = psf->u.sbuf ;
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	sptr = ubuf.sbuf ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 	while (len > 0)
 	{	readcount = (len >= bufferlen) ? bufferlen : (int) len ;
 		count = vox_read_block (psf, pvox, sptr, readcount) ;
@@ -308,6 +311,7 @@ vox_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len)
 static sf_count_t
 vox_write_i	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
 {	IMA_OKI_ADPCM *pvox ;
+	BUF_UNION	ubuf ;
 	short		*sptr ;
 	int			k, bufferlen, writecount, count ;
 	sf_count_t	total = 0 ;
@@ -316,8 +320,8 @@ vox_write_i	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
 		return 0 ;
 	pvox = (IMA_OKI_ADPCM*) psf->codec_data ;
 
-	sptr = psf->u.sbuf ;
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	sptr = ubuf.sbuf ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
 		for (k = 0 ; k < writecount ; k++)
@@ -335,6 +339,7 @@ vox_write_i	(SF_PRIVATE *psf, const int *ptr, sf_count_t len)
 static sf_count_t
 vox_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len)
 {	IMA_OKI_ADPCM *pvox ;
+	BUF_UNION	ubuf ;
 	short		*sptr ;
 	int			k, bufferlen, writecount, count ;
 	sf_count_t	total = 0 ;
@@ -346,8 +351,8 @@ vox_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len)
 
 	normfact = (psf->norm_float == SF_TRUE) ? (1.0 * 0x7FFF) : 1.0 ;
 
-	sptr = psf->u.sbuf ;
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	sptr = ubuf.sbuf ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
 		for (k = 0 ; k < writecount ; k++)
@@ -365,6 +370,7 @@ vox_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len)
 static sf_count_t
 vox_write_d	(SF_PRIVATE *psf, const double *ptr, sf_count_t len)
 {	IMA_OKI_ADPCM *pvox ;
+	BUF_UNION	ubuf ;
 	short		*sptr ;
 	int			k, bufferlen, writecount, count ;
 	sf_count_t	total = 0 ;
@@ -376,8 +382,8 @@ vox_write_d	(SF_PRIVATE *psf, const double *ptr, sf_count_t len)
 
 	normfact = (psf->norm_double == SF_TRUE) ? (1.0 * 0x7FFF) : 1.0 ;
 
-	sptr = psf->u.sbuf ;
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	sptr = ubuf.sbuf ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 	while (len > 0)
 	{	writecount = (len >= bufferlen) ? bufferlen : (int) len ;
 		for (k = 0 ; k < writecount ; k++)
diff --git a/libs/libsndfile/src/w64.c b/libs/libsndfile/src/w64.c
index 6e9abefa6a..2dbc962e13 100644
--- a/libs/libsndfile/src/w64.c
+++ b/libs/libsndfile/src/w64.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2012 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -37,13 +37,13 @@
 ** header.
 */
 
-#define MAKE_HASH16(x0,x1,x2,x3,x4,x5,x6,x7,x8,x9,xa,xb,xc,xd,xe,xf)	\
+#define MAKE_HASH16(x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, xa, xb, xc, xd, xe, xf)	\
 			(	(x0)			^ ((x1) << 1)	^ ((x2) << 2)	^ ((x3) << 3) ^	\
 				((x4) << 4) 	^ ((x5) << 5)	^ ((x6) << 6)	^ ((x7) << 7) ^	\
 				((x8) << 8) 	^ ((x9) << 9)	^ ((xa) << 10)	^ ((xb) << 11) ^ \
 				((xc) << 12) 	^ ((xd) << 13)	^ ((xe) << 14)	^ ((xf) << 15)	)
 
-#define MAKE_MARKER16(name,x0,x1,x2,x3,x4,x5,x6,x7,x8,x9,xa,xb,xc,xd,xe,xf)	\
+#define MAKE_MARKER16(name, x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, xa, xb, xc, xd, xe, xf)	\
 			static unsigned char name [16] = { (x0), (x1), (x2), (x3), (x4), (x5), \
 				(x6), (x7), (x8), (x9), (xa), (xb), (xc), (xd), (xe), (xf) }
 
@@ -129,7 +129,7 @@ w64_open	(SF_PRIVATE *psf)
 		return SFE_MALLOC_FAILED ;
 	psf->container_data = wpriv ;
 
-	if (psf->mode == SFM_READ || (psf->mode == SFM_RDWR &&psf->filelength > 0))
+	if (psf->file.mode == SFM_READ || (psf->file.mode == SFM_RDWR &&psf->filelength > 0))
 	{	if ((error = w64_read_header (psf, &blockalign, &framesperblock)))
 			return error ;
 		} ;
@@ -139,7 +139,7 @@ w64_open	(SF_PRIVATE *psf)
 
 	subformat = SF_CODEC (psf->sf.format) ;
 
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{	if (psf->is_pipe)
 			return SFE_NO_PIPE_WRITE ;
 
@@ -631,7 +631,7 @@ w64_write_header (SF_PRIVATE *psf, int calc_length)
 static int
 w64_close (SF_PRIVATE *psf)
 {
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 		w64_write_header (psf, SF_TRUE) ;
 
 	return 0 ;
diff --git a/libs/libsndfile/src/wav.c b/libs/libsndfile/src/wav.c
index 1e69018664..6e616b70ff 100644
--- a/libs/libsndfile/src/wav.c
+++ b/libs/libsndfile/src/wav.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2013 Erik de Castro Lopo 
 ** Copyright (C) 2004-2005 David Viens 
 **
 ** This program is free software; you can redistribute it and/or modify
@@ -24,6 +24,9 @@
 #include	
 #include	
 #include	
+#ifdef HAVE_INTTYPES_H
+#include	
+#endif
 
 #include	"sndfile.h"
 #include	"sfendian.h"
@@ -34,60 +37,76 @@
  * Macros to handle big/little endian issues.
  */
 
-#define RIFF_MARKER	 (MAKE_MARKER ('R', 'I', 'F', 'F'))
-#define RIFX_MARKER	 (MAKE_MARKER ('R', 'I', 'F', 'X'))
-#define WAVE_MARKER	 (MAKE_MARKER ('W', 'A', 'V', 'E'))
-#define fmt_MARKER	 (MAKE_MARKER ('f', 'm', 't', ' '))
-#define data_MARKER	 (MAKE_MARKER ('d', 'a', 't', 'a'))
-#define fact_MARKER	 (MAKE_MARKER ('f', 'a', 'c', 't'))
-#define PEAK_MARKER	 (MAKE_MARKER ('P', 'E', 'A', 'K'))
+#define RIFF_MARKER		(MAKE_MARKER ('R', 'I', 'F', 'F'))
+#define RIFX_MARKER		(MAKE_MARKER ('R', 'I', 'F', 'X'))
+#define WAVE_MARKER		(MAKE_MARKER ('W', 'A', 'V', 'E'))
+#define fmt_MARKER		(MAKE_MARKER ('f', 'm', 't', ' '))
+#define data_MARKER		(MAKE_MARKER ('d', 'a', 't', 'a'))
+#define fact_MARKER		(MAKE_MARKER ('f', 'a', 'c', 't'))
+#define PEAK_MARKER		(MAKE_MARKER ('P', 'E', 'A', 'K'))
 
-#define cue_MARKER	 (MAKE_MARKER ('c', 'u', 'e', ' '))
-#define LIST_MARKER	 (MAKE_MARKER ('L', 'I', 'S', 'T'))
-#define slnt_MARKER	 (MAKE_MARKER ('s', 'l', 'n', 't'))
-#define wavl_MARKER	 (MAKE_MARKER ('w', 'a', 'v', 'l'))
-#define INFO_MARKER	 (MAKE_MARKER ('I', 'N', 'F', 'O'))
-#define plst_MARKER	 (MAKE_MARKER ('p', 'l', 's', 't'))
-#define adtl_MARKER	 (MAKE_MARKER ('a', 'd', 't', 'l'))
-#define labl_MARKER	 (MAKE_MARKER ('l', 'a', 'b', 'l'))
-#define ltxt_MARKER	 (MAKE_MARKER ('l', 't', 'x', 't'))
-#define note_MARKER	 (MAKE_MARKER ('n', 'o', 't', 'e'))
-#define smpl_MARKER	 (MAKE_MARKER ('s', 'm', 'p', 'l'))
-#define bext_MARKER	 (MAKE_MARKER ('b', 'e', 'x', 't'))
-#define iXML_MARKER	 (MAKE_MARKER ('i', 'X', 'M', 'L'))
-#define levl_MARKER	 (MAKE_MARKER ('l', 'e', 'v', 'l'))
-#define MEXT_MARKER	 (MAKE_MARKER ('M', 'E', 'X', 'T'))
-#define DISP_MARKER	 (MAKE_MARKER ('D', 'I', 'S', 'P'))
-#define acid_MARKER	 (MAKE_MARKER ('a', 'c', 'i', 'd'))
-#define strc_MARKER	 (MAKE_MARKER ('s', 't', 'r', 'c'))
-#define PAD_MARKER	 (MAKE_MARKER ('P', 'A', 'D', ' '))
-#define afsp_MARKER	 (MAKE_MARKER ('a', 'f', 's', 'p'))
-#define clm_MARKER	 (MAKE_MARKER ('c', 'l', 'm', ' '))
-#define elmo_MARKER	 (MAKE_MARKER ('e', 'l', 'm', 'o'))
-#define cart_MARKER	 (MAKE_MARKER ('c', 'a', 'r', 't'))
+#define cue_MARKER		(MAKE_MARKER ('c', 'u', 'e', ' '))
+#define LIST_MARKER		(MAKE_MARKER ('L', 'I', 'S', 'T'))
+#define slnt_MARKER		(MAKE_MARKER ('s', 'l', 'n', 't'))
+#define wavl_MARKER		(MAKE_MARKER ('w', 'a', 'v', 'l'))
+#define INFO_MARKER		(MAKE_MARKER ('I', 'N', 'F', 'O'))
+#define plst_MARKER		(MAKE_MARKER ('p', 'l', 's', 't'))
+#define adtl_MARKER		(MAKE_MARKER ('a', 'd', 't', 'l'))
+#define labl_MARKER		(MAKE_MARKER ('l', 'a', 'b', 'l'))
+#define ltxt_MARKER		(MAKE_MARKER ('l', 't', 'x', 't'))
+#define note_MARKER		(MAKE_MARKER ('n', 'o', 't', 'e'))
+#define smpl_MARKER		(MAKE_MARKER ('s', 'm', 'p', 'l'))
+#define bext_MARKER		(MAKE_MARKER ('b', 'e', 'x', 't'))
+#define iXML_MARKER		(MAKE_MARKER ('i', 'X', 'M', 'L'))
+#define levl_MARKER		(MAKE_MARKER ('l', 'e', 'v', 'l'))
+#define MEXT_MARKER		(MAKE_MARKER ('M', 'E', 'X', 'T'))
+#define DISP_MARKER		(MAKE_MARKER ('D', 'I', 'S', 'P'))
+#define acid_MARKER		(MAKE_MARKER ('a', 'c', 'i', 'd'))
+#define strc_MARKER		(MAKE_MARKER ('s', 't', 'r', 'c'))
+#define PAD_MARKER		(MAKE_MARKER ('P', 'A', 'D', ' '))
+#define afsp_MARKER		(MAKE_MARKER ('a', 'f', 's', 'p'))
+#define clm_MARKER		(MAKE_MARKER ('c', 'l', 'm', ' '))
+#define elmo_MARKER		(MAKE_MARKER ('e', 'l', 'm', 'o'))
+#define cart_MARKER		(MAKE_MARKER ('c', 'a', 'r', 't'))
+#define FLLR_MARKER		(MAKE_MARKER ('F', 'L', 'L', 'R'))
 
-#define exif_MARKER	 (MAKE_MARKER ('e', 'x', 'i', 'f'))
-#define ever_MARKER	 (MAKE_MARKER ('e', 'v', 'e', 'r'))
-#define etim_MARKER	 (MAKE_MARKER ('e', 't', 'i', 'm'))
-#define ecor_MARKER	 (MAKE_MARKER ('e', 'c', 'o', 'r'))
-#define emdl_MARKER	 (MAKE_MARKER ('e', 'm', 'd', 'l'))
-#define emnt_MARKER	 (MAKE_MARKER ('e', 'm', 'n', 't'))
-#define erel_MARKER	 (MAKE_MARKER ('e', 'r', 'e', 'l'))
-#define eucm_MARKER	 (MAKE_MARKER ('e', 'u', 'c', 'm'))
+#define exif_MARKER		(MAKE_MARKER ('e', 'x', 'i', 'f'))
+#define ever_MARKER		(MAKE_MARKER ('e', 'v', 'e', 'r'))
+#define etim_MARKER		(MAKE_MARKER ('e', 't', 'i', 'm'))
+#define ecor_MARKER		(MAKE_MARKER ('e', 'c', 'o', 'r'))
+#define emdl_MARKER		(MAKE_MARKER ('e', 'm', 'd', 'l'))
+#define emnt_MARKER		(MAKE_MARKER ('e', 'm', 'n', 't'))
+#define erel_MARKER		(MAKE_MARKER ('e', 'r', 'e', 'l'))
+#define eucm_MARKER		(MAKE_MARKER ('e', 'u', 'c', 'm'))
+#define olym_MARKER		(MAKE_MARKER ('o', 'l', 'y', 'm'))
+#define minf_MARKER		(MAKE_MARKER ('m', 'i', 'n', 'f'))
+#define elm1_MARKER		(MAKE_MARKER ('e', 'l', 'm', '1'))
+#define regn_MARKER		(MAKE_MARKER ('r', 'e', 'g', 'n'))
+#define ovwf_MARKER		(MAKE_MARKER ('o', 'v', 'w', 'f'))
+#define umid_MARKER		(MAKE_MARKER ('u', 'm', 'i', 'd'))
+#define SyLp_MARKER		(MAKE_MARKER ('S', 'y', 'L', 'p'))
+#define Cr8r_MARKER		(MAKE_MARKER ('C', 'r', '8', 'r'))
+#define JUNK_MARKER		(MAKE_MARKER ('J', 'U', 'N', 'K'))
+#define PMX_MARKER		(MAKE_MARKER ('_', 'P', 'M', 'X'))
+#define inst_MARKER		(MAKE_MARKER ('i', 'n', 's', 't'))
+#define AFAn_MARKER		(MAKE_MARKER ('A', 'F', 'A', 'n'))
 
-#define ISFT_MARKER	 (MAKE_MARKER ('I', 'S', 'F', 'T'))
-#define ICRD_MARKER	 (MAKE_MARKER ('I', 'C', 'R', 'D'))
-#define ICOP_MARKER	 (MAKE_MARKER ('I', 'C', 'O', 'P'))
-#define IARL_MARKER	 (MAKE_MARKER ('I', 'A', 'R', 'L'))
-#define IART_MARKER	 (MAKE_MARKER ('I', 'A', 'R', 'T'))
-#define INAM_MARKER	 (MAKE_MARKER ('I', 'N', 'A', 'M'))
-#define IENG_MARKER	 (MAKE_MARKER ('I', 'E', 'N', 'G'))
-#define IART_MARKER	 (MAKE_MARKER ('I', 'A', 'R', 'T'))
-#define ICOP_MARKER	 (MAKE_MARKER ('I', 'C', 'O', 'P'))
-#define IPRD_MARKER	 (MAKE_MARKER ('I', 'P', 'R', 'D'))
-#define ISRC_MARKER	 (MAKE_MARKER ('I', 'S', 'R', 'C'))
-#define ISBJ_MARKER	 (MAKE_MARKER ('I', 'S', 'B', 'J'))
-#define ICMT_MARKER	 (MAKE_MARKER ('I', 'C', 'M', 'T'))
+
+#define ISFT_MARKER		(MAKE_MARKER ('I', 'S', 'F', 'T'))
+#define ICRD_MARKER		(MAKE_MARKER ('I', 'C', 'R', 'D'))
+#define ICOP_MARKER		(MAKE_MARKER ('I', 'C', 'O', 'P'))
+#define IARL_MARKER		(MAKE_MARKER ('I', 'A', 'R', 'L'))
+#define IART_MARKER		(MAKE_MARKER ('I', 'A', 'R', 'T'))
+#define INAM_MARKER		(MAKE_MARKER ('I', 'N', 'A', 'M'))
+#define IENG_MARKER		(MAKE_MARKER ('I', 'E', 'N', 'G'))
+#define IGNR_MARKER		(MAKE_MARKER ('I', 'G', 'N', 'R'))
+#define ICOP_MARKER		(MAKE_MARKER ('I', 'C', 'O', 'P'))
+#define IPRD_MARKER		(MAKE_MARKER ('I', 'P', 'R', 'D'))
+#define ISRC_MARKER		(MAKE_MARKER ('I', 'S', 'R', 'C'))
+#define ISBJ_MARKER		(MAKE_MARKER ('I', 'S', 'B', 'J'))
+#define ICMT_MARKER		(MAKE_MARKER ('I', 'C', 'M', 'T'))
+#define IAUT_MARKER		(MAKE_MARKER ('I', 'A', 'U', 'T'))
+#define ITRK_MARKER		(MAKE_MARKER ('I', 'T', 'R', 'K'))
 
 /* Weird WAVPACK marker which can show up at the start of the DATA section. */
 #define wvpk_MARKER (MAKE_MARKER ('w', 'v', 'p', 'k'))
@@ -97,6 +116,10 @@
 #define WAV_BEXT_MIN_CHUNK_SIZE		602
 #define WAV_BEXT_MAX_CHUNK_SIZE		(10 * 1024)
 
+#define WAV_CART_MIN_CHUNK_SIZE		2048
+#define WAV_CART_MAX_CHUNK_SIZE		0xffffffff
+
+
 enum
 {	HAVE_RIFF	= 0x01,
 	HAVE_WAVE	= 0x02,
@@ -155,27 +178,30 @@ static const EXT_SUBFORMAT MSGUID_SUBTYPE_PVOCEX =
 ** Private static functions.
 */
 
-static int	wav_read_header	 (SF_PRIVATE *psf, int *blockalign, int *framesperblock) ;
-static int	wav_write_header (SF_PRIVATE *psf, int calc_length) ;
+static int	wav_read_header		(SF_PRIVATE *psf, int *blockalign, int *framesperblock) ;
+static int	wav_write_header	(SF_PRIVATE *psf, int calc_length) ;
 
 static int	wav_write_tailer (SF_PRIVATE *psf) ;
 static void wav_write_strings (SF_PRIVATE *psf, int location) ;
 static int	wav_command (SF_PRIVATE *psf, int command, void *data, int datasize) ;
 static int	wav_close (SF_PRIVATE *psf) ;
 
-static int 	wav_subchunk_parse	 (SF_PRIVATE *psf, int chunk) ;
-static int 	exif_subchunk_parse	 (SF_PRIVATE *psf, unsigned int length) ;
-static int	wav_read_smpl_chunk (SF_PRIVATE *psf, unsigned int chunklen) ;
-static int	wav_read_acid_chunk (SF_PRIVATE *psf, unsigned int chunklen) ;
-static int	wav_read_bext_chunk (SF_PRIVATE *psf, unsigned int chunklen) ;
-static int	wav_write_bext_chunk (SF_PRIVATE *psf) ;
+static int 	wav_subchunk_parse	(SF_PRIVATE *psf, int chunk, uint32_t length) ;
+static int 	exif_subchunk_parse	(SF_PRIVATE *psf, uint32_t length) ;
+static int	wav_read_smpl_chunk (SF_PRIVATE *psf, uint32_t chunklen) ;
+static int	wav_read_acid_chunk (SF_PRIVATE *psf, uint32_t chunklen) ;
+
+static int wav_set_chunk (SF_PRIVATE *psf, const SF_CHUNK_INFO * chunk_info) ;
+static SF_CHUNK_ITERATOR * wav_next_chunk_iterator (SF_PRIVATE *psf, SF_CHUNK_ITERATOR * iterator) ;
+static int wav_get_chunk_size (SF_PRIVATE *psf, const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info) ;
+static int wav_get_chunk_data (SF_PRIVATE *psf, const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info) ;
 
 /*------------------------------------------------------------------------------
 ** Public function.
 */
 
 int
-wav_open	 (SF_PRIVATE *psf)
+wav_open	(SF_PRIVATE *psf)
 {	WAV_PRIVATE * wpriv ;
 	int	format, subformat, error, blockalign = 0, framesperblock = 0 ;
 
@@ -184,16 +210,20 @@ wav_open	 (SF_PRIVATE *psf)
 	psf->container_data = wpriv ;
 
 	wpriv->wavex_ambisonic = SF_AMBISONIC_NONE ;
-	psf->str_flags = SF_STR_ALLOW_START | SF_STR_ALLOW_END ;
+	psf->strings.flags = SF_STR_ALLOW_START | SF_STR_ALLOW_END ;
 
-	if (psf->mode == SFM_READ || (psf->mode == SFM_RDWR && psf->filelength > 0))
+	if (psf->file.mode == SFM_READ || (psf->file.mode == SFM_RDWR && psf->filelength > 0))
 	{	if ((error = wav_read_header (psf, &blockalign, &framesperblock)))
 			return error ;
+
+		psf->next_chunk_iterator = wav_next_chunk_iterator ;
+		psf->get_chunk_size = wav_get_chunk_size ;
+		psf->get_chunk_data = wav_get_chunk_data ;
 		} ;
 
 	subformat = SF_CODEC (psf->sf.format) ;
 
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{	if (psf->is_pipe)
 			return SFE_NO_PIPE_WRITE ;
 
@@ -212,7 +242,7 @@ wav_open	 (SF_PRIVATE *psf)
 		else if (psf->endian != SF_ENDIAN_BIG)
 			psf->endian = SF_ENDIAN_LITTLE ;
 
-		if (psf->mode != SFM_RDWR || psf->filelength < 44)
+		if (psf->file.mode != SFM_RDWR || psf->filelength < 44)
 		{	psf->filelength = 0 ;
 			psf->datalength = 0 ;
 			psf->dataoffset = 0 ;
@@ -227,13 +257,14 @@ wav_open	 (SF_PRIVATE *psf)
 		/* By default, add the peak chunk to floating point files. Default behaviour
 		** can be switched off using sf_command (SFC_SET_PEAK_CHUNK, SF_FALSE).
 		*/
-		if (psf->mode == SFM_WRITE && (subformat == SF_FORMAT_FLOAT || subformat == SF_FORMAT_DOUBLE))
+		if (psf->file.mode == SFM_WRITE && (subformat == SF_FORMAT_FLOAT || subformat == SF_FORMAT_DOUBLE))
 		{	if ((psf->peak_info = peak_info_calloc (psf->sf.channels)) == NULL)
 				return SFE_MALLOC_FAILED ;
 			psf->peak_info->peak_loc = SF_PEAK_START ;
 			} ;
 
-		psf->write_header = wav_write_header ;
+		psf->write_header	= wav_write_header ;
+		psf->set_chunk		= wav_set_chunk ;
 		} ;
 
 	psf->container_close = wav_close ;
@@ -284,7 +315,7 @@ wav_open	 (SF_PRIVATE *psf)
 		default : 	return SFE_UNIMPLEMENTED ;
 		} ;
 
-	if (psf->mode == SFM_WRITE || (psf->mode == SFM_RDWR && psf->filelength == 0))
+	if (psf->file.mode == SFM_WRITE || (psf->file.mode == SFM_RDWR && psf->filelength == 0))
 		return psf->write_header (psf, SF_FALSE) ;
 
 	return error ;
@@ -295,13 +326,13 @@ wav_open	 (SF_PRIVATE *psf)
 */
 
 static int
-wav_read_header	 (SF_PRIVATE *psf, int *blockalign, int *framesperblock)
+wav_read_header	(SF_PRIVATE *psf, int *blockalign, int *framesperblock)
 {	WAV_PRIVATE	*wpriv ;
 	WAV_FMT		*wav_fmt ;
 	FACT_CHUNK	fact_chunk ;
-	unsigned	dword = 0, marker, RIFFsize, done = 0 ;
+	uint32_t	marker, chunk_size = 0, RIFFsize = 0, done = 0, uk ;
 	int			parsestage = 0, error, format = 0 ;
-	char		*cptr ;
+	char		buffer [256] ;
 
 	if (psf->filelength > SF_PLATFORM_S64 (0xffffffff))
 		psf_log_printf (psf, "Warning : filelength > 0xffffffff. This is bad!!!!\n") ;
@@ -311,10 +342,26 @@ wav_read_header	 (SF_PRIVATE *psf, int *blockalign, int *framesperblock)
 	wav_fmt = &wpriv->wav_fmt ;
 
 	/* Set position to start of file to begin reading header. */
-	psf_binheader_readf (psf, "p", 0) ;
+	psf_binheader_readf (psf, "pmj", 0, &marker, -4) ;
+	psf->headindex = 0 ;
+
+	/* RIFX signifies big-endian format for all header and data  to prevent
+	** lots of code copying here, we'll set the psf->rwf_endian flag once here,
+	** and never specify endian-ness for all other header ops/
+	*/
+	psf->rwf_endian = (marker == RIFF_MARKER) ? SF_ENDIAN_LITTLE : SF_ENDIAN_BIG ;
 
 	while (! done)
-	{	psf_binheader_readf (psf, "m", &marker) ;
+	{	size_t jump = chunk_size & 1 ;
+
+		marker = chunk_size = 0 ;
+		psf_binheader_readf (psf, "jm4", jump, &marker, &chunk_size) ;
+		if (marker == 0)
+		{	psf_log_printf (psf, "Have 0 marker.\n") ;
+			break ;
+			} ;
+
+		psf_store_read_chunk_u32 (&psf->rchunks, marker, psf_ftell (psf), chunk_size) ;
 
 		switch (marker)
 		{	case RIFF_MARKER :
@@ -324,16 +371,7 @@ wav_read_header	 (SF_PRIVATE *psf, int *blockalign, int *framesperblock)
 
 					parsestage |= HAVE_RIFF ;
 
-					/* RIFX signifies big-endian format for all header and data
-					** to prevent lots of code copying here, we'll set the psf->rwf_endian
-					** flag once here, and never specify endian-ness for all other header ops
-					*/
-					if (marker == RIFF_MARKER)
-						psf->rwf_endian = SF_ENDIAN_LITTLE ;
-					else
-						psf->rwf_endian = SF_ENDIAN_BIG ;
-
-					psf_binheader_readf (psf, "4", &RIFFsize) ;
+					RIFFsize = chunk_size ;
 
 					if (psf->fileoffset > 0 && psf->filelength > RIFFsize + 8)
 					{	/* Set file length. */
@@ -343,13 +381,13 @@ wav_read_header	 (SF_PRIVATE *psf, int *blockalign, int *framesperblock)
 						else
 							psf_log_printf (psf, "RIFX : %u\n", RIFFsize) ;
 						}
-					else if (psf->filelength < RIFFsize + 2 * SIGNED_SIZEOF (dword))
+					else if (psf->filelength < RIFFsize + 2 * SIGNED_SIZEOF (marker))
 					{	if (marker == RIFF_MARKER)
-							psf_log_printf (psf, "RIFF : %u (should be %D)\n", RIFFsize, psf->filelength - 2 * SIGNED_SIZEOF (dword)) ;
+							psf_log_printf (psf, "RIFF : %u (should be %D)\n", RIFFsize, psf->filelength - 2 * SIGNED_SIZEOF (marker)) ;
 						else
-							psf_log_printf (psf, "RIFX : %u (should be %D)\n", RIFFsize, psf->filelength - 2 * SIGNED_SIZEOF (dword)) ;
+							psf_log_printf (psf, "RIFX : %u (should be %D)\n", RIFFsize, psf->filelength - 2 * SIGNED_SIZEOF (marker)) ;
 
-						RIFFsize = dword ;
+						RIFFsize = psf->filelength - 2 * SIGNED_SIZEOF (RIFFsize) ;
 						}
 					else
 					{	if (marker == RIFF_MARKER)
@@ -357,14 +395,13 @@ wav_read_header	 (SF_PRIVATE *psf, int *blockalign, int *framesperblock)
 						else
 							psf_log_printf (psf, "RIFX : %u\n", RIFFsize) ;
 					} ;
-					break ;
 
-			case WAVE_MARKER :
-					if ((parsestage & HAVE_RIFF) != HAVE_RIFF)
+					psf_binheader_readf (psf, "m", &marker) ;
+					if (marker != WAVE_MARKER)
 						return SFE_WAV_NO_WAVE ;
 					parsestage |= HAVE_WAVE ;
-
 					psf_log_printf (psf, "WAVE\n") ;
+					chunk_size = 0 ;
 					break ;
 
 			case fmt_MARKER :
@@ -377,10 +414,9 @@ wav_read_header	 (SF_PRIVATE *psf, int *blockalign, int *framesperblock)
 
 					parsestage |= HAVE_fmt ;
 
-					psf_binheader_readf (psf, "4", &dword) ;
-					psf_log_printf (psf, "fmt  : %d\n", dword) ;
+					psf_log_printf (psf, "fmt  : %d\n", chunk_size) ;
 
-					if ((error = wav_w64_read_fmt_chunk (psf, dword)))
+					if ((error = wav_w64_read_fmt_chunk (psf, chunk_size)))
 						return error ;
 
 					format = wav_fmt->format ;
@@ -390,18 +426,16 @@ wav_read_header	 (SF_PRIVATE *psf, int *blockalign, int *framesperblock)
 					if ((parsestage & (HAVE_RIFF | HAVE_WAVE | HAVE_fmt)) != (HAVE_RIFF | HAVE_WAVE | HAVE_fmt))
 						return SFE_WAV_NO_DATA ;
 
-					if (psf->mode == SFM_RDWR && (parsestage & HAVE_other) != 0)
+					if (psf->file.mode == SFM_RDWR && (parsestage & HAVE_other) != 0)
 						return SFE_RDWR_BAD_HEADER ;
 
 					parsestage |= HAVE_data ;
 
-					psf_binheader_readf (psf, "4", &dword) ;
-
-					psf->datalength = dword ;
+					psf->datalength = chunk_size ;
 					psf->dataoffset = psf_ftell (psf) ;
 
 					if (psf->dataoffset > 0)
-					{	if (dword == 0 && RIFFsize == 8 && psf->filelength > 44)
+					{	if (chunk_size == 0 && RIFFsize == 8 && psf->filelength > 44)
 						{	psf_log_printf (psf, "*** Looks like a WAV file which wasn't closed properly. Fixing it.\n") ;
 							psf->datalength = psf->filelength - psf->dataoffset ;
 							} ;
@@ -417,10 +451,8 @@ wav_read_header	 (SF_PRIVATE *psf, int *blockalign, int *framesperblock)
 						if (psf->datalength + psf->dataoffset < psf->filelength)
 							psf->dataend = psf->datalength + psf->dataoffset ;
 
-						if (format == WAVE_FORMAT_MS_ADPCM && psf->datalength % 2)
-						{	psf->datalength ++ ;
-							psf_log_printf (psf, "*** Data length odd. Increasing it by 1.\n") ;
-							} ;
+						psf->datalength += chunk_size & 1 ;
+						chunk_size = 0 ;
 						} ;
 
 					if (! psf->sf.seekable || psf->dataoffset < 0)
@@ -430,7 +462,7 @@ wav_read_header	 (SF_PRIVATE *psf, int *blockalign, int *framesperblock)
 					psf_fseek (psf, psf->datalength, SEEK_CUR) ;
 
 					if (psf_ftell (psf) != psf->datalength + psf->dataoffset)
-						psf_log_printf (psf, "*** psf_fseek past end error ***\n", dword, psf->dataoffset + psf->datalength) ;
+						psf_log_printf (psf, "*** psf_fseek past end error ***\n") ;
 					break ;
 
 			case fact_MARKER :
@@ -442,15 +474,15 @@ wav_read_header	 (SF_PRIVATE *psf, int *blockalign, int *framesperblock)
 					if ((parsestage & HAVE_fmt) != HAVE_fmt)
 						psf_log_printf (psf, "*** Should have 'fmt ' chunk before 'fact'\n") ;
 
-					psf_binheader_readf (psf, "44", &dword, & (fact_chunk.frames)) ;
+					psf_binheader_readf (psf, "4", & (fact_chunk.frames)) ;
 
-					if (dword > SIGNED_SIZEOF (fact_chunk))
-						psf_binheader_readf (psf, "j", (int) (dword - SIGNED_SIZEOF (fact_chunk))) ;
+					if (chunk_size > SIGNED_SIZEOF (fact_chunk))
+						psf_binheader_readf (psf, "j", (int) (chunk_size - SIGNED_SIZEOF (fact_chunk))) ;
 
-					if (dword)
-						psf_log_printf (psf, "%M : %d\n", marker, dword) ;
+					if (chunk_size)
+						psf_log_printf (psf, "%M : %d\n", marker, chunk_size) ;
 					else
-						psf_log_printf (psf, "%M : %d (should not be zero)\n", marker, dword) ;
+						psf_log_printf (psf, "%M : %d (should not be zero)\n", marker, chunk_size) ;
 
 					psf_log_printf (psf, "  frames  : %d\n", fact_chunk.frames) ;
 					break ;
@@ -461,11 +493,9 @@ wav_read_header	 (SF_PRIVATE *psf, int *blockalign, int *framesperblock)
 
 					parsestage |= HAVE_PEAK ;
 
-					psf_binheader_readf (psf, "4", &dword) ;
-
-					psf_log_printf (psf, "%M : %d\n", marker, dword) ;
-					if (dword != WAV_PEAK_CHUNK_SIZE (psf->sf.channels))
-					{	psf_binheader_readf (psf, "j", dword) ;
+					psf_log_printf (psf, "%M : %d\n", marker, chunk_size) ;
+					if (chunk_size != WAV_PEAK_CHUNK_SIZE (psf->sf.channels))
+					{	psf_binheader_readf (psf, "j", chunk_size) ;
 						psf_log_printf (psf, "*** File PEAK chunk size doesn't fit with number of channels (%d).\n", psf->sf.channels) ;
 						return SFE_WAV_BAD_PEAK ;
 						} ;
@@ -484,18 +514,18 @@ wav_read_header	 (SF_PRIVATE *psf, int *blockalign, int *framesperblock)
 					psf_log_printf (psf, "  time stamp : %d\n", psf->peak_info->timestamp) ;
 					psf_log_printf (psf, "    Ch   Position       Value\n") ;
 
-					cptr = psf->u.cbuf ;
-					for (dword = 0 ; dword < (unsigned) psf->sf.channels ; dword++)
+					for (uk = 0 ; uk < (uint32_t) psf->sf.channels ; uk++)
 					{	float value ;
-						unsigned int position ;
-						psf_binheader_readf (psf, "f4", &value, &position) ;
-						psf->peak_info->peaks [dword].value = value ;
-						psf->peak_info->peaks [dword].position = position ;
+						uint32_t position ;
 
-						snprintf (cptr, sizeof (psf->u.cbuf), "    %2d   %-12ld   %g\n",
-								dword, (long) psf->peak_info->peaks [dword].position, psf->peak_info->peaks [dword].value) ;
-						cptr [sizeof (psf->u.cbuf) - 1] = 0 ;
-						psf_log_printf (psf, cptr) ;
+						psf_binheader_readf (psf, "f4", &value, &position) ;
+						psf->peak_info->peaks [uk].value = value ;
+						psf->peak_info->peaks [uk].position = position ;
+
+						snprintf (buffer, sizeof (buffer), "    %2d   %-12" PRId64 "   %g\n",
+								uk, psf->peak_info->peaks [uk].position, psf->peak_info->peaks [uk].value) ;
+						buffer [sizeof (buffer) - 1] = 0 ;
+						psf_log_printf (psf, "%s", buffer) ;
 						} ;
 
 					psf->peak_info->peak_loc = ((parsestage & HAVE_data) == 0) ? SF_PEAK_START : SF_PEAK_END ;
@@ -504,12 +534,11 @@ wav_read_header	 (SF_PRIVATE *psf, int *blockalign, int *framesperblock)
 			case cue_MARKER :
 					parsestage |= HAVE_other ;
 
-					{	unsigned bytesread, cue_count ;
+					{	uint32_t bytesread, cue_count ;
 						int id, position, chunk_id, chunk_start, block_start, offset ;
 
-						bytesread = psf_binheader_readf (psf, "44", &dword, &cue_count) ;
-						bytesread -= 4 ; /* Remove bytes for first dword. */
-						psf_log_printf (psf, "%M : %u\n", marker, dword) ;
+						bytesread = psf_binheader_readf (psf, "4", &cue_count) ;
+						psf_log_printf (psf, "%M : %u\n", marker, chunk_size) ;
 
 						if (cue_count > 10)
 						{	psf_log_printf (psf, "  Count : %d (skipping)\n", cue_count) ;
@@ -522,17 +551,17 @@ wav_read_header	 (SF_PRIVATE *psf, int *blockalign, int *framesperblock)
 						while (cue_count)
 						{	bytesread += psf_binheader_readf (psf, "444444", &id, &position,
 									&chunk_id, &chunk_start, &block_start, &offset) ;
-							psf_log_printf (psf, "   Cue ID : %2d"
-												 "  Pos : %5u  Chunk : %M"
-												 "  Chk Start : %d  Blk Start : %d"
-												 "  Offset : %5d\n",
+							psf_log_printf (psf,	"   Cue ID : %2d"
+													"  Pos : %5u  Chunk : %M"
+													"  Chk Start : %d  Blk Start : %d"
+													"  Offset : %5d\n",
 									id, position, chunk_id, chunk_start, block_start, offset) ;
 							cue_count -- ;
 							} ;
 
-						if (bytesread != dword)
-						{	psf_log_printf (psf, "**** Chunk size weirdness (%d != %d)\n", dword, bytesread) ;
-							psf_binheader_readf (psf, "j", dword - bytesread) ;
+						if (bytesread != chunk_size)
+						{	psf_log_printf (psf, "**** Chunk size weirdness (%d != %d)\n", chunk_size, bytesread) ;
+							psf_binheader_readf (psf, "j", chunk_size - bytesread) ;
 							} ;
 						} ;
 					break ;
@@ -540,20 +569,18 @@ wav_read_header	 (SF_PRIVATE *psf, int *blockalign, int *framesperblock)
 			case smpl_MARKER :
 					parsestage |= HAVE_other ;
 
-					psf_binheader_readf (psf, "4", &dword) ;
-					psf_log_printf (psf, "smpl : %u\n", dword) ;
+					psf_log_printf (psf, "smpl : %u\n", chunk_size) ;
 
-					if ((error = wav_read_smpl_chunk (psf, dword)))
+					if ((error = wav_read_smpl_chunk (psf, chunk_size)))
 						return error ;
 					break ;
 
 			case acid_MARKER :
 					parsestage |= HAVE_other ;
 
-					psf_binheader_readf (psf, "4", &dword) ;
-					psf_log_printf (psf, "acid : %u\n", dword) ;
+					psf_log_printf (psf, "acid : %u\n", chunk_size) ;
 
-					if ((error = wav_read_acid_chunk (psf, dword)))
+					if ((error = wav_read_acid_chunk (psf, chunk_size)))
 						return error ;
 					break ;
 
@@ -561,7 +588,7 @@ wav_read_header	 (SF_PRIVATE *psf, int *blockalign, int *framesperblock)
 			case LIST_MARKER :
 					parsestage |= HAVE_other ;
 
-					if ((error = wav_subchunk_parse (psf, marker)) != 0)
+					if ((error = wav_subchunk_parse (psf, marker, chunk_size)) != 0)
 						return error ;
 					break ;
 
@@ -570,8 +597,7 @@ wav_read_header	 (SF_PRIVATE *psf, int *blockalign, int *framesperblock)
 					The 'bext' chunk can actually be updated, so don't need to set this.
 					parsestage |= HAVE_other ;
 					*/
-					psf_binheader_readf (psf, "4", &dword) ;
-					if ((error = wav_read_bext_chunk (psf, dword)))
+					if ((error = wav_read_bext_chunk (psf, chunk_size)))
 						return error ;
 					break ;
 
@@ -580,10 +606,13 @@ wav_read_header	 (SF_PRIVATE *psf, int *blockalign, int *framesperblock)
 					We can eat into a 'PAD ' chunk if we need to.
 					parsestage |= HAVE_other ;
 					*/
-					psf_binheader_readf (psf, "4", &dword) ;
-					psf_log_printf (psf, "%M : %u\n", marker, dword) ;
-					dword += (dword & 1) ;
-					psf_binheader_readf (psf, "j", dword) ;
+					psf_log_printf (psf, "%M : %u\n", marker, chunk_size) ;
+					psf_binheader_readf (psf, "j", chunk_size) ;
+					break ;
+
+			case cart_MARKER:
+					if ((error = wav_read_cart_chunk (psf, chunk_size)))
+						return error ;
 					break ;
 
 			case iXML_MARKER : /* See http://en.wikipedia.org/wiki/IXML */
@@ -591,42 +620,49 @@ wav_read_header	 (SF_PRIVATE *psf, int *blockalign, int *framesperblock)
 			case afsp_MARKER :
 			case clm_MARKER :
 			case elmo_MARKER :
-			case cart_MARKER :
 			case levl_MARKER :
 			case plst_MARKER :
+			case minf_MARKER :
+			case elm1_MARKER :
+			case regn_MARKER :
+			case ovwf_MARKER :
+			case inst_MARKER :
+			case AFAn_MARKER :
+			case umid_MARKER :
+			case SyLp_MARKER :
+			case Cr8r_MARKER :
+			case JUNK_MARKER :
+			case PMX_MARKER :
 			case DISP_MARKER :
 			case MEXT_MARKER :
-					parsestage |= HAVE_other ;
-
-					psf_binheader_readf (psf, "4", &dword) ;
-					psf_log_printf (psf, "%M : %u\n", marker, dword) ;
-					dword += (dword & 1) ;
-					psf_binheader_readf (psf, "j", dword) ;
+			case FLLR_MARKER :
+					psf_log_printf (psf, "%M : %u\n", marker, chunk_size) ;
+					psf_binheader_readf (psf, "j", chunk_size) ;
 					break ;
 
 			default :
-					parsestage |= HAVE_other ;
-					if (isprint ((marker >> 24) & 0xFF) && isprint ((marker >> 16) & 0xFF)
-						&& isprint ((marker >> 8) & 0xFF) && isprint (marker & 0xFF))
-					{	psf_binheader_readf (psf, "4", &dword) ;
-						psf_log_printf (psf, "*** %M : %d (unknown marker)\n", marker, dword) ;
-						psf_binheader_readf (psf, "j", dword) ;
+					if (psf_isprint ((marker >> 24) & 0xFF) && psf_isprint ((marker >> 16) & 0xFF)
+						&& psf_isprint ((marker >> 8) & 0xFF) && psf_isprint (marker & 0xFF))
+					{	psf_log_printf (psf, "*** %M : %d (unknown marker)\n", marker, chunk_size) ;
+						psf_binheader_readf (psf, "j", chunk_size) ;
 						break ;
 						} ;
 					if (psf_ftell (psf) & 0x03)
-					{	psf_log_printf (psf, "  Unknown chunk marker at position %d. Resynching.\n", dword - 4) ;
+					{	psf_log_printf (psf, "  Unknown chunk marker at position %D. Resynching.\n", psf_ftell (psf) - 8) ;
 						psf_binheader_readf (psf, "j", -3) ;
+						/* File is too messed up so we prevent editing in RDWR mode here. */
+						parsestage |= HAVE_other ;
 						break ;
 						} ;
-					psf_log_printf (psf, "*** Unknown chunk marker (%X) at position %D. Exiting parser.\n", marker, psf_ftell (psf) - 4) ;
+					psf_log_printf (psf, "*** Unknown chunk marker (%X) at position %D. Exiting parser.\n", marker, psf_ftell (psf) - 8) ;
 					done = SF_TRUE ;
 					break ;
-			} ;	/* switch (dword) */
+			} ;	/* switch (marker) */
 
 		if (! psf->sf.seekable && (parsestage & HAVE_data))
 			break ;
 
-		if (psf_ftell (psf) >= psf->filelength - SIGNED_SIZEOF (dword))
+		if (psf_ftell (psf) >= psf->filelength - SIGNED_SIZEOF (chunk_size))
 		{	psf_log_printf (psf, "End\n") ;
 			break ;
 			} ;
@@ -756,27 +792,27 @@ wav_write_fmt_chunk (SF_PRIVATE *psf)
 					break ;
 
 		case SF_FORMAT_ULAW :
-					fmt_size = 2 + 2 + 4 + 4 + 2 + 2 ;
+					fmt_size = 2 + 2 + 4 + 4 + 2 + 2 + 2 ;
 
 					/* fmt : format, channels, samplerate */
 					psf_binheader_writef (psf, "4224", fmt_size, WAVE_FORMAT_MULAW, psf->sf.channels, psf->sf.samplerate) ;
 					/*  fmt : bytespersec */
 					psf_binheader_writef (psf, "4", psf->sf.samplerate * psf->bytewidth * psf->sf.channels) ;
-					/*  fmt : blockalign, bitwidth */
-					psf_binheader_writef (psf, "22", psf->bytewidth * psf->sf.channels, 8) ;
+					/*  fmt : blockalign, bitwidth, extrabytes */
+					psf_binheader_writef (psf, "222", psf->bytewidth * psf->sf.channels, 8, 0) ;
 
 					add_fact_chunk = SF_TRUE ;
 					break ;
 
 		case SF_FORMAT_ALAW :
-					fmt_size = 2 + 2 + 4 + 4 + 2 + 2 ;
+					fmt_size = 2 + 2 + 4 + 4 + 2 + 2 + 2 ;
 
 					/* fmt : format, channels, samplerate */
 					psf_binheader_writef (psf, "4224", fmt_size, WAVE_FORMAT_ALAW, psf->sf.channels, psf->sf.samplerate) ;
 					/*  fmt : bytespersec */
 					psf_binheader_writef (psf, "4", psf->sf.samplerate * psf->bytewidth * psf->sf.channels) ;
-					/*  fmt : blockalign, bitwidth */
-					psf_binheader_writef (psf, "22", psf->bytewidth * psf->sf.channels, 8) ;
+					/*  fmt : blockalign, bitwidth, extrabytes */
+					psf_binheader_writef (psf, "222", psf->bytewidth * psf->sf.channels, 8, 0) ;
 
 					add_fact_chunk = SF_TRUE ;
 					break ;
@@ -918,6 +954,8 @@ wavex_write_fmt_chunk (SF_PRIVATE *psf)
 			*/
 			if (wpriv->wavex_ambisonic != SF_AMBISONIC_NONE)
 				psf_binheader_writef (psf, "4", 0) ;
+			else if (wpriv->wavex_channelmask != 0)
+				psf_binheader_writef (psf, "4", wpriv->wavex_channelmask) ;
 			else
 			{	/*
 				** Ok some liberty is taken here to use the most commonly used channel masks
@@ -1007,6 +1045,7 @@ wavex_write_fmt_chunk (SF_PRIVATE *psf)
 static int
 wav_write_header (SF_PRIVATE *psf, int calc_length)
 {	sf_count_t	current ;
+	uint32_t	uk ;
 	int 		k, error, has_data = SF_FALSE ;
 
 	current = psf_ftell (psf) ;
@@ -1021,9 +1060,8 @@ wav_write_header (SF_PRIVATE *psf, int calc_length)
 
 		if (psf->dataend)
 			psf->datalength -= psf->filelength - psf->dataend ;
-
-		if (psf->bytewidth > 0)
-			psf->sf.frames = psf->datalength / (psf->bytewidth * psf->sf.channels) ;
+		else if (psf->bytewidth > 0 && psf->sf.seekable == SF_TRUE)
+			psf->datalength = psf->sf.frames * psf->bytewidth * psf->sf.channels ;
 		} ;
 
 	/* Reset the current header length to zero. */
@@ -1064,7 +1102,7 @@ wav_write_header (SF_PRIVATE *psf, int calc_length)
 		} ;
 
 	/* The LIST/INFO chunk. */
-	if (psf->str_flags & SF_STR_LOCATE_START)
+	if (psf->strings.flags & SF_STR_LOCATE_START)
 		wav_write_strings (psf, SF_STR_LOCATE_START) ;
 
 	if (psf->peak_info != NULL && psf->peak_info->peak_loc == SF_PEAK_START)
@@ -1074,9 +1112,12 @@ wav_write_header (SF_PRIVATE *psf, int calc_length)
 			psf_binheader_writef (psf, "ft8", (float) psf->peak_info->peaks [k].value, psf->peak_info->peaks [k].position) ;
 		} ;
 
-	if (psf->broadcast_var != NULL)
+	if (psf->broadcast_16k != NULL)
 		wav_write_bext_chunk (psf) ;
 
+	if (psf->cart_16k != NULL)
+		wav_write_cart_chunk (psf) ;
+
 	if (psf->instrument != NULL)
 	{	int		tmp ;
 		double	dtune = (double) (0x40000000) / 25.0 ;
@@ -1085,7 +1126,7 @@ wav_write_header (SF_PRIVATE *psf, int calc_length)
 		psf_binheader_writef (psf, "44", 0, 0) ; /* Manufacturer zero is everyone */
 		tmp = (int) (1.0e9 / psf->sf.samplerate) ; /* Sample period in nano seconds */
 		psf_binheader_writef (psf, "44", tmp, psf->instrument->basenote) ;
-		tmp = (unsigned int) (psf->instrument->detune * dtune + 0.5) ;
+		tmp = (uint32_t) (psf->instrument->detune * dtune + 0.5) ;
 		psf_binheader_writef (psf, "4", tmp) ;
 		psf_binheader_writef (psf, "44", 0, 0) ; /* SMTPE format */
 		psf_binheader_writef (psf, "44", psf->instrument->loop_count, 0) ;
@@ -1094,14 +1135,18 @@ wav_write_header (SF_PRIVATE *psf, int calc_length)
 		{	int type ;
 
 			type = psf->instrument->loops [tmp].mode ;
-			type = (type == SF_LOOP_FORWARD ? 0 : type==SF_LOOP_BACKWARD ? 2 : type == SF_LOOP_ALTERNATING ? 1 : 32) ;
+			type = (type == SF_LOOP_FORWARD ? 0 : type == SF_LOOP_BACKWARD ? 2 : type == SF_LOOP_ALTERNATING ? 1 : 32) ;
 
 			psf_binheader_writef (psf, "44", tmp, type) ;
-			psf_binheader_writef (psf, "44", psf->instrument->loops [tmp].start, psf->instrument->loops [tmp].end) ;
+			psf_binheader_writef (psf, "44", psf->instrument->loops [tmp].start, psf->instrument->loops [tmp].end - 1) ;
 			psf_binheader_writef (psf, "44", 0, psf->instrument->loops [tmp].count) ;
 			} ;
 		} ;
 
+	/* Write custom headers. */
+	for (uk = 0 ; uk < psf->wchunks.used ; uk++)
+		psf_binheader_writef (psf, "m4b", (int) psf->wchunks.chunks [uk].mark32, psf->wchunks.chunks [uk].len, psf->wchunks.chunks [uk].data, make_size_t (psf->wchunks.chunks [uk].len)) ;
+
 	if (psf->headindex + 16 < psf->dataoffset)
 	{	/* Add PAD data if necessary. */
 		k = psf->dataoffset - (psf->headindex + 16) ;
@@ -1137,6 +1182,11 @@ wav_write_tailer (SF_PRIVATE *psf)
 	psf->header [0] = 0 ;
 	psf->headindex = 0 ;
 
+	if (psf->bytewidth > 0 && psf->sf.seekable == SF_TRUE)
+	{	psf->datalength = psf->sf.frames * psf->bytewidth * psf->sf.channels ;
+		psf->dataend = psf->dataoffset + psf->datalength ;
+		} ;
+
 	if (psf->dataend > 0)
 		psf_fseek (psf, psf->dataend, SEEK_SET) ;
 	else
@@ -1150,7 +1200,7 @@ wav_write_tailer (SF_PRIVATE *psf)
 			psf_binheader_writef (psf, "f4", psf->peak_info->peaks [k].value, psf->peak_info->peaks [k].position) ;
 		} ;
 
-	if (psf->str_flags & SF_STR_LOCATE_END)
+	if (psf->strings.flags & SF_STR_LOCATE_END)
 		wav_write_strings (psf, SF_STR_LOCATE_END) ;
 
 	/* Write the tailer. */
@@ -1172,34 +1222,46 @@ wav_write_strings (SF_PRIVATE *psf, int location)
 	psf_binheader_writef (psf, "m4m", LIST_MARKER, 0xBADBAD, INFO_MARKER) ;
 
 	for (k = 0 ; k < SF_MAX_STRINGS ; k++)
-	{	if (psf->strings [k].type == 0)
+	{	if (psf->strings.data [k].type == 0)
 			break ;
-		if (psf->strings [k].type < 0 || psf->strings [k].flags != location)
+		if (psf->strings.data [k].type < 0 || psf->strings.data [k].flags != location)
 			continue ;
 
-		switch (psf->strings [k].type)
+		switch (psf->strings.data [k].type)
 		{	case SF_STR_SOFTWARE :
-				psf_binheader_writef (psf, "ms", ISFT_MARKER, psf->strings [k].str) ;
+				psf_binheader_writef (psf, "ms", ISFT_MARKER, psf->strings.storage + psf->strings.data [k].offset) ;
 				break ;
 
 			case SF_STR_TITLE :
-				psf_binheader_writef (psf, "ms", INAM_MARKER, psf->strings [k].str) ;
+				psf_binheader_writef (psf, "ms", INAM_MARKER, psf->strings.storage + psf->strings.data [k].offset) ;
 				break ;
 
 			case SF_STR_COPYRIGHT :
-				psf_binheader_writef (psf, "ms", ICOP_MARKER, psf->strings [k].str) ;
+				psf_binheader_writef (psf, "ms", ICOP_MARKER, psf->strings.storage + psf->strings.data [k].offset) ;
 				break ;
 
 			case SF_STR_ARTIST :
-				psf_binheader_writef (psf, "ms", IART_MARKER, psf->strings [k].str) ;
+				psf_binheader_writef (psf, "ms", IART_MARKER, psf->strings.storage + psf->strings.data [k].offset) ;
 				break ;
 
 			case SF_STR_COMMENT :
-				psf_binheader_writef (psf, "ms", ICMT_MARKER, psf->strings [k].str) ;
+				psf_binheader_writef (psf, "ms", ICMT_MARKER, psf->strings.storage + psf->strings.data [k].offset) ;
 				break ;
 
 			case SF_STR_DATE :
-				psf_binheader_writef (psf, "ms", ICRD_MARKER, psf->strings [k].str) ;
+				psf_binheader_writef (psf, "ms", ICRD_MARKER, psf->strings.storage + psf->strings.data [k].offset) ;
+				break ;
+
+			case SF_STR_GENRE :
+				psf_binheader_writef (psf, "ms", IGNR_MARKER, psf->strings.storage + psf->strings.data [k].offset) ;
+				break ;
+
+			case SF_STR_ALBUM :
+				psf_binheader_writef (psf, "ms", IPRD_MARKER, psf->strings.storage + psf->strings.data [k].offset) ;
+				break ;
+
+			case SF_STR_TRACKNUMBER :
+				psf_binheader_writef (psf, "ms", ITRK_MARKER, psf->strings.storage + psf->strings.data [k].offset) ;
 				break ;
 
 			default :
@@ -1217,10 +1279,10 @@ wav_write_strings (SF_PRIVATE *psf, int location)
 static int
 wav_close (SF_PRIVATE *psf)
 {
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{	wav_write_tailer (psf) ;
 
-		if (psf->mode == SFM_RDWR)
+		if (psf->file.mode == SFM_RDWR)
 		{	sf_count_t current = psf_ftell (psf) ;
 
 			/*
@@ -1262,6 +1324,10 @@ wav_command (SF_PRIVATE *psf, int command, void * UNUSED (data), int datasize)
 		case SFC_WAVEX_GET_AMBISONIC :
 			return wpriv->wavex_ambisonic ;
 
+		case SFC_SET_CHANNEL_MAP_INFO :
+			wpriv->wavex_channelmask = wavex_gen_channel_mask (psf->channel_map, psf->sf.channels) ;
+			return (wpriv->wavex_channelmask != 0) ;
+
 		default :
 			break ;
 	} ;
@@ -1270,45 +1336,50 @@ wav_command (SF_PRIVATE *psf, int command, void * UNUSED (data), int datasize)
 } /* wav_command */
 
 static int
-wav_subchunk_parse (SF_PRIVATE *psf, int chunk)
+wav_subchunk_parse (SF_PRIVATE *psf, int chunk, uint32_t chunk_length)
 {	sf_count_t	current_pos ;
-	char		*cptr ;
-	unsigned 	dword, bytesread, length ;
+	char		buffer [512] ;
+	uint32_t 	dword, bytesread ;
 
-	current_pos = psf_fseek (psf, 0, SEEK_CUR) ;
+	current_pos = psf_fseek (psf, 0, SEEK_CUR) - 4 ;
 
-	bytesread = psf_binheader_readf (psf, "4", &length) ;
+	bytesread = sizeof (chunk_length) ;
 
-	if (length <= 8)
+	if (chunk_length <= 8)
 	{	/* This case is for broken files generated by PEAK. */
-		psf_log_printf (psf, "%M : %d (weird length)\n", chunk, length) ;
-		psf_binheader_readf (psf, "mj", &chunk, length - 4) ;
+		psf_log_printf (psf, "%M : %d (weird length)\n", chunk, chunk_length) ;
+		psf_binheader_readf (psf, "mj", &chunk, chunk_length - 4) ;
 		psf_log_printf (psf, "  %M\n", chunk) ;
 		return 0 ;
 		} ;
 
-	if (psf->headindex + length > SIGNED_SIZEOF (psf->header))
-	{	psf_log_printf (psf, "%M : %d (too long)\n", chunk, length) ;
-		psf_binheader_readf (psf, "j", length) ;
+	if (psf->headindex + chunk_length > SIGNED_SIZEOF (psf->header))
+	{	psf_log_printf (psf, "%M : %d (too long)\n", chunk, chunk_length) ;
+		psf_binheader_readf (psf, "j", chunk_length) ;
 		return 0 ;
 		} ;
 
-	if (current_pos + length > psf->filelength)
-	{	psf_log_printf (psf, "%M : %d (should be %d)\n", chunk, length, (int) (psf->filelength - current_pos)) ;
-		length = psf->filelength - current_pos ;
+	if (current_pos + chunk_length > psf->filelength)
+	{	psf_log_printf (psf, "%M : %d (should be %d)\n", chunk, chunk_length, (int) (psf->filelength - current_pos)) ;
+		chunk_length = psf->filelength - current_pos ;
 		}
 	else
-		psf_log_printf (psf, "%M : %d\n", chunk, length) ;
+		psf_log_printf (psf, "%M : %d\n", chunk, chunk_length) ;
 
-	while (bytesread < length)
+	while (bytesread < chunk_length)
 	{	bytesread += psf_binheader_readf (psf, "m", &chunk) ;
 
 		switch (chunk)
 		{	case adtl_MARKER :
 			case INFO_MARKER :
-					/* These markers don't contain anything. */
+					/* These markers don't contain anything, not even a chunk lebgth. */
 					psf_log_printf (psf, "  %M\n", chunk) ;
-					break ;
+					continue ;
+
+			case exif_MARKER :
+					psf_log_printf (psf, "  %M\n", chunk) ;
+					bytesread += exif_subchunk_parse (psf, chunk_length - bytesread) ;
+					continue ;
 
 			case data_MARKER :
 					psf_log_printf (psf, "  %M inside a LIST block??? Backing out.\n", chunk) ;
@@ -1316,31 +1387,47 @@ wav_subchunk_parse (SF_PRIVATE *psf, int chunk)
 					psf_binheader_readf (psf, "j", -4) ;
 					return 0 ;
 
-			case ISFT_MARKER :
+			case 0 :
+					/*
+					**	Four zero bytes where a marker was expected. Assume this means
+					**	the rest of the chunk is garbage.
+					*/
+					psf_log_printf (psf, "    *** Found weird-ass zero marker. Jumping to end of chunk.\n") ;
+					if (bytesread < chunk_length)
+						bytesread += psf_binheader_readf (psf, "j", chunk_length - bytesread + 4) ;
+					psf_log_printf (psf, "    *** Offset is now : 0x%X\n", psf_fseek (psf, 0, SEEK_CUR)) ;
+					return 0 ;
+
+			default :
+					break ;
+			} ;
+
+		switch (chunk)
+		{	case ISFT_MARKER :
 			case ICOP_MARKER :
 			case IARL_MARKER :
 			case IART_MARKER :
 			case ICMT_MARKER :
 			case ICRD_MARKER :
 			case IENG_MARKER :
-
+			case IGNR_MARKER :
 			case INAM_MARKER :
 			case IPRD_MARKER :
 			case ISBJ_MARKER :
 			case ISRC_MARKER :
+			case IAUT_MARKER :
+			case ITRK_MARKER :
 					bytesread += psf_binheader_readf (psf, "4", &dword) ;
 					dword += (dword & 1) ;
-					if (dword >= SIGNED_SIZEOF (psf->u.cbuf))
+					if (dword >= SIGNED_SIZEOF (buffer))
 					{	psf_log_printf (psf, "  *** %M : %d (too big)\n", chunk, dword) ;
 						psf_binheader_readf (psf, "j", dword) ;
 						break ;
 						} ;
 
-					cptr = psf->u.cbuf ;
-					psf_binheader_readf (psf, "b", cptr, dword) ;
-					bytesread += dword ;
-					cptr [dword] = 0 ;
-					psf_log_printf (psf, "    %M : %s\n", chunk, cptr) ;
+					bytesread += psf_binheader_readf (psf, "b", buffer, dword) ;
+					buffer [dword] = 0 ;
+					psf_log_printf (psf, "    %M : %s\n", chunk, buffer) ;
 					break ;
 
 			case labl_MARKER :
@@ -1349,17 +1436,15 @@ wav_subchunk_parse (SF_PRIVATE *psf, int chunk)
 						bytesread += psf_binheader_readf (psf, "44", &dword, &mark_id) ;
 						dword -= 4 ;
 						dword += (dword & 1) ;
-						if (dword < 1 || dword >= SIGNED_SIZEOF (psf->u.cbuf))
+						if (dword < 1 || dword >= SIGNED_SIZEOF (buffer))
 						{	psf_log_printf (psf, "  *** %M : %d (too big)\n", chunk, dword) ;
 							psf_binheader_readf (psf, "j", dword) ;
 							break ;
 							} ;
 
-						cptr = psf->u.cbuf ;
-						psf_binheader_readf (psf, "b", cptr, dword) ;
-						bytesread += dword ;
-						cptr [dword] = 0 ;
-						psf_log_printf (psf, "    %M : %d : %s\n", chunk, mark_id, cptr) ;
+						bytesread += psf_binheader_readf (psf, "b", buffer, dword) ;
+						buffer [dword] = 0 ;
+						psf_log_printf (psf, "    %M : %d : %s\n", chunk, mark_id, buffer) ;
 						} ;
 					break ;
 
@@ -1369,73 +1454,70 @@ wav_subchunk_parse (SF_PRIVATE *psf, int chunk)
 			case note_MARKER :
 					bytesread += psf_binheader_readf (psf, "4", &dword) ;
 					dword += (dword & 1) ;
-					psf_binheader_readf (psf, "j", dword) ;
-					bytesread += dword ;
+					bytesread += psf_binheader_readf (psf, "j", dword) ;
 					psf_log_printf (psf, "    %M : %d\n", chunk, dword) ;
 					break ;
 
-			case exif_MARKER :
-					psf_log_printf (psf, "  %M\n", chunk) ;
-					bytesread += exif_subchunk_parse (psf, length - bytesread) ;
-					break ;
-
-			case 0 :
-					/*
-					**	Four zero bytes where a marker was expected. Assume this means
-					**	the rest of the chunk is garbage.
-					*/
-					psf_log_printf (psf, "    *** Found weird-ass zero marker. Jumping to end of chunk.\n") ;
-					if (bytesread < length)
-						bytesread += psf_binheader_readf (psf, "j", length - bytesread + 4) ;
-					psf_log_printf (psf, "    *** Offset is now : 0x%X\n", psf_fseek (psf, 0, SEEK_CUR)) ;
-					return 0 ;
-
 			default :
-					psf_binheader_readf (psf, "4", &dword) ;
-					bytesread += sizeof (dword) ;
+					bytesread += psf_binheader_readf (psf, "4", &dword) ;
 					dword += (dword & 1) ;
-					psf_binheader_readf (psf, "j", dword) ;
-					bytesread += dword ;
 					psf_log_printf (psf, "    *** %M : %d\n", chunk, dword) ;
-					if (dword > length)
+					if (bytesread + dword > chunk_length)
+					{	bytesread += psf_binheader_readf (psf, "j", chunk_length - bytesread + 4) ;
+						continue ;
+						}
+					else
+						bytesread += psf_binheader_readf (psf, "j", dword) ;
+
+					if (dword >= chunk_length)
 						return 0 ;
 					break ;
 			} ;
 
 		switch (chunk)
 		{	case ISFT_MARKER :
-					psf_store_string (psf, SF_STR_SOFTWARE, psf->u.cbuf) ;
+					psf_store_string (psf, SF_STR_SOFTWARE, buffer) ;
 					break ;
 			case ICOP_MARKER :
-					psf_store_string (psf, SF_STR_COPYRIGHT, psf->u.cbuf) ;
+					psf_store_string (psf, SF_STR_COPYRIGHT, buffer) ;
 					break ;
 			case INAM_MARKER :
-					psf_store_string (psf, SF_STR_TITLE, psf->u.cbuf) ;
+					psf_store_string (psf, SF_STR_TITLE, buffer) ;
 					break ;
 			case IART_MARKER :
-					psf_store_string (psf, SF_STR_ARTIST, psf->u.cbuf) ;
+					psf_store_string (psf, SF_STR_ARTIST, buffer) ;
 					break ;
 			case ICMT_MARKER :
-					psf_store_string (psf, SF_STR_COMMENT, psf->u.cbuf) ;
+					psf_store_string (psf, SF_STR_COMMENT, buffer) ;
 					break ;
 			case ICRD_MARKER :
-					psf_store_string (psf, SF_STR_DATE, psf->u.cbuf) ;
+					psf_store_string (psf, SF_STR_DATE, buffer) ;
+					break ;
+			case IGNR_MARKER :
+					psf_store_string (psf, SF_STR_GENRE, buffer) ;
+					break ;
+			case IPRD_MARKER :
+					psf_store_string (psf, SF_STR_ALBUM, buffer) ;
+					break ;
+			case ITRK_MARKER :
+					psf_store_string (psf, SF_STR_TRACKNUMBER, buffer) ;
 					break ;
 			} ;
 		} ;
 
 	current_pos = psf_fseek (psf, 0, SEEK_CUR) - current_pos ;
 
-	if (current_pos - 4 != length)
-		psf_log_printf (psf, "**** Bad chunk length %d sbould be %D\n", length, current_pos - 4) ;
+	if (current_pos - 4 != chunk_length)
+		psf_log_printf (psf, "**** Bad chunk length %d sbould be %D\n", chunk_length, current_pos - 4) ;
 
 	return 0 ;
 } /* wav_subchunk_parse */
 
 static int
-wav_read_smpl_chunk (SF_PRIVATE *psf, unsigned int chunklen)
-{	unsigned int bytesread = 0, dword, sampler_data, loop_count ;
-	unsigned int note, start, end, type = -1, count ;
+wav_read_smpl_chunk (SF_PRIVATE *psf, uint32_t chunklen)
+{	char buffer [512] ;
+	uint32_t bytesread = 0, dword, sampler_data, loop_count ;
+	uint32_t note, start, end, type = -1, count ;
 	int j, k ;
 
 	chunklen += (chunklen & 1) ;
@@ -1454,9 +1536,9 @@ wav_read_smpl_chunk (SF_PRIVATE *psf, unsigned int chunklen)
 
 	bytesread += psf_binheader_readf (psf, "4", &dword) ;
 	if (dword != 0)
-	{	snprintf (psf->u.cbuf, sizeof (psf->u.cbuf), "%f",
-				 (1.0 * 0x80000000) / ((unsigned int) dword)) ;
-		psf_log_printf (psf, "  Pitch Fract. : %s\n", psf->u.cbuf) ;
+	{	snprintf (buffer, sizeof (buffer), "%f",
+					(1.0 * 0x80000000) / ((uint32_t) dword)) ;
+		psf_log_printf (psf, "  Pitch Fract. : %s\n", buffer) ;
 		}
 	else
 		psf_log_printf (psf, "  Pitch Fract. : 0\n") ;
@@ -1465,9 +1547,9 @@ wav_read_smpl_chunk (SF_PRIVATE *psf, unsigned int chunklen)
 	psf_log_printf (psf, "  SMPTE Format : %u\n", dword) ;
 
 	bytesread += psf_binheader_readf (psf, "4", &dword) ;
-	snprintf (psf->u.cbuf, sizeof (psf->u.cbuf), "%02d:%02d:%02d %02d",
-		 (dword >> 24) & 0x7F, (dword >> 16) & 0x7F, (dword >> 8) & 0x7F, dword & 0x7F) ;
-	psf_log_printf (psf, "  SMPTE Offset : %s\n", psf->u.cbuf) ;
+	snprintf (buffer, sizeof (buffer), "%02d:%02d:%02d %02d",
+				(dword >> 24) & 0x7F, (dword >> 16) & 0x7F, (dword >> 8) & 0x7F, dword & 0x7F) ;
+	psf_log_printf (psf, "  SMPTE Offset : %s\n", buffer) ;
 
 	bytesread += psf_binheader_readf (psf, "4", &loop_count) ;
 	psf_log_printf (psf, "  Loop Count   : %u\n", loop_count) ;
@@ -1503,7 +1585,7 @@ wav_read_smpl_chunk (SF_PRIVATE *psf, unsigned int chunklen)
 
 		if (j < ARRAY_LEN (psf->instrument->loops))
 		{	psf->instrument->loops [j].start = start ;
-			psf->instrument->loops [j].end = end ;
+			psf->instrument->loops [j].end = end + 1 ;
 			psf->instrument->loops [j].count = count ;
 
 			switch (type)
@@ -1593,8 +1675,9 @@ wav_read_smpl_chunk (SF_PRIVATE *psf, unsigned int chunklen)
 */
 
 static int
-wav_read_acid_chunk (SF_PRIVATE *psf, unsigned int chunklen)
-{	unsigned int bytesread = 0 ;
+wav_read_acid_chunk (SF_PRIVATE *psf, uint32_t chunklen)
+{	char buffer [512] ;
+	uint32_t bytesread = 0 ;
 	int	beats, flags ;
 	short rootnote, q1, meter_denom, meter_numer ;
 	float q2, tempo ;
@@ -1603,7 +1686,7 @@ wav_read_acid_chunk (SF_PRIVATE *psf, unsigned int chunklen)
 
 	bytesread += psf_binheader_readf (psf, "422f", &flags, &rootnote, &q1, &q2) ;
 
-	snprintf (psf->u.cbuf, sizeof (psf->u.cbuf), "%f", q2) ;
+	snprintf (buffer, sizeof (buffer), "%f", q2) ;
 
 	psf_log_printf (psf, "  Flags     : 0x%04x (%s,%s,%s,%s,%s)\n", flags,
 			(flags & 0x01) ? "OneShot" : "Loop",
@@ -1613,12 +1696,12 @@ wav_read_acid_chunk (SF_PRIVATE *psf, unsigned int chunklen)
 			(flags & 0x10) ? "??On" : "??Off") ;
 
 	psf_log_printf (psf, "  Root note : 0x%x\n  ????      : 0x%04x\n  ????      : %s\n",
-				rootnote, q1, psf->u.cbuf) ;
+				rootnote, q1, buffer) ;
 
 	bytesread += psf_binheader_readf (psf, "422f", &beats, &meter_denom, &meter_numer, &tempo) ;
-	snprintf (psf->u.cbuf, sizeof (psf->u.cbuf), "%f", tempo) ;
+	snprintf (buffer, sizeof (buffer), "%f", tempo) ;
 	psf_log_printf (psf, "  Beats     : %d\n  Meter     : %d/%d\n  Tempo     : %s\n",
-				beats, meter_numer, meter_denom, psf->u.cbuf) ;
+				beats, meter_numer, meter_denom, buffer) ;
 
 	psf_binheader_readf (psf, "j", chunklen - bytesread) ;
 
@@ -1635,11 +1718,11 @@ wav_read_acid_chunk (SF_PRIVATE *psf, unsigned int chunklen)
 	return 0 ;
 } /* wav_read_acid_chunk */
 
-static int
-wav_read_bext_chunk (SF_PRIVATE *psf, unsigned int chunksize)
+int
+wav_read_bext_chunk (SF_PRIVATE *psf, uint32_t chunksize)
 {
-	SF_BROADCAST_INFO* b ;
-	unsigned int bytes = 0 ;
+	SF_BROADCAST_INFO_16K * b ;
+	uint32_t bytes = 0 ;
 
 	if (chunksize < WAV_BEXT_MIN_CHUNK_SIZE)
 	{	psf_log_printf (psf, "bext : %u (should be >= %d)\n", chunksize, WAV_BEXT_MIN_CHUNK_SIZE) ;
@@ -1653,14 +1736,20 @@ wav_read_bext_chunk (SF_PRIVATE *psf, unsigned int chunksize)
 		return 0 ;
 		} ;
 
+	if (chunksize >= sizeof (SF_BROADCAST_INFO_16K))
+	{	psf_log_printf (psf, "bext : %u too big to be handled\n", chunksize) ;
+		psf_binheader_readf (psf, "j", chunksize) ;
+		return 0 ;
+		} ;
+
 	psf_log_printf (psf, "bext : %u\n", chunksize) ;
 
-	if ((psf->broadcast_var = broadcast_var_alloc (chunksize + 128)) == NULL)
+	if ((psf->broadcast_16k = broadcast_var_alloc ()) == NULL)
 	{	psf->error = SFE_MALLOC_FAILED ;
 		return psf->error ;
 		} ;
 
-	b = & psf->broadcast_var->binfo ;
+	b = psf->broadcast_16k ;
 
 	bytes += psf_binheader_readf (psf, "b", b->description, sizeof (b->description)) ;
 	bytes += psf_binheader_readf (psf, "b", b->originator, sizeof (b->originator)) ;
@@ -1685,14 +1774,14 @@ wav_read_bext_chunk (SF_PRIVATE *psf, unsigned int chunksize)
 	return 0 ;
 } /* wav_read_bext_chunk */
 
-static int
+int
 wav_write_bext_chunk (SF_PRIVATE *psf)
-{	SF_BROADCAST_INFO *b ;
+{	SF_BROADCAST_INFO_16K *b ;
 
-	if (psf->broadcast_var == NULL)
+	if (psf->broadcast_16k == NULL)
 		return -1 ;
 
-	b = & psf->broadcast_var->binfo ;
+	b = psf->broadcast_16k ;
 
 	psf_binheader_writef (psf, "m4", bext_MARKER, WAV_BEXT_MIN_CHUNK_SIZE + b->coding_history_size) ;
 
@@ -1716,6 +1805,112 @@ wav_write_bext_chunk (SF_PRIVATE *psf)
 	return 0 ;
 } /* wav_write_bext_chunk */
 
+int
+wav_read_cart_chunk (SF_PRIVATE *psf, uint32_t chunksize)
+{	SF_CART_INFO_16K *c ;
+	uint32_t bytes = 0 ;
+	int k ;
+
+	if (chunksize < WAV_CART_MIN_CHUNK_SIZE)
+	{	psf_log_printf (psf, "cart : %u (should be >= %d)\n", chunksize, WAV_CART_MIN_CHUNK_SIZE) ;
+		psf_binheader_readf (psf, "j", chunksize) ;
+		return 0 ;
+		} ;
+	if (chunksize > WAV_CART_MAX_CHUNK_SIZE)
+	{	psf_log_printf (psf, "cart : %u (should be < %d)\n", chunksize, WAV_CART_MAX_CHUNK_SIZE) ;
+		psf_binheader_readf (psf, "j", chunksize) ;
+		return 0 ;
+		} ;
+
+	if (chunksize >= sizeof (SF_CART_INFO_16K))
+	{	psf_log_printf (psf, "cart : %u too big to be handled\n", chunksize) ;
+		psf_binheader_readf (psf, "j", chunksize) ;
+		return 0 ;
+		} ;
+
+	psf_log_printf (psf, "cart : %u\n", chunksize) ;
+
+	if ((psf->cart_16k = cart_var_alloc ()) == NULL)
+	{	psf->error = SFE_MALLOC_FAILED ;
+		return psf->error ;
+		} ;
+
+	c = psf->cart_16k ;
+	bytes += psf_binheader_readf (psf, "b", c->version, sizeof (c->version)) ;
+	bytes += psf_binheader_readf (psf, "b", c->title, sizeof (c->title)) ;
+	bytes += psf_binheader_readf (psf, "b", c->artist, sizeof (c->artist)) ;
+	bytes += psf_binheader_readf (psf, "b", c->cut_id, sizeof (c->cut_id)) ;
+	bytes += psf_binheader_readf (psf, "b", c->client_id, sizeof (c->client_id)) ;
+	bytes += psf_binheader_readf (psf, "b", c->category, sizeof (c->category)) ;
+	bytes += psf_binheader_readf (psf, "b", c->classification, sizeof (c->classification)) ;
+	bytes += psf_binheader_readf (psf, "b", c->out_cue, sizeof (c->out_cue)) ;
+	bytes += psf_binheader_readf (psf, "b", c->start_date, sizeof (c->start_date)) ;
+	bytes += psf_binheader_readf (psf, "b", c->start_time, sizeof (c->start_time)) ;
+	bytes += psf_binheader_readf (psf, "b", c->end_date, sizeof (c->end_date)) ;
+	bytes += psf_binheader_readf (psf, "b", c->end_time, sizeof (c->end_time)) ;
+	bytes += psf_binheader_readf (psf, "b", c->producer_app_id, sizeof (c->producer_app_id)) ;
+	bytes += psf_binheader_readf (psf, "b", c->producer_app_version, sizeof (c->producer_app_version)) ;
+	bytes += psf_binheader_readf (psf, "b", c->user_def, sizeof (c->user_def)) ;
+	bytes += psf_binheader_readf (psf, "e4", &c->level_reference, sizeof (c->level_reference)) ;
+
+	for (k = 0 ; k < ARRAY_LEN (c->post_timers) ; k++)
+		bytes += psf_binheader_readf (psf, "b4", &c->post_timers [k].usage, make_size_t (4), &c->post_timers [k].value) ;
+
+	bytes += psf_binheader_readf (psf, "b", c->reserved, sizeof (c->reserved)) ;
+	bytes += psf_binheader_readf (psf, "b", c->url, sizeof (c->url)) ;
+
+	if (chunksize > WAV_CART_MIN_CHUNK_SIZE)
+	{	/* File has tag text. */
+		c->tag_text_size = chunksize - WAV_CART_MIN_CHUNK_SIZE ;
+		bytes += psf_binheader_readf (psf, "b", c->tag_text, make_size_t (c->tag_text_size)) ;
+		} ;
+
+	return 0 ;
+} /* wav_read_cart_chunk */
+
+int
+wav_write_cart_chunk (SF_PRIVATE *psf)
+{	SF_CART_INFO_16K *c ;
+	int k ;
+
+	if (psf->cart_16k == NULL)
+		return -1 ;
+
+	c = psf->cart_16k ;
+	psf_binheader_writef (psf, "m4", cart_MARKER, WAV_CART_MIN_CHUNK_SIZE + c->tag_text_size) ;
+	/*
+	**	Note that it is very important the the field widths of the SF_CART_INFO
+	**	struct match those for the cart chunk fields.
+	*/
+	psf_binheader_writef (psf, "b", c->version, sizeof (c->version)) ;
+	psf_binheader_writef (psf, "b", c->title, sizeof (c->title)) ;
+	psf_binheader_writef (psf, "b", c->artist, sizeof (c->artist)) ;
+	psf_binheader_writef (psf, "b", c->cut_id, sizeof (c->cut_id)) ;
+	psf_binheader_writef (psf, "b", c->client_id, sizeof (c->client_id)) ;
+	psf_binheader_writef (psf, "b", c->category, sizeof (c->category)) ;
+	psf_binheader_writef (psf, "b", c->classification, sizeof (c->classification)) ;
+	psf_binheader_writef (psf, "b", c->out_cue, sizeof (c->out_cue)) ;
+	psf_binheader_writef (psf, "b", c->start_date, sizeof (c->start_date)) ;
+	psf_binheader_writef (psf, "b", c->start_time, sizeof (c->start_time)) ;
+	psf_binheader_writef (psf, "b", c->end_date, sizeof (c->end_date)) ;
+	psf_binheader_writef (psf, "b", c->end_time, sizeof (c->end_time)) ;
+	psf_binheader_writef (psf, "b", c->producer_app_id, sizeof (c->producer_app_id)) ;
+	psf_binheader_writef (psf, "b", c->producer_app_version, sizeof (c->producer_app_version)) ;
+	psf_binheader_writef (psf, "b", c->user_def, sizeof (c->user_def)) ;
+	psf_binheader_writef (psf, "4", c->level_reference, sizeof (c->level_reference)) ;
+
+	for (k = 0 ; k < ARRAY_LEN (c->post_timers) ; k++)
+		psf_binheader_writef (psf, "b4", c->post_timers [k].usage, make_size_t (4), c->post_timers [k].value) ;
+
+	psf_binheader_writef (psf, "z", sizeof (c->reserved)) ;	// just write zeros, we don't have any other use for it
+	psf_binheader_writef (psf, "b", c->url, sizeof (c->url)) ;
+
+	if (c->tag_text_size > 0)
+		psf_binheader_writef (psf, "b", c->tag_text, make_size_t (c->tag_text_size)) ;
+
+	return 0 ;
+} /* wav_write_cart_chunk */
+
 static int
 exif_fill_and_sink (SF_PRIVATE *psf, char* buf, size_t bufsz, size_t toread)
 {
@@ -1739,8 +1934,8 @@ exif_fill_and_sink (SF_PRIVATE *psf, char* buf, size_t bufsz, size_t toread)
 ** (Exif Audio File Specification) http://www.exif.org/Exif2-2.PDF
 */
 static int
-exif_subchunk_parse (SF_PRIVATE *psf, unsigned int length)
-{	unsigned marker, dword, vmajor = -1, vminor = -1, bytesread = 0 ;
+exif_subchunk_parse (SF_PRIVATE *psf, uint32_t length)
+{	uint32_t marker, dword, vmajor = -1, vminor = -1, bytesread = 0 ;
 	char buf [4096] ;
 
 	while (bytesread < length)
@@ -1759,13 +1954,20 @@ exif_subchunk_parse (SF_PRIVATE *psf, unsigned int length)
 				psf_log_printf (psf, "    EXIF Version : %u.%02u\n", vmajor, vminor) ;
 				break ;
 
+			case olym_MARKER :
+				bytesread += psf_binheader_readf (psf, "4", &dword) ;
+				psf_log_printf (psf, "%M : %u\n", marker, dword) ;
+				dword += (dword & 1) ;
+				bytesread += psf_binheader_readf (psf, "j", dword) ;
+				break ;
+
 			case emnt_MARKER : /* design information: null-terminated string */
 			case emdl_MARKER : /* model name ; null-terminated string */
 			case ecor_MARKER : /* manufacturer: null-terminated string */
 			case etim_MARKER : /* creation time: null-terminated string in the format "hour:minute:second.subsecond" */
 			case erel_MARKER : /* relation info: null-terminated string (filename) */
 			case eucm_MARKER : /* user comment: 4-byte size follows, then possibly unicode data */
-				psf_binheader_readf (psf, "4", &dword) ;
+				bytesread += psf_binheader_readf (psf, "4", &dword) ;
 				bytesread += sizeof (dword) ;
 				dword += (dword & 1) ;
 
@@ -1798,3 +2000,49 @@ exif_subchunk_parse (SF_PRIVATE *psf, unsigned int length)
 	return bytesread ;
 } /* exif_subchunk_parse */
 
+/*==============================================================================
+*/
+
+static int
+wav_set_chunk (SF_PRIVATE *psf, const SF_CHUNK_INFO * chunk_info)
+{	return psf_save_write_chunk (&psf->wchunks, chunk_info) ;
+} /* wav_set_chunk */
+
+static SF_CHUNK_ITERATOR *
+wav_next_chunk_iterator (SF_PRIVATE *psf, SF_CHUNK_ITERATOR * iterator)
+{	return psf_next_chunk_iterator (&psf->rchunks, iterator) ;
+} /* wav_next_chunk_iterator */
+
+static int
+wav_get_chunk_size (SF_PRIVATE *psf, const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info)
+{	int indx ;
+
+	if ((indx = psf_find_read_chunk_iterator (&psf->rchunks, iterator)) < 0)
+		return SFE_UNKNOWN_CHUNK ;
+
+	chunk_info->datalen = psf->rchunks.chunks [indx].len ;
+
+	return SFE_NO_ERROR ;
+} /* wav_get_chunk_size */
+
+static int
+wav_get_chunk_data (SF_PRIVATE *psf, const SF_CHUNK_ITERATOR * iterator, SF_CHUNK_INFO * chunk_info)
+{	int indx ;
+	sf_count_t pos ;
+
+	if ((indx = psf_find_read_chunk_iterator (&psf->rchunks, iterator)) < 0)
+		return SFE_UNKNOWN_CHUNK ;
+
+	if (chunk_info->data == NULL)
+		return SFE_BAD_CHUNK_DATA_PTR ;
+
+	chunk_info->id_size = psf->rchunks.chunks [indx].id_size ;
+	memcpy (chunk_info->id, psf->rchunks.chunks [indx].id, sizeof (chunk_info->id) / sizeof (*chunk_info->id)) ;
+
+	pos = psf_ftell (psf) ;
+	psf_fseek (psf, psf->rchunks.chunks [indx].offset, SEEK_SET) ;
+	psf_fread (chunk_info->data, SF_MIN (chunk_info->datalen, psf->rchunks.chunks [indx].len), 1, psf) ;
+	psf_fseek (psf, pos, SEEK_SET) ;
+
+	return SFE_NO_ERROR ;
+} /* wav_get_chunk_data */
diff --git a/libs/libsndfile/src/wav_w64.c b/libs/libsndfile/src/wav_w64.c
index 4f540339a4..cf0d3ef2b1 100644
--- a/libs/libsndfile/src/wav_w64.c
+++ b/libs/libsndfile/src/wav_w64.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2012 Erik de Castro Lopo 
 ** Copyright (C) 2004-2005 David Viens 
 **
 ** This program is free software; you can redistribute it and/or modify
@@ -72,6 +72,32 @@ static const EXT_SUBFORMAT MSGUID_SUBTYPE_PVOCEX =
 } ;
 #endif
 
+/* This stores which bit in dwChannelMask maps to which channel */
+static const struct chanmap_s
+{	int id ;
+	const char * name ;
+} channel_mask_bits [] =
+{	/* WAVEFORMATEXTENSIBLE doesn't distuingish FRONT_LEFT from LEFT */
+	{	SF_CHANNEL_MAP_LEFT, "L" },
+	{	SF_CHANNEL_MAP_RIGHT, "R" },
+	{	SF_CHANNEL_MAP_CENTER, "C" },
+	{	SF_CHANNEL_MAP_LFE, "LFE" },
+	{	SF_CHANNEL_MAP_REAR_LEFT, "Ls" },
+	{	SF_CHANNEL_MAP_REAR_RIGHT, "Rs" },
+	{	SF_CHANNEL_MAP_FRONT_LEFT_OF_CENTER, "Lc" },
+	{	SF_CHANNEL_MAP_FRONT_RIGHT_OF_CENTER, "Rc" },
+	{	SF_CHANNEL_MAP_REAR_CENTER, "Cs" },
+	{	SF_CHANNEL_MAP_SIDE_LEFT, "Sl" },
+	{	SF_CHANNEL_MAP_SIDE_RIGHT, "Sr" },
+	{	SF_CHANNEL_MAP_TOP_CENTER, "Tc" },
+	{	SF_CHANNEL_MAP_TOP_FRONT_LEFT, "Tfl" },
+	{	SF_CHANNEL_MAP_TOP_FRONT_CENTER, "Tfc" },
+	{	SF_CHANNEL_MAP_TOP_FRONT_RIGHT, "Tfr" },
+	{	SF_CHANNEL_MAP_TOP_REAR_LEFT, "Trl" },
+	{	SF_CHANNEL_MAP_TOP_REAR_CENTER, "Trc" },
+	{	SF_CHANNEL_MAP_TOP_REAR_RIGHT, "Trr" },
+} ;
+
 /*------------------------------------------------------------------------------
  * Private static functions.
  */
@@ -109,12 +135,15 @@ wav_w64_read_fmt_chunk (SF_PRIVATE *psf, int fmtsize)
 	psf_log_printf (psf, "  Format        : 0x%X => %s\n", wav_fmt->format, wav_w64_format_str (wav_fmt->format)) ;
 	psf_log_printf (psf, "  Channels      : %d\n", wav_fmt->min.channels) ;
 	psf_log_printf (psf, "  Sample Rate   : %d\n", wav_fmt->min.samplerate) ;
-	psf_log_printf (psf, "  Block Align   : %d\n", wav_fmt->min.blockalign) ;
 
-	if (wav_fmt->min.blockalign == 0)
-	{	psf_log_printf (psf, "*** Error : wav_fmt->min.blockalign should not be zero.\n") ;
-		return SFE_INTERNAL ;
-		} ;
+	if (wav_fmt->format == WAVE_FORMAT_PCM && wav_fmt->min.blockalign == 0
+		&& wav_fmt->min.bitwidth > 0 && wav_fmt->min.channels > 0)
+	{	wav_fmt->min.blockalign = wav_fmt->min.bitwidth / 8 + (wav_fmt->min.bitwidth % 8 > 0 ? 1 : 0) ;
+		wav_fmt->min.blockalign *= wav_fmt->min.channels ;
+		psf_log_printf (psf, "  Block Align   : 0 (should be %d)\n", wav_fmt->min.blockalign) ;
+		}
+	else
+		psf_log_printf (psf, "  Block Align   : %d\n", wav_fmt->min.blockalign) ;
 
 	if (wav_fmt->format == WAVE_FORMAT_PCM && wav_fmt->min.bitwidth == 24 &&
 			wav_fmt->min.blockalign == 4 * wav_fmt->min.channels)
@@ -195,7 +224,6 @@ wav_w64_read_fmt_chunk (SF_PRIVATE *psf, int fmtsize)
 				else
 					psf_log_printf (psf, "  Bytes/sec     : %d\n", wav_fmt->ima.bytespersec) ;
 
-				psf->bytewidth = 2 ;
 				psf_log_printf (psf, "  Extra Bytes   : %d\n", wav_fmt->ima.extrabytes) ;
 				psf_log_printf (psf, "  Samples/Block : %d\n", wav_fmt->ima.samplesperblock) ;
 				break ;
@@ -218,8 +246,6 @@ wav_w64_read_fmt_chunk (SF_PRIVATE *psf, int fmtsize)
 				else
 					psf_log_printf (psf, "  Bytes/sec     : %d (should be %d)\n", wav_fmt->min.bytespersec, bytespersec) ;
 
-
-				psf->bytewidth = 2 ;
 				psf_log_printf (psf, "  Extra Bytes   : %d\n", wav_fmt->msadpcm.extrabytes) ;
 				psf_log_printf (psf, "  Samples/Block : %d\n", wav_fmt->msadpcm.samplesperblock) ;
 				if (wav_fmt->msadpcm.numcoeffs > ARRAY_LEN (wav_fmt->msadpcm.coeffs))
@@ -231,10 +257,12 @@ wav_w64_read_fmt_chunk (SF_PRIVATE *psf, int fmtsize)
 
 				psf_log_printf (psf, "    Index   Coeffs1   Coeffs2\n") ;
 				for (k = 0 ; k < wav_fmt->msadpcm.numcoeffs ; k++)
-				{	bytesread +=
-					psf_binheader_readf (psf, "22", &(wav_fmt->msadpcm.coeffs [k].coeff1), &(wav_fmt->msadpcm.coeffs [k].coeff2)) ;
-					snprintf (psf->u.cbuf, sizeof (psf->u.cbuf), "     %2d     %7d   %7d\n", k, wav_fmt->msadpcm.coeffs [k].coeff1, wav_fmt->msadpcm.coeffs [k].coeff2) ;
-					psf_log_printf (psf, psf->u.cbuf) ;
+				{	char buffer [128] ;
+
+					bytesread +=
+						psf_binheader_readf (psf, "22", &(wav_fmt->msadpcm.coeffs [k].coeff1), &(wav_fmt->msadpcm.coeffs [k].coeff2)) ;
+					snprintf (buffer, sizeof (buffer), "     %2d     %7d   %7d\n", k, wav_fmt->msadpcm.coeffs [k].coeff1, wav_fmt->msadpcm.coeffs [k].coeff2) ;
+					psf_log_printf (psf, buffer) ;
 					} ;
 				break ;
 
@@ -254,7 +282,6 @@ wav_w64_read_fmt_chunk (SF_PRIVATE *psf, int fmtsize)
 				else
 					psf_log_printf (psf, "  Bytes/sec     : %d\n", wav_fmt->gsm610.bytespersec) ;
 
-				psf->bytewidth = 2 ;
 				psf_log_printf (psf, "  Extra Bytes   : %d\n", wav_fmt->gsm610.extrabytes) ;
 				psf_log_printf (psf, "  Samples/Block : %d\n", wav_fmt->gsm610.samplesperblock) ;
 				break ;
@@ -270,11 +297,51 @@ wav_w64_read_fmt_chunk (SF_PRIVATE *psf, int fmtsize)
 						&(wav_fmt->ext.channelmask)) ;
 
 				psf_log_printf (psf, "  Valid Bits    : %d\n", wav_fmt->ext.validbits) ;
-				psf_log_printf (psf, "  Channel Mask  : 0x%X\n", wav_fmt->ext.channelmask) ;
 
-				bytesread +=
-				psf_binheader_readf (psf, "422", &(wav_fmt->ext.esf.esf_field1), &(wav_fmt->ext.esf.esf_field2),
-						&(wav_fmt->ext.esf.esf_field3)) ;
+				if (wav_fmt->ext.channelmask == 0)
+					psf_log_printf (psf, "  Channel Mask  : 0x0 (should not be zero)\n") ;
+				else
+				{	char buffer [512] ;
+					unsigned bit ;
+
+					wpriv->wavex_channelmask = wav_fmt->ext.channelmask ;
+
+					/* It's probably wise to ignore the channel mask if it is all zero */
+					free (psf->channel_map) ;
+
+					if ((psf->channel_map = calloc (psf->sf.channels, sizeof (psf->channel_map [0]))) == NULL)
+						return SFE_MALLOC_FAILED ;
+
+					/* Terminate the buffer we're going to append_snprintf into. */
+					buffer [0] = 0 ;
+
+					for (bit = k = 0 ; bit < ARRAY_LEN (channel_mask_bits) ; bit++)
+					{
+						if (wav_fmt->ext.channelmask & (1 << bit))
+						{	if (k > psf->sf.channels)
+							{	psf_log_printf (psf, "*** More channel map bits than there are channels.\n") ;
+								break ;
+								} ;
+
+							psf->channel_map [k++] = channel_mask_bits [bit].id ;
+							append_snprintf (buffer, sizeof (buffer), "%s, ", channel_mask_bits [bit].name) ;
+							} ;
+						} ;
+
+					/* Remove trailing ", ". */
+					bit = strlen (buffer) ;
+					buffer [--bit] = 0 ;
+					buffer [--bit] = 0 ;
+
+					if (k != psf->sf.channels)
+					{	psf_log_printf (psf, "  Channel Mask  : 0x%X\n", wav_fmt->ext.channelmask) ;
+						psf_log_printf (psf, "*** Less channel map bits than there are channels.\n") ;
+						}
+					else
+						psf_log_printf (psf, "  Channel Mask  : 0x%X (%s)\n", wav_fmt->ext.channelmask, buffer) ;
+					} ;
+
+				bytesread += psf_binheader_readf (psf, "422", &(wav_fmt->ext.esf.esf_field1), &(wav_fmt->ext.esf.esf_field2), &(wav_fmt->ext.esf.esf_field3)) ;
 
 				/* compare the esf_fields with each known GUID? and print? */
 				psf_log_printf (psf, "  Subformat\n") ;
@@ -368,9 +435,38 @@ wavex_write_guid (SF_PRIVATE *psf, const EXT_SUBFORMAT * subformat)
 					subformat->esf_field4, make_size_t (8)) ;
 } /* wavex_write_guid */
 
+
+int
+wavex_gen_channel_mask (const int *chan_map, int channels)
+{	int chan, mask = 0, bit = -1, last_bit = -1 ;
+
+	if (chan_map == NULL)
+		return 0 ;
+
+	for (chan = 0 ; chan < channels ; chan ++)
+	{	int k ;
+
+		for (k = bit + 1 ; k < ARRAY_LEN (channel_mask_bits) ; k++)
+			if (chan_map [chan] == channel_mask_bits [k].id)
+			{	bit = k ;
+				break ;
+				} ;
+
+		/* Check for bad sequence. */
+		if (bit <= last_bit)
+			return 0 ;
+
+		mask += 1 << bit ;
+		last_bit = bit ;
+		} ;
+
+	return mask ;
+} /* wavex_gen_channel_mask */
+
 void
 wav_w64_analyze (SF_PRIVATE *psf)
-{	AUDIO_DETECT ad ;
+{	unsigned char buffer [4096] ;
+	AUDIO_DETECT ad ;
 	int format = 0 ;
 
 	if (psf->is_pipe)
@@ -387,8 +483,8 @@ wav_w64_analyze (SF_PRIVATE *psf)
 
 	psf_fseek (psf, 3 * 4 * 50, SEEK_SET) ;
 
-	while (psf_fread (psf->u.ucbuf, 1, 4096, psf) == 4096)
-	{	format = audio_detect (psf, &ad, psf->u.ucbuf, 4096) ;
+	while (psf_fread (buffer, 1, sizeof (buffer), psf) == sizeof (buffer))
+	{	format = audio_detect (psf, &ad, buffer, sizeof (buffer)) ;
 		if (format != 0)
 			break ;
 		} ;
diff --git a/libs/libsndfile/src/wav_w64.h b/libs/libsndfile/src/wav_w64.h
index bcc86e8e62..7e180801a6 100644
--- a/libs/libsndfile/src/wav_w64.h
+++ b/libs/libsndfile/src/wav_w64.h
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2012 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -28,9 +28,9 @@
 
 enum
 {
-  /* keep sorted for wav_w64_format_str() */
+	/* keep sorted for wav_w64_format_str() */
 	WAVE_FORMAT_UNKNOWN					= 0x0000,		/* Microsoft Corporation */
-	WAVE_FORMAT_PCM	 					= 0x0001, 		/* Microsoft PCM format */
+	WAVE_FORMAT_PCM						= 0x0001, 		/* Microsoft PCM format */
 	WAVE_FORMAT_MS_ADPCM				= 0x0002,		/* Microsoft ADPCM */
 	WAVE_FORMAT_IEEE_FLOAT				= 0x0003,		/* Micrososft 32 bit float format */
 	WAVE_FORMAT_VSELP					= 0x0004,		/* Compaq Computer Corporation */
@@ -259,6 +259,7 @@ typedef struct
 typedef struct
 {	/* For ambisonic commands */
 	int	wavex_ambisonic ;
+	unsigned wavex_channelmask ;
 
 	/* Set to true when 'fmt ' chunk is ambiguous.*/
 	int fmt_is_broken ;
@@ -285,6 +286,13 @@ char const* wav_w64_format_str (int k) ;
 int		wav_w64_read_fmt_chunk (SF_PRIVATE *psf, int fmtsize) ;
 void	wavex_write_guid (SF_PRIVATE *psf, const EXT_SUBFORMAT * subformat) ;
 void	wav_w64_analyze (SF_PRIVATE *psf) ;
+int		wavex_gen_channel_mask (const int *chan_map, int channels) ;
+
+int		wav_read_bext_chunk (SF_PRIVATE *psf, unsigned int chunksize) ;
+int		wav_write_bext_chunk (SF_PRIVATE *psf) ;
+
+int		wav_read_cart_chunk (SF_PRIVATE *psf, unsigned int chunksize) ;
+int		wav_write_cart_chunk (SF_PRIVATE *psf) ;
 
 #endif
 
diff --git a/libs/libsndfile/src/windows.c b/libs/libsndfile/src/windows.c
new file mode 100644
index 0000000000..387afddafe
--- /dev/null
+++ b/libs/libsndfile/src/windows.c
@@ -0,0 +1,93 @@
+/*
+** Copyright (C) 2009-2011 Erik de Castro Lopo 
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU Lesser General Public License as published by
+** the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
+**
+** You should have received a copy of the GNU Lesser 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.
+*/
+
+/*
+**	This needs to be a separate file so that we don't have to include
+**	 elsewhere (too many symbol clashes).
+*/
+
+
+#include "sfconfig.h"
+
+#if OS_IS_WIN32
+#include 
+
+#define ENABLE_SNDFILE_WINDOWS_PROTOTYPES 1
+#include "sndfile.h"
+#include "common.h"
+
+extern int sf_errno ;
+
+static void copy_filename (SF_PRIVATE * psf, LPCWSTR wpath) ;
+
+SNDFILE*
+sf_wchar_open (LPCWSTR wpath, int mode, SF_INFO *sfinfo)
+{	SF_PRIVATE 	*psf ;
+	char utf8name [512] ;
+
+	if ((psf = calloc (1, sizeof (SF_PRIVATE))) == NULL)
+	{	sf_errno = SFE_MALLOC_FAILED ;
+		return	NULL ;
+		} ;
+
+	memset (psf, 0, sizeof (SF_PRIVATE)) ;
+	psf_init_files (psf) ;
+
+	if (WideCharToMultiByte (CP_UTF8, 0, wpath, -1, utf8name, sizeof (utf8name), NULL, NULL) == 0)
+		psf->file.path.wc [0] = 0 ;
+
+	psf_log_printf (psf, "File : '%s' (utf-8 converted from ucs-2)\n", utf8name) ;
+
+	copy_filename (psf, wpath) ;
+	psf->file.use_wchar = SF_TRUE ;
+	psf->file.mode = mode ;
+
+	psf->error = psf_fopen (psf) ;
+
+	return psf_open_file (psf, sfinfo) ;
+} /* sf_wchar_open */
+
+
+static void
+copy_filename (SF_PRIVATE *psf, LPCWSTR wpath)
+{	const wchar_t *cwcptr ;
+	wchar_t *wcptr ;
+
+	wcsncpy (psf->file.path.wc, wpath, ARRAY_LEN (psf->file.path.wc)) ;
+	psf->file.path.wc [ARRAY_LEN (psf->file.path.wc) - 1] = 0 ;
+	if ((cwcptr = wcsrchr (wpath, '/')) || (cwcptr = wcsrchr (wpath, '\\')))
+		cwcptr ++ ;
+	else
+		cwcptr = wpath ;
+
+	wcsncpy (psf->file.name.wc, cwcptr, ARRAY_LEN (psf->file.name.wc)) ;
+	psf->file.name.wc [ARRAY_LEN (psf->file.name.wc) - 1] = 0 ;
+
+	/* Now grab the directory. */
+	wcsncpy (psf->file.dir.wc, wpath, ARRAY_LEN (psf->file.dir.wc)) ;
+	psf->file.dir.wc [ARRAY_LEN (psf->file.dir.wc) - 1] = 0 ;
+
+	if ((wcptr = wcsrchr (psf->file.dir.wc, '/')) || (wcptr = wcsrchr (psf->file.dir.wc, '\\')))
+		wcptr [1] = 0 ;
+	else
+		psf->file.dir.wc [0] = 0 ;
+
+	return ;
+} /* copy_filename */
+
+#endif
diff --git a/libs/libsndfile/src/wve.c b/libs/libsndfile/src/wve.c
index d539347c0f..c13e7ab9b7 100644
--- a/libs/libsndfile/src/wve.c
+++ b/libs/libsndfile/src/wve.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2002-2009 Erik de Castro Lopo 
+** Copyright (C) 2002-2011 Erik de Castro Lopo 
 ** Copyright (C) 2007 Reuben Thomas
 **
 ** This program is free software; you can redistribute it and/or modify
@@ -58,12 +58,12 @@ wve_open (SF_PRIVATE *psf)
 	if (psf->is_pipe)
 		return SFE_WVE_NO_PIPE ;
 
-	if (psf->mode == SFM_READ || (psf->mode == SFM_RDWR && psf->filelength > 0))
+	if (psf->file.mode == SFM_READ || (psf->file.mode == SFM_RDWR && psf->filelength > 0))
 	{	if ((error = wve_read_header (psf)))
 			return error ;
 		} ;
 
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{	if ((SF_CONTAINER (psf->sf.format)) != SF_FORMAT_WVE)
 			return	SFE_BAD_OPEN_FORMAT ;
 
@@ -198,7 +198,7 @@ wve_write_header (SF_PRIVATE *psf, int calc_length)
 static int
 wve_close (SF_PRIVATE *psf)
 {
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{	/*  Now we know for certain the length of the file we can re-write
 		**	the header.
 		*/
diff --git a/libs/libsndfile/src/xi.c b/libs/libsndfile/src/xi.c
index d1de796578..fc442d1c3a 100644
--- a/libs/libsndfile/src/xi.c
+++ b/libs/libsndfile/src/xi.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2003-2009 Erik de Castro Lopo 
+** Copyright (C) 2003-2013 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -75,14 +75,14 @@ xi_open	(SF_PRIVATE *psf)
 
 	psf->codec_data = pxi ;
 
-	if (psf->mode == SFM_READ || (psf->mode == SFM_RDWR && psf->filelength > 0))
+	if (psf->file.mode == SFM_READ || (psf->file.mode == SFM_RDWR && psf->filelength > 0))
 	{	if ((error = xi_read_header (psf)))
 			return error ;
 		} ;
 
 	subformat = SF_CODEC (psf->sf.format) ;
 
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{	if ((SF_CONTAINER (psf->sf.format)) != SF_FORMAT_XI)
 			return	SFE_BAD_OPEN_FORMAT ;
 
@@ -163,7 +163,7 @@ dpcm_init (SF_PRIVATE *psf)
 
 	psf->blockwidth = psf->bytewidth * psf->sf.channels ;
 
-	if (psf->mode == SFM_READ || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_READ || psf->file.mode == SFM_RDWR)
 	{	switch (psf->bytewidth)
 		{	case 1 :
 					psf->read_short		= dpcm_read_dsc2s ;
@@ -183,7 +183,7 @@ dpcm_init (SF_PRIVATE *psf)
 			} ;
 		} ;
 
-	if (psf->mode == SFM_WRITE || psf->mode == SFM_RDWR)
+	if (psf->file.mode == SFM_WRITE || psf->file.mode == SFM_RDWR)
 	{	switch (psf->bytewidth)
 		{	case 1 :
 					psf->write_short	= dpcm_write_s2dsc ;
@@ -216,7 +216,8 @@ dpcm_init (SF_PRIVATE *psf)
 
 static sf_count_t
 dpcm_seek (SF_PRIVATE *psf, int mode, sf_count_t offset)
-{	XI_PRIVATE	*pxi ;
+{	BUF_UNION	ubuf ;
+	XI_PRIVATE	*pxi ;
 	int			total, bufferlen, len ;
 
 	if ((pxi = psf->codec_data) == NULL)
@@ -248,18 +249,18 @@ dpcm_seek (SF_PRIVATE *psf, int mode, sf_count_t offset)
 
 	if ((SF_CODEC (psf->sf.format)) == SF_FORMAT_DPCM_16)
 	{	total = offset ;
-		bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+		bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 		while (total > 0)
 		{	len = (total > bufferlen) ? bufferlen : total ;
-			total -= dpcm_read_dles2s (psf, psf->u.sbuf, len) ;
+			total -= dpcm_read_dles2s (psf, ubuf.sbuf, len) ;
 			} ;
 		}
 	else
 	{	total = offset ;
-		bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+		bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 		while (total > 0)
 		{	len = (total > bufferlen) ? bufferlen : total ;
-			total -= dpcm_read_dsc2s (psf, psf->u.sbuf, len) ;
+			total -= dpcm_read_dsc2s (psf, ubuf.sbuf, len) ;
 			} ;
 		} ;
 
@@ -351,11 +352,19 @@ xi_read_header (SF_PRIVATE *psf)
 		return SFE_XI_BAD_HEADER ;
 
 	buffer [22] = 0 ;
+	for (k = 21 ; k >= 0 && buffer [k] == ' ' ; k --)
+		buffer [k] = 0 ;
+
 	psf_log_printf (psf, "Extended Instrument : %s\n", buffer) ;
+	psf_store_string (psf, SF_STR_TITLE, buffer) ;
 
 	psf_binheader_readf (psf, "be2", buffer, 20, &version) ;
 	buffer [19] = 0 ;
+	for (k = 18 ; k >= 0 && buffer [k] == ' ' ; k --)
+		buffer [k] = 0 ;
+
 	psf_log_printf (psf, "Software : %s\nVersion  : %d.%02d\n", buffer, version / 256, version % 256) ;
+	psf_store_string (psf, SF_STR_SOFTWARE, buffer) ;
 
 	/* Jump note numbers (96), volume envelope (48), pan envelope (48),
 	** volume points (1), pan points (1)
@@ -387,6 +396,7 @@ xi_read_header (SF_PRIVATE *psf)
 	if (psf->instrument == NULL && (psf->instrument = psf_instrument_alloc ()) == NULL)
 		return SFE_MALLOC_FAILED ;
 
+	psf->instrument->basenote = 0 ;
 	/* Log all data for each sample. */
 	for (k = 0 ; k < sample_count ; k++)
 	{	psf_binheader_readf (psf, "e444", &(sample_sizes [k]), &loop_begin, &loop_end) ;
@@ -417,6 +427,14 @@ xi_read_header (SF_PRIVATE *psf)
 		psf_log_printf (psf, "  pan     : %u\n  note    : %d\n  namelen : %d\n",
 					buffer [3] & 0xFF, buffer [4], buffer [5]) ;
 
+		psf->instrument->basenote = buffer [4] ;
+		if (buffer [2] & 1)
+		{	psf->instrument->loop_count = 1 ;
+			psf->instrument->loops [0].mode = (buffer [2] & 2) ? SF_LOOP_ALTERNATING : SF_LOOP_FORWARD ;
+			psf->instrument->loops [0].start = loop_begin ;
+			psf->instrument->loops [0].end = loop_end ;
+			} ;
+
 		if (k != 0)
 			continue ;
 
@@ -469,7 +487,6 @@ xi_read_header (SF_PRIVATE *psf)
 	if (! psf->sf.frames && psf->blockwidth)
 		psf->sf.frames = (psf->filelength - psf->dataoffset) / psf->blockwidth ;
 
-	psf->instrument->basenote = 0 ;
 	psf->instrument->gain = 1 ;
 	psf->instrument->velocity_lo = psf->instrument->key_lo = 0 ;
 	psf->instrument->velocity_hi = psf->instrument->key_hi = 127 ;
@@ -492,20 +509,21 @@ static void dles2d_array (XI_PRIVATE *pxi, short *src, int count, double *dest,
 
 static sf_count_t
 dpcm_read_dsc2s (SF_PRIVATE *psf, short *ptr, sf_count_t len)
-{	XI_PRIVATE	*pxi ;
+{	BUF_UNION	ubuf ;
+	XI_PRIVATE	*pxi ;
 	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 
 	if ((pxi = psf->codec_data) == NULL)
 		return 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ucbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ucbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.scbuf, sizeof (signed char), bufferlen, psf) ;
-		dsc2s_array (pxi, psf->u.scbuf, readcount, ptr + total) ;
+		readcount = psf_fread (ubuf.scbuf, sizeof (signed char), bufferlen, psf) ;
+		dsc2s_array (pxi, ubuf.scbuf, readcount, ptr + total) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -517,20 +535,21 @@ dpcm_read_dsc2s (SF_PRIVATE *psf, short *ptr, sf_count_t len)
 
 static sf_count_t
 dpcm_read_dsc2i (SF_PRIVATE *psf, int *ptr, sf_count_t len)
-{	XI_PRIVATE	*pxi ;
+{	BUF_UNION	ubuf ;
+	XI_PRIVATE	*pxi ;
 	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 
 	if ((pxi = psf->codec_data) == NULL)
 		return 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ucbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ucbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.scbuf, sizeof (signed char), bufferlen, psf) ;
-		dsc2i_array (pxi, psf->u.scbuf, readcount, ptr + total) ;
+		readcount = psf_fread (ubuf.scbuf, sizeof (signed char), bufferlen, psf) ;
+		dsc2i_array (pxi, ubuf.scbuf, readcount, ptr + total) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -542,7 +561,8 @@ dpcm_read_dsc2i (SF_PRIVATE *psf, int *ptr, sf_count_t len)
 
 static sf_count_t
 dpcm_read_dsc2f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
-{	XI_PRIVATE	*pxi ;
+{	BUF_UNION	ubuf ;
+	XI_PRIVATE	*pxi ;
 	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 	float		normfact ;
@@ -552,13 +572,13 @@ dpcm_read_dsc2f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
 
 	normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x80) : 1.0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ucbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ucbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.scbuf, sizeof (signed char), bufferlen, psf) ;
-		dsc2f_array (pxi, psf->u.scbuf, readcount, ptr + total, normfact) ;
+		readcount = psf_fread (ubuf.scbuf, sizeof (signed char), bufferlen, psf) ;
+		dsc2f_array (pxi, ubuf.scbuf, readcount, ptr + total, normfact) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -570,7 +590,8 @@ dpcm_read_dsc2f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
 
 static sf_count_t
 dpcm_read_dsc2d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
-{	XI_PRIVATE	*pxi ;
+{	BUF_UNION	ubuf ;
+	XI_PRIVATE	*pxi ;
 	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 	double		normfact ;
@@ -580,13 +601,13 @@ dpcm_read_dsc2d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
 
 	normfact = (psf->norm_double == SF_TRUE) ? 1.0 / ((double) 0x80) : 1.0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ucbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ucbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.scbuf, sizeof (signed char), bufferlen, psf) ;
-		dsc2d_array (pxi, psf->u.scbuf, readcount, ptr + total, normfact) ;
+		readcount = psf_fread (ubuf.scbuf, sizeof (signed char), bufferlen, psf) ;
+		dsc2d_array (pxi, ubuf.scbuf, readcount, ptr + total, normfact) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -601,20 +622,21 @@ dpcm_read_dsc2d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
 
 static sf_count_t
 dpcm_read_dles2s (SF_PRIVATE *psf, short *ptr, sf_count_t len)
-{	XI_PRIVATE	*pxi ;
+{	BUF_UNION	ubuf ;
+	XI_PRIVATE	*pxi ;
 	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 
 	if ((pxi = psf->codec_data) == NULL)
 		return 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.sbuf, sizeof (short), bufferlen, psf) ;
-		dles2s_array (pxi, psf->u.sbuf, readcount, ptr + total) ;
+		readcount = psf_fread (ubuf.sbuf, sizeof (short), bufferlen, psf) ;
+		dles2s_array (pxi, ubuf.sbuf, readcount, ptr + total) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -626,20 +648,21 @@ dpcm_read_dles2s (SF_PRIVATE *psf, short *ptr, sf_count_t len)
 
 static sf_count_t
 dpcm_read_dles2i (SF_PRIVATE *psf, int *ptr, sf_count_t len)
-{	XI_PRIVATE	*pxi ;
+{	BUF_UNION	ubuf ;
+	XI_PRIVATE	*pxi ;
 	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 
 	if ((pxi = psf->codec_data) == NULL)
 		return 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.sbuf, sizeof (short), bufferlen, psf) ;
-		dles2i_array (pxi, psf->u.sbuf, readcount, ptr + total) ;
+		readcount = psf_fread (ubuf.sbuf, sizeof (short), bufferlen, psf) ;
+		dles2i_array (pxi, ubuf.sbuf, readcount, ptr + total) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -651,7 +674,8 @@ dpcm_read_dles2i (SF_PRIVATE *psf, int *ptr, sf_count_t len)
 
 static sf_count_t
 dpcm_read_dles2f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
-{	XI_PRIVATE	*pxi ;
+{	BUF_UNION	ubuf ;
+	XI_PRIVATE	*pxi ;
 	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 	float		normfact ;
@@ -661,13 +685,13 @@ dpcm_read_dles2f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
 
 	normfact = (psf->norm_float == SF_TRUE) ? 1.0 / ((float) 0x8000) : 1.0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.sbuf, sizeof (short), bufferlen, psf) ;
-		dles2f_array (pxi, psf->u.sbuf, readcount, ptr + total, normfact) ;
+		readcount = psf_fread (ubuf.sbuf, sizeof (short), bufferlen, psf) ;
+		dles2f_array (pxi, ubuf.sbuf, readcount, ptr + total, normfact) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -679,7 +703,8 @@ dpcm_read_dles2f (SF_PRIVATE *psf, float *ptr, sf_count_t len)
 
 static sf_count_t
 dpcm_read_dles2d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
-{	XI_PRIVATE	*pxi ;
+{	BUF_UNION	ubuf ;
+	XI_PRIVATE	*pxi ;
 	int			bufferlen, readcount ;
 	sf_count_t	total = 0 ;
 	double		normfact ;
@@ -689,13 +714,13 @@ dpcm_read_dles2d (SF_PRIVATE *psf, double *ptr, sf_count_t len)
 
 	normfact = (psf->norm_double == SF_TRUE) ? 1.0 / ((double) 0x8000) : 1.0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		readcount = psf_fread (psf->u.sbuf, sizeof (short), bufferlen, psf) ;
-		dles2d_array (pxi, psf->u.sbuf, readcount, ptr + total, normfact) ;
+		readcount = psf_fread (ubuf.sbuf, sizeof (short), bufferlen, psf) ;
+		dles2d_array (pxi, ubuf.sbuf, readcount, ptr + total, normfact) ;
 		total += readcount ;
 		if (readcount < bufferlen)
 			break ;
@@ -721,20 +746,21 @@ static void d2dles_array (XI_PRIVATE *pxi, const double *src, short *dest, int c
 
 static sf_count_t
 dpcm_write_s2dsc (SF_PRIVATE *psf, const short *ptr, sf_count_t len)
-{	XI_PRIVATE	*pxi ;
+{	BUF_UNION	ubuf ;
+	XI_PRIVATE	*pxi ;
 	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
 	if ((pxi = psf->codec_data) == NULL)
 		return 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ucbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ucbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		s2dsc_array (pxi, ptr + total, psf->u.scbuf, bufferlen) ;
-		writecount = psf_fwrite (psf->u.scbuf, sizeof (signed char), bufferlen, psf) ;
+		s2dsc_array (pxi, ptr + total, ubuf.scbuf, bufferlen) ;
+		writecount = psf_fwrite (ubuf.scbuf, sizeof (signed char), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -746,20 +772,21 @@ dpcm_write_s2dsc (SF_PRIVATE *psf, const short *ptr, sf_count_t len)
 
 static sf_count_t
 dpcm_write_i2dsc (SF_PRIVATE *psf, const int *ptr, sf_count_t len)
-{	XI_PRIVATE	*pxi ;
+{	BUF_UNION	ubuf ;
+	XI_PRIVATE	*pxi ;
 	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
 	if ((pxi = psf->codec_data) == NULL)
 		return 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ucbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ucbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		i2dsc_array (pxi, ptr + total, psf->u.scbuf, bufferlen) ;
-		writecount = psf_fwrite (psf->u.scbuf, sizeof (signed char), bufferlen, psf) ;
+		i2dsc_array (pxi, ptr + total, ubuf.scbuf, bufferlen) ;
+		writecount = psf_fwrite (ubuf.scbuf, sizeof (signed char), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -771,7 +798,8 @@ dpcm_write_i2dsc (SF_PRIVATE *psf, const int *ptr, sf_count_t len)
 
 static sf_count_t
 dpcm_write_f2dsc (SF_PRIVATE *psf, const float *ptr, sf_count_t len)
-{	XI_PRIVATE	*pxi ;
+{	BUF_UNION	ubuf ;
+	XI_PRIVATE	*pxi ;
 	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 	float		normfact ;
@@ -781,13 +809,13 @@ dpcm_write_f2dsc (SF_PRIVATE *psf, const float *ptr, sf_count_t len)
 
 	normfact = (psf->norm_float == SF_TRUE) ? (1.0 * 0x7F) : 1.0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ucbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ucbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		f2dsc_array (pxi, ptr + total, psf->u.scbuf, bufferlen, normfact) ;
-		writecount = psf_fwrite (psf->u.scbuf, sizeof (signed char), bufferlen, psf) ;
+		f2dsc_array (pxi, ptr + total, ubuf.scbuf, bufferlen, normfact) ;
+		writecount = psf_fwrite (ubuf.scbuf, sizeof (signed char), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -799,7 +827,8 @@ dpcm_write_f2dsc (SF_PRIVATE *psf, const float *ptr, sf_count_t len)
 
 static sf_count_t
 dpcm_write_d2dsc (SF_PRIVATE *psf, const double *ptr, sf_count_t len)
-{	XI_PRIVATE	*pxi ;
+{	BUF_UNION	ubuf ;
+	XI_PRIVATE	*pxi ;
 	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 	double		normfact ;
@@ -809,13 +838,13 @@ dpcm_write_d2dsc (SF_PRIVATE *psf, const double *ptr, sf_count_t len)
 
 	normfact = (psf->norm_double == SF_TRUE) ? (1.0 * 0x7F) : 1.0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.ucbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.ucbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		d2dsc_array (pxi, ptr + total, psf->u.scbuf, bufferlen, normfact) ;
-		writecount = psf_fwrite (psf->u.scbuf, sizeof (signed char), bufferlen, psf) ;
+		d2dsc_array (pxi, ptr + total, ubuf.scbuf, bufferlen, normfact) ;
+		writecount = psf_fwrite (ubuf.scbuf, sizeof (signed char), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -828,20 +857,21 @@ dpcm_write_d2dsc (SF_PRIVATE *psf, const double *ptr, sf_count_t len)
 
 static sf_count_t
 dpcm_write_s2dles (SF_PRIVATE *psf, const short *ptr, sf_count_t len)
-{	XI_PRIVATE	*pxi ;
+{	BUF_UNION	ubuf ;
+	XI_PRIVATE	*pxi ;
 	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
 	if ((pxi = psf->codec_data) == NULL)
 		return 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		s2dles_array (pxi, ptr + total, psf->u.sbuf, bufferlen) ;
-		writecount = psf_fwrite (psf->u.sbuf, sizeof (short), bufferlen, psf) ;
+		s2dles_array (pxi, ptr + total, ubuf.sbuf, bufferlen) ;
+		writecount = psf_fwrite (ubuf.sbuf, sizeof (short), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -853,20 +883,21 @@ dpcm_write_s2dles (SF_PRIVATE *psf, const short *ptr, sf_count_t len)
 
 static sf_count_t
 dpcm_write_i2dles (SF_PRIVATE *psf, const int *ptr, sf_count_t len)
-{	XI_PRIVATE	*pxi ;
+{	BUF_UNION	ubuf ;
+	XI_PRIVATE	*pxi ;
 	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 
 	if ((pxi = psf->codec_data) == NULL)
 		return 0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		i2dles_array (pxi, ptr + total, psf->u.sbuf, bufferlen) ;
-		writecount = psf_fwrite (psf->u.sbuf, sizeof (short), bufferlen, psf) ;
+		i2dles_array (pxi, ptr + total, ubuf.sbuf, bufferlen) ;
+		writecount = psf_fwrite (ubuf.sbuf, sizeof (short), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -878,7 +909,8 @@ dpcm_write_i2dles (SF_PRIVATE *psf, const int *ptr, sf_count_t len)
 
 static sf_count_t
 dpcm_write_f2dles (SF_PRIVATE *psf, const float *ptr, sf_count_t len)
-{	XI_PRIVATE	*pxi ;
+{	BUF_UNION	ubuf ;
+	XI_PRIVATE	*pxi ;
 	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 	float		normfact ;
@@ -888,13 +920,13 @@ dpcm_write_f2dles (SF_PRIVATE *psf, const float *ptr, sf_count_t len)
 
 	normfact = (psf->norm_float == SF_TRUE) ? (1.0 * 0x7FFF) : 1.0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		f2dles_array (pxi, ptr + total, psf->u.sbuf, bufferlen, normfact) ;
-		writecount = psf_fwrite (psf->u.sbuf, sizeof (short), bufferlen, psf) ;
+		f2dles_array (pxi, ptr + total, ubuf.sbuf, bufferlen, normfact) ;
+		writecount = psf_fwrite (ubuf.sbuf, sizeof (short), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -906,7 +938,8 @@ dpcm_write_f2dles (SF_PRIVATE *psf, const float *ptr, sf_count_t len)
 
 static sf_count_t
 dpcm_write_d2dles (SF_PRIVATE *psf, const double *ptr, sf_count_t len)
-{	XI_PRIVATE	*pxi ;
+{	BUF_UNION	ubuf ;
+	XI_PRIVATE	*pxi ;
 	int			bufferlen, writecount ;
 	sf_count_t	total = 0 ;
 	double		normfact ;
@@ -916,13 +949,13 @@ dpcm_write_d2dles (SF_PRIVATE *psf, const double *ptr, sf_count_t len)
 
 	normfact = (psf->norm_double == SF_TRUE) ? (1.0 * 0x7FFF) : 1.0 ;
 
-	bufferlen = ARRAY_LEN (psf->u.sbuf) ;
+	bufferlen = ARRAY_LEN (ubuf.sbuf) ;
 
 	while (len > 0)
 	{	if (len < bufferlen)
 			bufferlen = (int) len ;
-		d2dles_array (pxi, ptr + total, psf->u.sbuf, bufferlen, normfact) ;
-		writecount = psf_fwrite (psf->u.sbuf, sizeof (short), bufferlen, psf) ;
+		d2dles_array (pxi, ptr + total, ubuf.sbuf, bufferlen, normfact) ;
+		writecount = psf_fwrite (ubuf.sbuf, sizeof (short), bufferlen, psf) ;
 		total += writecount ;
 		if (writecount < bufferlen)
 			break ;
@@ -1074,7 +1107,7 @@ dles2s_array (XI_PRIVATE *pxi, short *src, int count, short *dest)
 	last_val = pxi->last_16 ;
 
 	for (k = 0 ; k < count ; k++)
-	{	last_val += LES2H_SHORT (src [k]) ;
+	{	last_val += LE2H_16 (src [k]) ;
 		dest [k] = last_val ;
 		} ;
 
@@ -1089,7 +1122,7 @@ dles2i_array (XI_PRIVATE *pxi, short *src, int count, int *dest)
 	last_val = pxi->last_16 ;
 
 	for (k = 0 ; k < count ; k++)
-	{	last_val += LES2H_SHORT (src [k]) ;
+	{	last_val += LE2H_16 (src [k]) ;
 		dest [k] = last_val << 16 ;
 		} ;
 
@@ -1104,7 +1137,7 @@ dles2f_array (XI_PRIVATE *pxi, short *src, int count, float *dest, float normfac
 	last_val = pxi->last_16 ;
 
 	for (k = 0 ; k < count ; k++)
-	{	last_val += LES2H_SHORT (src [k]) ;
+	{	last_val += LE2H_16 (src [k]) ;
 		dest [k] = last_val * normfact ;
 		} ;
 
@@ -1119,7 +1152,7 @@ dles2d_array (XI_PRIVATE *pxi, short *src, int count, double *dest, double normf
 	last_val = pxi->last_16 ;
 
 	for (k = 0 ; k < count ; k++)
-	{	last_val += LES2H_SHORT (src [k]) ;
+	{	last_val += LE2H_16 (src [k]) ;
 		dest [k] = last_val * normfact ;
 		} ;
 
@@ -1138,7 +1171,7 @@ s2dles_array (XI_PRIVATE *pxi, const short *src, short *dest, int count)
 
 	for (k = 0 ; k < count ; k++)
 	{	diff = src [k] - last_val ;
-		dest [k] = LES2H_SHORT (diff) ;
+		dest [k] = LE2H_16 (diff) ;
 		last_val = src [k] ;
 		} ;
 
@@ -1154,7 +1187,7 @@ i2dles_array (XI_PRIVATE *pxi, const int *src, short *dest, int count)
 
 	for (k = 0 ; k < count ; k++)
 	{	diff = (src [k] >> 16) - last_val ;
-		dest [k] = LES2H_SHORT (diff) ;
+		dest [k] = LE2H_16 (diff) ;
 		last_val = src [k] >> 16 ;
 		} ;
 
@@ -1171,7 +1204,7 @@ f2dles_array (XI_PRIVATE *pxi, const float *src, short *dest, int count, float n
 	for (k = 0 ; k < count ; k++)
 	{	current = lrintf (src [k] * normfact) ;
 		diff = current - last_val ;
-		dest [k] = LES2H_SHORT (diff) ;
+		dest [k] = LE2H_16 (diff) ;
 		last_val = current ;
 		} ;
 
@@ -1188,7 +1221,7 @@ d2dles_array (XI_PRIVATE *pxi, const double *src, short *dest, int count, double
 	for (k = 0 ; k < count ; k++)
 	{	current = lrint (src [k] * normfact) ;
 		diff = current - last_val ;
-		dest [k] = LES2H_SHORT (diff) ;
+		dest [k] = LE2H_16 (diff) ;
 		last_val = current ;
 		} ;
 
diff --git a/libs/libsndfile/tests/Makefile.am b/libs/libsndfile/tests/Makefile.am
index 59264e9888..089046bb81 100644
--- a/libs/libsndfile/tests/Makefile.am
+++ b/libs/libsndfile/tests/Makefile.am
@@ -6,16 +6,17 @@ else
 CPP_TEST = cpp_test
 endif
 
-INCLUDES = -I$(top_srcdir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/src
 
-noinst_PROGRAMS = sfversion floating_point_test write_read_test \
+check_PROGRAMS = sfversion floating_point_test write_read_test \
 	lossy_comp_test error_test ulaw_test alaw_test dwvw_test \
 	peak_chunk_test command_test stdin_test stdout_test stdio_test \
 	pcm_test headerless_test pipe_test benchmark header_test misc_test \
-	raw_test string_test multi_file_test dither_test \
+	raw_test string_test multi_file_test dither_test chunk_test \
 	scale_clip_test win32_test fix_this aiff_rw_test virtual_io_test \
-	locale_test largefile_test win32_ordinal_test ogg_test vorbis_test \
-	checksum_test external_libs_test $(CPP_TEST)
+	locale_test largefile_test win32_ordinal_test ogg_test compression_size_test \
+	checksum_test external_libs_test rdwr_test format_check_test $(CPP_TEST) \
+	channel_test
 
 noinst_HEADERS = dft_cmp.h utils.h generate.h
 
@@ -25,11 +26,38 @@ autogen_sources = write_read_test.tpl write_read_test.def	\
 					utils.tpl utils.def						\
 					scale_clip_test.tpl scale_clip_test.def	\
 					pipe_test.tpl pipe_test.def				\
+					rdwr_test.tpl rdwr_test.def				\
 					floating_point_test.tpl floating_point_test.def	\
 					benchmark.tpl benchmark.def
 
 EXTRA_DIST = $(autogen_sources)
 
+CLEANFILES = *~ *.exe
+
+#===============================================================================
+# If we're cross compiling from Linux to Windows and running the test suite
+# under Wine, we need a symbolic link to the generated libsndfile DLL.
+
+if LINUX_MINGW_CROSS_TEST
+
+$(check_PROGRAMS) : libsndfile-1.dll
+
+libsndfile-1.dll :
+	ln -s $(top_builddir)/src/.libs/$@ $@
+
+clean-local :
+	-rm -f libsndfile-1.dll
+
+endif
+
+#===============================================================================
+
+check: test_wrapper.sh
+	sh test_wrapper.sh
+
+# Need this target to force building of test programs.
+checkprograms : $(check_PROGRAMS)
+
 #===============================================================================
 
 sfversion_SOURCES = sfversion.c
@@ -101,6 +129,9 @@ string_test_LDADD = $(top_builddir)/src/libsndfile.la
 dither_test_SOURCES = dither_test.c utils.c
 dither_test_LDADD = $(top_builddir)/src/libsndfile.la
 
+chunk_test_SOURCES = chunk_test.c utils.c
+chunk_test_LDADD = $(top_builddir)/src/libsndfile.la
+
 multi_file_test_SOURCES = multi_file_test.c utils.c
 multi_file_test_LDADD = $(top_builddir)/src/libsndfile.la
 
@@ -110,11 +141,15 @@ virtual_io_test_LDADD = $(top_builddir)/src/libsndfile.la
 ogg_test_SOURCES = ogg_test.c utils.c
 ogg_test_LDADD = $(top_builddir)/src/libsndfile.la
 
-vorbis_test_SOURCES = vorbis_test.c utils.c
-vorbis_test_LDADD = $(top_builddir)/src/libsndfile.la
+compression_size_test_SOURCES = compression_size_test.c utils.c
+compression_size_test_LDADD = $(top_builddir)/src/libsndfile.la
+
+rdwr_test_SOURCES = rdwr_test.c utils.c
+rdwr_test_LDADD = $(top_builddir)/src/libsndfile.la
 
 win32_test_SOURCES = win32_test.c
-win32_test_LDADD =
+# Link lib here so that generating the testsuite tarball works correctly.
+win32_test_LDADD = $(top_builddir)/src/libsndfile.la
 
 win32_ordinal_test_SOURCES = win32_ordinal_test.c utils.c
 win32_ordinal_test_LDADD = $(top_builddir)/src/libsndfile.la
@@ -122,6 +157,12 @@ win32_ordinal_test_LDADD = $(top_builddir)/src/libsndfile.la
 external_libs_test_SOURCES = external_libs_test.c utils.c
 external_libs_test_LDADD = $(top_builddir)/src/libsndfile.la
 
+format_check_test_SOURCES = format_check_test.c utils.c
+format_check_test_LDADD = $(top_builddir)/src/libsndfile.la
+
+channel_test_SOURCES = channel_test.c utils.c
+channel_test_LDADD = $(top_builddir)/src/libsndfile.la
+
 cpp_test_SOURCES = cpp_test.cc utils.c
 cpp_test_LDADD = $(top_builddir)/src/libsndfile.la
 
@@ -145,51 +186,33 @@ scale_clip_test_LDADD = $(top_builddir)/src/libsndfile.la
 #===============================================================================
 
 write_read_test.c: write_read_test.def write_read_test.tpl
-	autogen --writable write_read_test.def
+	cd $(srcdir) && autogen --writable write_read_test.def && cd $(abs_builddir)
 
 pcm_test.c: pcm_test.def pcm_test.tpl
-	autogen --writable pcm_test.def
+	cd $(srcdir) && autogen --writable pcm_test.def && cd $(abs_builddir)
 
 header_test.c: header_test.def header_test.tpl
-	autogen --writable header_test.def
+	cd $(srcdir) && autogen --writable header_test.def && cd $(abs_builddir)
 
 utils.c utils.h : utils.def utils.tpl
-	autogen --writable utils.def
+	cd $(srcdir) && autogen --writable utils.def && cd $(abs_builddir)
 
 scale_clip_test.c: scale_clip_test.def scale_clip_test.tpl
-	autogen --writable scale_clip_test.def
+	cd $(srcdir) && autogen --writable scale_clip_test.def && cd $(abs_builddir)
 
 pipe_test.c: pipe_test.def pipe_test.tpl
-	autogen --writable pipe_test.def
+	cd $(srcdir) && autogen --writable pipe_test.def && cd $(abs_builddir)
+
+rdwr_test.c: rdwr_test.def rdwr_test.tpl
+	cd $(srcdir) && autogen --writable rdwr_test.def && cd $(abs_builddir)
 
 floating_point_test.c: floating_point_test.def floating_point_test.tpl
-	autogen --writable floating_point_test.def
+	cd $(srcdir) && autogen --writable floating_point_test.def && cd $(abs_builddir)
 
 benchmark.c: benchmark.def benchmark.tpl
-	autogen --writable benchmark.def
+	cd $(srcdir) && autogen --writable benchmark.def && cd $(abs_builddir)
 
 genfiles : write_read_test.c pcm_test.c header_test.c utils.c \
-		scale_clip_test.c pipe_test.c floating_point_test.c benchmark.c
+		scale_clip_test.c pipe_test.c floating_point_test.c rdwr_test.c \
+		benchmark.c
 
-#===============================================================================
-# If we're cross compiling from Linux to Windows and running the test suite
-# under Wine, we need a symbolic link to the generated libsndfile DLL.
-
-if LINUX_MINGW_CROSS_TEST
-
-$(noinst_PROGRAMS) : libsndfile-1.dll
-
-libsndfile-1.dll :
-	ln -s $(top_builddir)/src/.libs/$@ $@
-
-clean-local :
-	-rm -f libsndfile-1.dll
-
-endif
-
-#===============================================================================
-
-check: $(noinst_PROGRAMS) test_wrapper.sh
-	sh test_wrapper.sh
-
-	
diff --git a/libs/libsndfile/tests/aiff_rw_test.c b/libs/libsndfile/tests/aiff_rw_test.c
index 92f8222403..43d34dbc8f 100644
--- a/libs/libsndfile/tests/aiff_rw_test.c
+++ b/libs/libsndfile/tests/aiff_rw_test.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2003-2009 Erik de Castro Lopo 
+** Copyright (C) 2003-2012 Erik de Castro Lopo 
 **
 ** 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
@@ -17,15 +17,17 @@
 */
 
 
-#include	
-#include	
-#include	
-#include	
-#include	
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
-#include	
 
-#include	"utils.h"
+#include 
+
+#include "utils.h"
 
 
 static unsigned char aifc_data [] =
@@ -152,8 +154,8 @@ rw_test (const char *filename)
 		} ;
 
 	if (sfinfo_rd.frames != sfinfo_rw.frames)
-	{	printf ("\n\nLine %d : frame count mismatch (rd %ld != rw %ld).\n\n", __LINE__,
-			SF_COUNT_TO_LONG (sfinfo_rd.frames), SF_COUNT_TO_LONG (sfinfo_rw.frames)) ;
+	{	printf ("\n\nLine %d : frame count mismatch (rd %" PRId64 " != rw %" PRId64 ").\n\n", __LINE__,
+			sfinfo_rd.frames, sfinfo_rw.frames) ;
 		exit (1) ;
 		} ;
 
diff --git a/libs/libsndfile/tests/alaw_test.c b/libs/libsndfile/tests/alaw_test.c
index 4bbb518a1a..6d71ffed98 100644
--- a/libs/libsndfile/tests/alaw_test.c
+++ b/libs/libsndfile/tests/alaw_test.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2012 Erik de Castro Lopo 
 **
 ** 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
@@ -20,6 +20,7 @@
 
 #include 
 #include 
+#include 
 
 #if HAVE_UNISTD_H
 #include 
@@ -44,12 +45,11 @@ main (void)
 	const char	*filename ;
 	int			k ;
 
+	print_test_name ("alaw_test", "encoder") ;
+
 	filename = "test.raw" ;
 
-	sfinfo.format		= SF_FORMAT_RAW | SF_FORMAT_ALAW ;
-	sfinfo.samplerate	= 44100 ;
-	sfinfo.frames		= 123456789 ; /* Wrong length. Library should correct this on sf_close. */
-	sfinfo.channels		= 1 ;
+	sf_info_setup (&sfinfo, SF_FORMAT_RAW | SF_FORMAT_ALAW, 44100, 1) ;
 
 	if ((file = sf_open (filename, SFM_WRITE, &sfinfo)) == NULL)
 	{	printf ("sf_open_write failed with error : ") ;
@@ -94,8 +94,9 @@ main (void)
 
 	sf_close (file) ;
 
-	printf ("    alaw_test : encoder ... ok\n") ;
+	puts ("ok") ;
 
+	print_test_name ("alaw_test", "decoder") ;
 	/* Now generate a file containing all possible 8 bit encoded
 	** sample values and write it to disk as alaw encoded.frames.
 	*/
@@ -139,7 +140,7 @@ main (void)
 
 	sf_close (file) ;
 
-	printf ("    alaw_test : decoder ... ok\n") ;
+	puts ("ok") ;
 
 	unlink (filename) ;
 
@@ -188,48 +189,48 @@ unsigned char alaw_encode (int sample)
 		7, 7, 7, 7, 7, 7, 7, 7
 		} ;
 
-    int sign, exponent, mantissa ;
-    unsigned char Alawbyte ;
+	int sign, exponent, mantissa ;
+	unsigned char Alawbyte ;
 
-    /* Get the sample into sign-magnitude. */
-    sign = ((~sample) >> 8) & 0x80 ;			/* set aside the sign */
-    if (sign == 0)
+	/* Get the sample into sign-magnitude. */
+	sign = ((~sample) >> 8) & 0x80 ;			/* set aside the sign */
+	if (sign == 0)
 		sample = -sample ;		/* get magnitude */
-    if (sample > ACLIP)
+	if (sample > ACLIP)
 		sample = ACLIP ;						/* clip the magnitude */
 
-    /* Convert from 16 bit linear to ulaw. */
-    if (sample >= 256)
+	/* Convert from 16 bit linear to ulaw. */
+	if (sample >= 256)
 	{	exponent = exp_lut [(sample >> 8) & 0x7F] ;
-		mantissa = ( sample >> ( exponent + 3 ) ) & 0x0F ;
+		mantissa = (sample >> (exponent + 3)) & 0x0F ;
 		Alawbyte = ((exponent << 4) | mantissa) ;
 		}
-    else
+	else
 		Alawbyte = (sample >> 4) ;
 
 	Alawbyte ^= (sign ^ 0x55) ;
 
-    return Alawbyte ;
+	return Alawbyte ;
 } /* alaw_encode */
 
 static
 int alaw_decode (unsigned int Alawbyte)
 {	static int exp_lut [8] = { 0, 264, 528, 1056, 2112, 4224, 8448, 16896 } ;
-    int sign, exponent, mantissa, sample ;
+	int sign, exponent, mantissa, sample ;
 
-    Alawbyte ^= 0x55 ;
-    sign = (Alawbyte & 0x80) ;
-    Alawbyte &= 0x7f ;			/* get magnitude */
-    if (Alawbyte >= 16)
-	{	exponent = (Alawbyte >> 4 ) & 0x07 ;
+	Alawbyte ^= 0x55 ;
+	sign = (Alawbyte & 0x80) ;
+	Alawbyte &= 0x7f ;			/* get magnitude */
+	if (Alawbyte >= 16)
+	{	exponent = (Alawbyte >> 4) & 0x07 ;
 		mantissa = Alawbyte & 0x0F ;
-		sample = exp_lut [exponent] + (mantissa << ( exponent + 3 )) ;
+		sample = exp_lut [exponent] + (mantissa << (exponent + 3)) ;
 		}
-    else
+	else
 		sample = (Alawbyte << 4) + 8 ;
-    if (sign == 0)
+	if (sign == 0)
 		sample = -sample ;
 
-    return sample ;
+	return sample ;
 } /* alaw_decode */
 
diff --git a/libs/libsndfile/tests/benchmark-0.0.28 b/libs/libsndfile/tests/benchmark-0.0.28
new file mode 100644
index 0000000000..2d2b06f9bc
--- /dev/null
+++ b/libs/libsndfile/tests/benchmark-0.0.28
@@ -0,0 +1,40 @@
+erikd@coltrane > tests/benchmark 
+Benchmarking libsndfile-0.0.28
+------------------------------
+Each test takes a little over 5 seconds.
+
+    Raw write PCM_16  :   30660117 samples per sec
+    Raw read  PCM_16  :   62788982 samples per sec
+
+Native endian I/O :
+    Write short   to  PCM_16 :  83.37% of raw write
+    Read  short  from PCM_16 :  83.17% of raw read
+    Write int     to  PCM_24 :  30.78% of raw write
+    Read  int    from PCM_24 :  32.96% of raw read
+    Write int     to  PCM_32 :  42.05% of raw write
+    Read  int    from PCM_32 :  41.11% of raw read
+    Write float   to  PCM_16 :  17.75% of raw write
+    Read  float  from PCM_16 :  43.27% of raw read
+    Write float   to  PCM_24 :  15.30% of raw write
+    Read  float  from PCM_24 :  28.09% of raw read
+    Write float   to  PCM_32 :  14.55% of raw write
+    Read  float  from PCM_32 :  34.65% of raw read
+    Write float   to  FLOAT  :  28.98% of raw write
+    Read  float  from FLOAT  :  56.71% of raw read
+
+Endian swapped I/O :
+    Write short   to  PCM_16 :  43.39% of raw write
+    Read  short  from PCM_16 :  49.12% of raw read
+    Write int     to  PCM_24 :  29.65% of raw write
+    Read  int    from PCM_24 :  33.66% of raw read
+    Write int     to  PCM_32 :  19.62% of raw write
+    Read  int    from PCM_32 :  21.97% of raw read
+    Write float   to  PCM_16 :  17.63% of raw write
+    Read  float  from PCM_16 :  31.43% of raw read
+    Write float   to  PCM_24 :  14.91% of raw write
+    Read  float  from PCM_24 :  27.99% of raw read
+    Write float   to  PCM_32 :  13.69% of raw write
+    Read  float  from PCM_32 :  22.23% of raw read
+    Write float   to  FLOAT  :  19.25% of raw write
+    Read  float  from FLOAT  :  25.66% of raw read
+
diff --git a/libs/libsndfile/tests/benchmark-1.0.0 b/libs/libsndfile/tests/benchmark-1.0.0
new file mode 100644
index 0000000000..2922836419
--- /dev/null
+++ b/libs/libsndfile/tests/benchmark-1.0.0
@@ -0,0 +1,35 @@
+Benchmarking libsndfile-1.0.0
+-----------------------------
+Each test takes a little over 5 seconds.
+
+    Raw write PCM_16  :   31084269 samples per sec
+    Raw read  PCM_16  :   63597065 samples per sec
+
+Native endian I/O :
+    Write short   to  PCM_16 :  83.19% of raw write
+    Read  short  from PCM_16 :  82.93% of raw read
+    Write int     to  PCM_24 :  31.12% of raw write
+    Read  int    from PCM_24 :  37.90% of raw read
+    Write float   to  PCM_16 :  37.00% of raw write
+    Read  float  from PCM_16 :  45.53% of raw read
+    Write float   to  PCM_24 :  29.08% of raw write
+    Read  float  from PCM_24 :  28.48% of raw read
+    Write float   to  PCM_32 :  22.08% of raw write
+    Read  float  from PCM_32 :  31.21% of raw read
+    Write float   to  FLOAT  :  28.70% of raw write
+    Read  float  from FLOAT  :  56.32% of raw read
+
+Endian swapped I/O :
+    Write short   to  PCM_16 :  22.08% of raw write
+    Read  short  from PCM_16 :  23.20% of raw read
+    Write int     to  PCM_24 :  30.96% of raw write
+    Read  int    from PCM_24 :  37.76% of raw read
+    Write float   to  PCM_16 :  35.82% of raw write
+    Read  float  from PCM_16 :  22.61% of raw read
+    Write float   to  PCM_24 :  27.70% of raw write
+    Read  float  from PCM_24 :  28.37% of raw read
+    Write float   to  PCM_32 :  20.77% of raw write
+    Read  float  from PCM_32 :  23.46% of raw read
+    Write float   to  FLOAT  :  15.03% of raw write
+    Read  float  from FLOAT  :  15.43% of raw read
+
diff --git a/libs/libsndfile/tests/benchmark-1.0.0rc2 b/libs/libsndfile/tests/benchmark-1.0.0rc2
new file mode 100644
index 0000000000..770224672f
--- /dev/null
+++ b/libs/libsndfile/tests/benchmark-1.0.0rc2
@@ -0,0 +1,31 @@
+Benchmarking libsndfile-1.0.0rc2
+--------------------------------
+Each test takes a little over 5 seconds.
+
+    Raw write PCM_16  :   31638069 samples per sec
+    Raw read  PCM_16  :   62788982 samples per sec
+
+Native endian I/O :
+    Write short   to  PCM_16 :  82.37% of raw write
+    Read  short  from PCM_16 :  82.17% of raw read
+    Write int     to  PCM_24 :  30.80% of raw write
+    Read  int    from PCM_24 :  37.95% of raw read
+    Write float   to  PCM_16 :  36.22% of raw write
+    Read  float  from PCM_16 :  23.32% of raw read
+    Write float   to  PCM_24 :  28.41% of raw write
+    Read  float  from PCM_24 :  28.41% of raw read
+    Write float   to  FLOAT  :  28.41% of raw write
+    Read  float  from FLOAT  :  57.50% of raw read
+
+Endian swapped I/O :
+    Write short   to  PCM_16 :  21.73% of raw write
+    Read  short  from PCM_16 :  23.37% of raw read
+    Write int     to  PCM_24 :  31.02% of raw write
+    Read  int    from PCM_24 :  38.24% of raw read
+    Write float   to  PCM_16 :  35.51% of raw write
+    Read  float  from PCM_16 :  19.16% of raw read
+    Write float   to  PCM_24 :  27.37% of raw write
+    Read  float  from PCM_24 :  28.74% of raw read
+    Write float   to  FLOAT  :  15.11% of raw write
+    Read  float  from FLOAT  :  15.60% of raw read
+
diff --git a/libs/libsndfile/tests/benchmark-1.0.18pre16-hendrix b/libs/libsndfile/tests/benchmark-1.0.18pre16-hendrix
new file mode 100644
index 0000000000..951bc56d25
--- /dev/null
+++ b/libs/libsndfile/tests/benchmark-1.0.18pre16-hendrix
@@ -0,0 +1,38 @@
+Benchmarking libsndfile-1.0.18pre15
+-----------------------------------
+Each test takes a little over 5 seconds.
+
+    Raw write PCM_16  :  103189885 samples per sec
+    Raw read  PCM_16  :  660854036 samples per sec
+
+Native endian I/O :
+    Write short   to  PCM_16 :  95.08% of raw write
+    Read  short  from PCM_16 :  96.39% of raw read
+    Write int     to  PCM_24 :  54.55% of raw write
+    Read  int    from PCM_24 :  28.50% of raw read
+    Write int     to  PCM_32 :  46.97% of raw write
+    Read  int    from PCM_32 :  39.98% of raw read
+    Write float   to  PCM_16 :  60.85% of raw write
+    Read  float  from PCM_16 :  27.79% of raw read
+    Write float   to  PCM_24 :  46.23% of raw write
+    Read  float  from PCM_24 :  22.62% of raw read
+    Write float   to  PCM_32 :  35.38% of raw write
+    Read  float  from PCM_32 :  24.18% of raw read
+    Write float   to  FLOAT  :  47.73% of raw write
+    Read  float  from FLOAT  :  40.62% of raw read
+
+Endian swapped I/O :
+    Write short   to  PCM_16 :  79.98% of raw write
+    Read  short  from PCM_16 :  49.27% of raw read
+    Write int     to  PCM_24 :  53.80% of raw write
+    Read  int    from PCM_24 :  28.50% of raw read
+    Write int     to  PCM_32 :  41.68% of raw write
+    Read  int    from PCM_32 :  25.89% of raw read
+    Write float   to  PCM_16 :  61.03% of raw write
+    Read  float  from PCM_16 :  27.74% of raw read
+    Write float   to  PCM_24 :  45.10% of raw write
+    Read  float  from PCM_24 :  22.43% of raw read
+    Write float   to  PCM_32 :  35.24% of raw write
+    Read  float  from PCM_32 :  22.37% of raw read
+    Write float   to  FLOAT  :  42.01% of raw write
+    Read  float  from FLOAT  :  28.98% of raw read
diff --git a/libs/libsndfile/tests/benchmark-1.0.18pre16-mingus b/libs/libsndfile/tests/benchmark-1.0.18pre16-mingus
new file mode 100644
index 0000000000..fa0584e149
--- /dev/null
+++ b/libs/libsndfile/tests/benchmark-1.0.18pre16-mingus
@@ -0,0 +1,38 @@
+Benchmarking libsndfile-1.0.18pre15
+-----------------------------------
+Each test takes a little over 5 seconds.
+
+    Raw write PCM_16  :  178237074 samples per sec
+    Raw read  PCM_16  :  368885269 samples per sec
+
+Native endian I/O :
+    Write short   to  PCM_16 :  98.84% of raw write
+    Read  short  from PCM_16 : 147.10% of raw read
+    Write int     to  PCM_24 :  33.74% of raw write
+    Read  int    from PCM_24 :  30.82% of raw read
+    Write int     to  PCM_32 :  48.34% of raw write
+    Read  int    from PCM_32 :  62.43% of raw read
+    Write float   to  PCM_16 :  41.86% of raw write
+    Read  float  from PCM_16 :  36.73% of raw read
+    Write float   to  PCM_24 :  28.38% of raw write
+    Read  float  from PCM_24 :  19.50% of raw read
+    Write float   to  PCM_32 :  23.68% of raw write
+    Read  float  from PCM_32 :  28.76% of raw read
+    Write float   to  FLOAT  :  47.21% of raw write
+    Read  float  from FLOAT  :  60.85% of raw read
+
+Endian swapped I/O :
+    Write short   to  PCM_16 :  54.94% of raw write
+    Read  short  from PCM_16 :  59.03% of raw read
+    Write int     to  PCM_24 :  33.40% of raw write
+    Read  int    from PCM_24 :  31.98% of raw read
+    Write int     to  PCM_32 :  30.89% of raw write
+    Read  int    from PCM_32 :  33.68% of raw read
+    Write float   to  PCM_16 :  41.61% of raw write
+    Read  float  from PCM_16 :  26.76% of raw read
+    Write float   to  PCM_24 :  25.75% of raw write
+    Read  float  from PCM_24 :  19.84% of raw read
+    Write float   to  PCM_32 :  21.29% of raw write
+    Read  float  from PCM_32 :  21.78% of raw read
+    Write float   to  FLOAT  :  30.82% of raw write
+    Read  float  from FLOAT  :  35.04% of raw read
diff --git a/libs/libsndfile/tests/benchmark-1.0.6pre10-coltrane b/libs/libsndfile/tests/benchmark-1.0.6pre10-coltrane
new file mode 100644
index 0000000000..12f71a8a78
--- /dev/null
+++ b/libs/libsndfile/tests/benchmark-1.0.6pre10-coltrane
@@ -0,0 +1,39 @@
+Benchmarking libsndfile-1.0.6pre10
+----------------------------------
+Each test takes a little over 5 seconds.
+
+    Raw write PCM_16  :   28845961 samples per sec
+    Raw read  PCM_16  :   63471874 samples per sec
+
+Native endian I/O :
+    Write short   to  PCM_16 :  86.21% of raw write
+    Read  short  from PCM_16 :  82.60% of raw read
+    Write int     to  PCM_24 :  34.89% of raw write
+    Read  int    from PCM_24 :  37.26% of raw read
+    Write int     to  PCM_32 :  43.36% of raw write
+    Read  int    from PCM_32 :  41.30% of raw read
+    Write float   to  PCM_16 :  43.02% of raw write
+    Read  float  from PCM_16 :  43.99% of raw read
+    Write float   to  PCM_24 :  32.72% of raw write
+    Read  float  from PCM_24 :  28.21% of raw read
+    Write float   to  PCM_32 :  25.92% of raw write
+    Read  float  from PCM_32 :  30.98% of raw read
+    Write float   to  FLOAT  :  46.65% of raw write
+    Read  float  from FLOAT  :  56.66% of raw read
+
+Endian swapped I/O :
+    Write short   to  PCM_16 :  54.53% of raw write
+    Read  short  from PCM_16 :  56.32% of raw read
+    Write int     to  PCM_24 :  35.28% of raw write
+    Read  int    from PCM_24 :  37.33% of raw read
+    Write int     to  PCM_32 :  26.21% of raw write
+    Read  int    from PCM_32 :  23.51% of raw read
+    Write float   to  PCM_16 :  41.39% of raw write
+    Read  float  from PCM_16 :  23.56% of raw read
+    Write float   to  PCM_24 :  30.86% of raw write
+    Read  float  from PCM_24 :  28.27% of raw read
+    Write float   to  PCM_32 :  23.83% of raw write
+    Read  float  from PCM_32 :  20.54% of raw read
+    Write float   to  FLOAT  :  27.26% of raw write
+    Read  float  from FLOAT  :  29.04% of raw read
+
diff --git a/libs/libsndfile/tests/benchmark-1.0.6pre10-miles b/libs/libsndfile/tests/benchmark-1.0.6pre10-miles
new file mode 100644
index 0000000000..fffdb84630
--- /dev/null
+++ b/libs/libsndfile/tests/benchmark-1.0.6pre10-miles
@@ -0,0 +1,39 @@
+Benchmarking libsndfile-1.0.6pre10
+----------------------------------
+Each test takes a little over 5 seconds.
+
+    Raw write PCM_16  :   40092612 samples per sec
+    Raw read  PCM_16  :   42382563 samples per sec
+
+Native endian I/O :
+    Write short   to  PCM_16 :  61.90% of raw write
+    Read  short  from PCM_16 : 100.20% of raw read
+    Write int     to  PCM_24 :  28.69% of raw write
+    Read  int    from PCM_24 :  33.62% of raw read
+    Write int     to  PCM_32 :  31.14% of raw write
+    Read  int    from PCM_32 :  51.04% of raw read
+    Write float   to  PCM_16 :  25.57% of raw write
+    Read  float  from PCM_16 :  28.17% of raw read
+    Write float   to  PCM_24 :  23.59% of raw write
+    Read  float  from PCM_24 :  24.14% of raw read
+    Write float   to  PCM_32 :  18.00% of raw write
+    Read  float  from PCM_32 :  22.59% of raw read
+    Write float   to  FLOAT  :  31.32% of raw write
+    Read  float  from FLOAT  :  51.54% of raw read
+
+Endian swapped I/O :
+    Write short   to  PCM_16 :  42.81% of raw write
+    Read  short  from PCM_16 :  54.58% of raw read
+    Write int     to  PCM_24 :  29.28% of raw write
+    Read  int    from PCM_24 :  33.43% of raw read
+    Write int     to  PCM_32 :  22.21% of raw write
+    Read  int    from PCM_32 :  27.24% of raw read
+    Write float   to  PCM_16 :  25.76% of raw write
+    Read  float  from PCM_16 :  26.84% of raw read
+    Write float   to  PCM_24 :  23.71% of raw write
+    Read  float  from PCM_24 :  24.10% of raw read
+    Write float   to  PCM_32 :  18.47% of raw write
+    Read  float  from PCM_32 :  21.45% of raw read
+    Write float   to  FLOAT  :  22.46% of raw write
+    Read  float  from FLOAT  :  29.72% of raw read
+
diff --git a/libs/libsndfile/tests/benchmark-latest-coltrane b/libs/libsndfile/tests/benchmark-latest-coltrane
new file mode 100644
index 0000000000..97ce29a8a9
--- /dev/null
+++ b/libs/libsndfile/tests/benchmark-latest-coltrane
@@ -0,0 +1,75 @@
+erikd@coltrane > cat tests/benchmark-0.0.28         
+Benchmarking libsndfile-0.0.28
+------------------------------
+Each test takes a little over 5 seconds.
+
+    Raw write PCM_16  :   31022959 samples per sec
+    Raw read  PCM_16  :   63471874 samples per sec
+
+Native endian I/O :
+    Write short   to  PCM_16 :  83.19% of raw write
+    Read  short  from PCM_16 :  82.28% of raw read
+    Write int     to  PCM_24 :  30.81% of raw write
+    Read  int    from PCM_24 :  32.92% of raw read
+    Write float   to  PCM_16 :  17.70% of raw write
+    Read  float  from PCM_16 :  43.64% of raw read
+    Write float   to  PCM_24 :  15.09% of raw write
+    Read  float  from PCM_24 :  27.79% of raw read
+    Write float   to  PCM_32 :  14.32% of raw write
+    Read  float  from PCM_32 :  34.42% of raw read
+    Write float   to  FLOAT  :  28.64% of raw write
+    Read  float  from FLOAT  :  56.77% of raw read
+
+Endian swapped I/O :
+    Write short   to  PCM_16 :  44.04% of raw write
+    Read  short  from PCM_16 :  49.46% of raw read
+    Write int     to  PCM_24 :  28.92% of raw write
+    Read  int    from PCM_24 :  33.10% of raw read
+    Write float   to  PCM_16 :  17.30% of raw write
+    Read  float  from PCM_16 :  31.46% of raw read
+    Write float   to  PCM_24 :  14.62% of raw write
+    Read  float  from PCM_24 :  27.64% of raw read
+    Write float   to  PCM_32 :  13.65% of raw write
+    Read  float  from PCM_32 :  22.41% of raw read
+    Write float   to  FLOAT  :  19.13% of raw write
+    Read  float  from FLOAT  :  26.21% of raw read
+
+erikd@coltrane > tests/benchmark 
+Benchmarking libsndfile-1.0.0
+-----------------------------
+Each test takes a little over 5 seconds.
+
+    Raw write PCM_16  :   29884416 samples per sec
+    Raw read  PCM_16  :   63347175 samples per sec
+
+Native endian I/O :
+    Write short   to  PCM_16 :  88.24% of raw write
+    Read  short  from PCM_16 :  82.76% of raw read
+    Write int     to  PCM_24 :  34.95% of raw write
+    Read  int    from PCM_24 :  37.17% of raw read
+    Write int     to  PCM_32 :  43.86% of raw write
+    Read  int    from PCM_32 :  41.22% of raw read
+    Write float   to  PCM_16 :  42.07% of raw write
+    Read  float  from PCM_16 :  44.25% of raw read
+    Write float   to  PCM_24 :  32.43% of raw write
+    Read  float  from PCM_24 :  28.93% of raw read
+    Write float   to  PCM_32 :  25.60% of raw write
+    Read  float  from PCM_32 :  31.10% of raw read
+    Write float   to  FLOAT  :  45.55% of raw write
+    Read  float  from FLOAT  :  57.41% of raw read
+
+Endian swapped I/O :
+    Write short   to  PCM_16 :  43.46% of raw write
+    Read  short  from PCM_16 :  43.99% of raw read
+    Write int     to  PCM_24 :  35.09% of raw write
+    Read  int    from PCM_24 :  37.34% of raw read
+    Write int     to  PCM_32 :  24.05% of raw write
+    Read  int    from PCM_32 :  19.74% of raw read
+    Write float   to  PCM_16 :  40.25% of raw write
+    Read  float  from PCM_16 :  32.15% of raw read
+    Write float   to  PCM_24 :  31.02% of raw write
+    Read  float  from PCM_24 :  28.82% of raw read
+    Write float   to  PCM_32 :  23.54% of raw write
+    Read  float  from PCM_32 :  23.65% of raw read
+    Write float   to  FLOAT  :  24.87% of raw write
+    Read  float  from FLOAT  :  20.28% of raw read
diff --git a/libs/libsndfile/tests/benchmark.c b/libs/libsndfile/tests/benchmark.c
index 21f62efce6..f33bfee43b 100644
--- a/libs/libsndfile/tests/benchmark.c
+++ b/libs/libsndfile/tests/benchmark.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2002-2009 Erik de Castro Lopo 
+** Copyright (C) 2002-2011 Erik de Castro Lopo 
 **
 ** 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
diff --git a/libs/libsndfile/tests/benchmark.def b/libs/libsndfile/tests/benchmark.def
index f2db29ae24..382bf3b1a6 100644
--- a/libs/libsndfile/tests/benchmark.def
+++ b/libs/libsndfile/tests/benchmark.def
@@ -1,16 +1,16 @@
 autogen definitions benchmark.tpl;
 
-data_type = { 
+data_type = {
 	type_name		= short ;
 	multiplier		= "32700.0" ;
 	};
 
-data_type = { 
+data_type = {
 	type_name		= int ;
-	multiplier		= "32700.0 * (1<<16)" ;
+	multiplier		= "32700.0 * (1 << 16)" ;
 	};
 
-data_type = { 
+data_type = {
 	type_name		= float ;
 	multiplier		= "1.0" ;
 	};
diff --git a/libs/libsndfile/tests/benchmark.tpl b/libs/libsndfile/tests/benchmark.tpl
index e1a6f3ccfd..14b22e2e22 100644
--- a/libs/libsndfile/tests/benchmark.tpl
+++ b/libs/libsndfile/tests/benchmark.tpl
@@ -1,6 +1,6 @@
 [+ AutoGen5 template c +]
 /*
-** Copyright (C) 2002-2009 Erik de Castro Lopo 
+** Copyright (C) 2002-2012 Erik de Castro Lopo 
 **
 ** 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
@@ -60,7 +60,7 @@
 	#define WRITE_PERMS	(S_IRUSR | S_IWUSR | S_IRGRP)
 #endif
 
-#define	BUFFER_SIZE		(1<<18)
+#define	BUFFER_SIZE		(1 << 18)
 #define	BLOCK_COUNT		(30)
 #define	TEST_DURATION	(5)		/* 5 Seconds. */
 
diff --git a/libs/libsndfile/tests/channel_test.c b/libs/libsndfile/tests/channel_test.c
new file mode 100644
index 0000000000..8a69734389
--- /dev/null
+++ b/libs/libsndfile/tests/channel_test.c
@@ -0,0 +1,134 @@
+/*
+** Copyright (C) 2001-2012 Erik de Castro Lopo 
+**
+** 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 "sfconfig.h"
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#if HAVE_UNISTD_H
+#include 
+#endif
+
+#include 
+
+#include 
+
+#include "utils.h"
+
+#define	BUFFER_LEN		(1 << 10)
+#define LOG_BUFFER_SIZE	1024
+
+static	void	channel_test			(void) ;
+static	double	max_diff		(const float *a, const float *b, int len) ;
+
+int
+main (void) // int argc, char *argv [])
+{	channel_test () ;
+	return 0 ;
+} /* main */
+
+/*============================================================================================
+**	Here are the test functions.
+*/
+
+static void
+channel_test (void)
+{	static float	float_data [1024] ;
+	static float	read_float [1024] ;
+	static int		read_int [1024] ;
+	static short	read_short [1024] ;
+	unsigned int	ch, k ;
+
+	gen_windowed_sine_float (float_data, ARRAY_LEN (float_data), 0.9) ;
+
+	for (ch = 1 ; ch <= 8 ; ch++)
+	{	SNDFILE	*file ;
+		SF_INFO	wsfinfo, rsfinfo ;
+		sf_count_t wframes = ARRAY_LEN (float_data) / ch ;
+		double	maxdiff ;
+		char	filename [256] ;
+
+		snprintf (filename, sizeof (filename), "chan_%d.wav", ch) ;
+		print_test_name (__func__, filename) ;
+
+		sf_info_setup (&wsfinfo, SF_FORMAT_WAV | SF_FORMAT_FLOAT, 48000, ch) ;
+		sf_info_clear (&rsfinfo) ;
+
+		/* Write the test file. */
+		file = test_open_file_or_die (filename, SFM_WRITE, &wsfinfo, SF_FALSE, __LINE__) ;
+		test_writef_float_or_die (file, 0, float_data, wframes, __LINE__) ;
+		sf_close (file) ;
+
+		/* Read it as float and test. */
+		file = test_open_file_or_die (filename, SFM_READ, &rsfinfo, SF_FALSE, __LINE__) ;
+		exit_if_true (rsfinfo.frames == 0,
+				"\n\nLine %d : Frames in file %" PRId64 ".\n\n", __LINE__, rsfinfo.frames) ;
+		exit_if_true (wframes != rsfinfo.frames,
+				"\n\nLine %d : Wrote %" PRId64 ", read %" PRId64 " frames.\n\n", __LINE__, wframes, rsfinfo.frames) ;
+
+		sf_command (file, SFC_SET_SCALE_FLOAT_INT_READ, NULL, SF_TRUE) ;
+
+		test_readf_float_or_die (file, 0, read_float, rsfinfo.frames, __LINE__) ;
+		compare_float_or_die (float_data, read_float, ch * rsfinfo.frames, __LINE__) ;
+
+		/* Read it as short and test. */
+		test_seek_or_die (file, 0, SEEK_SET, 0, ch, __LINE__) ;
+		test_readf_short_or_die (file, 0, read_short, rsfinfo.frames, __LINE__) ;
+
+		for (k = 0 ; k < ARRAY_LEN (read_float) ; k++)
+			read_float [k] = read_short [k] * (0.9 / 0x8000) ;
+
+		maxdiff = max_diff (float_data, read_float, ch * rsfinfo.frames) ;
+		exit_if_true (maxdiff > 0.5, "\n\nLine %d : Max diff is %f\n\n", __LINE__, maxdiff) ;
+
+		/* Read it as int and test. */
+		test_seek_or_die (file, 0, SEEK_SET, 0, ch, __LINE__) ;
+		test_readf_int_or_die (file, 0, read_int, rsfinfo.frames, __LINE__) ;
+
+		for (k = 0 ; k < ARRAY_LEN (read_float) ; k++)
+			read_float [k] = read_int [k] * (0.9 / 0x80000000) ;
+
+		maxdiff = max_diff (float_data, read_float, ch * rsfinfo.frames) ;
+		exit_if_true (maxdiff > 0.5, "\n\nLine %d : Max diff is %f\n\n", __LINE__, maxdiff) ;
+
+		sf_close (file) ;
+		unlink (filename) ;
+		printf ("ok\n") ;
+		} ;
+
+	return ;
+} /* channel_test */
+
+static double
+max_diff (const float *a, const float *b, int len)
+{	double mdiff = 0.0, diff ;
+	int k ;
+
+	for (k = 0 ; k < len ; k++)
+	{	diff = fabs (a [k] - b [k]) ;
+		mdiff = diff > mdiff ? diff : mdiff ;
+		// printf ("%4d:     % f        % f          % f          % f\n", k, a [k], b [k], diff, mdiff) ;
+		} ;
+
+	return mdiff ;
+} /* max_diff */
diff --git a/libs/libsndfile/tests/checksum_test.c b/libs/libsndfile/tests/checksum_test.c
index 52007e3a32..544da93408 100644
--- a/libs/libsndfile/tests/checksum_test.c
+++ b/libs/libsndfile/tests/checksum_test.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2008-2009 Erik de Castro Lopo 
+** Copyright (C) 2008-2011 Erik de Castro Lopo 
 **
 ** 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
diff --git a/libs/libsndfile/tests/chunk_test.c b/libs/libsndfile/tests/chunk_test.c
new file mode 100644
index 0000000000..5a036b1e07
--- /dev/null
+++ b/libs/libsndfile/tests/chunk_test.c
@@ -0,0 +1,293 @@
+/*
+** Copyright (C) 2003-2012 Erik de Castro Lopo 
+**
+** 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 "sfconfig.h"
+
+#include 
+#include 
+#include 
+#include 
+
+#if HAVE_UNISTD_H
+#include 
+#endif
+
+#include	
+
+#include	"utils.h"
+
+#define	BUFFER_LEN			(1 << 10)
+#define LOG_BUFFER_SIZE		1024
+
+static void	chunk_test (const char *filename, int format) ;
+
+static void
+chunk_test_helper (const char *filename, int format, const char * testdata) ;
+
+int
+main (int argc, char *argv [])
+{	int		do_all = 0 ;
+	int		test_count = 0 ;
+
+	if (argc != 2)
+	{	printf ("Usage : %s \n", argv [0]) ;
+		printf ("    Where  is one of the following:\n") ;
+		printf ("           wav  - test adding chunks to WAV files\n") ;
+		printf ("           aiff - test adding chunks to AIFF files\n") ;
+		printf ("           all  - perform all tests\n") ;
+		exit (1) ;
+		} ;
+
+	do_all = ! strcmp (argv [1], "all") ;
+
+	if (do_all || ! strcmp (argv [1], "wav"))
+	{	chunk_test ("chunks_pcm16.wav", SF_FORMAT_WAV | SF_FORMAT_PCM_16) ;
+		chunk_test ("chunks_pcm16.rifx", SF_ENDIAN_BIG | SF_FORMAT_WAV | SF_FORMAT_PCM_16) ;
+		chunk_test ("chunks_pcm16.wavex", SF_FORMAT_WAVEX | SF_FORMAT_PCM_16) ;
+		test_count++ ;
+		} ;
+
+	if (do_all || ! strcmp (argv [1], "aiff"))
+	{	chunk_test ("chunks_pcm16.aiff", SF_FORMAT_AIFF | SF_FORMAT_PCM_16) ;
+		test_count++ ;
+		} ;
+
+	if (do_all || ! strcmp (argv [1], "caf"))
+	{	chunk_test ("chunks_pcm16.caf", SF_FORMAT_CAF | SF_FORMAT_PCM_16) ;
+		chunk_test ("chunks_alac.caf", SF_FORMAT_CAF | SF_FORMAT_ALAC_16) ;
+		test_count++ ;
+		} ;
+
+	if (test_count == 0)
+	{	printf ("Mono : ************************************\n") ;
+		printf ("Mono : *  No '%s' test defined.\n", argv [1]) ;
+		printf ("Mono : ************************************\n") ;
+		return 1 ;
+		} ;
+
+	return 0 ;
+} /* main */
+
+
+/*============================================================================================
+**	Here are the test functions.
+*/
+
+static void
+chunk_test_helper (const char *filename, int format, const char * testdata)
+{	SNDFILE			*file ;
+	SF_INFO			sfinfo ;
+	SF_CHUNK_INFO	chunk_info ;
+	SF_CHUNK_ITERATOR * iterator ;
+	uint32_t		length_before ;
+	int				err, allow_fd ;
+
+	switch (format & SF_FORMAT_SUBMASK)
+	{	case SF_FORMAT_ALAC_16 :
+			allow_fd = SF_FALSE ;
+			break ;
+		default :
+			allow_fd = SF_TRUE ;
+			break ;
+		} ;
+
+	sfinfo.samplerate	= 44100 ;
+	sfinfo.channels		= 1 ;
+	sfinfo.frames		= 0 ;
+	sfinfo.format		= format ;
+
+	file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, allow_fd, __LINE__) ;
+
+	/* Set up the chunk to write. */
+	memset (&chunk_info, 0, sizeof (chunk_info)) ;
+	snprintf (chunk_info.id, sizeof (chunk_info.id), "Test") ;
+	chunk_info.id_size = 4 ;
+	chunk_info.data = strdup (testdata) ;
+	chunk_info.datalen = strlen (chunk_info.data) ;
+
+	length_before = chunk_info.datalen ;
+
+	err = sf_set_chunk (file, &chunk_info) ;
+	exit_if_true (
+		err != SF_ERR_NO_ERROR,
+		"\n\nLine %d : sf_set_chunk returned for testdata '%s' : %s\n\n", __LINE__, testdata, sf_error_number (err)
+		) ;
+
+	memset (chunk_info.data, 0, chunk_info.datalen) ;
+	free (chunk_info.data) ;
+
+	sf_close (file) ;
+
+	file = test_open_file_or_die (filename, SFM_READ, &sfinfo, allow_fd, __LINE__) ;
+
+	memset (&chunk_info, 0, sizeof (chunk_info)) ;
+	snprintf (chunk_info.id, sizeof (chunk_info.id), "Test") ;
+	chunk_info.id_size = 4 ;
+
+	iterator = sf_get_chunk_iterator (file, &chunk_info) ;
+	err = sf_get_chunk_size (iterator, &chunk_info) ;
+	exit_if_true (
+		err != SF_ERR_NO_ERROR,
+		"\n\nLine %d : sf_get_chunk_size returned for testdata '%s' : %s\n\n", __LINE__, testdata, sf_error_number (err)
+		) ;
+
+	exit_if_true (
+		length_before > chunk_info.datalen || chunk_info.datalen - length_before > 4,
+		"\n\nLine %d : testdata '%s' : Bad chunk length %u (previous length %u)\n\n", __LINE__, testdata, chunk_info.datalen, length_before
+		) ;
+
+	chunk_info.data = malloc (chunk_info.datalen) ;
+	err = sf_get_chunk_data (iterator, &chunk_info) ;
+	exit_if_true (
+		err != SF_ERR_NO_ERROR,
+		"\n\nLine %d : sf_get_chunk_size returned for testdata '%s' : %s\n\n", __LINE__, testdata, sf_error_number (err)
+		) ;
+
+	exit_if_true (
+		memcmp (testdata, chunk_info.data, length_before),
+		"\n\nLine %d : Data compare failed.\n    %s\n    %s\n\n", __LINE__, testdata, (char*) chunk_info.data
+		) ;
+
+	free (chunk_info.data) ;
+
+	sf_close (file) ;
+	unlink (filename) ;
+} /* chunk_test_helper */
+
+static void
+multichunk_test_helper (const char *filename, int format, const char * testdata [], size_t testdata_len)
+{	SNDFILE			*file ;
+	SF_INFO			sfinfo ;
+	SF_CHUNK_INFO	chunk_info ;
+	SF_CHUNK_ITERATOR * iterator ;
+	uint32_t		length_before [testdata_len] ;
+	int				err, allow_fd ;
+	size_t			i ;
+
+	sfinfo.samplerate	= 44100 ;
+	sfinfo.channels		= 1 ;
+	sfinfo.frames		= 0 ;
+	sfinfo.format		= format ;
+
+	switch (format & SF_FORMAT_SUBMASK)
+	{	case SF_FORMAT_ALAC_16 :
+			allow_fd = SF_FALSE ;
+			break ;
+		default :
+			allow_fd = SF_TRUE ;
+			break ;
+		} ;
+
+	file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, allow_fd, __LINE__) ;
+
+	/* Set up the chunk to write. */
+	for (i = 0 ; i < testdata_len ; i++)
+	{	memset (&chunk_info, 0, sizeof (chunk_info)) ;
+		snprintf (chunk_info.id, sizeof (chunk_info.id), "Test") ;
+		chunk_info.id_size = 4 ;
+
+		chunk_info.data = strdup (testdata [i]) ;
+		chunk_info.datalen = strlen (chunk_info.data) ;
+
+		length_before [i] = chunk_info.datalen ;
+
+		err = sf_set_chunk (file, &chunk_info) ;
+		exit_if_true (
+			err != SF_ERR_NO_ERROR,
+			"\n\nLine %d : sf_set_chunk returned for testdata[%d] '%s' : %s\n\n", __LINE__, (int) i, testdata [i], sf_error_number (err)
+			) ;
+
+		memset (chunk_info.data, 0, chunk_info.datalen) ;
+		free (chunk_info.data) ;
+	}
+
+	sf_close (file) ;
+
+	file = test_open_file_or_die (filename, SFM_READ, &sfinfo, allow_fd, __LINE__) ;
+
+	memset (&chunk_info, 0, sizeof (chunk_info)) ;
+	snprintf (chunk_info.id, sizeof (chunk_info.id), "Test") ;
+	chunk_info.id_size = 4 ;
+
+	iterator = sf_get_chunk_iterator (file, &chunk_info) ;
+
+	i = 0 ;
+	while (iterator)
+	{	memset (&chunk_info, 0, sizeof (chunk_info)) ;
+		err = sf_get_chunk_size (iterator, &chunk_info) ;
+		exit_if_true (
+			i > testdata_len,
+			"\n\nLine %d : iterated to chunk #%d, but only %d chunks have been written\n\n", __LINE__, (int) i, (int) testdata_len
+			) ;
+
+		exit_if_true (
+			err != SF_ERR_NO_ERROR,
+			"\n\nLine %d : sf_get_chunk_size returned for testdata[%d] '%s' : %s\n\n", __LINE__, (int) i, testdata [i], sf_error_number (err)
+			) ;
+
+		exit_if_true (
+			length_before [i] > chunk_info.datalen || chunk_info.datalen - length_before [i] > 4,
+			"\n\nLine %d : testdata[%d] '%s' : Bad chunk length %u (previous length %u)\n\n", __LINE__, (int) i, testdata [i], chunk_info.datalen, length_before [i]
+			) ;
+
+		chunk_info.data = malloc (chunk_info.datalen) ;
+		err = sf_get_chunk_data (iterator, &chunk_info) ;
+		exit_if_true (
+			err != SF_ERR_NO_ERROR,
+			"\n\nLine %d : sf_get_chunk_size returned for testdata[%d] '%s' : %s\n\n", __LINE__, (int) i, testdata [i], sf_error_number (err)
+			) ;
+
+		exit_if_true (
+			4 != chunk_info.id_size,
+			"\n\nLine %d : testdata[%d] : Bad ID length %u (previous length %u)\n\n", __LINE__, (int) i, chunk_info.id_size, 4
+			) ;
+		exit_if_true (
+			memcmp ("Test", chunk_info.id, 4),
+			"\n\nLine %d : ID compare failed at %d.\n    %s\n    %s\n\n", __LINE__, (int) i, "Test", (char*) chunk_info.id
+			) ;
+
+		exit_if_true (
+			memcmp (testdata [i], chunk_info.data, length_before [i]),
+			"\n\nLine %d : Data compare failed at %d.\n    %s\n    %s\n\n", __LINE__, (int) i, testdata [i], (char*) chunk_info.data
+			) ;
+
+		free (chunk_info.data) ;
+		iterator = sf_next_chunk_iterator (iterator) ;
+		i++ ;
+	}
+
+	sf_close (file) ;
+	unlink (filename) ;
+} /* multichunk_test_helper */
+
+
+static void
+chunk_test (const char *filename, int format)
+{	const char*		testdata [] =
+	{	"There can be only one.", "", "A", "AB", "ABC", "ABCD", "ABCDE" } ;
+	uint32_t k ;
+
+	print_test_name (__func__, filename) ;
+
+	for (k = 0 ; k < ARRAY_LEN (testdata) ; k++)
+		chunk_test_helper (filename, format, testdata [k]) ;
+
+	multichunk_test_helper (filename, format, testdata, ARRAY_LEN (testdata)) ;
+
+	puts ("ok") ;
+} /* chunk_test */
diff --git a/libs/libsndfile/tests/command_test.c b/libs/libsndfile/tests/command_test.c
index 6940d25684..9e6bfd485b 100644
--- a/libs/libsndfile/tests/command_test.c
+++ b/libs/libsndfile/tests/command_test.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2001-2009 Erik de Castro Lopo 
+** Copyright (C) 2001-2013 Erik de Castro Lopo 
 **
 ** 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
@@ -20,6 +20,8 @@
 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 
@@ -33,7 +35,7 @@
 
 #include "utils.h"
 
-#define	BUFFER_LEN		(1<<10)
+#define	BUFFER_LEN		(1 << 10)
 #define LOG_BUFFER_SIZE	1024
 
 static	void	float_norm_test			(const char *filename) ;
@@ -51,6 +53,10 @@ static	void	broadcast_rdwr_test		(const char *filename, int filetype) ;
 static	void	broadcast_coding_history_test	(const char *filename) ;
 static	void	broadcast_coding_history_size	(const char *filename) ;
 
+/* Cart Chunk tests */
+static void	cart_test			(const char *filename, int filetype) ;
+static void	cart_rdwr_test			(const char *filename, int filetype) ;
+
 /* Force the start of this buffer to be double aligned. Sparc-solaris will
 ** choke if its not.
 */
@@ -76,12 +82,13 @@ main (int argc, char *argv [])
 		printf ("           chanmap - test set/get of channel map data..\n") ;
 		printf ("           bext    - test set/get of SF_BROADCAST_INFO.\n") ;
 		printf ("           bextch  - test set/get of SF_BROADCAST_INFO coding_history.\n") ;
+		printf ("           cart    - test set/get of SF_CART_INFO.\n") ;
 		printf ("           rawend  - test SFC_RAW_NEEDS_ENDSWAP.\n") ;
 		printf ("           all     - perform all tests\n") ;
 		exit (1) ;
 		} ;
 
-	do_all =! strcmp (argv [1], "all") ;
+	do_all = ! strcmp (argv [1], "all") ;
 
 	if (do_all || strcmp (argv [1], "ver") == 0)
 	{	char buffer [128] ;
@@ -141,6 +148,17 @@ main (int argc, char *argv [])
 
 		broadcast_test ("broadcast.wavex", SF_FORMAT_WAVEX | SF_FORMAT_PCM_16) ;
 		broadcast_rdwr_test	("broadcast.wavex", SF_FORMAT_WAVEX | SF_FORMAT_PCM_16) ;
+
+		broadcast_test ("broadcast.rf64", SF_FORMAT_RF64 | SF_FORMAT_PCM_16) ;
+		broadcast_rdwr_test	("broadcast.rf64", SF_FORMAT_RF64 | SF_FORMAT_PCM_16) ;
+		test_count ++ ;
+		} ;
+
+	if (do_all || strcmp (argv [1], "cart") == 0)
+	{	cart_test ("cart.wav", SF_FORMAT_WAV | SF_FORMAT_PCM_16) ;
+		cart_rdwr_test ("cart.wav", SF_FORMAT_WAV | SF_FORMAT_PCM_16) ;
+		cart_test ("cart.rf64", SF_FORMAT_RF64 | SF_FORMAT_PCM_16) ;
+		cart_rdwr_test ("cart.rf64", SF_FORMAT_RF64 | SF_FORMAT_PCM_16) ;
 		test_count ++ ;
 		} ;
 
@@ -151,8 +169,10 @@ main (int argc, char *argv [])
 		} ;
 
 	if (do_all || strcmp (argv [1], "chanmap") == 0)
-	{	channel_map_test ("chanmap.wav", SF_FORMAT_WAV | SF_FORMAT_PCM_16) ;
-		channel_map_test ("chanmap.aiff" , SF_FORMAT_AIFF | SF_FORMAT_PCM_24) ;
+	{	channel_map_test ("chanmap.wavex", SF_FORMAT_WAVEX | SF_FORMAT_PCM_16) ;
+		channel_map_test ("chanmap.rf64", SF_FORMAT_RF64 | SF_FORMAT_PCM_16) ;
+		channel_map_test ("chanmap.aifc" , SF_FORMAT_AIFF | SF_FORMAT_PCM_16) ;
+		channel_map_test ("chanmap.caf" , SF_FORMAT_CAF | SF_FORMAT_PCM_16) ;
 		test_count ++ ;
 		} ;
 
@@ -236,7 +256,7 @@ float_norm_test (const char *filename)
 		} ;
 
 	if (sfinfo.frames != BUFFER_LEN)
-	{	printf ("\n\nLine %d: Incorrect number of.frames in file. (%d => %ld)\n", __LINE__, BUFFER_LEN, SF_COUNT_TO_LONG (sfinfo.frames)) ;
+	{	printf ("\n\nLine %d: Incorrect number of.frames in file. (%d => %" PRId64 ")\n", __LINE__, BUFFER_LEN, sfinfo.frames) ;
 		exit (1) ;
 		} ;
 
@@ -352,7 +372,7 @@ double_norm_test (const char *filename)
 		} ;
 
 	if (sfinfo.frames != BUFFER_LEN)
-	{	printf ("\n\nLine %d: Incorrect number of.frames in file. (%d => %ld)\n", __LINE__, BUFFER_LEN, SF_COUNT_TO_LONG (sfinfo.frames)) ;
+	{	printf ("\n\nLine %d: Incorrect number of.frames in file. (%d => %" PRId64 ")\n", __LINE__, BUFFER_LEN, sfinfo.frames) ;
 		exit (1) ;
 		} ;
 
@@ -541,7 +561,7 @@ calc_peak_test (int filetype, const char *filename)
 		} ;
 
 	if (sfinfo.frames != BUFFER_LEN)
-	{	printf ("\n\nLine %d: Incorrect number of.frames in file. (%d => %ld)\n", __LINE__, BUFFER_LEN, SF_COUNT_TO_LONG (sfinfo.frames)) ;
+	{	printf ("\n\nLine %d: Incorrect number of.frames in file. (%d => %" PRId64 ")\n", __LINE__, BUFFER_LEN, sfinfo.frames) ;
 		exit (1) ;
 		} ;
 
@@ -588,7 +608,7 @@ calc_peak_test (int filetype, const char *filename)
 		} ;
 
 	if (sfinfo.frames != BUFFER_LEN)
-	{	printf ("\n\nLine %d: Incorrect number of.frames in file. (%d => %ld)\n", __LINE__, BUFFER_LEN, SF_COUNT_TO_LONG (sfinfo.frames)) ;
+	{	printf ("\n\nLine %d: Incorrect number of.frames in file. (%d => %" PRId64 ")\n", __LINE__, BUFFER_LEN, sfinfo.frames) ;
 		exit (1) ;
 		} ;
 
@@ -694,8 +714,8 @@ instrument_test (const char *filename, int filetype)
 		}
 	} ;
 	SF_INSTRUMENT read_inst ;
-	SNDFILE	 *file ;
-	SF_INFO	 sfinfo ;
+	SNDFILE	*file ;
+	SF_INFO	sfinfo ;
 
 	print_test_name ("instrument_test", filename) ;
 
@@ -800,7 +820,6 @@ static	void
 current_sf_info_test	(const char *filename)
 {	SNDFILE *outfile, *infile ;
 	SF_INFO outinfo, ininfo ;
-	sf_count_t last_count ;
 
 	print_test_name ("current_sf_info_test", filename) ;
 
@@ -820,23 +839,21 @@ current_sf_info_test	(const char *filename)
 	sf_command (outfile, SFC_GET_CURRENT_SF_INFO, &outinfo, sizeof (outinfo)) ;
 
 	exit_if_true (outinfo.frames != BUFFER_LEN,
-		"\n\nLine %d : Initial sfinfo.frames (%ld) should be %d.\n\n", __LINE__,
-		SF_COUNT_TO_LONG (outinfo.frames), BUFFER_LEN
+		"\n\nLine %d : Initial sfinfo.frames (%" PRId64 ") should be %d.\n\n", __LINE__,
+		outinfo.frames, BUFFER_LEN
 		) ;
 
 	/* Read file making sure no channel map exists. */
 	memset (&ininfo, 0, sizeof (ininfo)) ;
 	infile = test_open_file_or_die (filename, SFM_READ, &ininfo, SF_TRUE, __LINE__) ;
 
-	last_count = ininfo.frames ;
-
 	test_write_double_or_die (outfile, 0, double_data, BUFFER_LEN, __LINE__) ;
 
 	sf_command (infile, SFC_GET_CURRENT_SF_INFO, &ininfo, sizeof (ininfo)) ;
 
 	exit_if_true (ininfo.frames != BUFFER_LEN,
-		"\n\nLine %d : Initial sfinfo.frames (%ld) should be %d.\n\n", __LINE__,
-		SF_COUNT_TO_LONG (ininfo.frames), BUFFER_LEN
+		"\n\nLine %d : Initial sfinfo.frames (%" PRId64 ") should be %d.\n\n", __LINE__,
+		ininfo.frames, BUFFER_LEN
 		) ;
 
 	sf_close (outfile) ;
@@ -849,8 +866,8 @@ current_sf_info_test	(const char *filename)
 static void
 broadcast_test (const char *filename, int filetype)
 {	static SF_BROADCAST_INFO bc_write, bc_read ;
-	SNDFILE	 *file ;
-	SF_INFO	 sfinfo ;
+	SNDFILE	*file ;
+	SF_INFO	sfinfo ;
 	int errors = 0 ;
 
 	print_test_name ("broadcast_test", filename) ;
@@ -965,7 +982,7 @@ broadcast_rdwr_test (const char *filename, int filetype)
 
 	file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ;
 	sf_close (file) ;
-	exit_if_true (frames != sfinfo.frames, "\n\nLine %d : Frame count %lld should be %lld.\n", __LINE__, sfinfo.frames, frames) ;
+	exit_if_true (frames != sfinfo.frames, "\n\nLine %d : Frame count %" PRId64 " should be %" PRId64 ".\n", __LINE__, sfinfo.frames, frames) ;
 
 	unlink (filename) ;
 	puts ("ok") ;
@@ -974,8 +991,8 @@ broadcast_rdwr_test (const char *filename, int filetype)
 static void
 check_coding_history_newlines (const char *filename)
 {	static SF_BROADCAST_INFO bc_write, bc_read ;
-	SNDFILE	 *file ;
-	SF_INFO	 sfinfo ;
+	SNDFILE	*file ;
+	SF_INFO	sfinfo ;
 	unsigned k ;
 
 	sfinfo.samplerate	= 22050 ;
@@ -1044,8 +1061,8 @@ check_coding_history_newlines (const char *filename)
 static void
 broadcast_coding_history_test (const char *filename)
 {	static SF_BROADCAST_INFO bc_write, bc_read ;
-	SNDFILE	 *file ;
-	SF_INFO	 sfinfo ;
+	SNDFILE	*file ;
+	SF_INFO	sfinfo ;
 	const char *default_history = "A=PCM,F=22050,W=16,M=mono" ;
 	const char *supplied_history =
 					"A=PCM,F=44100,W=24,M=mono,T=other\r\n"
@@ -1093,7 +1110,9 @@ broadcast_coding_history_test (const char *filename)
 		} ;
 
 	if (bc_read.coding_history_size < strlen (default_history) || memcmp (bc_read.coding_history, default_history, strlen (default_history)) != 0)
-	{	printf ("\n\nLine %d : unexpected coding history '%.*s'.\n\n", __LINE__, bc_read.coding_history_size, bc_read.coding_history) ;
+	{	printf ("\n\n"
+				"Line %d : unexpected coding history '%.*s',\n"
+				"            should be '%s'\n\n", __LINE__, bc_read.coding_history_size, bc_read.coding_history, default_history) ;
 		exit (1) ;
 		} ;
 
@@ -1146,8 +1165,8 @@ broadcast_coding_history_size (const char *filename)
 {	/* SF_BROADCAST_INFO struct with coding_history field of 1024 bytes. */
 	static SF_BROADCAST_INFO_VAR (1024) bc_write ;
 	static SF_BROADCAST_INFO_VAR (1024) bc_read ;
-	SNDFILE	 *file ;
-	SF_INFO	 sfinfo ;
+	SNDFILE	*file ;
+	SF_INFO	sfinfo ;
 	int k ;
 
 	print_test_name (__func__, filename) ;
@@ -1204,16 +1223,227 @@ broadcast_coding_history_size (const char *filename)
 	puts ("ok") ;
 } /* broadcast_coding_history_size */
 
+/*==============================================================================
+*/
+static void
+cart_test (const char *filename, int filetype)
+{	static SF_CART_INFO ca_write, ca_read ;
+	SNDFILE	*file ;
+	SF_INFO	sfinfo ;
+	int errors = 0 ;
+
+	print_test_name ("cart_test", filename) ;
+
+	sfinfo.samplerate	= 11025 ;
+	sfinfo.format		= filetype ;
+	sfinfo.channels		= 1 ;
+	memset (&ca_write, 0, sizeof (ca_write)) ;
+
+	// example test data
+	snprintf (ca_write.artist, sizeof (ca_write.artist), "Test artist") ;
+	snprintf (ca_write.version, sizeof (ca_write.version), "Test version") ;
+	snprintf (ca_write.cut_id, sizeof (ca_write.cut_id), "Test cut ID") ;
+	snprintf (ca_write.client_id, sizeof (ca_write.client_id), "Test client ID") ;
+	snprintf (ca_write.category, sizeof (ca_write.category), "Test category") ;
+	snprintf (ca_write.classification, sizeof (ca_write.classification), "Test classification") ;
+	snprintf (ca_write.out_cue, sizeof (ca_write.out_cue), "Test out cue") ;
+	snprintf (ca_write.start_date, sizeof (ca_write.start_date), "%d/%02d/%02d", 2006, 3, 30) ;
+	snprintf (ca_write.start_time, sizeof (ca_write.start_time), "%02d:%02d:%02d", 20, 27, 0) ;
+	snprintf (ca_write.end_date, sizeof (ca_write.end_date), "%d/%02d/%02d", 2006, 3, 30) ;
+	snprintf (ca_write.end_time, sizeof (ca_write.end_time), "%02d:%02d:%02d", 20, 27, 0) ;
+	snprintf (ca_write.producer_app_id, sizeof (ca_write.producer_app_id), "Test producer app id") ;
+	snprintf (ca_write.producer_app_version, sizeof (ca_write.producer_app_version), "Test producer app version") ;
+	snprintf (ca_write.user_def, sizeof (ca_write.user_def), "test user def test test") ;
+	ca_write.level_reference = 42 ;
+	snprintf (ca_write.url, sizeof (ca_write.url), "http://www.test.com/test_url") ;
+	snprintf (ca_write.tag_text, sizeof (ca_write.tag_text), "tag text test! \r\n") ; // must be terminated \r\n to be valid
+	ca_write.tag_text_size = strlen (ca_write.tag_text) ;
+
+	file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ;
+	if (sf_command (file, SFC_SET_CART_INFO, &ca_write, sizeof (ca_write)) == SF_FALSE)
+		exit (1) ;
+
+	test_write_double_or_die (file, 0, double_data, BUFFER_LEN, __LINE__) ;
+	sf_close (file) ;
+
+	memset (&ca_read, 0, sizeof (ca_read)) ;
+
+	file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ;
+	if (sf_command (file, SFC_GET_CART_INFO, &ca_read, sizeof (ca_read)) == SF_FALSE)
+	{	printf ("\n\nLine %d : sf_command (SFC_GET_CART_INFO) failed.\n\n", __LINE__) ;
+		exit (1) ;
+		return ;
+		} ;
+	check_log_buffer_or_die (file, __LINE__) ;
+	sf_close (file) ;
+
+
+	if (memcmp (ca_write.artist, ca_read.artist, sizeof (ca_write.artist)) != 0)
+	{	printf ("\n\nLine %d : artist mismatch :\n\twrite : '%s'\n\tread  : '%s'\n\n", __LINE__, ca_write.artist, ca_read.artist) ;
+		errors ++ ;
+		} ;
+
+	if (memcmp (ca_write.version, ca_read.version, sizeof (ca_write.version)) != 0)
+	{	printf ("\n\nLine %d : version mismatch :\n\twrite : '%s'\n\tread  : '%s'\n\n", __LINE__, ca_write.version, ca_read.version) ;
+		errors ++ ;
+		} ;
+
+	if (memcmp (ca_write.title, ca_read.title, sizeof (ca_write.title)) != 0)
+	{	printf ("\n\nLine %d : title mismatch :\n\twrite : '%s'\n\tread  : '%s'\n\n", __LINE__, ca_write.title, ca_read.title) ;
+		errors ++ ;
+		} ;
+
+	if (memcmp (ca_write.cut_id, ca_read.cut_id, sizeof (ca_write.cut_id)) != 0)
+	{	printf ("\n\nLine %d : cut_id mismatch :\n\twrite : '%s'\n\tread  : '%s'\n\n", __LINE__, ca_write.cut_id, ca_read.cut_id) ;
+		errors ++ ;
+		} ;
+
+	if (memcmp (ca_write.client_id, ca_read.client_id, sizeof (ca_write.client_id)) != 0)
+	{	printf ("\n\nLine %d : client_id mismatch :\n\twrite : '%s'\n\tread  : '%s'\n\n", __LINE__, ca_write.client_id, ca_read.client_id) ;
+		errors ++ ;
+		} ;
+
+	if (memcmp (ca_write.category, ca_read.category, sizeof (ca_write.category)) != 0)
+	{	printf ("\n\nLine %d : category mismatch :\n\twrite : '%s'\n\tread  : '%s'\n\n", __LINE__, ca_write.category, ca_read.category) ;
+		errors ++ ;
+		} ;
+
+	if (memcmp (ca_write.out_cue, ca_read.out_cue, sizeof (ca_write.out_cue)) != 0)
+	{	printf ("\n\nLine %d : out_cue mismatch :\n\twrite : '%s'\n\tread  : '%s'\n\n", __LINE__, ca_write.out_cue, ca_read.out_cue) ;
+		errors ++ ;
+		} ;
+
+	if (memcmp (ca_write.start_date, ca_read.start_date, sizeof (ca_write.start_date)) != 0)
+	{	printf ("\n\nLine %d : start_date mismatch :\n\twrite : '%s'\n\tread  : '%s'\n\n", __LINE__, ca_write.start_date, ca_read.start_date) ;
+		errors ++ ;
+		} ;
+
+
+	if (memcmp (ca_write.start_time, ca_read.start_time, sizeof (ca_write.start_time)) != 0)
+	{	printf ("\n\nLine %d : start_time mismatch :\n\twrite : '%s'\n\tread  : '%s'\n\n", __LINE__, ca_write.start_time, ca_read.start_time) ;
+		errors ++ ;
+		} ;
+
+
+	if (memcmp (ca_write.end_date, ca_read.end_date, sizeof (ca_write.end_date)) != 0)
+	{	printf ("\n\nLine %d : end_date mismatch :\n\twrite : '%s'\n\tread  : '%s'\n\n", __LINE__, ca_write.end_date, ca_read.end_date) ;
+		errors ++ ;
+		} ;
+
+
+	if (memcmp (ca_write.end_time, ca_read.end_time, sizeof (ca_write.end_time)) != 0)
+	{	printf ("\n\nLine %d : end_time mismatch :\n\twrite : '%s'\n\tread  : '%s'\n\n", __LINE__, ca_write.end_time, ca_read.end_time) ;
+		errors ++ ;
+		} ;
+
+
+	if (memcmp (ca_write.producer_app_id, ca_read.producer_app_id, sizeof (ca_write.producer_app_id)) != 0)
+	{	printf ("\n\nLine %d : producer_app_id mismatch :\n\twrite : '%s'\n\tread  : '%s'\n\n", __LINE__, ca_write.producer_app_id, ca_read.producer_app_id) ;
+		errors ++ ;
+		} ;
+
+
+	if (memcmp (ca_write.producer_app_version, ca_read.producer_app_version, sizeof (ca_write.producer_app_version)) != 0)
+	{	printf ("\n\nLine %d : producer_app_version mismatch :\n\twrite : '%s'\n\tread  : '%s'\n\n", __LINE__, ca_write.producer_app_version, ca_read.producer_app_version) ;
+		errors ++ ;
+		} ;
+
+
+	if (memcmp (ca_write.user_def, ca_read.user_def, sizeof (ca_write.user_def)) != 0)
+	{	printf ("\n\nLine %d : user_def mismatch :\n\twrite : '%s'\n\tread  : '%s'\n\n", __LINE__, ca_write.user_def, ca_read.user_def) ;
+		errors ++ ;
+		} ;
+
+
+	if (ca_write.level_reference != ca_read.level_reference)
+	{	printf ("\n\nLine %d : level_reference mismatch :\n\twrite : '%d'\n\tread  : '%d'\n\n", __LINE__, ca_write.level_reference, ca_read.level_reference) ;
+		errors ++ ;
+		} ;
+
+	// TODO: make this more helpful
+	if (memcmp (ca_write.post_timers, ca_read.post_timers, sizeof (ca_write.post_timers)) != 0)
+	{	printf ("\n\nLine %d : post_timers mismatch :\n'\n\n", __LINE__) ;
+		errors ++ ;
+		} ;
+
+	if (memcmp (ca_write.url, ca_read.url, sizeof (ca_write.url)) != 0)
+	{	printf ("\n\nLine %d : url mismatch :\n\twrite : '%s'\n\tread  : '%s'\n\n", __LINE__, ca_write.url, ca_read.url) ;
+		errors ++ ;
+		} ;
+
+
+	if (memcmp (ca_write.tag_text, ca_read.tag_text, (size_t) (ca_read.tag_text_size)) != 0)
+	{	printf ("\n\nLine %d : tag_text mismatch :\n\twrite : '%s'\n\tread  : '%s'\n\n", __LINE__, ca_write.tag_text, ca_read.tag_text) ;
+		errors ++ ;
+		} ;
+
+
+	if (errors)
+		exit (1) ;
+
+	unlink (filename) ;
+	puts ("ok") ;
+} /* cart_test */
+
+static	void
+cart_rdwr_test (const char *filename, int filetype)
+{	SF_CART_INFO cinfo ;
+	SNDFILE *file ;
+	SF_INFO sfinfo ;
+	sf_count_t frames ;
+
+	print_test_name (__func__, filename) ;
+
+	create_short_sndfile (filename, filetype, 2) ;
+
+	memset (&sfinfo, 0, sizeof (sfinfo)) ;
+	memset (&cinfo, 0, sizeof (cinfo)) ;
+
+	snprintf (cinfo.artist, sizeof (cinfo.artist), "Test artist") ;
+	snprintf (cinfo.version, sizeof (cinfo.version), "Test version") ;
+	snprintf (cinfo.cut_id, sizeof (cinfo.cut_id), "Test cut ID") ;
+	snprintf (cinfo.client_id, sizeof (cinfo.client_id), "Test client ID") ;
+	snprintf (cinfo.category, sizeof (cinfo.category), "Test category") ;
+	snprintf (cinfo.classification, sizeof (cinfo.classification), "Test classification") ;
+	snprintf (cinfo.out_cue, sizeof (cinfo.out_cue), "Test out cue") ;
+	snprintf (cinfo.start_date, sizeof (cinfo.start_date), "%d/%02d/%02d", 2006, 3, 30) ;
+	snprintf (cinfo.start_time, sizeof (cinfo.start_time), "%02d:%02d:%02d", 20, 27, 0) ;
+	snprintf (cinfo.end_date, sizeof (cinfo.end_date), "%d/%02d/%02d", 2006, 3, 30) ;
+	snprintf (cinfo.end_time, sizeof (cinfo.end_time), "%02d:%02d:%02d", 20, 27, 0) ;
+	snprintf (cinfo.producer_app_id, sizeof (cinfo.producer_app_id), "Test producer app id") ;
+	snprintf (cinfo.producer_app_version, sizeof (cinfo.producer_app_version), "Test producer app version") ;
+	snprintf (cinfo.user_def, sizeof (cinfo.user_def), "test user def test test") ;
+	cinfo.level_reference = 42 ;
+	snprintf (cinfo.url, sizeof (cinfo.url), "http://www.test.com/test_url") ;
+	snprintf (cinfo.tag_text, sizeof (cinfo.tag_text), "tag text test!\r\n") ;
+	cinfo.tag_text_size = strlen (cinfo.tag_text) ;
+
+	file = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, SF_TRUE, __LINE__) ;
+	frames = sfinfo.frames ;
+	if (sf_command (file, SFC_SET_CART_INFO, &cinfo, sizeof (cinfo)) != SF_FALSE)
+	{	printf ("\n\nLine %d : sf_command (SFC_SET_CART_INFO) should have failed but didn't.\n\n", __LINE__) ;
+		exit (1) ;
+		} ;
+	sf_close (file) ;
+
+	file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ;
+	sf_close (file) ;
+	exit_if_true (frames != sfinfo.frames, "\n\nLine %d : Frame count %" PRId64 " should be %" PRId64 ".\n", __LINE__, sfinfo.frames, frames) ;
+
+	unlink (filename) ;
+	puts ("ok") ;
+} /* cart_rdwr_test */
+
 /*==============================================================================
 */
 
 static	void
 channel_map_test (const char *filename, int filetype)
-{	SNDFILE	 *file ;
-	SF_INFO	 sfinfo ;
+{	SNDFILE	*file ;
+	SF_INFO	sfinfo ;
 	int channel_map_read [4], channel_map_write [4] =
-	{	SF_CHANNEL_MAP_FRONT_LEFT, SF_CHANNEL_MAP_FRONT_CENTER,
-		SF_CHANNEL_MAP_REAR_LEFT, SF_CHANNEL_MAP_REAR_RIGHT
+	{	SF_CHANNEL_MAP_LEFT, SF_CHANNEL_MAP_RIGHT, SF_CHANNEL_MAP_LFE,
+		SF_CHANNEL_MAP_REAR_CENTER
 		} ;
 
 	print_test_name ("channel_map_test", filename) ;
@@ -1223,27 +1453,36 @@ channel_map_test (const char *filename, int filetype)
 	sfinfo.format		= filetype ;
 	sfinfo.channels		= ARRAY_LEN (channel_map_read) ;
 
-	/* Write file without channel map. */
-	file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ;
-	test_write_double_or_die (file, 0, double_data, BUFFER_LEN, __LINE__) ;
-	sf_close (file) ;
+	switch (filetype & SF_FORMAT_TYPEMASK)
+	{	/* WAVEX and RF64 have a default channel map, even if you don't specify one. */
+		case SF_FORMAT_WAVEX :
+		case SF_FORMAT_RF64 :
+			/* Write file without channel map. */
+			file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ;
+			test_write_double_or_die (file, 0, double_data, BUFFER_LEN, __LINE__) ;
+			sf_close (file) ;
 
-	/* Read file making sure no channel map exists. */
-	file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ;
-	exit_if_true (
-		sf_command (file, SFC_GET_CHANNEL_MAP_INFO, channel_map_read, sizeof (channel_map_read)) != SF_FALSE,
-		"\n\nLine %d : sf_command (SFC_GET_CHANNEL_MAP_INFO) should have failed.\n\n", __LINE__
-		) ;
-	check_log_buffer_or_die (file, __LINE__) ;
-	sf_close (file) ;
+			/* Read file making default channel map exists. */
+			file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ;
+			exit_if_true (
+				sf_command (file, SFC_GET_CHANNEL_MAP_INFO, channel_map_read, sizeof (channel_map_read)) == SF_FALSE,
+				"\n\nLine %d : sf_command (SFC_GET_CHANNEL_MAP_INFO) should not have failed.\n\n", __LINE__
+				) ;
+			check_log_buffer_or_die (file, __LINE__) ;
+			sf_close (file) ;
+			break ;
+
+		default :
+			break ;
+		} ;
 
 	/* Write file with a channel map. */
 	file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ;
-	test_write_double_or_die (file, 0, double_data, BUFFER_LEN, __LINE__) ;
 	exit_if_true (
 		sf_command (file, SFC_SET_CHANNEL_MAP_INFO, channel_map_write, sizeof (channel_map_write)) == SF_FALSE,
 		"\n\nLine %d : sf_command (SFC_SET_CHANNEL_MAP_INFO) failed.\n\n", __LINE__
 		) ;
+	test_write_double_or_die (file, 0, double_data, BUFFER_LEN, __LINE__) ;
 	sf_close (file) ;
 
 	/* Read file making sure no channel map exists. */
@@ -1270,8 +1509,8 @@ raw_needs_endswap_test (const char *filename, int filetype)
 	{	SF_FORMAT_FLOAT, SF_FORMAT_DOUBLE,
 		SF_FORMAT_PCM_16, SF_FORMAT_PCM_24, SF_FORMAT_PCM_32
 		} ;
-	SNDFILE	 *file ;
-	SF_INFO	 sfinfo ;
+	SNDFILE	*file ;
+	SF_INFO	sfinfo ;
 	unsigned k ;
 	int needs_endswap ;
 
diff --git a/libs/libsndfile/tests/compression_size_test.c b/libs/libsndfile/tests/compression_size_test.c
new file mode 100644
index 0000000000..ddacf94905
--- /dev/null
+++ b/libs/libsndfile/tests/compression_size_test.c
@@ -0,0 +1,205 @@
+/*
+** Copyright (C) 2007-2012 Erik de Castro Lopo 
+**
+** 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 "sfconfig.h"
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+#include	
+
+#include	"utils.h"
+#include	"dft_cmp.h"
+
+#define	SAMPLE_RATE		16000
+#define	DATA_LENGTH		(SAMPLE_RATE)
+
+static float data_out [DATA_LENGTH] ;
+
+static inline float
+max_float (float a, float b)
+{	return a > b ? a : b ;
+} /* max_float */
+
+static void
+vorbis_test (void)
+{	static float float_data [DFT_DATA_LENGTH] ;
+	const char * filename = "vorbis_test.oga" ;
+	SNDFILE * file ;
+	SF_INFO sfinfo ;
+	float max_abs = 0.0 ;
+	unsigned k ;
+
+	print_test_name ("vorbis_test", filename) ;
+
+	/* Generate float data. */
+	gen_windowed_sine_float (float_data, ARRAY_LEN (float_data), 1.0) ;
+
+	/* Set up output file type. */
+	memset (&sfinfo, 0, sizeof (sfinfo)) ;
+	sfinfo.format = SF_FORMAT_OGG | SF_FORMAT_VORBIS ;
+	sfinfo.channels = 1 ;
+	sfinfo.samplerate = SAMPLE_RATE ;
+
+	/* Write the output file. */
+
+	/*	The Vorbis encoder has a bug on PowerPC and X86-64 with sample rates
+	**	<= 22050. Increasing the sample rate to 32000 avoids triggering it.
+	**	See https://trac.xiph.org/ticket/1229
+	*/
+	if ((file = sf_open (filename, SFM_WRITE, &sfinfo)) == NULL)
+	{	const char * errstr ;
+
+		errstr = sf_strerror (NULL) ;
+		if (strstr (errstr, "Sample rate chosen is known to trigger a Vorbis") == NULL)
+		{	printf ("Line %d: sf_open (SFM_WRITE) failed : %s\n", __LINE__, errstr) ;
+			dump_log_buffer (NULL) ;
+			exit (1) ;
+			} ;
+
+		printf ("\n                                  Sample rate -> 32kHz    ") ;
+		sfinfo.samplerate = 32000 ;
+
+		file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ;
+		} ;
+
+	test_write_float_or_die (file, 0, float_data, ARRAY_LEN (float_data), __LINE__) ;
+	sf_close (file) ;
+
+	memset (float_data, 0, sizeof (float_data)) ;
+
+	/* Read the file back in again. */
+	memset (&sfinfo, 0, sizeof (sfinfo)) ;
+	file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_FALSE, __LINE__) ;
+	test_read_float_or_die (file, 0, float_data, ARRAY_LEN (float_data), __LINE__) ;
+	sf_close (file) ;
+
+	for (k = 0 ; k < ARRAY_LEN (float_data) ; k ++)
+		max_abs = max_float (max_abs, fabs (float_data [k])) ;
+
+	if (max_abs > 1.021)
+	{	printf ("\n\n    Error : max_abs %f should be < 1.021.\n\n", max_abs) ;
+		exit (1) ;
+		} ;
+
+	puts ("ok") ;
+	unlink (filename) ;
+} /* vorbis_test */
+
+static void
+compression_size_test (int format, const char * filename)
+{	/*
+	**	Encode two files, one at quality 0.3 and one at quality 0.5 and then
+	**	make sure that the quality 0.3 files is the smaller of the two.
+	*/
+	char q3_fname [64] ;
+	char q6_fname [64] ;
+	char test_name [64] ;
+
+	SNDFILE *q3_file, *q6_file ;
+	SF_INFO sfinfo ;
+	int q3_size, q6_size ;
+	double quality ;
+	int k ;
+
+	snprintf (q3_fname, sizeof (q3_fname), "q3_%s", filename) ;
+	snprintf (q6_fname, sizeof (q6_fname), "q6_%s", filename) ;
+
+	snprintf (test_name, sizeof (test_name), "q[36]_%s", filename) ;
+	print_test_name (__func__, test_name) ;
+
+	memset (&sfinfo, 0, sizeof (sfinfo)) ;
+
+	/* Set up output file type. */
+	sfinfo.format = format ;
+	sfinfo.channels = 1 ;
+	sfinfo.samplerate = SAMPLE_RATE ;
+
+	/* Write the output file. */
+	q3_file = test_open_file_or_die (q3_fname, SFM_WRITE, &sfinfo, SF_FALSE, __LINE__) ;
+	q6_file = test_open_file_or_die (q6_fname, SFM_WRITE, &sfinfo, SF_FALSE, __LINE__) ;
+
+	quality = 0.3 ;
+	sf_command (q3_file, SFC_SET_VBR_ENCODING_QUALITY, &quality, sizeof (quality)) ;
+	quality = 0.6 ;
+	sf_command (q6_file, SFC_SET_VBR_ENCODING_QUALITY, &quality, sizeof (quality)) ;
+
+	for (k = 0 ; k < 5 ; k++)
+	{	gen_lowpass_signal_float (data_out, ARRAY_LEN (data_out)) ;
+		test_write_float_or_die (q3_file, 0, data_out, ARRAY_LEN (data_out), __LINE__) ;
+		test_write_float_or_die (q6_file, 0, data_out, ARRAY_LEN (data_out), __LINE__) ;
+		} ;
+
+	sf_close (q3_file) ;
+	sf_close (q6_file) ;
+
+	q3_size = file_length (q3_fname) ;
+	q6_size = file_length (q6_fname) ;
+
+	if (q3_size >= q6_size)
+	{	printf ("\n\nLine %d : q3 size (%d) >= q5 size (%d)\n\n", __LINE__, q3_size, q6_size) ;
+		exit (1) ;
+		} ;
+
+	puts ("ok") ;
+	unlink (q3_fname) ;
+	unlink (q6_fname) ;
+} /* compression_size_test */
+
+
+
+int
+main (int argc, char *argv [])
+{	int all_tests = 0, tests = 0 ;
+
+	if (argc != 2)
+	{	printf (
+			"Usage : %s \n"
+			"    Where  is one of:\n"
+			"        vorbis - test Ogg/Vorbis\n"
+			"        flac   - test FLAC\n"
+			"        all    - perform all tests\n",
+			argv [0]) ;
+		exit (0) ;
+		} ;
+
+	if (! HAVE_EXTERNAL_LIBS)
+	{	puts ("    No Ogg/Vorbis tests because Ogg/Vorbis support was not compiled in.") ;
+		return 0 ;
+	} ;
+
+	if (strcmp (argv [1], "all") == 0)
+		all_tests = 1 ;
+
+	if (all_tests || strcmp (argv [1], "vorbis") == 0)
+	{	vorbis_test () ;
+		compression_size_test (SF_FORMAT_OGG | SF_FORMAT_VORBIS, "vorbis.oga") ;
+		tests ++ ;
+		} ;
+
+	if (all_tests || strcmp (argv [1], "flac") == 0)
+	{	compression_size_test (SF_FORMAT_FLAC | SF_FORMAT_PCM_16, "pcm16.flac") ;
+		tests ++ ;
+		} ;
+
+	return 0 ;
+} /* main */
diff --git a/libs/libsndfile/tests/cpp_test.cc b/libs/libsndfile/tests/cpp_test.cc
index 213b6545a3..364ec86ee2 100644
--- a/libs/libsndfile/tests/cpp_test.cc
+++ b/libs/libsndfile/tests/cpp_test.cc
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2006 Erik de Castro Lopo 
+** Copyright (C) 2006-2012 Erik de Castro Lopo 
 **
 ** 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,6 +29,41 @@ static int 		ibuffer [100] ;
 static float	fbuffer [100] ;
 static double	dbuffer [100] ;
 
+static void
+ceeplusplus_wchar_test (void)
+{
+#if 0
+	LPCWSTR filename = L"wchar_test.wav" ;
+
+	print_test_name (__func__, "ceeplusplus_wchar_test.wav") ;
+
+	/* Use this scope to make sure the created file is closed. */
+	{
+		SndfileHandle file (filename, SFM_WRITE, SF_FORMAT_WAV | SF_FORMAT_PCM_16, 2, 44100) ;
+
+		if (file.refCount () != 1)
+		{	printf ("\n\n%s %d : Error : Reference count (%d) should be 1.\n\n", __func__, __LINE__, file.refCount ()) ;
+			exit (1) ;
+			} ;
+
+		/*	This should check that the file did in fact get created with a
+		**	wchar_t * filename.
+		*/
+		exit_if_true (
+			GetFileAttributesW (filename) == INVALID_FILE_ATTRIBUTES,
+			"\n\nLine %d : GetFileAttributes failed.\n\n", __LINE__
+			) ;
+	}
+
+	/* Use this because the file was created with CreateFileW. */
+	DeleteFileW (filename) ;
+
+	puts ("ok") ;
+#endif
+} /* ceeplusplus_wchar_test */
+
+
+
 static void
 create_file (const char * filename, int format)
 {	SndfileHandle file ;
@@ -124,7 +159,7 @@ read_file (const char * filename, int format)
 
 	if (file.frames () != ARRAY_LEN (sbuffer) * 4)
 	{	printf ("\n\n%s %d : Error : frames %ld should be %lu.\n\n", __func__, __LINE__,
-				SF_COUNT_TO_LONG (file.frames ()), (long unsigned int) ARRAY_LEN (sbuffer) * 4 / 2) ;
+				(long) file.frames (), (long) ARRAY_LEN (sbuffer) * 4 / 2) ;
 		exit (1) ;
 		} ;
 
@@ -152,14 +187,14 @@ read_file (const char * filename, int format)
 	count = file.seek (file.frames () - 10, SEEK_SET) ;
 	if (count != file.frames () - 10)
 	{	printf ("\n\n%s %d : Error : offset (%ld) should be %ld\n\n", __func__, __LINE__,
-				SF_COUNT_TO_LONG (count), SF_COUNT_TO_LONG (file.frames () - 10)) ;
+				(long) count, (long) (file.frames () - 10)) ;
 		exit (1) ;
 		} ;
 
 	count = file.read (sbuffer, ARRAY_LEN (sbuffer)) ;
 	if (count != 10 * file.channels ())
 	{	printf ("\n\n%s %d : Error : count (%ld) should be %ld\n\n", __func__, __LINE__,
-				SF_COUNT_TO_LONG (count), SF_COUNT_TO_LONG (10 * file.channels ())) ;
+				(long) count, (long) (10 * file.channels ())) ;
 		exit (1) ;
 		} ;
 
@@ -190,7 +225,7 @@ ceeplusplus_extra_test (void)
 
 	error = file.error () ;
 	if (error == 0)
-	{	printf ("\n\n%s %d : error should be zero.\n\n", __func__, __LINE__) ;
+	{	printf ("\n\n%s %d : error should not be zero.\n\n", __func__, __LINE__) ;
 		exit (1) ;
 		} ;
 
@@ -207,6 +242,60 @@ ceeplusplus_extra_test (void)
 	puts ("ok") ;
 } /* ceeplusplus_extra_test */
 
+
+static void
+ceeplusplus_rawhandle_test (const char *filename)
+{
+	SNDFILE* handle ;
+	{
+		SndfileHandle file (filename) ;
+		handle = file.rawHandle () ;
+		sf_read_float (handle, fbuffer, ARRAY_LEN (fbuffer)) ;
+	}
+} /* ceeplusplus_rawhandle_test */
+
+static void
+ceeplusplus_takeOwnership_test (const char *filename)
+{
+	SNDFILE* handle ;
+	{
+		SndfileHandle file (filename) ;
+		handle = file.takeOwnership () ;
+	}
+
+	if (sf_read_float (handle, fbuffer, ARRAY_LEN (fbuffer)) <= 0)
+	{	printf ("\n\n%s %d : error when taking ownership of handle.\n\n", __func__, __LINE__) ;
+		exit (1) ;
+		}
+
+	if (sf_close (handle) != 0)
+	{	printf ("\n\n%s %d : cannot close file.\n\n", __func__, __LINE__) ;
+		exit (1) ;
+		}
+
+	SndfileHandle file (filename) ;
+	SndfileHandle file2 (file) ;
+
+	if (file2.takeOwnership ())
+	{	printf ("\n\n%s %d : taking ownership of shared handle is not allowed.\n\n", __func__, __LINE__) ;
+		exit (1) ;
+		}
+} /* ceeplusplus_takeOwnership_test */
+
+static void
+ceeplusplus_handle_test (const char *filename, int format)
+{
+	print_test_name ("ceeplusplus_handle_test", filename) ;
+
+	create_file (filename, format) ;
+
+	if (0) ceeplusplus_rawhandle_test (filename) ;
+	ceeplusplus_takeOwnership_test (filename) ;
+
+	remove (filename) ;
+	puts ("ok") ;
+} /* ceeplusplus_test */
+
 int
 main (void)
 {
@@ -215,6 +304,9 @@ main (void)
 	ceeplusplus_test ("cpp_test.au", SF_FORMAT_AU | SF_FORMAT_FLOAT) ;
 
 	ceeplusplus_extra_test () ;
+	ceeplusplus_handle_test ("cpp_test.wav", SF_FORMAT_WAV | SF_FORMAT_PCM_16) ;
+
+	ceeplusplus_wchar_test () ;
 
 	return 0 ;
 } /* main */
diff --git a/libs/libsndfile/tests/dft_cmp.c b/libs/libsndfile/tests/dft_cmp.c
index ddec0ccd1e..439a53949a 100644
--- a/libs/libsndfile/tests/dft_cmp.c
+++ b/libs/libsndfile/tests/dft_cmp.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2002-2009 Erik de Castro Lopo 
+** Copyright (C) 2002-2013 Erik de Castro Lopo 
 **
 ** 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
@@ -123,7 +123,7 @@ dft_magnitude (const double *data, double *spectrum)
 		spectrum [k] = sqrt (real_part * real_part + imag_part * imag_part) ;
 		} ;
 
-	spectrum [k] = 0.0 ;
+	spectrum [DFT_DATA_LENGTH - 1] = 0.0 ;
 
 	spectrum [0] = spectrum [1] = spectrum [2] = spectrum [3] = spectrum [4] = 0.0 ;
 
diff --git a/libs/libsndfile/tests/dft_cmp.h b/libs/libsndfile/tests/dft_cmp.h
index 349e0a066e..3cbdd118e7 100644
--- a/libs/libsndfile/tests/dft_cmp.h
+++ b/libs/libsndfile/tests/dft_cmp.h
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2002-2009 Erik de Castro Lopo 
+** Copyright (C) 2002-2011 Erik de Castro Lopo 
 **
 ** 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
diff --git a/libs/libsndfile/tests/dither_test.c b/libs/libsndfile/tests/dither_test.c
index c5300116ca..e9eef7c136 100644
--- a/libs/libsndfile/tests/dither_test.c
+++ b/libs/libsndfile/tests/dither_test.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2003-2009 Erik de Castro Lopo 
+** Copyright (C) 2003-2013 Erik de Castro Lopo 
 **
 ** 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
@@ -28,7 +28,7 @@
 
 #include	"utils.h"
 
-#define	BUFFER_LEN		(1<<16)
+#define	BUFFER_LEN		(1 << 16)
 #define LOG_BUFFER_SIZE	1024
 
 static void	dither_test (const char *filename, int filetype) ;
@@ -52,7 +52,7 @@ main (int argc, char *argv [])
 		exit (1) ;
 		} ;
 
-	do_all=!strcmp (argv [1], "all") ;
+	do_all = ! strcmp (argv [1], "all") ;
 
 	if (do_all || ! strcmp (argv [1], "wav"))
 	{	dither_test ("dither.wav", SF_FORMAT_WAV | SF_FORMAT_PCM_U8) ;
@@ -134,9 +134,6 @@ dither_test (const char *filename, int filetype)
 {	SNDFILE			*file ;
 	SF_INFO			sfinfo ;
 	SF_DITHER_INFO	dither ;
-	int				frames ;
-
-	filetype = filetype ;
 
 	print_test_name ("dither_test", filename) ;
 
@@ -145,8 +142,6 @@ dither_test (const char *filename, int filetype)
 	sfinfo.channels		= 1 ;
 	sfinfo.frames		= 0 ;
 
-	frames = BUFFER_LEN / sfinfo.channels ;
-
 	file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ;
 
 	/* Check for old version of the dither API. */
diff --git a/libs/libsndfile/tests/dwvw_test.c b/libs/libsndfile/tests/dwvw_test.c
index eeaa85d951..2bd11d18c9 100644
--- a/libs/libsndfile/tests/dwvw_test.c
+++ b/libs/libsndfile/tests/dwvw_test.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2002-2009 Erik de Castro Lopo 
+** Copyright (C) 2002-2011 Erik de Castro Lopo 
 **
 ** 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
@@ -20,6 +20,7 @@
 
 #include 
 #include 
+#include 
 #include 
 
 #if HAVE_UNISTD_H
@@ -65,15 +66,11 @@ dwvw_test (const char *filename, int format, int bit_width)
 
 	print_test_name ("dwvw_test", filename) ;
 
-	sfinfo.format		= format ;
-	sfinfo.samplerate	= 44100 ;
-	sfinfo.frames		= -1 ; /* Unknown! */
-	sfinfo.channels		= 1 ;
+	sf_info_setup (&sfinfo, format, 44100, 1) ;
 
 	file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ;
 
 	/* Generate random.frames. */
-	k = 0 ;
 	for (k = 0 ; k < BUFFER_SIZE / 2 ; k++)
 	{	value = 0x7FFFFFFF * sin (123.0 / sfinfo.samplerate * 2 * k * M_PI) ;
 		write_buf [k] = bit_mask & lrint (value) ;
diff --git a/libs/libsndfile/tests/error_test.c b/libs/libsndfile/tests/error_test.c
index e7b47fdb70..4207c0a3cf 100644
--- a/libs/libsndfile/tests/error_test.c
+++ b/libs/libsndfile/tests/error_test.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2012 Erik de Castro Lopo 
 **
 ** 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
@@ -26,11 +26,15 @@
 #include 
 #endif
 
+#if OS_IS_WIN32
+#include 
+#endif
+
 #include 
 
 #include "utils.h"
 
-#define	BUFFER_SIZE		(1<<15)
+#define	BUFFER_SIZE		(1 << 15)
 #define	SHORT_BUFFER	(256)
 
 static void
@@ -203,8 +207,22 @@ error_close_test (void)
 	fclose (file) ;
 
 	if (sf_close (sndfile) == 0)
-	{	printf ("\n\nLine %d : sf_close should not have returned zero.\n", __LINE__) ;
+	{
+#if OS_IS_WIN32
+		OSVERSIONINFOEX osvi ;
+
+		memset (&osvi, 0, sizeof (OSVERSIONINFOEX)) ;
+		osvi.dwOSVersionInfoSize = sizeof (OSVERSIONINFOEX) ;
+
+		if (GetVersionEx ((OSVERSIONINFO *) &osvi))
+		{	printf ("\n\nLine %d : sf_close should not have returned zero.\n", __LINE__) ;
+			printf ("\nHowever, this is a known bug in version %d.%d of windows so we'll ignore it.\n\n",
+					(int) osvi.dwMajorVersion, (int) osvi.dwMinorVersion) ;
+			} ;
+#else
+		printf ("\n\nLine %d : sf_close should not have returned zero.\n", __LINE__) ;
 		exit (1) ;
+#endif
 		} ;
 
 	unlink (filename) ;
diff --git a/libs/libsndfile/tests/external_libs_test.c b/libs/libsndfile/tests/external_libs_test.c
index 8d20cbd4f9..86b029078e 100644
--- a/libs/libsndfile/tests/external_libs_test.c
+++ b/libs/libsndfile/tests/external_libs_test.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2008-2009 Erik de Castro Lopo 
+** Copyright (C) 2008-2011 Erik de Castro Lopo 
 **
 ** 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
diff --git a/libs/libsndfile/tests/fix_this.c b/libs/libsndfile/tests/fix_this.c
index f108c88f85..4cbb8d43ac 100644
--- a/libs/libsndfile/tests/fix_this.c
+++ b/libs/libsndfile/tests/fix_this.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2012 Erik de Castro Lopo 
 **
 ** 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
@@ -16,17 +16,18 @@
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include	
-#include	
-#include	
-#include	
-#include	
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
-#include	
+#include 
 
-#include	"utils.h"
+#include "utils.h"
 
-#define		BUFFER_SIZE		(1<<14) /* Should be (1<<14) */
+#define		BUFFER_SIZE		(1 << 14)
 #define		SAMPLE_RATE		(11025)
 
 #ifndef		M_PI
@@ -69,8 +70,9 @@ static void
 lcomp_test_int (const char *str, const char *filename, int filetype, double margin)
 {	SNDFILE		*file ;
 	SF_INFO		sfinfo ;
-	int			k, m, *orig, *data, sum_abs ;
-	long		datalen, seekpos ;
+	int			k, m, *orig, *data ;
+	sf_count_t	datalen, seekpos ;
+	int64_t		sum_abs ;
 	double		scale ;
 
 	printf ("\nThis is program is not part of the libsndfile test suite.\n\n") ;
@@ -102,7 +104,7 @@ lcomp_test_int (const char *str, const char *filename, int filetype, double marg
 		} ;
 
 	if ((k = sf_writef_int (file, orig, datalen)) != datalen)
-	{	printf ("sf_writef_int failed with short write (%ld => %d).\n", datalen, k) ;
+	{	printf ("sf_writef_int failed with short write (%" PRId64 " => %d).\n", datalen, k) ;
 		exit (1) ;
 		} ;
 	sf_close (file) ;
@@ -124,12 +126,12 @@ lcomp_test_int (const char *str, const char *filename, int filetype, double marg
 		} ;
 
 	if (sfinfo.frames < datalen)
-	{	printf ("Too few.frames in file. (%ld should be a little more than %ld)\n", datalen, SF_COUNT_TO_LONG (sfinfo.frames)) ;
+	{	printf ("Too few.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", datalen, sfinfo.frames) ;
 		exit (1) ;
 		} ;
 
 	if (sfinfo.frames > (datalen + datalen / 2))
-	{	printf ("Too many.frames in file. (%ld should be a little more than %ld)\n", datalen, SF_COUNT_TO_LONG (sfinfo.frames)) ;
+	{	printf ("Too many.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", datalen, sfinfo.frames) ;
 		exit (1) ;
 		} ;
 
@@ -141,7 +143,7 @@ lcomp_test_int (const char *str, const char *filename, int filetype, double marg
 	check_log_buffer_or_die (file, __LINE__) ;
 
 	if ((k = sf_readf_int (file, data, datalen)) != datalen)
-	{	printf ("Line %d: short read (%d should be %ld).\n", __LINE__, k, datalen) ;
+	{	printf ("Line %d: short read (%d should be %" PRId64 ").\n", __LINE__, k, datalen) ;
 		exit (1) ;
 		} ;
 
@@ -152,7 +154,7 @@ lcomp_test_int (const char *str, const char *filename, int filetype, double marg
 			oct_save_int (orig, data, datalen) ;
 			exit (1) ;
 			} ;
-		sum_abs = abs (sum_abs + abs (data [k])) ;
+		sum_abs += abs (data [k]) ;
 		} ;
 
 	if (sum_abs < 1.0)
@@ -161,7 +163,7 @@ lcomp_test_int (const char *str, const char *filename, int filetype, double marg
 		} ;
 
 	if ((k = sf_readf_int (file, data, datalen)) != sfinfo.frames - datalen)
-	{	printf ("Line %d: Incorrect read length (%ld should be %d).\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames - datalen), k) ;
+	{	printf ("Line %d: Incorrect read length (%" PRId64 " should be %d).\n", __LINE__, sfinfo.frames - datalen, k) ;
 		exit (1) ;
 		} ;
 
@@ -188,7 +190,9 @@ lcomp_test_int (const char *str, const char *filename, int filetype, double marg
 		} ;
 
 	for (m = 0 ; m < 3 ; m++)
-	{	if ((k = sf_readf_int (file, data, 11)) != 11)
+	{	int n ;
+
+		if ((k = sf_readf_int (file, data, 11)) != 11)
 		{	printf ("Line %d: Incorrect read length (11 => %d).\n", __LINE__, k) ;
 			exit (1) ;
 			} ;
@@ -196,8 +200,8 @@ lcomp_test_int (const char *str, const char *filename, int filetype, double marg
 		for (k = 0 ; k < 11 ; k++)
 			if (error_function (data [k] / scale, orig [k + m * 11] / scale, margin))
 			{	printf ("Line %d: Incorrect sample (m = %d) (#%d : %d => %d).\n", __LINE__, m, k + m * 11, orig [k + m * 11], data [k]) ;
-				for (m = 0 ; m < 1 ; m++)
-					printf ("%d ", data [m]) ;
+				for (n = 0 ; n < 1 ; n++)
+					printf ("%d ", data [n]) ;
 				printf ("\n") ;
 				exit (1) ;
 				} ;
@@ -207,7 +211,7 @@ lcomp_test_int (const char *str, const char *filename, int filetype, double marg
 
 	/* Check seek from start of file. */
 	if ((k = sf_seek (file, seekpos, SEEK_SET)) != seekpos)
-	{	printf ("Seek to start of file + %ld failed (%d).\n", seekpos, k) ;
+	{	printf ("Seek to start of file + %" PRId64 " failed (%d).\n", seekpos, k) ;
 		exit (1) ;
 		} ;
 
@@ -222,7 +226,7 @@ lcomp_test_int (const char *str, const char *filename, int filetype, double marg
 		} ;
 
 	if ((k = sf_seek (file, 0, SEEK_CUR)) != seekpos + 1)
-	{	printf ("Line %d: sf_seek (SEEK_CUR) with 0 offset failed (%d should be %ld)\n", __LINE__, k, seekpos + 1) ;
+	{	printf ("Line %d: sf_seek (SEEK_CUR) with 0 offset failed (%d should be %" PRId64 ")\n", __LINE__, k, seekpos + 1) ;
 		exit (1) ;
 		} ;
 
@@ -230,7 +234,7 @@ lcomp_test_int (const char *str, const char *filename, int filetype, double marg
 	k = sf_seek (file, BUFFER_SIZE / 5, SEEK_CUR) ;
 	sf_readf_int (file, data, 1) ;
 	if (error_function ((double) data [0], (double) orig [seekpos], margin) || k != seekpos)
-	{	printf ("Line %d: sf_seek (forwards, SEEK_CUR) followed by sf_readf_int failed (%d, %d) (%d, %ld).\n", __LINE__, data [0], orig [seekpos], k, seekpos + 1) ;
+	{	printf ("Line %d: sf_seek (forwards, SEEK_CUR) followed by sf_readf_int failed (%d, %d) (%d, %" PRId64 ").\n", __LINE__, data [0], orig [seekpos], k, seekpos + 1) ;
 		exit (1) ;
 		} ;
 
@@ -239,7 +243,7 @@ lcomp_test_int (const char *str, const char *filename, int filetype, double marg
 	k = sf_seek (file, -20, SEEK_CUR) ;
 	sf_readf_int (file, data, 1) ;
 	if (error_function ((double) data [0], (double) orig [seekpos], margin) || k != seekpos)
-	{	printf ("sf_seek (backwards, SEEK_CUR) followed by sf_readf_int failed (%d, %d) (%d, %ld).\n", data [0], orig [seekpos], k, seekpos) ;
+	{	printf ("sf_seek (backwards, SEEK_CUR) followed by sf_readf_int failed (%d, %d) (%d, %" PRId64 ").\n", data [0], orig [seekpos], k, seekpos) ;
 		exit (1) ;
 		} ;
 
diff --git a/libs/libsndfile/tests/floating_point_test.c b/libs/libsndfile/tests/floating_point_test.c
index 7db65192a5..aaf53866ea 100644
--- a/libs/libsndfile/tests/floating_point_test.c
+++ b/libs/libsndfile/tests/floating_point_test.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2011 Erik de Castro Lopo 
 **
 ** 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
diff --git a/libs/libsndfile/tests/floating_point_test.tpl b/libs/libsndfile/tests/floating_point_test.tpl
index 443ec0a34a..4b2d21caab 100644
--- a/libs/libsndfile/tests/floating_point_test.tpl
+++ b/libs/libsndfile/tests/floating_point_test.tpl
@@ -1,6 +1,6 @@
 [+ AutoGen5 template c +]
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2013 Erik de Castro Lopo 
 **
 ** 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
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #if HAVE_UNISTD_H
 #include 
@@ -60,7 +61,7 @@ main (int argc, char *argv [])
 	if (argc == 2 && ! strstr (argv [1], "no-exit"))
 		allow_exit = 0 ;
 
-#if ((HAVE_LRINTF == 0) && (HAVE_LRINT_REPLACEMENT == 0))
+#if (HAVE_LRINTF == 0)
 	puts ("*** Cannot run this test on this platform because it lacks lrintf().") ;
 	exit (0) ;
 #endif
@@ -106,6 +107,11 @@ main (int argc, char *argv [])
 	float_scaled_test	("pcm_16.sds", allow_exit, SF_FALSE, SF_FORMAT_SDS | SF_FORMAT_PCM_16, -140.0) ;
 	float_scaled_test	("pcm_24.sds", allow_exit, SF_FALSE, SF_FORMAT_SDS | SF_FORMAT_PCM_24, -170.0) ;
 
+	float_scaled_test	("alac_16.caf", allow_exit, SF_FALSE, SF_FORMAT_CAF | SF_FORMAT_ALAC_16, -90.0) ;
+	float_scaled_test	("alac_32.caf", allow_exit, SF_FALSE, SF_FORMAT_CAF | SF_FORMAT_ALAC_32, -181.0) ;
+	float_scaled_test	("alac_24.caf", allow_exit, SF_FALSE, SF_FORMAT_CAF | SF_FORMAT_ALAC_24, -160.0) ;
+	float_scaled_test	("alac_20.caf", allow_exit, SF_FALSE, SF_FORMAT_CAF | SF_FORMAT_ALAC_20, -134.0) ;
+
 #if HAVE_EXTERNAL_LIBS
 	float_scaled_test	("flac_8.flac", allow_exit, SF_FALSE, SF_FORMAT_FLAC | SF_FORMAT_PCM_S8, -39.0) ;
 	float_scaled_test	("flac_16.flac", allow_exit, SF_FALSE, SF_FORMAT_FLAC | SF_FORMAT_PCM_16, -87.0) ;
@@ -120,7 +126,7 @@ main (int argc, char *argv [])
 	** Double tests.
 	*/
 
-	double_scaled_test	("double.raw", allow_exit, SF_FALSE, SF_FORMAT_RAW | SF_FORMAT_DOUBLE, -300.0) ;
+	double_scaled_test	("double.raw", allow_exit, SF_FALSE, SF_FORMAT_RAW | SF_FORMAT_DOUBLE, -205.0) ;
 
 	/* Test both signed (AIFF) and unsigned (WAV) 8 bit files. */
 	double_scaled_test	("pcm_s8.raw", allow_exit, SF_FALSE, SF_FORMAT_RAW | SF_FORMAT_PCM_S8, -39.0) ;
@@ -158,6 +164,11 @@ main (int argc, char *argv [])
 	double_scaled_test	("pcm_16.sds", allow_exit, SF_FALSE, SF_FORMAT_SDS | SF_FORMAT_PCM_16, -140.0) ;
 	double_scaled_test	("pcm_24.sds", allow_exit, SF_FALSE, SF_FORMAT_SDS | SF_FORMAT_PCM_24, -180.0) ;
 
+	double_scaled_test	("alac_16.caf", allow_exit, SF_FALSE, SF_FORMAT_CAF | SF_FORMAT_ALAC_16, -90.0) ;
+	double_scaled_test	("alac_20.caf", allow_exit, SF_FALSE, SF_FORMAT_CAF | SF_FORMAT_ALAC_20, -134.0) ;
+	double_scaled_test	("alac_24.caf", allow_exit, SF_FALSE, SF_FORMAT_CAF | SF_FORMAT_ALAC_24, -158.0) ;
+	double_scaled_test	("alac_32.caf", allow_exit, SF_FALSE, SF_FORMAT_CAF | SF_FORMAT_ALAC_32, -186.0) ;
+
 #if HAVE_EXTERNAL_LIBS
 	double_scaled_test	("flac_8.flac", allow_exit, SF_FALSE, SF_FORMAT_FLAC | SF_FORMAT_PCM_S8, -39.0) ;
 	double_scaled_test	("flac_16.flac", allow_exit, SF_FALSE, SF_FORMAT_FLAC | SF_FORMAT_PCM_16, -87.0) ;
@@ -166,7 +177,7 @@ main (int argc, char *argv [])
 	double_scaled_test	("vorbis.oga", allow_exit, SF_FALSE, SF_FORMAT_OGG | SF_FORMAT_VORBIS, -29.0) ;
 #endif
 
-	double_scaled_test	("replace_double.raw", allow_exit, SF_TRUE, SF_FORMAT_RAW | SF_FORMAT_DOUBLE, -300.0) ;
+	double_scaled_test	("replace_double.raw", allow_exit, SF_TRUE, SF_FORMAT_RAW | SF_FORMAT_DOUBLE, -205.0) ;
 
 	putchar ('\n') ;
 	/* Float int tests. */
@@ -187,6 +198,7 @@ float_scaled_test (const char *filename, int allow_exit, int replace_float, int
 {	SNDFILE		*file ;
 	SF_INFO		sfinfo ;
 	double		snr ;
+	int			byterate ;
 
 	print_test_name ("float_scaled_test", filename) ;
 
@@ -210,13 +222,16 @@ float_scaled_test (const char *filename, int allow_exit, int replace_float, int
 	sf_command (file, SFC_TEST_IEEE_FLOAT_REPLACE, NULL, replace_float) ;
 
 	exit_if_true (sfinfo.format != filetype, "\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, filetype, sfinfo.format) ;
-	exit_if_true (sfinfo.frames < DFT_DATA_LENGTH, "\n\nLine %d: Incorrect number of frames in file (too short). (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), DFT_DATA_LENGTH) ;
+	exit_if_true (sfinfo.frames < DFT_DATA_LENGTH, "\n\nLine %d: Incorrect number of frames in file (too short). (%" PRId64 " should be %d)\n", __LINE__, sfinfo.frames, DFT_DATA_LENGTH) ;
 	exit_if_true (sfinfo.channels != 1, "\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ;
 
 	check_log_buffer_or_die (file, __LINE__) ;
 
 	test_read_float_or_die (file, 0, float_test, DFT_DATA_LENGTH, __LINE__) ;
 
+	byterate = sf_current_byterate (file) ;
+	exit_if_true (byterate <= 0, "\n\nLine %d: byterate is zero.\n", __LINE__) ;
+
 	sf_close (file) ;
 
 	snr = dft_cmp_float (__LINE__, float_data, float_test, DFT_DATA_LENGTH, target_snr, allow_exit) ;
@@ -235,6 +250,7 @@ double_scaled_test (const char *filename, int allow_exit, int replace_float, int
 {	SNDFILE		*file ;
 	SF_INFO		sfinfo ;
 	double		snr ;
+	int			byterate ;
 
 	print_test_name ("double_scaled_test", filename) ;
 
@@ -258,13 +274,16 @@ double_scaled_test (const char *filename, int allow_exit, int replace_float, int
 	sf_command (file, SFC_TEST_IEEE_FLOAT_REPLACE, NULL, replace_float) ;
 
 	exit_if_true (sfinfo.format != filetype, "\n\nLine %d: Returned format incorrect (0x%08X => 0x%08X).\n", __LINE__, filetype, sfinfo.format) ;
-	exit_if_true (sfinfo.frames < DFT_DATA_LENGTH, "\n\nLine %d: Incorrect number of frames in file (too short). (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), DFT_DATA_LENGTH) ;
+	exit_if_true (sfinfo.frames < DFT_DATA_LENGTH, "\n\nLine %d: Incorrect number of frames in file (too short). (%" PRId64 " should be %d)\n", __LINE__, sfinfo.frames, DFT_DATA_LENGTH) ;
 	exit_if_true (sfinfo.channels != 1, "\n\nLine %d: Incorrect number of channels in file.\n", __LINE__) ;
 
 	check_log_buffer_or_die (file, __LINE__) ;
 
 	test_read_double_or_die (file, 0, double_test, DFT_DATA_LENGTH, __LINE__) ;
 
+	byterate = sf_current_byterate (file) ;
+	exit_if_true (byterate <= 0, "\n\nLine %d: byterate is zero.\n", __LINE__) ;
+
 	sf_close (file) ;
 
 	snr = dft_cmp_double (__LINE__, double_data, double_test, DFT_DATA_LENGTH, target_snr, allow_exit) ;
@@ -305,7 +324,7 @@ static void
 	file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ;
 
 	if (sfinfo.frames != ARRAY_LEN ([+ (get "float_name") +]_data))
-	{	printf ("\n\nLine %d: Incorrect number of frames in file (too short). (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), DFT_DATA_LENGTH) ;
+	{	printf ("\n\nLine %d: Incorrect number of frames in file (too short). (%" PRId64 " should be %d)\n", __LINE__, sfinfo.frames, DFT_DATA_LENGTH) ;
 		exit (1) ;
 		} ;
 
diff --git a/libs/libsndfile/tests/format_check_test.c b/libs/libsndfile/tests/format_check_test.c
new file mode 100644
index 0000000000..a371c71ff7
--- /dev/null
+++ b/libs/libsndfile/tests/format_check_test.c
@@ -0,0 +1,149 @@
+/*
+** Copyright (C) 2011 Erik de Castro Lopo 
+**
+** 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 "sfconfig.h"
+
+#include 
+#include 
+#include 
+
+#if HAVE_UNISTD_H
+#include 
+#endif
+
+#include "sndfile.h"
+#include "utils.h"
+
+static void format_error_test (void) ;
+static void format_combo_test (void) ;
+
+int
+main (void)
+{
+	format_error_test () ;
+	format_combo_test () ;
+
+	return 0 ;
+} /* main */
+
+/*==============================================================================
+*/
+
+static void
+format_error_test (void)
+{	const char *filename = "format-error.wav" ;
+	SNDFILE *file ;
+	SF_INFO info ;
+
+	print_test_name (__func__, NULL) ;
+
+	memset (&info, 0, sizeof (info)) ;
+	info.format = SF_FORMAT_WAV | SF_FORMAT_PCM_16 ;
+	info.channels = 1 ;
+	info.samplerate = 44100 ;
+
+	info.format = SF_FORMAT_WAV ;
+	file = sf_open (filename, SFM_WRITE, &info) ;
+	exit_if_true (file != NULL, "\n\nLine %d : Format should not be valid.\n\n", __LINE__) ;
+	exit_if_true (
+		strstr (sf_strerror (NULL), "minor format") == NULL,
+		"\n\nLine %d : Error string should reference bad 'minor format'.\n\n", __LINE__
+		) ;
+
+	info.format = SF_FORMAT_PCM_16 ;
+	file = sf_open (filename, SFM_WRITE, &info) ;
+	exit_if_true (file != NULL, "\n\nLine %d : Format should not be valid.\n\n", __LINE__) ;
+	exit_if_true (
+		strstr (sf_strerror (NULL), "major format") == NULL,
+		"\n\nLine %d : Error string should reference bad 'major format'.\n\n", __LINE__
+		) ;
+
+	unlink (filename) ;
+	puts ("ok") ;
+} /* format_error_test */
+
+static void
+format_combo_test (void)
+{	int container_max, codec_max, cont, codec ;
+
+	print_test_name (__func__, NULL) ;
+
+	sf_command (NULL, SFC_GET_FORMAT_MAJOR_COUNT, &container_max, sizeof (container_max)) ;
+	sf_command (NULL, SFC_GET_FORMAT_SUBTYPE_COUNT, &codec_max, sizeof (codec_max)) ;
+
+	for (cont = 0 ; cont < container_max + 10 ; cont ++)
+	{	SF_FORMAT_INFO major_fmt_info ;
+
+		memset (&major_fmt_info, 0, sizeof (major_fmt_info)) ;
+		major_fmt_info.format = cont ;
+		(void) sf_command (NULL, SFC_GET_FORMAT_MAJOR, &major_fmt_info, sizeof (major_fmt_info)) ;
+
+		for (codec = 0 ; codec < codec_max + 10 ; codec ++)
+		{	SF_FORMAT_INFO subtype_fmt_info ;
+			SNDFILE * sndfile ;
+			SF_INFO info ;
+			char filename [128] ;
+			int subtype_is_valid, check_is_valid ;
+
+			memset (&subtype_fmt_info, 0, sizeof (subtype_fmt_info)) ;
+			subtype_fmt_info.format = codec ;
+			subtype_is_valid = sf_command (NULL, SFC_GET_FORMAT_SUBTYPE, &subtype_fmt_info, sizeof (subtype_fmt_info)) == 0 ;
+
+			sf_info_setup (&info, major_fmt_info.format | subtype_fmt_info.format, 22050, 1) ;
+
+			check_is_valid = sf_format_check (&info) ;
+
+			exit_if_true (
+				NOT (subtype_is_valid) && check_is_valid,
+				"\n\nLine %d : Subtype is not valid but checks ok.\n",
+				__LINE__
+				) ;
+
+			snprintf (filename, sizeof (filename), "format-check.%s", major_fmt_info.extension) ;
+
+			sndfile = sf_open (filename, SFM_WRITE, &info) ;
+
+			sf_close (sndfile) ;
+			unlink (filename) ;
+
+			if (major_fmt_info.extension != NULL && strcmp (major_fmt_info.extension, "sd2") == 0)
+			{	snprintf (filename, sizeof (filename), "._format-check.%s", major_fmt_info.extension) ;
+				unlink (filename) ;
+				} ;
+
+			exit_if_true (
+				sndfile && NOT (check_is_valid),
+				"\n\nError : Format was not valid but file opened correctly.\n"
+				"    Container : %s\n"
+				"    Codec     : %s\n\n",
+				major_fmt_info.name, subtype_fmt_info.name
+				) ;
+
+			exit_if_true (
+				NOT (sndfile) && check_is_valid,
+				"\n\nError : Format was valid but file failed to open.\n"
+				"    Container : %s\n"
+				"    Codec     : %s\n\n",
+				major_fmt_info.name, subtype_fmt_info.name
+				) ;
+			} ;
+		} ;
+
+	puts ("ok") ;
+} /* format_combo_test */
+
diff --git a/libs/libsndfile/tests/generate.c b/libs/libsndfile/tests/generate.c
index 1dc105c565..653018b0f4 100644
--- a/libs/libsndfile/tests/generate.c
+++ b/libs/libsndfile/tests/generate.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2007-2009 Erik de Castro Lopo 
+** Copyright (C) 2007-2012 Erik de Castro Lopo 
 **
 ** 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
@@ -26,7 +26,7 @@
 #include "utils.h"
 #include "generate.h"
 
-#define	SF_MAX(x,y)		((x) > (y) ? (x) : (y))
+#define	SF_MAX(x, y)		((x) > (y) ? (x) : (y))
 
 static float crappy_snare (float *output, int len, int offset, float gain, float maxabs) ;
 
@@ -40,7 +40,7 @@ generate_file (const char * filename, int format, int len)
 	maxabs = crappy_snare (output, len, 0, 0.95, maxabs) ;
 	maxabs = crappy_snare (output, len, len / 4, 0.85, maxabs) ;
 	maxabs = crappy_snare (output, len, 2 * len / 4, 0.85, maxabs) ;
-	maxabs = crappy_snare (output, len, 3 * len / 4, 0.85, maxabs) ;
+	crappy_snare (output, len, 3 * len / 4, 0.85, maxabs) ;
 
 	write_mono_file (filename, format, 44100, output, len) ;
 
diff --git a/libs/libsndfile/tests/generate.h b/libs/libsndfile/tests/generate.h
index 6de6160fcb..709ea61191 100644
--- a/libs/libsndfile/tests/generate.h
+++ b/libs/libsndfile/tests/generate.h
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2007-2009 Erik de Castro Lopo 
+** Copyright (C) 2007-2011 Erik de Castro Lopo 
 **
 ** 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
diff --git a/libs/libsndfile/tests/header_test.c b/libs/libsndfile/tests/header_test.c
index dee936b3e3..9802fd9e58 100644
--- a/libs/libsndfile/tests/header_test.c
+++ b/libs/libsndfile/tests/header_test.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2001-2009 Erik de Castro Lopo 
+** Copyright (C) 2001-2011 Erik de Castro Lopo 
 **
 ** 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
@@ -244,15 +244,13 @@ static void
 update_header_sub (const char *filename, int typemajor, int write_mode)
 {	SNDFILE		*outfile, *infile ;
 	SF_INFO		sfinfo ;
-	int			k, frames ;
+	int			k ;
 
 	sfinfo.samplerate = 44100 ;
 	sfinfo.format = (typemajor | SF_FORMAT_PCM_16) ;
 	sfinfo.channels = 1 ;
 	sfinfo.frames = 0 ;
 
-	frames = BUFFER_LEN / sfinfo.channels ;
-
 	outfile = test_open_file_or_die (filename, write_mode, &sfinfo, SF_TRUE, __LINE__) ;
 
 	for (k = 0 ; k < BUFFER_LEN ; k++)
@@ -642,7 +640,7 @@ header_shrink_test (const char *filename, int filetype)
 
 static void
 extra_header_test (const char *filename, int filetype)
-{	SNDFILE *outfile ;
+{	SNDFILE *outfile, *infile ;
 	SF_INFO sfinfo ;
     sf_count_t frames ;
     short buffer [8] ;
@@ -660,9 +658,9 @@ extra_header_test (const char *filename, int filetype)
 	frames = ARRAY_LEN (buffer) / sfinfo.channels ;
 
 	/* Test the file with extra header data. */
-	outfile = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, 464) ;
+	outfile = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, 462) ;
 	sf_set_string (outfile, SF_STR_TITLE, filename) ;
-	test_writef_short_or_die (outfile, k, buffer, frames, 466) ;
+	test_writef_short_or_die (outfile, k, buffer, frames, 464) ;
 	sf_set_string (outfile, SF_STR_COPYRIGHT, "(c) 1980 Erik") ;
 	sf_close (outfile) ;
 
@@ -676,7 +674,7 @@ extra_header_test (const char *filename, int filetype)
 	** integration is done.
 	*/
 
-	if (sf_open (filename, SFM_RDWR, &sfinfo) != NULL)
+	if ((infile = sf_open (filename, SFM_RDWR, &sfinfo)) != NULL)
 	{	printf ("\n\nError : should not be able to open this file in SFM_RDWR.\n\n") ;
 		exit (1) ;
 		} ;
@@ -689,7 +687,7 @@ extra_header_test (const char *filename, int filetype)
 	hexdump_file (filename, 0, 100000) ;
 
 	/* Open again for read/write. */
-	outfile = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, 493) ;
+	outfile = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, 491) ;
 
 	/*
 	** In auto header update mode, seeking to the end of the file with
@@ -710,26 +708,26 @@ extra_header_test (const char *filename, int filetype)
 		memset (buffer, 0xA0 + k, sizeof (buffer)) ;
 
 
-		test_seek_or_die (outfile, k * frames, SEEK_SET, k * frames, sfinfo.channels, 514) ;
-		test_seek_or_die (outfile, 0, SEEK_END, k * frames, sfinfo.channels, 515) ;
+		test_seek_or_die (outfile, k * frames, SEEK_SET, k * frames, sfinfo.channels, 512) ;
+		test_seek_or_die (outfile, 0, SEEK_END, k * frames, sfinfo.channels, 513) ;
 
 		/* Open file again and make sure no errors in log buffer. */
 		if (0)
-		{	infile = test_open_file_or_die (filename, SFM_READ, &sfinfo, 519) ;
-			check_log_buffer_or_die (infile, 520) ;
+		{	infile = test_open_file_or_die (filename, SFM_READ, &sfinfo, 517) ;
+			check_log_buffer_or_die (infile, 518) ;
 			sf_close (infile) ;
 			} ;
 
 		if (sfinfo.frames != k * frames)
-		{	printf ("\n\nLine %d : Incorrect sample count (%ld should be %ld)\n", 525, SF_COUNT_TO_LONG (sfinfo.frames), SF_COUNT_TO_LONG (k + frames)) ;
+		{	printf ("\n\nLine %d : Incorrect sample count (%ld should be %ld)\n", 523, SF_COUNT_TO_LONG (sfinfo.frames), SF_COUNT_TO_LONG (k + frames)) ;
 			dump_log_buffer (infile) ;
 			exit (1) ;
 			} ;
 
 		if ((k & 1) == 0)
-			test_write_short_or_die (outfile, k, buffer, sfinfo.channels * frames, 531) ;
+			test_write_short_or_die (outfile, k, buffer, sfinfo.channels * frames, 529) ;
 		else
-			test_writef_short_or_die (outfile, k, buffer, frames, 533) ;
+			test_writef_short_or_die (outfile, k, buffer, frames, 531) ;
 		hexdump_file (filename, 0, 100000) ;
 		} ;
 
diff --git a/libs/libsndfile/tests/header_test.tpl b/libs/libsndfile/tests/header_test.tpl
index 488e128acb..6545bb498b 100644
--- a/libs/libsndfile/tests/header_test.tpl
+++ b/libs/libsndfile/tests/header_test.tpl
@@ -1,6 +1,6 @@
 [+ AutoGen5 template c +]
 /*
-** Copyright (C) 2001-2009 Erik de Castro Lopo 
+** Copyright (C) 2001-2012 Erik de Castro Lopo 
 **
 ** 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
@@ -22,9 +22,10 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
-#include 
 
 #if HAVE_UNISTD_H
 #include 
@@ -43,7 +44,7 @@
 
 #include	"utils.h"
 
-#define	BUFFER_LEN		(1<<10)
+#define	BUFFER_LEN		(1 << 10)
 #define LOG_BUFFER_SIZE	1024
 
 static void	update_header_test (const char *filename, int typemajor) ;
@@ -77,7 +78,7 @@ main (int argc, char *argv [])
 		exit (1) ;
 		} ;
 
-	do_all=!strcmp (argv [1], "all") ;
+	do_all= !strcmp (argv [1], "all") ;
 
 	if (do_all || ! strcmp (argv [1], "wav"))
 	{	update_header_test ("header.wav", SF_FORMAT_WAV) ;
@@ -244,15 +245,13 @@ static void
 update_header_sub (const char *filename, int typemajor, int write_mode)
 {	SNDFILE		*outfile, *infile ;
 	SF_INFO		sfinfo ;
-	int			k, frames ;
+	int			k ;
 
 	sfinfo.samplerate = 44100 ;
 	sfinfo.format = (typemajor | SF_FORMAT_PCM_16) ;
 	sfinfo.channels = 1 ;
 	sfinfo.frames = 0 ;
 
-	frames = BUFFER_LEN / sfinfo.channels ;
-
 	outfile = test_open_file_or_die (filename, write_mode, &sfinfo, SF_TRUE, __LINE__) ;
 
 	for (k = 0 ; k < BUFFER_LEN ; k++)
@@ -275,7 +274,7 @@ update_header_sub (const char *filename, int typemajor, int write_mode)
 	check_log_buffer_or_die (infile, __LINE__) ;
 
 	if (sfinfo.frames < BUFFER_LEN || sfinfo.frames > BUFFER_LEN + 50)
-	{	printf ("\n\nLine %d : Incorrect sample count (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), BUFFER_LEN) ;
+	{	printf ("\n\nLine %d : Incorrect sample count (%" PRId64 " should be %d)\n", __LINE__, sfinfo.frames, BUFFER_LEN) ;
 		dump_log_buffer (infile) ;
 		exit (1) ;
 		} ;
@@ -300,7 +299,7 @@ update_header_sub (const char *filename, int typemajor, int write_mode)
 	check_log_buffer_or_die (infile, __LINE__) ;
 
 	if (sfinfo.frames < 2 * BUFFER_LEN || sfinfo.frames > 2 * BUFFER_LEN + 50)
-	{	printf ("\n\nLine %d : Incorrect sample count (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), 2 * BUFFER_LEN) ;
+	{	printf ("\n\nLine %d : Incorrect sample count (%" PRId64 " should be %d)\n", __LINE__, sfinfo.frames, 2 * BUFFER_LEN) ;
 		dump_log_buffer (infile) ;
 		exit (1) ;
 		} ;
@@ -332,8 +331,8 @@ update_header_test (const char *filename, int typemajor)
 update_seek_[+ (get "name") +]_test	(const char *filename, int filetype)
 {	SNDFILE *outfile, *infile ;
 	SF_INFO sfinfo ;
-    sf_count_t frames ;
-    [+ (get "name") +] buffer [8] ;
+	sf_count_t frames ;
+	[+ (get "name") +] buffer [8] ;
 	int k ;
 
 	print_test_name ("update_seek_[+ (get "name") +]_test", filename) ;
@@ -356,11 +355,11 @@ update_seek_[+ (get "name") +]_test	(const char *filename, int filetype)
 
 	/*
 	** In auto header update mode, seeking to the end of the file with
-    ** SEEK_SET will fail from the 2nd seek on.  seeking to 0, SEEK_END
+	** SEEK_SET will fail from the 2nd seek on.  seeking to 0, SEEK_END
 	** will seek to 0 anyway
 	*/
 	if (sf_command (outfile, SFC_SET_UPDATE_HEADER_AUTO, NULL, SF_TRUE) == 0)
-    {	printf ("\n\nError : sf_command (SFC_SET_UPDATE_HEADER_AUTO) return error : %s\n\n", sf_strerror (outfile)) ;
+	{	printf ("\n\nError : sf_command (SFC_SET_UPDATE_HEADER_AUTO) return error : %s\n\n", sf_strerror (outfile)) ;
 		exit (1) ;
 		} ;
 
@@ -377,7 +376,7 @@ update_seek_[+ (get "name") +]_test	(const char *filename, int filetype)
 		sf_close (infile) ;
 
 		if (sfinfo.frames != k * frames)
-		{	printf ("\n\nLine %d : Incorrect sample count (%ld should be %ld)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), SF_COUNT_TO_LONG (k + frames)) ;
+		{	printf ("\n\nLine %d : Incorrect sample count (%" PRId64 " should be %" PRId64 ")\n", __LINE__, sfinfo.frames, k + frames) ;
 			dump_log_buffer (infile) ;
 			exit (1) ;
 			} ;
@@ -445,8 +444,8 @@ static void
 extra_header_test (const char *filename, int filetype)
 {	SNDFILE *outfile, *infile ;
 	SF_INFO sfinfo ;
-    sf_count_t frames ;
-    short buffer [8] ;
+	sf_count_t frames ;
+	short buffer [8] ;
 	int k = 0 ;
 
 	print_test_name ("extra_header_test", filename) ;
@@ -494,11 +493,11 @@ extra_header_test (const char *filename, int filetype)
 
 	/*
 	** In auto header update mode, seeking to the end of the file with
-    ** SEEK_SET will fail from the 2nd seek on.  seeking to 0, SEEK_END
+	** SEEK_SET will fail from the 2nd seek on.  seeking to 0, SEEK_END
 	** will seek to 0 anyway
 	*/
 	if (sf_command (outfile, SFC_SET_UPDATE_HEADER_AUTO, NULL, SF_TRUE) == 0)
-    {	printf ("\n\nError : sf_command (SFC_SET_UPDATE_HEADER_AUTO) return error : %s\n\n", sf_strerror (outfile)) ;
+	{	printf ("\n\nError : sf_command (SFC_SET_UPDATE_HEADER_AUTO) return error : %s\n\n", sf_strerror (outfile)) ;
 		exit (1) ;
 		} ;
 
@@ -522,7 +521,7 @@ extra_header_test (const char *filename, int filetype)
 			} ;
 
 		if (sfinfo.frames != k * frames)
-		{	printf ("\n\nLine %d : Incorrect sample count (%ld should be %ld)\n", [+ (tpl-file-line "%2$d") +], SF_COUNT_TO_LONG (sfinfo.frames), SF_COUNT_TO_LONG (k + frames)) ;
+		{	printf ("\n\nLine %d : Incorrect sample count (%" PRId64 " should be %" PRId64 ")\n", [+ (tpl-file-line "%2$d") +], sfinfo.frames, k + frames) ;
 			dump_log_buffer (infile) ;
 			exit (1) ;
 			} ;
diff --git a/libs/libsndfile/tests/headerless_test.c b/libs/libsndfile/tests/headerless_test.c
index 4300a1f1a9..6d3e2f2589 100644
--- a/libs/libsndfile/tests/headerless_test.c
+++ b/libs/libsndfile/tests/headerless_test.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2012 Erik de Castro Lopo 
 **
 ** 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
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #if HAVE_UNISTD_H
 #include 
@@ -93,7 +94,7 @@ headerless_test (const char * filename, int format, int expected)
 		} ;
 
 	if (sfinfo.frames < BUFFER_SIZE)
-	{	printf ("Line %d: Incorrect number of.frames in file. (%d => %ld)\n", __LINE__, BUFFER_SIZE, SF_COUNT_TO_LONG (sfinfo.frames)) ;
+	{	printf ("Line %d: Incorrect number of.frames in file. (%d => %" PRId64 ")\n", __LINE__, BUFFER_SIZE, sfinfo.frames) ;
 		exit (1) ;
 		} ;
 
@@ -154,7 +155,7 @@ old_test (void)
 		} ;
 
 	if (sfinfo.frames < BUFFER_SIZE)
-	{	printf ("Line %d: Incorrect number of.frames in file. (%d => %ld)\n", __LINE__, BUFFER_SIZE, SF_COUNT_TO_LONG (sfinfo.frames)) ;
+	{	printf ("Line %d: Incorrect number of.frames in file. (%d => %" PRId64 ")\n", __LINE__, BUFFER_SIZE, sfinfo.frames) ;
 		exit (1) ;
 		} ;
 
diff --git a/libs/libsndfile/tests/largefile_test.c b/libs/libsndfile/tests/largefile_test.c
index 73c11ef8cb..328a589a02 100644
--- a/libs/libsndfile/tests/largefile_test.c
+++ b/libs/libsndfile/tests/largefile_test.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2006-2009 Erik de Castro Lopo 
+** Copyright (C) 2006-2011 Erik de Castro Lopo 
 **
 ** 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
diff --git a/libs/libsndfile/tests/locale_test.c b/libs/libsndfile/tests/locale_test.c
index d8f16ed21f..b67d549c58 100644
--- a/libs/libsndfile/tests/locale_test.c
+++ b/libs/libsndfile/tests/locale_test.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2005-2009 Erik de Castro Lopo 
+** Copyright (C) 2005-2011 Erik de Castro Lopo 
 **
 ** 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
@@ -17,7 +17,6 @@
 */
 
 #include "sfconfig.h"
-#include "sndfile.h"
 
 #include 
 #include 
@@ -31,41 +30,98 @@
 #include 
 #endif
 
+#if OS_IS_WIN32
+#include 
+#define ENABLE_SNDFILE_WINDOWS_PROTOTYPES 1
+#endif
+
+#include "sndfile.h"
 #include "utils.h"
 
-typedef struct
-{	const char *locale ;
-	const char *filename ;
-	int	width ;
-} LOCALE_DATA ;
-
-static void locale_test (const char * locname, const char * filename, int width) ;
+static void utf8_test (void) ;
+static void wchar_test (void) ;
 
 int
 main (void)
-{	LOCALE_DATA ldata [] =
-	{	{	"de_DE", "F\303\274\303\237e.au", 7 },
-		{	"en_AU", "kangaroo.au", 11 },
-		{	"POSIX", "posix.au", 8 },
-		{	"pt_PT", "concei\303\247\303\243o.au", 12 },
-
-#if OS_IS_WIN32 == 0
-		{	"ja_JP", "\343\201\212\343\201\257\343\202\210\343\201\206\343\201\224\343\201\226\343\201\204\343\201\276\343\201\231.au", 21 },
-		{	"vi_VN", "qu\341\273\221c ng\341\273\257.au", 11 },
-#endif
-
-		{	NULL, NULL, 0 }
-		} ;
-	int k ;
-
-	for (k = 0 ; ldata [k].locale != NULL ; k++)
-		locale_test (ldata [k].locale, ldata [k].filename, ldata [k].width) ;
+{
+	utf8_test () ;
+	wchar_test () ;
 
 	return 0 ;
 } /* main */
 
+/*==============================================================================
+*/
+
 static void
-locale_test (const char * locname, const char * filename, int width)
+wchar_test (void)
+{
+#if OS_IS_WIN32
+	SNDFILE * file ;
+	SF_INFO info ;
+	LPCWSTR filename = L"test.wav" ;
+
+	print_test_name (__func__, "test.wav") ;
+
+	info.format = SF_FORMAT_WAV | SF_FORMAT_PCM_16 ;
+	info.channels = 1 ;
+	info.samplerate = 44100 ;
+
+	file = sf_wchar_open (filename, SFM_WRITE, &info) ;
+	exit_if_true (file == NULL, "\n\nLine %d : sf_wchar_open failed : %s\n\n", __LINE__, sf_strerror (NULL)) ;
+	sf_close (file) ;
+
+	/*	This should check that the file did in fact get created with a
+	**	wchar_t * filename.
+	*/
+	exit_if_true (
+		GetFileAttributesW (filename) == INVALID_FILE_ATTRIBUTES,
+		"\n\nLine %d : GetFileAttributes failed.\n\n", __LINE__
+		) ;
+
+	/* Use this because the file was created with CreateFileW. */
+	DeleteFileW (filename) ;
+
+	puts ("ok") ;
+#endif
+} /* wchar_test */
+
+/*==============================================================================
+*/
+
+typedef struct
+{	const char *locale ;
+	int utf8 ;
+	const char *filename ;
+	int	width ;
+} LOCALE_DATA ;
+
+static void locale_test (const LOCALE_DATA * locdata) ;
+
+static void
+utf8_test (void)
+{	LOCALE_DATA ldata [] =
+	{	{	"de_DE", 1, "F\303\274\303\237e.au", 7 },
+		{	"en_AU", 1, "kangaroo.au", 11 },
+		{	"POSIX", 0, "posix.au", 8 },
+		{	"pt_PT", 1, "concei\303\247\303\243o.au", 12 },
+
+#if OS_IS_WIN32 == 0
+		{	"ja_JP", 1, "\343\201\212\343\201\257\343\202\210\343\201\206\343\201\224\343\201\226\343\201\204\343\201\276\343\201\231.au", 21 },
+#endif
+
+		{	"vi_VN", 1, "qu\341\273\221c ng\341\273\257.au", 11 },
+		{	NULL, 0, NULL, 0 }
+		} ;
+	int k ;
+
+	for (k = 0 ; ldata [k].locale != NULL ; k++)
+		locale_test (ldata + k) ;
+} /* utf8_test */
+
+
+static void
+locale_test (const LOCALE_DATA * ldata)
 {
 #if (HAVE_LOCALE_H == 0 || HAVE_SETLOCALE == 0)
 	locname = filename = NULL ;
@@ -75,34 +131,36 @@ locale_test (const char * locname, const char * filename, int width)
 	const short wdata [] = { 1, 2, 3, 4, 5, 6, 7, 8 } ;
 	short rdata [ARRAY_LEN (wdata)] ;
 	const char *old_locale ;
+	char utf8_locname [32] ;
 	SNDFILE *file ;
 	SF_INFO sfinfo ;
 
-	/* Grab the old locale. */
-	old_locale = setlocale (LC_ALL, NULL) ;
+	snprintf (utf8_locname, sizeof (utf8_locname), "%s%s", ldata->locale, ldata->utf8 ? ".UTF-8" : "") ;
 
-	if (setlocale (LC_ALL, locname) == NULL)
+	/* Change the locale saving the old one. */
+	if ((old_locale = setlocale (LC_CTYPE, utf8_locname)) == NULL)
 		return ;
 
-	printf ("    locale_test : %-6s   %s%*c : ", locname, filename, 28 - width, ' ') ;
+	printf ("    locale_test           %-8s : %s %*c ", ldata->locale, ldata->filename, 24 - ldata->width, ' ') ;
 	fflush (stdout) ;
 
 	sfinfo.format = SF_FORMAT_AU | SF_FORMAT_PCM_16 ;
 	sfinfo.channels = 1 ;
 	sfinfo.samplerate = 44100 ;
 
-	file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, 0, __LINE__) ;
+	file = test_open_file_or_die (ldata->filename, SFM_WRITE, &sfinfo, 0, __LINE__) ;
 	test_write_short_or_die (file, 0, wdata, ARRAY_LEN (wdata), __LINE__) ;
 	sf_close (file) ;
 
-	file = test_open_file_or_die (filename, SFM_READ, &sfinfo, 0, __LINE__) ;
+	file = test_open_file_or_die (ldata->filename, SFM_READ, &sfinfo, 0, __LINE__) ;
 	test_read_short_or_die (file, 0, rdata, ARRAY_LEN (rdata), __LINE__) ;
 	sf_close (file) ;
 
-	/* Restore old locale. */
-	setlocale (LC_ALL, old_locale) ;
+	unlink (ldata->filename) ;
+
+	/* Restore old locale. */
+	setlocale (LC_CTYPE, old_locale) ;
 
-	unlink (filename) ;
 	puts ("ok") ;
 #endif
 } /* locale_test */
diff --git a/libs/libsndfile/tests/lossy_comp_test.c b/libs/libsndfile/tests/lossy_comp_test.c
index 8947da02cf..5f9f593f8f 100644
--- a/libs/libsndfile/tests/lossy_comp_test.c
+++ b/libs/libsndfile/tests/lossy_comp_test.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2012 Erik de Castro Lopo 
 **
 ** 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
@@ -22,6 +22,8 @@
 #include 
 #include 
 #include 
+#include 
+
 
 #if HAVE_UNISTD_H
 #include 
@@ -31,14 +33,14 @@
 
 #include "utils.h"
 
-#define	BUFFER_SIZE		(1<<14) /* Should be (1<<14) */
+#define	BUFFER_SIZE		(1 << 14)
 #define	SAMPLE_RATE		11025
 
 #ifndef		M_PI
 #define		M_PI		3.14159265358979323846264338
 #endif
 
-#define		LCT_MAX(x,y)	((x) > (y) ? (x) : (y))
+#define		LCT_MAX(x, y)	((x) > (y) ? (x) : (y))
 
 static	void	lcomp_test_short	(const char *filename, int filetype, int chan, double margin) ;
 static	void	lcomp_test_int		(const char *filename, int filetype, int chan, double margin) ;
@@ -556,7 +558,7 @@ lcomp_test_short (const char *filename, int filetype, int channels, double margi
 {	SNDFILE			*file ;
 	SF_INFO			sfinfo ;
 	int				k, m, seekpos, half_max_abs ;
-	long			datalen ;
+	sf_count_t		datalen ;
 	short			*orig, *data ;
 
 	print_test_name ("lcomp_test_short", filename) ;
@@ -593,12 +595,12 @@ lcomp_test_short (const char *filename, int filetype, int channels, double margi
 		} ;
 
 	if (sfinfo.frames < datalen / channels)
-	{	printf ("Too few frames in file. (%ld should be a little more than %ld)\n", SF_COUNT_TO_LONG (sfinfo.frames), datalen) ;
+	{	printf ("Too few frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", sfinfo.frames, datalen) ;
 		exit (1) ;
 		} ;
 
 	if (sfinfo.frames > (datalen + datalen / 20))
-	{	printf ("Too many frames in file. (%ld should be a little more than %ld)\n", SF_COUNT_TO_LONG (sfinfo.frames), datalen) ;
+	{	printf ("Too many frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", sfinfo.frames, datalen) ;
 		exit (1) ;
 		} ;
 
@@ -629,8 +631,8 @@ lcomp_test_short (const char *filename, int filetype, int channels, double margi
 		} ;
 
 	if ((k = sf_readf_short (file, data, datalen)) != sfinfo.frames - datalen)
-	{	printf ("\n\nLine %d: Incorrect read length (%ld should be %d).\n", __LINE__,
-			SF_COUNT_TO_LONG (channels * sfinfo.frames - datalen), k) ;
+	{	printf ("\n\nLine %d: Incorrect read length (%" PRId64 " should be %d).\n", __LINE__,
+			channels * sfinfo.frames - datalen, k) ;
 		exit (1) ;
 		} ;
 
@@ -742,7 +744,7 @@ lcomp_test_int (const char *filename, int filetype, int channels, double margin)
 {	SNDFILE			*file ;
 	SF_INFO			sfinfo ;
 	int				k, m, half_max_abs ;
-	long			datalen, seekpos ;
+	sf_count_t		datalen, seekpos ;
 	double			scale, max_val ;
 	int				*orig, *data ;
 
@@ -790,12 +792,12 @@ lcomp_test_int (const char *filename, int filetype, int channels, double margin)
 		} ;
 
 	if (sfinfo.frames < datalen / channels)
-	{	printf ("Too few.frames in file. (%ld should be a little more than %ld)\n", datalen, SF_COUNT_TO_LONG (sfinfo.frames)) ;
+	{	printf ("Too few.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", datalen, sfinfo.frames) ;
 		exit (1) ;
 		} ;
 
 	if (sfinfo.frames > (datalen + datalen / 20))
-	{	printf ("Too many.frames in file. (%ld should be a little more than %ld)\n", datalen, SF_COUNT_TO_LONG (sfinfo.frames)) ;
+	{	printf ("Too many.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", datalen, sfinfo.frames) ;
 		exit (1) ;
 		} ;
 
@@ -826,8 +828,8 @@ lcomp_test_int (const char *filename, int filetype, int channels, double margin)
 		} ;
 
 	if ((k = sf_readf_int (file, data, datalen)) != sfinfo.frames - datalen)
-	{	printf ("\n\nLine %d: Incorrect read length (%ld should be %d).\n", __LINE__,
-			SF_COUNT_TO_LONG (channels * sfinfo.frames - datalen), k) ;
+	{	printf ("\n\nLine %d: Incorrect read length (%" PRId64 " should be %d).\n", __LINE__,
+			channels * sfinfo.frames - datalen, k) ;
 		exit (1) ;
 		} ;
 
@@ -872,7 +874,7 @@ lcomp_test_int (const char *filename, int filetype, int channels, double margin)
 
 	/* Check seek from start of file. */
 	if ((k = sf_seek (file, seekpos, SEEK_SET)) != seekpos)
-	{	printf ("Seek to start of file + %ld failed (%d).\n", seekpos, k) ;
+	{	printf ("Seek to start of file + %" PRId64 " failed (%d).\n", seekpos, k) ;
 		exit (1) ;
 		} ;
 
@@ -884,7 +886,7 @@ lcomp_test_int (const char *filename, int filetype, int channels, double margin)
 		} ;
 
 	if ((k = sf_seek (file, 0, SEEK_CUR)) != seekpos + 1)
-	{	printf ("\n\nLine %d: sf_seek (SEEK_CUR) with 0 offset failed (%d should be %ld)\n", __LINE__, k, seekpos + 1) ;
+	{	printf ("\n\nLine %d: sf_seek (SEEK_CUR) with 0 offset failed (%d should be %" PRId64 ")\n", __LINE__, k, seekpos + 1) ;
 		exit (1) ;
 		} ;
 
@@ -892,7 +894,7 @@ lcomp_test_int (const char *filename, int filetype, int channels, double margin)
 	k = sf_seek (file, BUFFER_SIZE / 5, SEEK_CUR) ;
 	test_readf_int_or_die (file, 0, data, 1, __LINE__) ;
 	if (error_function (1.0 * data [0], 1.0 * orig [seekpos * channels], margin) || k != seekpos)
-	{	printf ("\nLine %d: sf_seek (forwards, SEEK_CUR) followed by sf_readf_int failed (%d, %d) (%d, %ld).\n", __LINE__, data [0], orig [seekpos * channels], k, seekpos + 1) ;
+	{	printf ("\nLine %d: sf_seek (forwards, SEEK_CUR) followed by sf_readf_int failed (%d, %d) (%d, %" PRId64 ").\n", __LINE__, data [0], orig [seekpos * channels], k, seekpos + 1) ;
 		exit (1) ;
 		} ;
 
@@ -901,7 +903,7 @@ lcomp_test_int (const char *filename, int filetype, int channels, double margin)
 	k = sf_seek (file, -20, SEEK_CUR) ;
 	test_readf_int_or_die (file, 0, data, 1, __LINE__) ;
 	if (error_function (1.0 * data [0], 1.0 * orig [seekpos * channels], margin) || k != seekpos)
-	{	printf ("\nLine %d: sf_seek (backwards, SEEK_CUR) followed by sf_readf_int failed (%d, %d) (%d, %ld).\n", __LINE__, data [0], orig [seekpos * channels], k, seekpos) ;
+	{	printf ("\nLine %d: sf_seek (backwards, SEEK_CUR) followed by sf_readf_int failed (%d, %d) (%d, %" PRId64 ").\n", __LINE__, data [0], orig [seekpos * channels], k, seekpos) ;
 		exit (1) ;
 		} ;
 
@@ -939,7 +941,7 @@ lcomp_test_float (const char *filename, int filetype, int channels, double margi
 {	SNDFILE			*file ;
 	SF_INFO			sfinfo ;
 	int				k, m, seekpos ;
-	long			datalen ;
+	sf_count_t		datalen ;
 	float			*orig, *data ;
 	double			half_max_abs ;
 
@@ -978,12 +980,12 @@ lcomp_test_float (const char *filename, int filetype, int channels, double margi
 		} ;
 
 	if (sfinfo.frames < datalen / channels)
-	{	printf ("Too few.frames in file. (%ld should be a little more than %ld)\n", datalen, SF_COUNT_TO_LONG (sfinfo.frames)) ;
+	{	printf ("Too few.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", datalen, sfinfo.frames) ;
 		exit (1) ;
 		} ;
 
 	if (sfinfo.frames > (datalen + datalen / 20))
-	{	printf ("Too many.frames in file. (%ld should be a little more than %ld)\n", datalen, SF_COUNT_TO_LONG (sfinfo.frames)) ;
+	{	printf ("Too many.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", datalen, sfinfo.frames) ;
 		exit (1) ;
 		} ;
 
@@ -1020,8 +1022,8 @@ lcomp_test_float (const char *filename, int filetype, int channels, double margi
 		} ;
 
 	if ((k = sf_readf_float (file, data, datalen)) != sfinfo.frames - datalen)
-	{	printf ("\n\nLine %d: Incorrect read length (%ld should be %d).\n", __LINE__,
-			SF_COUNT_TO_LONG (channels * sfinfo.frames - datalen), k) ;
+	{	printf ("\n\nLine %d: Incorrect read length (%" PRId64 " should be %d).\n", __LINE__,
+			channels * sfinfo.frames - datalen, k) ;
 		exit (1) ;
 		} ;
 
@@ -1133,7 +1135,7 @@ lcomp_test_double (const char *filename, int filetype, int channels, double marg
 {	SNDFILE			*file ;
 	SF_INFO			sfinfo ;
 	int				k, m, seekpos ;
-	long			datalen ;
+	sf_count_t		datalen ;
 	double			*orig, *data ;
 	double			half_max_abs ;
 
@@ -1172,12 +1174,12 @@ lcomp_test_double (const char *filename, int filetype, int channels, double marg
 		} ;
 
 	if (sfinfo.frames < datalen / channels)
-	{	printf ("Too few.frames in file. (%ld should be a little more than %ld)\n", datalen, SF_COUNT_TO_LONG (sfinfo.frames)) ;
+	{	printf ("Too few.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", datalen, sfinfo.frames) ;
 		exit (1) ;
 		} ;
 
 	if (sfinfo.frames > (datalen + datalen / 20))
-	{	printf ("Too many.frames in file. (%ld should be a little more than %ld)\n", datalen, SF_COUNT_TO_LONG (sfinfo.frames)) ;
+	{	printf ("Too many.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", datalen, sfinfo.frames) ;
 		exit (1) ;
 		} ;
 
@@ -1214,8 +1216,8 @@ lcomp_test_double (const char *filename, int filetype, int channels, double marg
 		} ;
 
 	if ((k = sf_readf_double (file, data, datalen)) != sfinfo.frames - datalen)
-	{	printf ("\n\nLine %d: Incorrect read length (%ld should be %d).\n", __LINE__,
-			SF_COUNT_TO_LONG (channels * sfinfo.frames - datalen), k) ;
+	{	printf ("\n\nLine %d: Incorrect read length (%" PRId64 " should be %d).\n", __LINE__,
+			channels * sfinfo.frames - datalen, k) ;
 		exit (1) ;
 		} ;
 
@@ -1328,7 +1330,7 @@ sdlcomp_test_short	(const char *filename, int filetype, int channels, double mar
 {	SNDFILE			*file ;
 	SF_INFO			sfinfo ;
 	int				k, m, seekpos, half_max_abs ;
-	long			datalen ;
+	sf_count_t		datalen ;
 	short			*orig, *data, *smooth ;
 
 channels = 1 ;
@@ -1386,12 +1388,12 @@ channels = 1 ;
 		} ;
 
 	if (sfinfo.frames < datalen / channels)
-	{	printf ("Too few.frames in file. (%ld should be a little more than %ld)\n", datalen, SF_COUNT_TO_LONG (sfinfo.frames)) ;
+	{	printf ("Too few.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", datalen, sfinfo.frames) ;
 		exit (1) ;
 		} ;
 
 	if (sfinfo.frames > (datalen + 400))
-	{	printf ("Too many.frames in file. (%ld should be a little more than %ld)\n", SF_COUNT_TO_LONG (sfinfo.frames), datalen) ;
+	{	printf ("Too many.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", sfinfo.frames, datalen) ;
 		exit (1) ;
 		} ;
 
@@ -1428,7 +1430,7 @@ channels = 1 ;
 		} ;
 
 	if ((k = sf_read_short (file, data, datalen)) != sfinfo.frames - datalen)
-	{	printf ("\n\nLine %d: Incorrect read length (%d should be %ld).\n", __LINE__, k, SF_COUNT_TO_LONG (sfinfo.frames - datalen)) ;
+	{	printf ("\n\nLine %d: Incorrect read length (%d should be %" PRId64 ").\n", __LINE__, k, sfinfo.frames - datalen) ;
 		exit (1) ;
 		} ;
 
@@ -1436,7 +1438,7 @@ channels = 1 ;
 		(sfinfo.format & SF_FORMAT_SUBMASK) != SF_FORMAT_GSM610)
 		for (k = 0 ; k < sfinfo.frames - datalen ; k++)
 			if (abs (data [k]) > decay_response (k))
-			{	printf ("\n\nLine %d: Incorrect sample (#%ld : abs (%d) should be < %d).\n", __LINE__, datalen + k, data [k], decay_response (k)) ;
+			{	printf ("\n\nLine %d: Incorrect sample (#%" PRId64 " : abs (%d) should be < %d).\n", __LINE__, datalen + k, data [k], decay_response (k)) ;
 				exit (1) ;
 				} ;
 
@@ -1456,7 +1458,7 @@ channels = 1 ;
 
 			for (k = 0 ; k < datalen / 7 ; k++)
 				if (error_function (1.0 * data [k], 1.0 * smooth [k], margin))
-				{	printf ("\nLine %d: Incorrect sample C (#%d (%ld) : %d => %d).\n", __LINE__, k, k + m * (datalen / 7), smooth [k], data [k]) ;
+				{	printf ("\nLine %d: Incorrect sample C (#%d (%" PRId64 ") : %d => %d).\n", __LINE__, k, k + m * (datalen / 7), smooth [k], data [k]) ;
 					for (m = 0 ; m < 10 ; m++)
 						printf ("%d ", data [k]) ;
 					printf ("\n") ;
@@ -1503,10 +1505,10 @@ channels = 1 ;
 		/* Check that read past end of file returns number of items. */
 		sf_seek (file, sfinfo.frames, SEEK_SET) ;
 
-	 	if ((k = sf_read_short (file, data, datalen)) != 0)
-	 	{	printf ("\n\nLine %d: Return value from sf_read_short past end of file incorrect (%d).\n", __LINE__, k) ;
-	 		exit (1) ;
-	 		} ;
+		if ((k = sf_read_short (file, data, datalen)) != 0)
+		{	printf ("\n\nLine %d: Return value from sf_read_short past end of file incorrect (%d).\n", __LINE__, k) ;
+			exit (1) ;
+			} ;
 
 		/* Check seek backward from end. */
 
@@ -1533,7 +1535,7 @@ sdlcomp_test_int	(const char *filename, int filetype, int channels, double margi
 {	SNDFILE			*file ;
 	SF_INFO			sfinfo ;
 	int				k, m, seekpos, half_max_abs ;
-	long			datalen ;
+	sf_count_t		datalen ;
 	int				*orig, *data, *smooth ;
 	double			scale ;
 
@@ -1594,12 +1596,12 @@ channels = 1 ;
 		} ;
 
 	if (sfinfo.frames < datalen / channels)
-	{	printf ("Too few.frames in file. (%ld should be a little more than %ld)\n", datalen, SF_COUNT_TO_LONG (sfinfo.frames)) ;
+	{	printf ("Too few.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", datalen, sfinfo.frames) ;
 		exit (1) ;
 		} ;
 
 	if (sfinfo.frames > (datalen + 400))
-	{	printf ("Too many.frames in file. (%ld should be a little more than %ld)\n", SF_COUNT_TO_LONG (sfinfo.frames), datalen) ;
+	{	printf ("Too many.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", sfinfo.frames, datalen) ;
 		exit (1) ;
 		} ;
 
@@ -1632,7 +1634,7 @@ channels = 1 ;
 		} ;
 
 	if ((k = sf_readf_int (file, data, datalen)) != sfinfo.frames - datalen)
-	{	printf ("\n\nLine %d: Incorrect read length (%d should be %ld).\n", __LINE__, k, SF_COUNT_TO_LONG (sfinfo.frames - datalen)) ;
+	{	printf ("\n\nLine %d: Incorrect read length (%d should be %" PRId64 ").\n", __LINE__, k, sfinfo.frames - datalen) ;
 		exit (1) ;
 		} ;
 
@@ -1643,7 +1645,7 @@ channels = 1 ;
 		(sfinfo.format & SF_FORMAT_SUBMASK) != SF_FORMAT_G723_24)
 		for (k = 0 ; k < sfinfo.frames - datalen ; k++)
 			if (abs (data [k]) > decay_response (k))
-			{	printf ("\n\nLine %d: Incorrect sample (#%ld : abs (%d) should be < %d).\n", __LINE__, datalen + k, data [k], decay_response (k)) ;
+			{	printf ("\n\nLine %d: Incorrect sample (#%" PRId64 " : abs (%d) should be < %d).\n", __LINE__, datalen + k, data [k], decay_response (k)) ;
 				exit (1) ;
 				} ;
 
@@ -1663,7 +1665,7 @@ channels = 1 ;
 
 			for (k = 0 ; k < datalen / 7 ; k++)
 				if (error_function (data [k] / scale, smooth [k] / scale, margin))
-				{	printf ("\nLine %d: Incorrect sample (#%d (%ld) : %d => %d).\n", __LINE__, k, k + m * (datalen / 7), smooth [k], data [k]) ;
+				{	printf ("\nLine %d: Incorrect sample (#%d (%" PRId64 ") : %d => %d).\n", __LINE__, k, k + m * (datalen / 7), smooth [k], data [k]) ;
 					for (m = 0 ; m < 10 ; m++)
 						printf ("%d ", data [k]) ;
 					printf ("\n") ;
@@ -1710,10 +1712,10 @@ channels = 1 ;
 		/* Check that read past end of file returns number of items. */
 		sf_seek (file, sfinfo.frames, SEEK_SET) ;
 
-	 	if ((k = sf_readf_int (file, data, datalen)) != 0)
-	 	{	printf ("\n\nLine %d: Return value from sf_readf_int past end of file incorrect (%d).\n", __LINE__, k) ;
-	 		exit (1) ;
-	 		} ;
+		if ((k = sf_readf_int (file, data, datalen)) != 0)
+		{	printf ("\n\nLine %d: Return value from sf_readf_int past end of file incorrect (%d).\n", __LINE__, k) ;
+			exit (1) ;
+			} ;
 
 		/* Check seek backward from end. */
 
@@ -1740,7 +1742,7 @@ sdlcomp_test_float	(const char *filename, int filetype, int channels, double mar
 {	SNDFILE			*file ;
 	SF_INFO			sfinfo ;
 	int				k, m, seekpos ;
-	long			datalen ;
+	sf_count_t		datalen ;
 	float			*orig, *data, *smooth ;
 	double			half_max_abs ;
 
@@ -1789,12 +1791,12 @@ printf ("** fix this ** ") ;
 		} ;
 
 	if (sfinfo.frames < datalen / channels)
-	{	printf ("Too few.frames in file. (%ld should be a little more than %ld)\n", datalen, SF_COUNT_TO_LONG (sfinfo.frames)) ;
+	{	printf ("Too few.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", datalen, sfinfo.frames) ;
 		exit (1) ;
 		} ;
 
 	if (sfinfo.frames > (datalen + 400))
-	{	printf ("Too many.frames in file. (%ld should be a little more than %ld)\n", SF_COUNT_TO_LONG (sfinfo.frames), datalen) ;
+	{	printf ("Too many.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", sfinfo.frames, datalen) ;
 		exit (1) ;
 		} ;
 
@@ -1832,7 +1834,7 @@ printf ("** fix this ** ") ;
 		} ;
 
 	if ((k = sf_read_float (file, data, datalen)) != sfinfo.frames - datalen)
-	{	printf ("\n\nLine %d: Incorrect read length (%d should be %ld).\n", __LINE__, k, SF_COUNT_TO_LONG (sfinfo.frames - datalen)) ;
+	{	printf ("\n\nLine %d: Incorrect read length (%d should be %" PRId64 ").\n", __LINE__, k, sfinfo.frames - datalen) ;
 		exit (1) ;
 		} ;
 
@@ -1840,7 +1842,7 @@ printf ("** fix this ** ") ;
 		(sfinfo.format & SF_FORMAT_SUBMASK) != SF_FORMAT_GSM610)
 		for (k = 0 ; k < sfinfo.frames - datalen ; k++)
 			if (abs (data [k]) > decay_response (k))
-			{	printf ("\n\nLine %d: Incorrect sample (#%ld : abs (%d) should be < %d).\n", __LINE__, datalen + k, (int) data [k], (int) decay_response (k)) ;
+			{	printf ("\n\nLine %d: Incorrect sample (#%" PRId64 " : abs (%d) should be < %d).\n", __LINE__, datalen + k, (int) data [k], (int) decay_response (k)) ;
 				exit (1) ;
 				} ;
 
@@ -1860,7 +1862,7 @@ printf ("** fix this ** ") ;
 
 			for (k = 0 ; k < datalen / 7 ; k++)
 				if (error_function (data [k], smooth [k], margin))
-				{	printf ("\nLine %d: Incorrect sample C (#%d (%ld) : %d => %d).\n", __LINE__, k, k + m * (datalen / 7), (int) smooth [k], (int) data [k]) ;
+				{	printf ("\nLine %d: Incorrect sample C (#%d (%" PRId64 ") : %d => %d).\n", __LINE__, k, k + m * (datalen / 7), (int) smooth [k], (int) data [k]) ;
 					for (m = 0 ; m < 10 ; m++)
 						printf ("%d ", (int) data [k]) ;
 					printf ("\n") ;
@@ -1907,10 +1909,10 @@ printf ("** fix this ** ") ;
 		/* Check that read past end of file returns number of items. */
 		sf_seek (file, sfinfo.frames, SEEK_SET) ;
 
-	 	if ((k = sf_read_float (file, data, datalen)) != 0)
-	 	{	printf ("\n\nLine %d: Return value from sf_read_float past end of file incorrect (%d).\n", __LINE__, k) ;
-	 		exit (1) ;
-	 		} ;
+		if ((k = sf_read_float (file, data, datalen)) != 0)
+		{	printf ("\n\nLine %d: Return value from sf_read_float past end of file incorrect (%d).\n", __LINE__, k) ;
+			exit (1) ;
+			} ;
 
 		/* Check seek backward from end. */
 
@@ -1937,7 +1939,7 @@ sdlcomp_test_double	(const char *filename, int filetype, int channels, double ma
 {	SNDFILE			*file ;
 	SF_INFO			sfinfo ;
 	int				k, m, seekpos ;
-	long			datalen ;
+	sf_count_t		datalen ;
 	double			*orig, *data, *smooth, half_max_abs ;
 
 channels = 1 ;
@@ -1980,12 +1982,12 @@ channels = 1 ;
 		} ;
 
 	if (sfinfo.frames < datalen / channels)
-	{	printf ("Too few.frames in file. (%ld should be a little more than %ld)\n", datalen, SF_COUNT_TO_LONG (sfinfo.frames)) ;
+	{	printf ("Too few.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", datalen, sfinfo.frames) ;
 		exit (1) ;
 		} ;
 
 	if (sfinfo.frames > (datalen + 400))
-	{	printf ("Too many.frames in file. (%ld should be a little more than %ld)\n", SF_COUNT_TO_LONG (sfinfo.frames), datalen) ;
+	{	printf ("Too many.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", sfinfo.frames, datalen) ;
 		exit (1) ;
 		} ;
 
@@ -2024,7 +2026,7 @@ channels = 1 ;
 		} ;
 
 	if ((k = sf_read_double (file, data, datalen)) != sfinfo.frames - datalen)
-	{	printf ("\n\nLine %d: Incorrect read length (%d should be %ld).\n", __LINE__, k, SF_COUNT_TO_LONG (sfinfo.frames - datalen)) ;
+	{	printf ("\n\nLine %d: Incorrect read length (%d should be %" PRId64 ").\n", __LINE__, k, sfinfo.frames - datalen) ;
 		exit (1) ;
 		} ;
 
@@ -2032,7 +2034,7 @@ channels = 1 ;
 		(sfinfo.format & SF_FORMAT_SUBMASK) != SF_FORMAT_GSM610)
 		for (k = 0 ; k < sfinfo.frames - datalen ; k++)
 			if (abs (data [k]) > decay_response (k))
-			{	printf ("\n\nLine %d: Incorrect sample (#%ld : abs (%d) should be < %d).\n", __LINE__, datalen + k, (int) data [k], (int) decay_response (k)) ;
+			{	printf ("\n\nLine %d: Incorrect sample (#%" PRId64 " : abs (%d) should be < %d).\n", __LINE__, datalen + k, (int) data [k], (int) decay_response (k)) ;
 				exit (1) ;
 				} ;
 
@@ -2052,7 +2054,7 @@ channels = 1 ;
 
 			for (k = 0 ; k < datalen / 7 ; k++)
 				if (error_function (data [k], smooth [k], margin))
-				{	printf ("\nLine %d: Incorrect sample C (#%d (%ld) : %d => %d).\n", __LINE__, k, k + m * (datalen / 7), (int) smooth [k], (int) data [k]) ;
+				{	printf ("\nLine %d: Incorrect sample C (#%d (%" PRId64 ") : %d => %d).\n", __LINE__, k, k + m * (datalen / 7), (int) smooth [k], (int) data [k]) ;
 					for (m = 0 ; m < 10 ; m++)
 						printf ("%d ", (int) data [k]) ;
 					printf ("\n") ;
@@ -2099,10 +2101,10 @@ channels = 1 ;
 		/* Check that read past end of file returns number of items. */
 		sf_seek (file, sfinfo.frames, SEEK_SET) ;
 
-	 	if ((k = sf_read_double (file, data, datalen)) != 0)
-	 	{	printf ("\n\nLine %d: Return value from sf_read_double past end of file incorrect (%d).\n", __LINE__, k) ;
-	 		exit (1) ;
-	 		} ;
+		if ((k = sf_read_double (file, data, datalen)) != 0)
+		{	printf ("\n\nLine %d: Return value from sf_read_double past end of file incorrect (%d).\n", __LINE__, k) ;
+			exit (1) ;
+			} ;
 
 		/* Check seek backward from end. */
 
@@ -2128,8 +2130,7 @@ static void
 read_raw_test (const char *filename, int filetype, int channels)
 {	SNDFILE			*file ;
 	SF_INFO			sfinfo ;
-	sf_count_t		count ;
-	long			datalen ;
+	sf_count_t		count, datalen ;
 	short			*orig, *data ;
 	int				k ;
 
@@ -2167,12 +2168,12 @@ read_raw_test (const char *filename, int filetype, int channels)
 		} ;
 
 	if (sfinfo.frames < datalen / channels)
-	{	printf ("Too few.frames in file. (%ld should be a little more than %ld)\n", datalen, SF_COUNT_TO_LONG (sfinfo.frames)) ;
+	{	printf ("Too few.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", datalen, sfinfo.frames) ;
 		exit (1) ;
 		} ;
 
 	if (sfinfo.frames > (datalen + 400))
-	{	printf ("Too many.frames in file. (%ld should be a little more than %ld)\n", SF_COUNT_TO_LONG (sfinfo.frames), datalen) ;
+	{	printf ("Too many.frames in file. (%" PRId64 " should be a little more than %" PRId64 ")\n", sfinfo.frames, datalen) ;
 		exit (1) ;
 		} ;
 
@@ -2185,7 +2186,7 @@ read_raw_test (const char *filename, int filetype, int channels)
 
 	count = sf_read_raw (file, orig_buffer.c, datalen + 5 * channels) ;
 	if (count != sfinfo.channels * sfinfo.frames)
-	{	printf ("\nLine %d : sf_read_raw returned %ld should be %ld\n", __LINE__, SF_COUNT_TO_LONG (count), sfinfo.channels * SF_COUNT_TO_LONG (sfinfo.frames)) ;
+	{	printf ("\nLine %d : sf_read_raw returned %" PRId64 " should be %" PRId64 "\n", __LINE__, count, sfinfo.channels * sfinfo.frames) ;
 		exit (1) ;
 		} ;
 
diff --git a/libs/libsndfile/tests/misc_test.c b/libs/libsndfile/tests/misc_test.c
index ab66078eca..b95e421dce 100644
--- a/libs/libsndfile/tests/misc_test.c
+++ b/libs/libsndfile/tests/misc_test.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2001-2009 Erik de Castro Lopo 
+** Copyright (C) 2001-2012 Erik de Castro Lopo 
 **
 ** 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
@@ -43,7 +43,7 @@
 
 #include	"utils.h"
 
-#define	BUFFER_LEN		(1<<10)
+#define	BUFFER_LEN		(1 << 10)
 #define LOG_BUFFER_SIZE	1024
 
 static void	zero_data_test (const char *filename, int format) ;
@@ -65,7 +65,7 @@ main (int argc, char *argv [])
 		exit (1) ;
 		} ;
 
-	do_all=!strcmp (argv [1], "all") ;
+	do_all = ! strcmp (argv [1], "all") ;
 
 	if (do_all || ! strcmp (argv [1], "wav"))
 	{	zero_data_test ("zerolen.wav", SF_FORMAT_WAV | SF_FORMAT_PCM_16) ;
@@ -220,7 +220,6 @@ static void
 zero_data_test (const char *filename, int format)
 {	SNDFILE		*file ;
 	SF_INFO		sfinfo ;
-	int			frames ;
 
 	switch (format & SF_FORMAT_TYPEMASK)
 	{	case SF_FORMAT_OGG :
@@ -238,8 +237,6 @@ zero_data_test (const char *filename, int format)
 	sfinfo.channels = 1 ;
 	sfinfo.frames = 0 ;
 
-	frames = BUFFER_LEN / sfinfo.channels ;
-
 	file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ;
 
 	sf_close (file) ;
@@ -261,7 +258,6 @@ filesystem_full_test (int format)
 	struct stat buf ;
 
 	const char	*filename = "/dev/full", *errorstr ;
-	int			frames ;
 
 #if (defined (WIN32) || defined (_WIN32))
 	/* Can't run this test on Win32 so return. */
@@ -288,8 +284,6 @@ filesystem_full_test (int format)
 	sfinfo.channels = 1 ;
 	sfinfo.frames = 0 ;
 
-	frames = BUFFER_LEN / sfinfo.channels ;
-
 	if ((file = sf_open (filename, SFM_WRITE, &sfinfo)) != NULL)
 	{	printf ("\n\nLine %d : Error, file should not have openned.\n", __LINE__ - 1) ;
 		exit (1) ;
@@ -321,7 +315,6 @@ permission_test (const char *filename, int typemajor)
 	SNDFILE		*file ;
 	SF_INFO		sfinfo ;
 	const char	*errorstr ;
-	int			frames ;
 
 	/* Make sure errno is zero before doing anything else. */
 	errno = 0 ;
@@ -360,8 +353,6 @@ permission_test (const char *filename, int typemajor)
 	sfinfo.channels = 1 ;
 	sfinfo.frames = 0 ;
 
-	frames = BUFFER_LEN / sfinfo.channels ;
-
 	if ((file = sf_open (filename, SFM_WRITE, &sfinfo)) != NULL)
 	{	printf ("\n\nLine %d : Error, file should not have opened.\n", __LINE__ - 1) ;
 		exit (1) ;
diff --git a/libs/libsndfile/tests/multi_file_test.c b/libs/libsndfile/tests/multi_file_test.c
index 2e066a2bd4..502d15a6ba 100644
--- a/libs/libsndfile/tests/multi_file_test.c
+++ b/libs/libsndfile/tests/multi_file_test.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2012 Erik de Castro Lopo 
 **
 ** 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
@@ -20,6 +20,9 @@
 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 #if HAVE_UNISTD_H
 #include 
@@ -30,8 +33,6 @@
 #endif
 
 #include 
-#include 
-#include 
 #include 
 #include 
 
@@ -131,15 +132,13 @@ multi_file_test (const char *filename, int *formats, int format_count)
 	SF_INFO				sfinfo ;
 	SF_EMBED_FILE_INFO	embed_info ;
 	sf_count_t			filelen ;
-	int					fd, k, file_count = 0, open_perm ;
+	int					fd, k, file_count = 0 ;
 
 	print_test_name ("multi_file_test", filename) ;
 
 	unlink (filename) ;
 
-	open_perm = OS_IS_WIN32 ? 0 : S_IRUSR | S_IWUSR | S_IRGRP ;
-
-	if ((fd = open (filename, O_RDWR | O_CREAT, open_perm)) < 0)
+	if ((fd = open (filename, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR)) < 0)
 	{	printf ("\n\nLine %d: open failed : %s\n", __LINE__, strerror (errno)) ;
 		exit (1) ;
 		} ;
@@ -155,13 +154,11 @@ multi_file_test (const char *filename, int *formats, int format_count)
 	embed_info.length = 0 ;
 
 
-	for (file_count = 0 ; embed_info.offset + embed_info.length < filelen ; )
+	for (file_count = 1 ; embed_info.offset + embed_info.length < filelen ; file_count ++)
 	{
-		file_count ++ ;
-
 		if (verbose)
 		{	puts ("\n------------------------------------") ;
-			printf ("This offset : %ld\n", SF_COUNT_TO_LONG (embed_info.offset + embed_info.length)) ;
+			printf ("This offset : %" PRId64 "\n", embed_info.offset + embed_info.length) ;
 			} ;
 
 		if (lseek (fd, embed_info.offset + embed_info.length, SEEK_SET) < 0)
@@ -172,7 +169,7 @@ multi_file_test (const char *filename, int *formats, int format_count)
 		memset (&sfinfo, 0, sizeof (sfinfo)) ;
 		if ((sndfile = sf_open_fd (fd, SFM_READ, &sfinfo, SF_FALSE)) == NULL)
 		{	printf ("\n\nLine %d: sf_open_fd failed\n", __LINE__) ;
-			printf ("Embedded file number : %d   offset : %ld\n", file_count, SF_COUNT_TO_LONG (embed_info.offset)) ;
+			printf ("Embedded file number : %d   offset : %" PRId64 "\n", file_count, embed_info.offset) ;
 			puts (sf_strerror (sndfile)) ;
 			dump_log_buffer (sndfile) ;
 			exit (1) ;
@@ -183,9 +180,11 @@ multi_file_test (const char *filename, int *formats, int format_count)
 		sf_close (sndfile) ;
 
 		if (verbose)
-			printf ("\nNext offset : %ld\nNext length : %ld\n", SF_COUNT_TO_LONG (embed_info.offset), SF_COUNT_TO_LONG (embed_info.length)) ;
+			printf ("\nNext offset : %" PRId64 "\nNext length : %" PRId64 "\n", embed_info.offset, embed_info.length) ;
 		} ;
 
+	file_count -- ;
+
 	if (file_count != format_count)
 	{	printf ("\n\nLine %d: file count (%d) not equal to %d.\n\n", __LINE__, file_count, format_count) ;
 		printf ("Embedded file number : %d\n", file_count) ;
diff --git a/libs/libsndfile/tests/ogg_test.c b/libs/libsndfile/tests/ogg_test.c
index b3b8327fdc..4b1be031fc 100644
--- a/libs/libsndfile/tests/ogg_test.c
+++ b/libs/libsndfile/tests/ogg_test.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2007-2009 Erik de Castro Lopo 
+** Copyright (C) 2007-2013 Erik de Castro Lopo 
 **
 ** 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
@@ -90,6 +90,9 @@ ogg_short_test (void)
 	test_read_short_or_die (file, 0, seek_data, ARRAY_LEN (seek_data), __LINE__) ;
 	compare_short_or_die (seek_data, data_in.s + 10, ARRAY_LEN (seek_data), __LINE__) ;
 
+	/* Test seek to end of file. */
+	test_seek_or_die (file, 0, SEEK_END, sfinfo.frames, sfinfo.channels, __LINE__) ;
+
 	sf_close (file) ;
 
 	puts ("ok") ;
@@ -266,7 +269,7 @@ ogg_stereo_seek_test (const char * filename, int format)
 	gen_windowed_sine_float (data, ARRAY_LEN (data), 0.95) ;
 	for (k = 0 ; k < ARRAY_LEN (data) ; k++)
 	{	stereo_out [2 * k] = data [k] ;
-   		stereo_out [2 * k + 1] = data [ARRAY_LEN (data) - k - 1] ;
+		stereo_out [2 * k + 1] = data [ARRAY_LEN (data) - k - 1] ;
 		} ;
 
 	memset (&sfinfo, 0, sizeof (sfinfo)) ;
diff --git a/libs/libsndfile/tests/pcm_test.c b/libs/libsndfile/tests/pcm_test.c
index 88bde01242..86511f65e4 100644
--- a/libs/libsndfile/tests/pcm_test.c
+++ b/libs/libsndfile/tests/pcm_test.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2011 Erik de Castro Lopo 
 **
 ** 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
@@ -80,8 +80,6 @@ main (void)
 	pcm_test_double	("le-double.raw", SF_ENDIAN_LITTLE	| SF_FORMAT_RAW | SF_FORMAT_DOUBLE, 0xc682726f958f669cLL, SF_FALSE) ;
 	pcm_test_double	("be-double.raw", SF_ENDIAN_BIG	| SF_FORMAT_RAW | SF_FORMAT_DOUBLE, 0xd9a3583f8ee51164LL, SF_FALSE) ;
 
-	puts ("Test IEEE replacement code.") ;
-
 	pcm_test_float	("le-float.raw", SF_ENDIAN_LITTLE	| SF_FORMAT_RAW | SF_FORMAT_FLOAT, 0x3c2ad04f7554267aLL, SF_TRUE) ;
 	pcm_test_float	("be-float.raw", SF_ENDIAN_BIG		| SF_FORMAT_RAW | SF_FORMAT_FLOAT, 0x074de3e248fa9186LL, SF_TRUE) ;
 
@@ -318,7 +316,6 @@ pcm_test_bits_8 (const char *filename, int filetype, uint64_t hash)
 		if (fabs (float_out [k] - float_in [k]) > 1e-10)
 		{	printf ("\n\nLine %d: float : Incorrect sample (#%d : %f => %f).\n", __LINE__, k, (double) float_out [k], (double) float_in [k]) ;
 			exit (1) ;
-			break ;
 			} ;
 
 	sf_close (file) ;
@@ -585,7 +582,6 @@ pcm_test_bits_16 (const char *filename, int filetype, uint64_t hash)
 		if (fabs (float_out [k] - float_in [k]) > 1e-10)
 		{	printf ("\n\nLine %d: float : Incorrect sample (#%d : %f => %f).\n", __LINE__, k, (double) float_out [k], (double) float_in [k]) ;
 			exit (1) ;
-			break ;
 			} ;
 
 	sf_close (file) ;
@@ -852,7 +848,6 @@ pcm_test_bits_24 (const char *filename, int filetype, uint64_t hash)
 		if (fabs (float_out [k] - float_in [k]) > 1e-10)
 		{	printf ("\n\nLine %d: float : Incorrect sample (#%d : %f => %f).\n", __LINE__, k, (double) float_out [k], (double) float_in [k]) ;
 			exit (1) ;
-			break ;
 			} ;
 
 	sf_close (file) ;
@@ -1119,7 +1114,6 @@ pcm_test_bits_32 (const char *filename, int filetype, uint64_t hash)
 		if (fabs (float_out [k] - float_in [k]) > 1e-10)
 		{	printf ("\n\nLine %d: float : Incorrect sample (#%d : %f => %f).\n", __LINE__, k, (double) float_out [k], (double) float_in [k]) ;
 			exit (1) ;
-			break ;
 			} ;
 
 	sf_close (file) ;
@@ -1205,7 +1199,7 @@ pcm_test_float (const char *filename, int filetype, uint64_t hash, int replace_f
 	int				sign ;
 	double			*data, error ;
 
-	print_test_name ("pcm_test_float", filename) ;
+	print_test_name (replace_float ?  "pcm_test_float (replace)" : "pcm_test_float", filename) ;
 
 	items = BUFFER_SIZE ;
 
@@ -1461,7 +1455,7 @@ pcm_test_double (const char *filename, int	filetype, uint64_t hash, int replace_
 
 	/* This is the best test routine. Other should be brought up to this standard. */
 
-	print_test_name ("pcm_test_double", filename) ;
+	print_test_name (replace_float ?  "pcm_test_double (replace)" : "pcm_test_double", filename) ;
 
 	items = BUFFER_SIZE ;
 
diff --git a/libs/libsndfile/tests/pcm_test.tpl b/libs/libsndfile/tests/pcm_test.tpl
index a84520ee04..459e741d0a 100644
--- a/libs/libsndfile/tests/pcm_test.tpl
+++ b/libs/libsndfile/tests/pcm_test.tpl
@@ -1,6 +1,6 @@
 [+ AutoGen5 template c +]
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2013 Erik de Castro Lopo 
 **
 ** 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
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #if HAVE_UNISTD_H
 #include 
@@ -32,7 +33,7 @@
 
 #include "utils.h"
 
-#define	BUFFER_SIZE		(1<<12)
+#define	BUFFER_SIZE		(1 << 12)
 
 static void	lrintf_test (void) ;
 
@@ -80,8 +81,6 @@ main (void)
 	pcm_test_double	("le-double.raw", SF_ENDIAN_LITTLE	| SF_FORMAT_RAW | SF_FORMAT_DOUBLE, 0xc682726f958f669cLL, SF_FALSE) ;
 	pcm_test_double	("be-double.raw", SF_ENDIAN_BIG	| SF_FORMAT_RAW | SF_FORMAT_DOUBLE, 0xd9a3583f8ee51164LL, SF_FALSE) ;
 
-	puts ("Test IEEE replacement code.") ;
-
 	pcm_test_float	("le-float.raw", SF_ENDIAN_LITTLE	| SF_FORMAT_RAW | SF_FORMAT_FLOAT, 0x3c2ad04f7554267aLL, SF_TRUE) ;
 	pcm_test_float	("be-float.raw", SF_ENDIAN_BIG		| SF_FORMAT_RAW | SF_FORMAT_FLOAT, 0x074de3e248fa9186LL, SF_TRUE) ;
 
@@ -176,7 +175,7 @@ pcm_test_[+ (get "name") +] (const char *filename, int filetype, uint64_t hash)
 		} ;
 
 	if (sfinfo.frames != items)
-	{	printf ("\n\nLine %d: Incorrect number of frames in file. (%d => %ld)\n", __LINE__, items, SF_COUNT_TO_LONG (sfinfo.frames)) ;
+	{	printf ("\n\nLine %d: Incorrect number of frames in file. (%d => %" PRId64 ")\n", __LINE__, items, sfinfo.frames) ;
 		exit (1) ;
 		} ;
 
@@ -238,7 +237,7 @@ pcm_test_[+ (get "name") +] (const char *filename, int filetype, uint64_t hash)
 		} ;
 
 	if (sfinfo.frames != items)
-	{	printf ("\n\nLine %d: Incorrect number of frames in file. (%d => %ld)\n", __LINE__, items, SF_COUNT_TO_LONG (sfinfo.frames)) ;
+	{	printf ("\n\nLine %d: Incorrect number of frames in file. (%d => %" PRId64 ")\n", __LINE__, items, sfinfo.frames) ;
 		exit (1) ;
 		} ;
 
@@ -300,7 +299,7 @@ pcm_test_[+ (get "name") +] (const char *filename, int filetype, uint64_t hash)
 		} ;
 
 	if (sfinfo.frames != items)
-	{	printf ("\n\nLine %d: Incorrect number of frames in file. (%d => %ld)\n", __LINE__, items, SF_COUNT_TO_LONG (sfinfo.frames)) ;
+	{	printf ("\n\nLine %d: Incorrect number of frames in file. (%d => %" PRId64 ")\n", __LINE__, items, sfinfo.frames) ;
 		exit (1) ;
 		} ;
 
@@ -319,7 +318,6 @@ pcm_test_[+ (get "name") +] (const char *filename, int filetype, uint64_t hash)
 		if (fabs (float_out [k] - float_in [k]) > 1e-10)
 		{	printf ("\n\nLine %d: float : Incorrect sample (#%d : %f => %f).\n", __LINE__, k, (double) float_out [k], (double) float_in [k]) ;
 			exit (1) ;
-			break ;
 			} ;
 
 	sf_close (file) ;
@@ -364,7 +362,7 @@ pcm_test_[+ (get "name") +] (const char *filename, int filetype, uint64_t hash)
 		} ;
 
 	if (sfinfo.frames != items)
-	{	printf ("\n\nLine %d: Incorrect number of frames in file. (%d => %ld)\n", __LINE__, items, SF_COUNT_TO_LONG (sfinfo.frames)) ;
+	{	printf ("\n\nLine %d: Incorrect number of frames in file. (%d => %" PRId64 ")\n", __LINE__, items, sfinfo.frames) ;
 		exit (1) ;
 		} ;
 
@@ -406,7 +404,7 @@ pcm_test_float (const char *filename, int filetype, uint64_t hash, int replace_f
 	int				sign ;
 	double			*data, error ;
 
-	print_test_name ("pcm_test_float", filename) ;
+	print_test_name (replace_float ? "pcm_test_float (replace)" : "pcm_test_float", filename) ;
 
 	items = BUFFER_SIZE ;
 
@@ -454,7 +452,7 @@ pcm_test_float (const char *filename, int filetype, uint64_t hash, int replace_f
 		} ;
 
 	if (sfinfo.frames != items)
-	{	printf ("\n\nError (%s:%d) Mono : Incorrect number of frames in file. (%d => %ld)\n", __FILE__, __LINE__, items, SF_COUNT_TO_LONG (sfinfo.frames)) ;
+	{	printf ("\n\nError (%s:%d) Mono : Incorrect number of frames in file. (%d => %" PRId64 ")\n", __FILE__, __LINE__, items, sfinfo.frames) ;
 		exit (1) ;
 		} ;
 
@@ -475,6 +473,9 @@ pcm_test_float (const char *filename, int filetype, uint64_t hash, int replace_f
 			} ;
 		} ;
 
+	/* Seek to end of file. */
+	test_seek_or_die (file, 0, SEEK_END, sfinfo.frames, sfinfo.channels, __LINE__) ;
+
 	/* Seek to start of file. */
 	test_seek_or_die (file, 0, SEEK_SET, 0, sfinfo.channels, __LINE__) ;
 
@@ -578,7 +579,7 @@ pcm_test_float (const char *filename, int filetype, uint64_t hash, int replace_f
 		} ;
 
 	if (sfinfo.frames != frames)
-	{	printf ("\n\nError (%s:%d) Stereo : Incorrect number of frames in file. (%d => %ld)\n", __FILE__, __LINE__, frames, SF_COUNT_TO_LONG (sfinfo.frames)) ;
+	{	printf ("\n\nError (%s:%d) Stereo : Incorrect number of frames in file. (%d => %" PRId64 ")\n", __FILE__, __LINE__, frames, sfinfo.frames) ;
 		exit (1) ;
 		} ;
 
@@ -662,7 +663,7 @@ pcm_test_double (const char *filename, int	filetype, uint64_t hash, int replace_
 
 	/* This is the best test routine. Other should be brought up to this standard. */
 
-	print_test_name ("pcm_test_double", filename) ;
+	print_test_name (replace_float ? "pcm_test_double (replace)" : "pcm_test_double", filename) ;
 
 	items = BUFFER_SIZE ;
 
@@ -717,7 +718,7 @@ pcm_test_double (const char *filename, int	filetype, uint64_t hash, int replace_
 		} ;
 
 	if (sfinfo.frames != items)
-	{	printf ("\n\nError (%s:%d) Mono : Incorrect number of frames in file. (%d => %ld)\n", __FILE__, __LINE__, items, SF_COUNT_TO_LONG (sfinfo.frames)) ;
+	{	printf ("\n\nError (%s:%d) Mono : Incorrect number of frames in file. (%d => %" PRId64 ")\n", __FILE__, __LINE__, items, sfinfo.frames) ;
 		exit (1) ;
 		} ;
 
@@ -851,7 +852,7 @@ pcm_test_double (const char *filename, int	filetype, uint64_t hash, int replace_
 		} ;
 
 	if (sfinfo.frames != frames)
-	{	printf ("\n\nError (%s:%d) Stereo : Incorrect number of frames in file. (%d => %ld)\n", __FILE__, __LINE__, frames, SF_COUNT_TO_LONG (sfinfo.frames)) ;
+	{	printf ("\n\nError (%s:%d) Stereo : Incorrect number of frames in file. (%d => %" PRId64 ")\n", __FILE__, __LINE__, frames, sfinfo.frames) ;
 		exit (1) ;
 		} ;
 
diff --git a/libs/libsndfile/tests/peak_chunk_test.c b/libs/libsndfile/tests/peak_chunk_test.c
index 9083e4735e..9e5332a1e4 100644
--- a/libs/libsndfile/tests/peak_chunk_test.c
+++ b/libs/libsndfile/tests/peak_chunk_test.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2001-2009 Erik de Castro Lopo 
+** Copyright (C) 2001-2012 Erik de Castro Lopo 
 **
 ** 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
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #if HAVE_UNISTD_H
 #include 
@@ -31,7 +32,7 @@
 
 #include "utils.h"
 
-#define	BUFFER_LEN		(1<<15)
+#define	BUFFER_LEN		(1 << 15)
 #define LOG_BUFFER_SIZE	1024
 
 
@@ -54,8 +55,9 @@ main (int argc, char *argv [])
 	if (argc != 2)
 	{	printf ("Usage : %s \n", argv [0]) ;
 		printf ("    Where  is one of the following:\n") ;
-		printf ("           wav  - test WAV file peak chunk\n") ;
 		printf ("           aiff - test AIFF file PEAK chunk\n") ;
+		printf ("           caf  - test CAF file PEAK chunk\n") ;
+		printf ("           wav  - test WAV file peak chunk\n") ;
 		printf ("           all  - perform all tests\n") ;
 		exit (1) ;
 		} ;
@@ -79,6 +81,13 @@ main (int argc, char *argv [])
 		test_count++ ;
 		} ;
 
+	if (do_all || ! strcmp (argv [1], "caf"))
+	{	test_float_peak	("peak_float.caf", SF_FORMAT_CAF | SF_FORMAT_FLOAT) ;
+
+		read_write_peak_test ("rw_peak.caf", SF_FORMAT_CAF | SF_FORMAT_FLOAT) ;
+		test_count++ ;
+		} ;
+
 	if (test_count == 0)
 	{	printf ("Mono : ************************************\n") ;
 		printf ("Mono : *  No '%s' test defined.\n", argv [1]) ;
@@ -248,7 +257,13 @@ check_logged_peaks (char *buffer)
 		exit (1) ;
 		} ;
 
-	if (! (cptr = strstr (buffer, "Channels")) || sscanf (cptr, "Channels      : %d", &channel_count) != 1)
+	channel_count = 0 ;
+	cptr = strstr (buffer, "Channels") ;
+	if (cptr && sscanf (cptr, "Channels      : %d", &k) == 1)
+		channel_count = k ;
+	else if (cptr && sscanf (cptr, "Channels / frame : %d", &k) == 1)
+		channel_count = k ;
+	else
 	{	printf ("\n\nLine %d: Couldn't find channel count.\n", __LINE__) ;
 		exit (1) ;
 		} ;
@@ -291,56 +306,55 @@ check_logged_peaks (char *buffer)
 static	void
 read_write_peak_test (const char *filename, int filetype)
 {	SNDFILE	*file ;
-    SF_INFO	sfinfo ;
+	SF_INFO	sfinfo ;
 
-    double   small_data [10] ;
-    double   max_peak = 0.0 ;
-    unsigned k ;
+	double	small_data [10], max_peak = 0.0 ;
+	unsigned k ;
 
 	print_test_name (__func__, filename) ;
 
-    for (k = 0 ; k < ARRAY_LEN (small_data) ; k ++)
-        small_data [k] = 0.1 ;
+	for (k = 0 ; k < ARRAY_LEN (small_data) ; k ++)
+		small_data [k] = 0.1 ;
 
-    sfinfo.samplerate	= 44100 ;
-    sfinfo.channels		= 2 ;
-    sfinfo.format		= filetype ;
-    sfinfo.frames		= 0 ;
+	sfinfo.samplerate	= 44100 ;
+	sfinfo.channels		= 2 ;
+	sfinfo.format		= filetype ;
+	sfinfo.frames		= 0 ;
 
 	/* Open the file, add peak chunk and write samples with value 0.1. */
-    file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_FALSE, __LINE__) ;
+	file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_FALSE, __LINE__) ;
 
-    sf_command (file, SFC_SET_ADD_PEAK_CHUNK, NULL, SF_TRUE) ;
+	sf_command (file, SFC_SET_ADD_PEAK_CHUNK, NULL, SF_TRUE) ;
 
 	test_write_double_or_die (file, 0, small_data, ARRAY_LEN (small_data), __LINE__) ;
 
-    sf_close (file) ;
+	sf_close (file) ;
 
-    /* Open the fiel RDWR, write sample valied 1.25. */
-    file = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, SF_FALSE, __LINE__) ;
+	/* Open the fiel RDWR, write sample valied 1.25. */
+	file = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, SF_FALSE, __LINE__) ;
 
-    for (k = 0 ; k < ARRAY_LEN (small_data) ; k ++)
-        small_data [k] = 1.0 ;
+	for (k = 0 ; k < ARRAY_LEN (small_data) ; k ++)
+		small_data [k] = 1.0 ;
 
 	test_write_double_or_die (file, 0, small_data, ARRAY_LEN (small_data), __LINE__) ;
 
-    sf_command (file, SFC_GET_SIGNAL_MAX, &max_peak, sizeof (max_peak)) ;
+	sf_command (file, SFC_GET_SIGNAL_MAX, &max_peak, sizeof (max_peak)) ;
 
-    sf_close (file) ;
+	sf_close (file) ;
 
-    exit_if_true (max_peak < 0.1, "\n\nLine %d : max peak (%5.3f) should not be 0.1.\n\n", __LINE__, max_peak) ;
+	exit_if_true (max_peak < 0.1, "\n\nLine %d : max peak (%5.3f) should not be 0.1.\n\n", __LINE__, max_peak) ;
 
-    /* Open the file and test the values written to the PEAK chunk. */
-    file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_FALSE, __LINE__) ;
+	/* Open the file and test the values written to the PEAK chunk. */
+	file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_FALSE, __LINE__) ;
 
 	exit_if_true (sfinfo.channels * sfinfo.frames != 2 * ARRAY_LEN (small_data),
-			"Line %d : frame count is %ld, should be %d\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), 2 * ARRAY_LEN (small_data)) ;
+			"Line %d : frame count is %" PRId64 ", should be %zd\n", __LINE__, sfinfo.frames, 2 * ARRAY_LEN (small_data)) ;
 
-    sf_command (file, SFC_GET_SIGNAL_MAX, &max_peak, sizeof (double)) ;
+	sf_command (file, SFC_GET_SIGNAL_MAX, &max_peak, sizeof (double)) ;
 
-    sf_close (file) ;
+	sf_close (file) ;
 
-    exit_if_true (max_peak < 1.0, "\n\nLine %d : max peak (%5.3f) should be 1.0.\n\n", __LINE__, max_peak) ;
+	exit_if_true (max_peak < 1.0, "\n\nLine %d : max peak (%5.3f) should be 1.0.\n\n", __LINE__, max_peak) ;
 
 	unlink (filename) ;
 	puts ("ok") ;
diff --git a/libs/libsndfile/tests/pedantic-header-test.sh.in b/libs/libsndfile/tests/pedantic-header-test.sh.in
new file mode 100644
index 0000000000..8b1962803a
--- /dev/null
+++ b/libs/libsndfile/tests/pedantic-header-test.sh.in
@@ -0,0 +1,58 @@
+#!/bin/bash
+
+# Copyright (C) 2010-2011 Erik de Castro Lopo 
+#
+# All rights reserved.
+#
+# 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 author nor the names of any 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 COPYRIGHT OWNER 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 test ! -f @top_srcdir@/tests/sfversion.c ; then
+	exit 0
+	fi
+
+echo -n "    Pedantic header test           : "
+
+# Only do this if the compiler is GCC.
+if test -n "@GCC_MAJOR_VERSION@" ; then
+
+	CC=`echo "@CC@" | sed "s/.*shave cc //"`
+	# Compile with -Werror and -pedantic.
+	$CC -std=c99 -Werror -pedantic -I@top_builddir@/src -c @top_srcdir@/tests/sfversion.c -o /dev/null
+
+	# Check compiler return status.
+	if test $? -ne 0 ; then
+		echo
+		exit 1
+		fi
+
+	echo "ok"
+else
+	echo "n/a"
+	fi
+
+exit 0
diff --git a/libs/libsndfile/tests/pipe_test.c b/libs/libsndfile/tests/pipe_test.c
index 56f1bfca35..10fa5725c9 100644
--- a/libs/libsndfile/tests/pipe_test.c
+++ b/libs/libsndfile/tests/pipe_test.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2001-2009 Erik de Castro Lopo 
+** Copyright (C) 2001-2011 Erik de Castro Lopo 
 **
 ** 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
@@ -26,12 +26,12 @@
 #include 
 #include 
 
-#if (OS_IS_WIN32)
+#if (OS_IS_WIN32 || HAVE_PIPE == 0 || HAVE_WAITPID == 0)
 
 int
 main (void)
 {
-	puts ("    pipe_test  : this test doesn't work on win32.") ;
+	puts ("    pipe_test  : this test doesn't work on this OS.") ;
 	return 0 ;
 } /* main */
 
diff --git a/libs/libsndfile/tests/pipe_test.tpl b/libs/libsndfile/tests/pipe_test.tpl
index a39c27b023..1bc1f4367e 100644
--- a/libs/libsndfile/tests/pipe_test.tpl
+++ b/libs/libsndfile/tests/pipe_test.tpl
@@ -1,6 +1,6 @@
 [+ AutoGen5 template c +]
 /*
-** Copyright (C) 2001-2009 Erik de Castro Lopo 
+** Copyright (C) 2001-2012 Erik de Castro Lopo 
 **
 ** 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
@@ -27,12 +27,12 @@
 #include 
 #include 
 
-#if (OS_IS_WIN32)
+#if (OS_IS_WIN32 || defined __OS2__ || HAVE_PIPE == 0 || HAVE_WAITPID == 0)
 
 int
 main (void)
 {
-	puts ("    pipe_test  : this test doesn't work on win32.") ;
+	puts ("    pipe_test  : this test doesn't work on this OS.") ;
 	return 0 ;
 } /* main */
 
diff --git a/libs/libsndfile/tests/raw_test.c b/libs/libsndfile/tests/raw_test.c
index e7bbe5d602..002f3ee4ab 100644
--- a/libs/libsndfile/tests/raw_test.c
+++ b/libs/libsndfile/tests/raw_test.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2002-2009 Erik de Castro Lopo 
+** Copyright (C) 2002-2012 Erik de Castro Lopo 
 **
 ** 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
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #if HAVE_UNISTD_H
 #include 
@@ -31,7 +32,7 @@
 
 #include "utils.h"
 
-#define	BUFFER_LEN		(1<<10)
+#define	BUFFER_LEN		(1 << 10)
 #define LOG_BUFFER_SIZE	1024
 
 static	void	raw_offset_test (const char *filename, int typeminor) ;
@@ -60,7 +61,7 @@ raw_offset_test (const char *filename, int typeminor)
 {	SNDFILE		*sndfile ;
 	SF_INFO		sfinfo ;
 	sf_count_t	start ;
-	int			k, frames ;
+	int			k ;
 
 	print_test_name ("raw_offset_test", filename) ;
 
@@ -69,8 +70,6 @@ raw_offset_test (const char *filename, int typeminor)
 	sfinfo.channels		= 1 ;
 	sfinfo.frames		= 0 ;
 
-	frames = BUFFER_LEN / sfinfo.channels ;
-
 	sndfile = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, SF_TRUE, __LINE__) ;
 
 	start = 0 ;
@@ -86,7 +85,7 @@ raw_offset_test (const char *filename, int typeminor)
 	check_log_buffer_or_die (sndfile, __LINE__) ;
 
 	if (abs (BUFFER_LEN - sfinfo.frames) > 1)
-	{	printf ("\n\nLine %d : Incorrect sample count (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), BUFFER_LEN) ;
+	{	printf ("\n\nLine %d : Incorrect sample count (%" PRId64 " should be %d)\n", __LINE__, sfinfo.frames, BUFFER_LEN) ;
 		dump_log_buffer (sndfile) ;
 		exit (1) ;
 		} ;
diff --git a/libs/libsndfile/tests/rdwr_test.def b/libs/libsndfile/tests/rdwr_test.def
new file mode 100644
index 0000000000..43c1089818
--- /dev/null
+++ b/libs/libsndfile/tests/rdwr_test.def
@@ -0,0 +1,32 @@
+autogen definitions rdwr_test.tpl;
+
+data_type = {
+	name	= "short" ;
+	type	= "short" ;
+	format	= "SF_FORMAT_PCM_16" ;
+	} ;
+
+data_type = {
+	name	= "int" ;
+	type	= "int" ;
+	format	= "SF_FORMAT_PCM_32" ;
+	} ;
+
+data_type = {
+	name	= "float" ;
+	type	= "float" ;
+	format	= "SF_FORMAT_FLOAT" ;
+	} ;
+
+data_type = {
+	name	= "double" ;
+	type	= "double" ;
+	format	= "SF_FORMAT_DOUBLE" ;
+	} ;
+
+data_type = {
+	name	= "raw" ;
+	type	= "unsigned char" ;
+	format	= "SF_FORMAT_PCM_U8" ;
+	} ;
+
diff --git a/libs/libsndfile/tests/rdwr_test.tpl b/libs/libsndfile/tests/rdwr_test.tpl
new file mode 100644
index 0000000000..8cfdd3687e
--- /dev/null
+++ b/libs/libsndfile/tests/rdwr_test.tpl
@@ -0,0 +1,105 @@
+[+ AutoGen5 template c +]
+/*
+** Copyright (C) 2010-2012 Erik de Castro Lopo 
+**
+** 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 "sfconfig.h"
+
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+#if HAVE_UNISTD_H
+#include 
+#endif
+
+#if (HAVE_DECL_S_IRGRP == 0)
+#include 
+#endif
+
+#if (defined (WIN32) || defined (_WIN32))
+#include 
+#include 
+#endif
+
+#include	
+
+#include	"utils.h"
+
+[+ FOR data_type
++]static void	rdwr_[+ (get "name") +]_test	(const char *filename) ;
+[+ ENDFOR data_type
++]
+
+int
+main (void)
+{
+	rdwr_short_test ("rdwr_short.wav") ;
+	rdwr_int_test ("rdwr_int.wav") ;
+	rdwr_float_test ("rdwr_float.wav") ;
+	rdwr_double_test ("rdwr_double.wav") ;
+	rdwr_raw_test ("rdwr_raw.wav") ;
+
+	return 0 ;
+} /* main */
+
+
+/*============================================================================================
+**	Here are the test functions.
+*/
+
+[+ FOR data_type
++]static void
+rdwr_[+ (get "name") +]_test	(const char *filename)
+{	SNDFILE *file ;
+	SF_INFO sfinfo ;
+	sf_count_t frames ;
+	[+ (get "type") +] buffer [160] ;
+
+	print_test_name ("rdwr_[+ (get "name") +]_test", filename) ;
+
+	memset (buffer, 0, sizeof (buffer)) ;
+
+	/* Create sound file with no data. */
+	sfinfo.format = SF_FORMAT_WAV | [+ (get "format") +] ;
+	sfinfo.samplerate = 16000 ;
+	sfinfo.channels = 1 ;
+
+	unlink (filename) ;
+
+	frames = ARRAY_LEN (buffer) ;
+
+	/* Open again for read/write. */
+	file = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, SF_TRUE, __LINE__) ;
+
+	test_write_[+ (get "name") +]_or_die (file, 0, buffer, frames, __LINE__) ;
+
+	test_read_[+ (get "name") +]_or_die (file, 0, buffer, frames, __LINE__) ;
+
+	sf_close (file) ;
+	unlink (filename) ;
+
+	puts ("ok") ;
+	return ;
+} /* rdwr_[+ (get "name") +]_test */
+
+[+ ENDFOR data_type
++]
+
diff --git a/libs/libsndfile/tests/scale_clip_test.c b/libs/libsndfile/tests/scale_clip_test.c
index bdabd25673..57b0b96073 100644
--- a/libs/libsndfile/tests/scale_clip_test.c
+++ b/libs/libsndfile/tests/scale_clip_test.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2011 Erik de Castro Lopo 
 **
 ** 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
diff --git a/libs/libsndfile/tests/scale_clip_test.tpl b/libs/libsndfile/tests/scale_clip_test.tpl
index 4c5e43aa59..39ddf57c1f 100644
--- a/libs/libsndfile/tests/scale_clip_test.tpl
+++ b/libs/libsndfile/tests/scale_clip_test.tpl
@@ -1,6 +1,6 @@
 [+ AutoGen5 template c +]
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2012 Erik de Castro Lopo 
 **
 ** 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
@@ -22,13 +22,13 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #if HAVE_UNISTD_H
 #include 
 #endif
 
-#include 
-
 #include 
 
 #include "utils.h"
@@ -167,7 +167,7 @@ main (void)
 		} ;
 
 	if (sfinfo.frames != BUFFER_SIZE)
-	{	printf ("\n\nLine %d: Incorrect number of frames in file (%d => %ld).\n\n", __LINE__, BUFFER_SIZE, SF_COUNT_TO_LONG (sfinfo.frames)) ;
+	{	printf ("\n\nLine %d: Incorrect number of frames in file (%d => %" PRId64 ").\n\n", __LINE__, BUFFER_SIZE, sfinfo.frames) ;
 		exit (1) ;
 		} ;
 
@@ -301,7 +301,7 @@ main (void)
 		} ;
 
 	if (sfinfo.frames != BUFFER_SIZE)
-	{	printf ("\n\nLine %d: Incorrect number of frames in file (%d => %ld).\n\n", __LINE__, BUFFER_SIZE, SF_COUNT_TO_LONG (sfinfo.frames)) ;
+	{	printf ("\n\nLine %d: Incorrect number of frames in file (%d => %" PRId64 ").\n\n", __LINE__, BUFFER_SIZE, sfinfo.frames) ;
 		exit (1) ;
 		} ;
 
@@ -380,7 +380,7 @@ main (void)
 		} ;
 
 	if (sfinfo.frames != 3 * BUFFER_SIZE)
-	{	printf ("\n\nLine %d: Incorrect number of frames in file (%d => %ld).\n\n", __LINE__, 3 * BUFFER_SIZE, SF_COUNT_TO_LONG (sfinfo.frames)) ;
+	{	printf ("\n\nLine %d: Incorrect number of frames in file (%d => %" PRId64 ").\n\n", __LINE__, 3 * BUFFER_SIZE, sfinfo.frames) ;
 		exit (1) ;
 		} ;
 
diff --git a/libs/libsndfile/tests/sftest.c b/libs/libsndfile/tests/sftest.c
new file mode 100644
index 0000000000..78a9f7faaf
--- /dev/null
+++ b/libs/libsndfile/tests/sftest.c
@@ -0,0 +1,65 @@
+/*
+** Copyright (C) 1999-2011 Erik de Castro Lopo 
+**
+** 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 "sfconfig.h"
+
+#include 
+
+#if HAVE_UNISTD_H
+#include 
+#endif
+
+#include 
+
+#define	BUFFER_SIZE		(1024)
+
+
+static short buffer [BUFFER_SIZE] ;
+
+int
+main (int argc, char *argv [])
+{	SNDFILE	*file ;
+	SF_INFO sfinfo ;
+	int		k, count, max = 0, total = 0 ;
+
+	if (argc < 2)
+	{	printf ("Expecting input file name.\n") ;
+		return 0 ;
+		} ;
+
+	if (! (file = sf_open (argv [1], SFM_READ, &sfinfo)))
+	{	printf ("sf_open_read failed with error : ") ;
+		puts (sf_strerror (NULL)) ;
+		exit (1) ;
+		} ;
+
+	while ((count = sf_read_short (file, buffer, BUFFER_SIZE)))
+	{	for (k = 0 ; k < count ; k++)
+			if (abs (buffer [k]) > max)
+				max = abs (buffer [k]) ;
+		total += count ;
+		} ;
+
+	printf ("Total         : %d\n", total) ;
+	printf ("Maximun value : %d\n", max) ;
+
+	sf_close (file) ;
+
+	return 0 ;
+} /* main */
+
diff --git a/libs/libsndfile/tests/sfversion.c b/libs/libsndfile/tests/sfversion.c
index 503b30ca81..c464f08647 100644
--- a/libs/libsndfile/tests/sfversion.c
+++ b/libs/libsndfile/tests/sfversion.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2011 Erik de Castro Lopo 
 **
 ** 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
@@ -16,24 +16,27 @@
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "sfconfig.h"
-
 #include 
+#include 
 #include 
 
-#if HAVE_UNISTD_H
-#include 
-#endif
-
 #include 
 
 #define	BUFFER_SIZE	(256)
 
-static	char	strbuffer [BUFFER_SIZE] ;
 
 int
 main (void)
-{	sf_command (NULL, SFC_GET_LIB_VERSION, strbuffer, sizeof (strbuffer)) ;
+{	static char	strbuffer [BUFFER_SIZE] ;
+	const char * ver ;
+
+	sf_command (NULL, SFC_GET_LIB_VERSION, strbuffer, sizeof (strbuffer)) ;
+	ver = sf_version_string () ;
+
+	if (strcmp (ver, strbuffer) != 0)
+	{	printf ("Version mismatch : '%s' != '%s'\n\n", ver, strbuffer) ;
+		exit (1) ;
+		} ;
 
 	printf ("%s", strbuffer) ;
 
diff --git a/libs/libsndfile/tests/stdin_test.c b/libs/libsndfile/tests/stdin_test.c
index 3589c481ea..a893915cce 100644
--- a/libs/libsndfile/tests/stdin_test.c
+++ b/libs/libsndfile/tests/stdin_test.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2001-2009 Erik de Castro Lopo 
+** Copyright (C) 2001-2012 Erik de Castro Lopo 
 **
 ** 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
@@ -31,7 +31,7 @@
 
 #include "utils.h"
 
-#define	BUFFER_LEN		(1<<16)
+#define	BUFFER_LEN		(1 << 16)
 
 static	void	stdin_test	(int typemajor, int count) ;
 
@@ -123,9 +123,9 @@ main (int argc, char *argv [])
 		} ;
 
 	if (test_count == 0)
-	{	fprintf (stderr, "************************************\n") ;
-		fprintf (stderr, "*  No '%s' test defined.\n", argv [1]) ;
-		fprintf (stderr, "************************************\n") ;
+	{	fprintf (stderr, "\n*****************************************\n") ;
+		fprintf (stderr, "*  stdin_test : No '%s' test defined.\n", argv [1]) ;
+		fprintf (stderr, "*****************************************\n") ;
 		return 1 ;
 		} ;
 
@@ -138,7 +138,7 @@ stdin_test	(int typemajor, int count)
 
 	SNDFILE		*file ;
 	SF_INFO		sfinfo ;
-	int			k, total ;
+	int			k, total, err ;
 
 	if (typemajor == SF_FORMAT_RAW)
 	{	sfinfo.samplerate	= 44100 ;
@@ -147,15 +147,21 @@ stdin_test	(int typemajor, int count)
 		sfinfo.frames		= 0 ;
 		}
 	else
-		sfinfo.format = 0 ;
+		memset (&sfinfo, 0, sizeof (sfinfo)) ;
 
-	if (! (file = sf_open ("-", SFM_READ, &sfinfo)))
-	{	fprintf (stderr, "sf_open_read failed with error : ") ;
+	if ((file = sf_open_fd (STDIN_FILENO, SFM_READ, &sfinfo, SF_TRUE)) == NULL)
+	{	fprintf (stderr, "sf_open_fd failed with error : ") ;
 		puts (sf_strerror (NULL)) ;
 		dump_log_buffer (NULL) ;
 		exit (1) ;
 		} ;
 
+	err = sf_error (file) ;
+	if (err != SF_ERR_NO_ERROR)
+	{	printf ("Line %d : unexpected error : %s\n", __LINE__, sf_error_number (err)) ;
+		exit (1) ;
+		} ;
+
 	if ((sfinfo.format & SF_FORMAT_TYPEMASK) != typemajor)
 	{	fprintf (stderr, "\n\nError : File type doesn't match.\n") ;
 		exit (1) ;
diff --git a/libs/libsndfile/tests/stdio_test.c b/libs/libsndfile/tests/stdio_test.c
index 6b841591d7..80a696cf53 100644
--- a/libs/libsndfile/tests/stdio_test.c
+++ b/libs/libsndfile/tests/stdio_test.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2001-2009 Erik de Castro Lopo 
+** Copyright (C) 2001-2011 Erik de Castro Lopo 
 **
 ** 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
@@ -40,7 +40,8 @@
 
 #include "utils.h"
 
-#if (OS_IS_WIN32)
+/* EMX is OS/2. */
+#if (OS_IS_WIN32) || defined (__EMX__)
 
 int
 main (void)
diff --git a/libs/libsndfile/tests/stdout_test.c b/libs/libsndfile/tests/stdout_test.c
index 5e7308a0fd..850718dc1b 100644
--- a/libs/libsndfile/tests/stdout_test.c
+++ b/libs/libsndfile/tests/stdout_test.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2001-2009 Erik de Castro Lopo 
+** Copyright (C) 2001-2012 Erik de Castro Lopo 
 **
 ** 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
@@ -43,7 +43,7 @@ main (int argc, char *argv [])
 		exit (1) ;
 		} ;
 
-	do_all =! strcmp (argv [1], "all") ;
+	do_all = ! strcmp (argv [1], "all") ;
 
 	if (do_all || ! strcmp (argv [1], "raw"))
 	{	stdout_test	(SF_FORMAT_RAW, PIPE_TEST_LEN) ;
@@ -111,9 +111,9 @@ main (int argc, char *argv [])
 		} ;
 
 	if (test_count == 0)
-	{	fprintf (stderr, "************************************\n") ;
-		fprintf (stderr, "*  No '%s' test defined.\n", argv [1]) ;
-		fprintf (stderr, "************************************\n") ;
+	{	fprintf (stderr, "\n******************************************\n") ;
+		fprintf (stderr, "*  stdout_test : No '%s' test defined.\n", argv [1]) ;
+		fprintf (stderr, "******************************************\n") ;
 		return 1 ;
 		} ;
 
diff --git a/libs/libsndfile/tests/string_test.c b/libs/libsndfile/tests/string_test.c
index c74f6f1f60..eac716e8b2 100644
--- a/libs/libsndfile/tests/string_test.c
+++ b/libs/libsndfile/tests/string_test.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2003-2009 Erik de Castro Lopo 
+** Copyright (C) 2003-2013 Erik de Castro Lopo 
 **
 ** 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
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #if HAVE_UNISTD_H
 #include 
@@ -39,6 +40,10 @@ static void	string_start_end_test (const char *filename, int typemajor) ;
 static void	string_multi_set_test (const char *filename, int typemajor) ;
 static void	string_rdwr_test (const char *filename, int typemajor) ;
 static void	string_short_rdwr_test (const char *filename, int typemajor) ;
+static void	string_rdwr_grow_test (const char *filename, int typemajor) ;
+static void	string_header_update (const char *filename, int typemajor) ;
+
+static void	software_string_test (const char *filename) ;
 
 static int str_count (const char * haystack, const char * needle) ;
 
@@ -58,13 +63,15 @@ main (int argc, char *argv [])
 		exit (1) ;
 		} ;
 
-	do_all =! strcmp (argv [1], "all") ;
+	do_all = ! strcmp (argv [1], "all") ;
 
 	if (do_all || ! strcmp (argv [1], "wav"))
 	{	string_start_end_test ("strings.wav", SF_FORMAT_WAV) ;
 		string_multi_set_test ("multi.wav", SF_FORMAT_WAV) ;
 		string_rdwr_test ("rdwr.wav", SF_FORMAT_WAV) ;
 		string_short_rdwr_test ("short_rdwr.wav", SF_FORMAT_WAV) ;
+		string_rdwr_grow_test ("rdwr_grow.wav", SF_FORMAT_WAV) ;
+		string_header_update ("header_update.wav", SF_FORMAT_WAV) ;
 
 		string_start_end_test ("strings.wavex", SF_FORMAT_WAVEX) ;
 		string_multi_set_test ("multi.wavex", SF_FORMAT_WAVEX) ;
@@ -75,16 +82,22 @@ main (int argc, char *argv [])
 		string_multi_set_test ("multi.rifx", SF_ENDIAN_BIG | SF_FORMAT_WAV) ;
 		string_rdwr_test ("rdwr.rifx", SF_ENDIAN_BIG | SF_FORMAT_WAV) ;
 		string_short_rdwr_test ("short_rdwr.rifx", SF_ENDIAN_BIG | SF_FORMAT_WAV) ;
+
+		software_string_test ("software_string.wav") ;
 		test_count++ ;
 		} ;
 
 	if (do_all || ! strcmp (argv [1], "aiff"))
 	{	string_start_end_test ("strings.aiff", SF_FORMAT_AIFF) ;
 		/*
+		TODO : Fix src/aiff.c so these tests pass.
 		string_multi_set_test ("multi.aiff", SF_FORMAT_AIFF) ;
 		string_rdwr_test ("rdwr.aiff", SF_FORMAT_AIFF) ;
 		string_short_rdwr_test ("short_rdwr.aiff", SF_FORMAT_AIFF) ;
+		string_rdwr_grow_test ("rdwr_grow.aiff", SF_FORMAT_AIFF) ;
+		string_header_update ("header_update.aiff", SF_FORMAT_AIFF) ;
 		*/
+
 		test_count++ ;
 		} ;
 
@@ -140,7 +153,9 @@ static const char
 	license		[]	= "The license",
 	title		[]	= "This is the title",
 	long_title	[]	= "This is a very long and very boring title for this file",
-	long_artist	[]	= "The artist who kept on changing its name" ;
+	long_artist	[]	= "The artist who kept on changing its name",
+	genre		[]	= "The genre",
+	trackno		[]	= "Track three" ;
 
 
 static	short	data_out [BUFFER_LEN] ;
@@ -150,25 +165,24 @@ string_start_end_test (const char *filename, int typemajor)
 {	const char	*cptr ;
 	SNDFILE		*file ;
 	SF_INFO		sfinfo ;
-	int			frames, errors = 0 ;
-
-	typemajor = typemajor ;
+	int			errors = 0 ;
 
 	print_test_name ("string_start_end_test", filename) ;
 
+	memset (&sfinfo, 0, sizeof (sfinfo)) ;
 	sfinfo.samplerate	= 44100 ;
 	sfinfo.channels		= 1 ;
 	sfinfo.frames		= 0 ;
 	sfinfo.format		= typemajor | SF_FORMAT_PCM_16 ;
 
-	frames = BUFFER_LEN / sfinfo.channels ;
-
 	file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ;
 
 	/* Write stuff at start of file. */
 	sf_set_string (file, SF_STR_TITLE, filename) ;
 	sf_set_string (file, SF_STR_SOFTWARE, software) ;
 	sf_set_string (file, SF_STR_ARTIST, artist) ;
+	sf_set_string (file, SF_STR_GENRE, genre) ;
+	sf_set_string (file, SF_STR_TRACKNUMBER, trackno) ;
 
 	/* Write data to file. */
 	test_write_short_or_die (file, 0, data_out, BUFFER_LEN, __LINE__) ;
@@ -240,6 +254,13 @@ string_start_end_test (const char *filename, int typemajor)
 				puts ("\n") ;
 			printf ("    Bad date      : %s\n", cptr) ;
 			} ;
+
+		cptr = sf_get_string (file, SF_STR_GENRE) ;
+		if (cptr == NULL || strcmp (genre, cptr) != 0)
+		{	if (errors++ == 0)
+				puts ("\n") ;
+			printf ("    Bad genre     : %s\n", cptr) ;
+			} ;
 		} ;
 
 	switch (typemajor)
@@ -264,6 +285,12 @@ string_start_end_test (const char *filename, int typemajor)
 				printf ("    Bad license : %s\n", cptr) ;
 				} ;
 
+			cptr = sf_get_string (file, SF_STR_TRACKNUMBER) ;
+			if (cptr == NULL || strcmp (genre, cptr) != 0)
+			{	if (errors++ == 0)
+					puts ("\n") ;
+				printf ("    Bad track no. : %s\n", cptr) ;
+				} ;
 			break ;
 		} ;
 
@@ -284,10 +311,11 @@ string_start_test (const char *filename, int typemajor)
 {	const char	*cptr ;
 	SNDFILE		*file ;
 	SF_INFO		sfinfo ;
-	int			frames, errors = 0 ;
+	int			errors = 0 ;
 
 	print_test_name ("string_start_test", filename) ;
 
+	memset (&sfinfo, 0, sizeof (sfinfo)) ;
 	sfinfo.samplerate	= 44100 ;
 	sfinfo.channels		= 1 ;
 	sfinfo.frames		= 0 ;
@@ -302,8 +330,6 @@ string_start_test (const char *filename, int typemajor)
 			break ;
 		} ;
 
-	frames = BUFFER_LEN / sfinfo.channels ;
-
 	file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ;
 
 	/* Write stuff at start of file. */
@@ -425,6 +451,7 @@ string_multi_set_test (const char *filename, int typemajor)
 
 	print_test_name (__func__, filename) ;
 
+	memset (&sfinfo, 0, sizeof (sfinfo)) ;
 	sfinfo.format		= typemajor | SF_FORMAT_PCM_16 ;
 	sfinfo.samplerate	= 44100 ;
 	sfinfo.channels		= 1 ;
@@ -501,7 +528,7 @@ string_rdwr_test (const char *filename, int typemajor)
 	sf_close (file) ;
 
 	file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_FALSE, __LINE__) ;
-	exit_if_true (frames != sfinfo.frames, "\n\nLine %d : Frame count %lld should be %lld.\n", __LINE__, sfinfo.frames, frames) ;
+	exit_if_true (frames != sfinfo.frames, "\n\nLine %d : Frame count %" PRId64 " should be %" PRId64 ".\n", __LINE__, sfinfo.frames, frames) ;
 	str = sf_get_string (file, SF_STR_TITLE) ;
 	exit_if_true (str == NULL, "\n\nLine %d : SF_STR_TITLE string is NULL.\n", __LINE__) ;
 	exit_if_true (strcmp (str, title) != 0, "\n\nLine %d : SF_STR_TITLE doesn't match what was written.\n", __LINE__) ;
@@ -528,7 +555,7 @@ string_rdwr_test (const char *filename, int typemajor)
 	exit_if_true (str == NULL, "\n\nLine %d : SF_STR_TITLE string is NULL.\n", __LINE__) ;
 	exit_if_true (strcmp (str, title) != 0, "\n\nLine %d : SF_STR_TITLE doesn't match what was written.\n", __LINE__) ;
 
-	exit_if_true (frames != sfinfo.frames, "\n\nLine %d : Frame count %lld should be %lld.\n", __LINE__, sfinfo.frames, frames) ;
+	exit_if_true (frames != sfinfo.frames, "\n\nLine %d : Frame count %" PRId64 " should be %" PRId64 ".\n", __LINE__, sfinfo.frames, frames) ;
 
 	sf_close (file) ;
 	unlink (filename) ;
@@ -562,7 +589,7 @@ string_short_rdwr_test (const char *filename, int typemajor)
 
 	/* Open the file RDWR. */
 	file = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, SF_FALSE, __LINE__) ;
-	exit_if_true (frames != sfinfo.frames, "\n\nLine %d : Frame count %lld should be %lld.\n", __LINE__, sfinfo.frames, frames) ;
+	exit_if_true (frames != sfinfo.frames, "\n\nLine %d : Frame count %" PRId64 " should be %" PRId64 ".\n", __LINE__, sfinfo.frames, frames) ;
 	str = sf_get_string (file, SF_STR_TITLE) ;
 	exit_if_true (str == NULL, "\n\nLine %d : SF_STR_TITLE string is NULL.\n", __LINE__) ;
 	exit_if_true (strcmp (str, long_title) != 0, "\n\nLine %d : SF_STR_TITLE doesn't match what was written.\n", __LINE__) ;
@@ -606,3 +633,163 @@ str_count (const char * haystack, const char * needle)
 	return count ;
 } /* str_count */
 
+#define MIN(a, b)	((a) < (b) ? (a) : (b))
+
+static void
+software_string_test (const char *filename)
+{	size_t k ;
+
+	print_test_name (__func__, filename) ;
+
+	for (k = 0 ; k < 50 ; k++)
+	{	const char *result ;
+		char sfname [64] = "" ;
+		SNDFILE *file ;
+		SF_INFO info ;
+
+		sf_info_setup (&info, SF_FORMAT_WAV | SF_FORMAT_PCM_16, 44100, 1) ;
+		file = test_open_file_or_die (filename, SFM_WRITE, &info, SF_TRUE, __LINE__) ;
+
+		snprintf (sfname, MIN (k, sizeof (sfname)), "%s", "abcdefghijklmnopqrestvwxyz0123456789abcdefghijklmnopqrestvwxyz") ;
+
+		exit_if_true (sf_set_string (file, SF_STR_SOFTWARE, sfname),
+			"\n\nLine %d : sf_set_string (f, SF_STR_SOFTWARE, '%s') failed : %s\n", __LINE__, sfname, sf_strerror (file)) ;
+
+		sf_close (file) ;
+
+		file = test_open_file_or_die (filename, SFM_READ, &info, SF_TRUE, __LINE__) ;
+		result = sf_get_string (file, SF_STR_SOFTWARE) ;
+
+		exit_if_true (result == NULL, "\n\nLine %d : sf_get_string (file, SF_STR_SOFTWARE) returned NULL.\n\n", __LINE__) ;
+
+		exit_if_true (strstr (result, sfname) != result,
+			"\n\nLine %d : Can't fine string '%s' in '%s'\n\n", __LINE__, sfname, result) ;
+		sf_close (file) ;
+		} ;
+
+	unlink (filename) ;
+	puts ("ok") ;
+} /* software_string_test */
+
+
+static void
+string_rdwr_grow_test (const char *filename, int typemajor)
+{	SNDFILE *file ;
+	SF_INFO sfinfo ;
+	sf_count_t frames ;
+	const char * str ;
+
+	print_test_name (__func__, filename) ;
+
+	/* Create a file that contains some strings. Then open the file in RDWR mode and
+		 grow the file by writing more audio data to it. Check that the audio data has
+		 been added to the file, and that the strings are still there. */
+
+	/* Create a short file that contains a string. */
+	memset (&sfinfo, 0, sizeof (sfinfo)) ;
+	sfinfo.samplerate	= 44100 ;
+	sfinfo.channels		= 2 ;
+	sfinfo.frames		= 0 ;
+	sfinfo.format		= typemajor | SF_FORMAT_PCM_16 ;
+
+	file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ;
+	/* Write data to file. */
+	test_write_short_or_die (file, 0, data_out, BUFFER_LEN, __LINE__) ;
+
+	/* Write some strings at end of file. */
+	sf_set_string (file, SF_STR_TITLE , title) ;
+	sf_set_string (file, SF_STR_COMMENT, comment) ;
+	sf_close (file) ;
+
+
+	/* Now open file again in SFM_RDWR mode and write more audio data to it. */
+	file = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, SF_TRUE, __LINE__) ;
+	/* Write more data to file.  */
+	test_write_short_or_die (file, 0, data_out, BUFFER_LEN, __LINE__) ;
+	sf_close (file) ;
+
+
+	/* Now open file again. It should now contain two BUFFER_LEN's worth of frames and the strings. */
+	frames = 2 * BUFFER_LEN / sfinfo.channels ;
+	file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ;
+	exit_if_true (frames != sfinfo.frames, "\n\nLine %d : Frame count %" PRId64 " should be %" PRId64 ".\n", __LINE__, sfinfo.frames, frames) ;
+
+	/* Check the strings */
+	str = sf_get_string (file, SF_STR_TITLE) ;
+	exit_if_true (str == NULL, "\n\nLine %d : SF_STR_TITLE string is NULL.\n", __LINE__) ;
+	exit_if_true (strcmp (str, title) != 0, "\n\nLine %d : SF_STR_TITLE doesn't match what was written.\n", __LINE__) ;
+
+	str = sf_get_string (file, SF_STR_COMMENT) ;
+	exit_if_true (str == NULL, "\n\nLine %d : SF_STR_COMMENT string is NULL.\n", __LINE__) ;
+	exit_if_true (strcmp (str, comment) != 0, "\n\nLine %d : SF_STR_COMMENT doesn't match what was written.\n", __LINE__) ;
+
+	sf_close (file) ;
+	unlink (filename) ;
+
+	puts ("ok") ;
+} /* string_rdwr_grow_test */
+
+static void
+string_header_update (const char *filename, int typemajor)
+{	SNDFILE *file , *file1 ;
+	SF_INFO sfinfo , sfinfo1 ;
+	sf_count_t frames ;
+	const char * str ;
+	const int GROW_BUFFER_AMOUNT = 4 ; /* this should be less than half the size of the string header */
+
+	print_test_name (__func__, filename) ;
+
+	/* Create a short file. */
+	memset (&sfinfo, 0, sizeof (sfinfo)) ;
+	sfinfo.samplerate	= 44100 ;
+	sfinfo.channels		= 2 ;
+	sfinfo.frames		= 0 ;
+	sfinfo.format		= typemajor | SF_FORMAT_PCM_16 ;
+
+	file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_TRUE, __LINE__) ;
+	test_write_short_or_die (file, 0, data_out, BUFFER_LEN, __LINE__) ;
+	sf_set_string (file, SF_STR_TITLE, long_title) ;
+	sf_close (file) ;
+
+
+	/* Check that SFC_UPDATE_HEADER_NOW correctly calculates datalength. */
+	file = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, SF_TRUE, __LINE__) ;
+	/* Write a very small amount of new audio data that doesn't completely overwrite the existing header. */
+	test_write_short_or_die (file, 0, data_out, GROW_BUFFER_AMOUNT, __LINE__) ;
+
+	/* Update the header without closing the file. */
+	sf_command (file, SFC_UPDATE_HEADER_NOW, NULL, 0) ;
+
+	/* The file should now contain BUFFER_LEN + GROW_BUFFER_AMOUNT frames.
+		Open a second handle to the file and check the reported length. */
+	memset (&sfinfo1, 0, sizeof (sfinfo1)) ;
+	file1 = test_open_file_or_die (filename, SFM_READ, &sfinfo1, SF_TRUE, __LINE__) ;
+
+	frames = (BUFFER_LEN + GROW_BUFFER_AMOUNT) / sfinfo.channels ;
+	exit_if_true (frames != sfinfo1.frames, "\n\nLine %d : Frame count %" PRId64 " should be %" PRId64 ".\n", __LINE__, sfinfo1.frames, frames) ;
+
+	/* The strings are probably not readable by the second soundfile handle because write_tailer has not yet been called.
+		It's a design decision whether SFC_UPDATE_HEADER_NOW should write the tailer. I think it's fine that it doesn't.  */
+
+	sf_close (file1) ;
+	sf_close (file) ;
+
+
+	/* Check that sf_close correctly calculates datalength. */
+	file = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, SF_TRUE, __LINE__) ;
+	/* Write a very small amount of new audio data that doesn't completely overwrite the existing header. */
+	test_write_short_or_die (file, 0, data_out, GROW_BUFFER_AMOUNT, __LINE__) ;
+	sf_close (file) ;
+
+
+	/* Open file again and verify data and string. */
+	file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_TRUE, __LINE__) ;
+	frames = (BUFFER_LEN + 2*GROW_BUFFER_AMOUNT) / sfinfo.channels ;
+	exit_if_true (frames != sfinfo.frames, "\n\nLine %d : Frame count %" PRId64 " should be %" PRId64 ".\n", __LINE__, sfinfo.frames, frames) ;
+	str = sf_get_string (file, SF_STR_TITLE) ;
+	exit_if_true (str == NULL, "\n\nLine %d : SF_STR_TITLE string is NULL.\n", __LINE__) ;
+	exit_if_true (strcmp (str, long_title) != 0, "\n\nLine %d : SF_STR_TITLE doesn't match what was written.\n", __LINE__) ;
+	sf_close (file) ;
+	unlink (filename) ;
+	puts ("ok") ;
+} /* string_header_update */
diff --git a/libs/libsndfile/tests/test_wrapper.sh.in b/libs/libsndfile/tests/test_wrapper.sh.in
index 1caa614d50..daf030b05f 100644
--- a/libs/libsndfile/tests/test_wrapper.sh.in
+++ b/libs/libsndfile/tests/test_wrapper.sh.in
@@ -1,21 +1,83 @@
 #!/bin/sh
 
-if [ -f tests/sfversion@EXEEXT@ ]; then
+# Copyright (C) 2008-2013 Erik de Castro Lopo 
+#
+# All rights reserved.
+#
+# 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 author nor the names of any 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 COPYRIGHT OWNER 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.
+
+
+HOST_TRIPLET=@HOST_TRIPLET@
+PACKAGE_VERSION=@PACKAGE_VERSION@
+LIB_VERSION=`echo $PACKAGE_VERSION | sed "s/[a-z].*//"`
+
+if test -f tests/sfversion@EXEEXT@ ; then
 	cd tests
 	fi
 
-if [ ! -f sfversion@EXEEXT@ ]; then
+if test ! -f sfversion@EXEEXT@ ; then
 	echo "Not able to find test executables."
 	exit 1
 	fi
 
-sfversion=`./sfversion@EXEEXT@`
+if test -f libsndfile.so.$LIB_VERSION ; then
+	# This will work on Linux, but not on Mac.
+	# Windows is already sorted out.
+	export LD_LIBRARY_PATH=`pwd`
+	if test ! -f libsndfile.so.1 ; then
+		ln -s libsndfile.so.$LIB_VERSION libsndfile.so.1
+		fi
+	fi
+
+sfversion=`./sfversion@EXEEXT@ | sed "s/-exp$//"`
+
+if test $sfversion != libsndfile-$PACKAGE_VERSION ; then
+	echo "Error : sfversion ($sfversion) and PACKAGE_VERSION ($PACKAGE_VERSION) don't match."
+	exit 1
+	fi
 
 # Force exit on errors.
 set -e
 
-# generic-tests
+# Generic-tests
 uname -a
+
+# Check the header file.
+sh pedantic-header-test.sh
+
+# Need this for when we're running from files collected into the
+# libsndfile-testsuite-@PACKAGE_VERSION@ tarball.
+if test -x test_main@EXEEXT@ ; then
+	echo "Running unit tests from src/ directory of source code tree."
+	./test_main@EXEEXT@
+	echo
+	echo "Running end-to-end tests from tests/ directory."
+	fi
+
 ./error_test@EXEEXT@
 ./pcm_test@EXEEXT@
 ./ulaw_test@EXEEXT@
@@ -30,14 +92,31 @@ uname -a
 ./command_test@EXEEXT@ current_sf_info
 ./command_test@EXEEXT@ bext
 ./command_test@EXEEXT@ bextch
+./command_test@EXEEXT@ chanmap
+./command_test@EXEEXT@ cart
 ./floating_point_test@EXEEXT@
 ./checksum_test@EXEEXT@
 ./scale_clip_test@EXEEXT@
 ./headerless_test@EXEEXT@
+./rdwr_test@EXEEXT@
 ./locale_test@EXEEXT@
 ./win32_ordinal_test@EXEEXT@
 ./external_libs_test@EXEEXT@
-./cpp_test@EXEEXT@
+./format_check_test@EXEEXT@
+./channel_test@EXEEXT@
+
+# The w64 G++ compiler requires an extra runtime DLL which we don't have,
+# so skip this test.
+case "$HOST_TRIPLET" in
+	x86_64-w64-mingw32)
+		;;
+	i686-w64-mingw32)
+		;;
+	*)
+		./cpp_test@EXEEXT@
+		;;
+	esac
+
 echo "----------------------------------------------------------------------"
 echo "  $sfversion passed common tests."
 echo "----------------------------------------------------------------------"
@@ -56,6 +135,7 @@ echo "=========================="
 ./string_test@EXEEXT@ aiff
 ./multi_file_test@EXEEXT@ aiff
 ./aiff_rw_test@EXEEXT@
+./chunk_test@EXEEXT@ aiff
 echo "----------------------------------------------------------------------"
 echo "  $sfversion passed tests on AIFF files."
 echo "----------------------------------------------------------------------"
@@ -78,7 +158,9 @@ echo "----------------------------------------------------------------------"
 ./lossy_comp_test@EXEEXT@ caf_ulaw
 ./lossy_comp_test@EXEEXT@ caf_alaw
 ./header_test@EXEEXT@ caf
+./peak_chunk_test@EXEEXT@ caf
 ./misc_test@EXEEXT@ caf
+./chunk_test@EXEEXT@ caf
 echo "----------------------------------------------------------------------"
 echo "  $sfversion passed tests on CAF files."
 echo "----------------------------------------------------------------------"
@@ -97,6 +179,7 @@ echo "----------------------------------------------------------------------"
 ./misc_test@EXEEXT@ wav
 ./string_test@EXEEXT@ wav
 ./multi_file_test@EXEEXT@ wav
+./chunk_test@EXEEXT@ wav
 echo "----------------------------------------------------------------------"
 echo "  $sfversion passed tests on WAV files."
 echo "----------------------------------------------------------------------"
@@ -255,6 +338,7 @@ echo "----------------------------------------------------------------------"
 
 # flac-tests
 ./write_read_test@EXEEXT@ flac
+./compression_size_test@EXEEXT@ flac
 ./string_test@EXEEXT@ flac
 echo "----------------------------------------------------------------------"
 echo "  $sfversion passed tests on FLAC files."
@@ -262,7 +346,7 @@ echo "----------------------------------------------------------------------"
 
 # vorbis-tests
 ./ogg_test@EXEEXT@
-./vorbis_test@EXEEXT@
+./compression_size_test@EXEEXT@ vorbis
 ./lossy_comp_test@EXEEXT@ ogg_vorbis
 ./string_test@EXEEXT@ ogg
 ./misc_test@EXEEXT@ ogg
diff --git a/libs/libsndfile/tests/ulaw_test.c b/libs/libsndfile/tests/ulaw_test.c
index 6959e84c00..fc0d497aa0 100644
--- a/libs/libsndfile/tests/ulaw_test.c
+++ b/libs/libsndfile/tests/ulaw_test.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2012 Erik de Castro Lopo 
 **
 ** 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
@@ -20,6 +20,7 @@
 
 #include 
 #include 
+#include 
 
 #if HAVE_UNISTD_H
 #include 
@@ -44,12 +45,11 @@ main (void)
 	const char	*filename ;
 	int			k ;
 
+	print_test_name ("ulaw_test", "encoder") ;
+
 	filename = "test.raw" ;
 
-	sfinfo.format		= SF_FORMAT_RAW | SF_FORMAT_ULAW ;
-	sfinfo.samplerate	= 44100 ;
-	sfinfo.frames		= 123456789 ;
-	sfinfo.channels		= 1 ;
+	sf_info_setup (&sfinfo, SF_FORMAT_RAW | SF_FORMAT_ULAW, 44100, 1) ;
 
 	if ((file = sf_open (filename, SFM_WRITE, &sfinfo)) == NULL)
 	{	printf ("sf_open_write failed with error : ") ;
@@ -94,7 +94,9 @@ main (void)
 
 	sf_close (file) ;
 
-	printf ("    ulaw_test : encoder ... ok\n") ;
+	puts ("ok") ;
+
+	print_test_name ("ulaw_test", "decoder") ;
 
 	/* Now generate a file containing all possible 8 bit encoded
 	** sample values and write it to disk as ulaw encoded.frames.
@@ -139,7 +141,7 @@ main (void)
 
 	sf_close (file) ;
 
-	printf ("    ulaw_test : decoder ... ok\n") ;
+	puts ("ok") ;
 
 	unlink (filename) ;
 
@@ -201,21 +203,21 @@ unsigned char ulaw_encode (int sample)
 		7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7
 		} ;
 
-    int sign, exponent, mantissa ;
-    unsigned char ulawbyte ;
+	int sign, exponent, mantissa ;
+	unsigned char ulawbyte ;
 
-    /* Get the sample into sign-magnitude. */
-    sign = (sample >> 8) & 0x80 ;					/* set aside the sign */
-    if ( sign != 0 )
+	/* Get the sample into sign-magnitude. */
+	sign = (sample >> 8) & 0x80 ;					/* set aside the sign */
+	if (sign != 0)
 		sample = -sample ;							/* get magnitude */
-    if ( sample > uCLIP )
+	if (sample > uCLIP)
 		sample = uCLIP ;							/* clip the magnitude */
 
-    /* Convert from 16 bit linear to ulaw. */
-    sample = sample + uBIAS ;
-    exponent = exp_lut [( sample >> 7 ) & 0xFF] ;
-    mantissa = (sample >> ( exponent + 3 ) ) & 0x0F ;
-    ulawbyte = ~ (sign | ( exponent << 4 ) | mantissa) ;
+	/* Convert from 16 bit linear to ulaw. */
+	sample = sample + uBIAS ;
+	exponent = exp_lut [(sample >> 7) & 0xFF] ;
+	mantissa = (sample >> (exponent + 3)) & 0x0F ;
+	ulawbyte = ~ (sign | (exponent << 4) | mantissa) ;
 
 	return ulawbyte ;
 } /* ulaw_encode */
@@ -240,16 +242,16 @@ unsigned char ulaw_encode (int sample)
 static
 int ulaw_decode (unsigned int ulawbyte)
 {	static int exp_lut [8] = { 0, 132, 396, 924, 1980, 4092, 8316, 16764 } ;
-    int sign, exponent, mantissa, sample ;
+	int sign, exponent, mantissa, sample ;
 
-    ulawbyte = ~ ulawbyte ;
-    sign = (ulawbyte & 0x80) ;
-    exponent = (ulawbyte >> 4) & 0x07 ;
-    mantissa = ulawbyte & 0x0F ;
-    sample = exp_lut [exponent] + (mantissa << (exponent + 3)) ;
-    if (sign != 0)
+	ulawbyte = ~ ulawbyte ;
+	sign = (ulawbyte & 0x80) ;
+	exponent = (ulawbyte >> 4) & 0x07 ;
+	mantissa = ulawbyte & 0x0F ;
+	sample = exp_lut [exponent] + (mantissa << (exponent + 3)) ;
+	if (sign != 0)
 		sample = -sample ;
 
-    return sample ;
+	return sample ;
 } /* ulaw_decode */
 
diff --git a/libs/libsndfile/tests/utils.c b/libs/libsndfile/tests/utils.c
index ba1f24ecd2..882c969ab1 100644
--- a/libs/libsndfile/tests/utils.c
+++ b/libs/libsndfile/tests/utils.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2002-2009 Erik de Castro Lopo 
+** Copyright (C) 2002-2011 Erik de Castro Lopo 
 **
 ** 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
@@ -340,7 +340,7 @@ check_log_buffer_or_die (SNDFILE *file, int line_num)
 {	static char	buffer [LOG_BUFFER_SIZE] ;
 	int			count ;
 
-	memset (buffer, 0, LOG_BUFFER_SIZE) ;
+	memset (buffer, 0, sizeof (buffer)) ;
 
 	/* Get the log buffer data. */
 	count = sf_command	(file, SFC_GET_LOG_INFO, buffer, LOG_BUFFER_SIZE) ;
@@ -379,7 +379,7 @@ string_in_log_buffer (SNDFILE *file, const char *s)
 {	static char	buffer [LOG_BUFFER_SIZE] ;
 	int			count ;
 
-	memset (buffer, 0, LOG_BUFFER_SIZE) ;
+	memset (buffer, 0, sizeof (buffer)) ;
 
 	/* Get the log buffer data. */
 	count = sf_command	(file, SFC_GET_LOG_INFO, buffer, LOG_BUFFER_SIZE) ;
@@ -448,12 +448,11 @@ hexdump_file (const char * filename, sf_count_t offset, sf_count_t length)
 void
 dump_log_buffer (SNDFILE *file)
 {	static char	buffer [LOG_BUFFER_SIZE] ;
-	int			count ;
 
-	memset (buffer, 0, LOG_BUFFER_SIZE) ;
+	memset (buffer, 0, sizeof (buffer)) ;
 
 	/* Get the log buffer data. */
-	count = sf_command	(file, SFC_GET_LOG_INFO, buffer, LOG_BUFFER_SIZE) ;
+	sf_command	(file, SFC_GET_LOG_INFO, buffer, LOG_BUFFER_SIZE) ;
 
 	if (strlen (buffer) < 1)
 		puts ("Log buffer empty.\n") ;
@@ -469,7 +468,7 @@ test_open_file_or_die (const char *filename, int mode, SF_INFO *sfinfo, int allo
 
 	SNDFILE *file ;
 	const char *modestr, *func_name ;
-	int oflags = 0, omode = 0 ;
+	int oflags = 0, omode = 0, err ;
 
 	/*
 	** Need to test both sf_open() and sf_open_fd().
@@ -500,17 +499,20 @@ test_open_file_or_die (const char *filename, int mode, SF_INFO *sfinfo, int allo
 		} ;
 
 	if (OS_IS_WIN32)
-	{	/* Windows doesn't support Unix file permissions so set it to zero. */
-		omode = 0 ;
+	{	/* Windows does not understand and ignores the S_IRGRP flag, but Wine
+		** gives a run time warning message, so just clear it.
+		*/
+		omode &= ~S_IRGRP ;
 		} ;
 
 	if (allow_fd && ((++count) & 1) == 1)
 	{	int fd ;
 
-		fd = open (filename, oflags, omode) ;
+		/* Only use the three argument open() function if omode != 0. */
+		fd = (omode == 0) ? open (filename, oflags) : open (filename, oflags, omode) ;
 
 		if (fd < 0)
-		{	perror ("open") ;
+		{	printf ("\n\n%s : open failed : %s\n", __func__, strerror (errno)) ;
 			exit (1) ;
 			} ;
 
@@ -528,6 +530,13 @@ test_open_file_or_die (const char *filename, int mode, SF_INFO *sfinfo, int allo
 		exit (1) ;
 		} ;
 
+	err = sf_error (file) ;
+	if (err != SF_ERR_NO_ERROR)
+	{	printf ("\n\nLine %d : sf_error : %s\n\n", line_num, sf_error_number (err)) ;
+		dump_log_buffer (file) ;
+		exit (1) ;
+		} ;
+
 	return file ;
 } /* test_open_file_or_die */
 
@@ -629,7 +638,7 @@ test_read_short_or_die (SNDFILE *file, int pass, short *test, sf_count_t items,
 		} ;
 
 	return ;
-} /* test_read_short */
+} /* test_read_short_or_die */
 
 void
 test_read_int_or_die (SNDFILE *file, int pass, int *test, sf_count_t items, int line_num)
@@ -647,7 +656,7 @@ test_read_int_or_die (SNDFILE *file, int pass, int *test, sf_count_t items, int
 		} ;
 
 	return ;
-} /* test_read_int */
+} /* test_read_int_or_die */
 
 void
 test_read_float_or_die (SNDFILE *file, int pass, float *test, sf_count_t items, int line_num)
@@ -665,7 +674,7 @@ test_read_float_or_die (SNDFILE *file, int pass, float *test, sf_count_t items,
 		} ;
 
 	return ;
-} /* test_read_float */
+} /* test_read_float_or_die */
 
 void
 test_read_double_or_die (SNDFILE *file, int pass, double *test, sf_count_t items, int line_num)
@@ -683,7 +692,7 @@ test_read_double_or_die (SNDFILE *file, int pass, double *test, sf_count_t items
 		} ;
 
 	return ;
-} /* test_read_double */
+} /* test_read_double_or_die */
 
 
 void
@@ -702,7 +711,7 @@ test_readf_short_or_die (SNDFILE *file, int pass, short *test, sf_count_t frames
 		} ;
 
 	return ;
-} /* test_readf_short */
+} /* test_readf_short_or_die */
 
 void
 test_readf_int_or_die (SNDFILE *file, int pass, int *test, sf_count_t frames, int line_num)
@@ -720,7 +729,7 @@ test_readf_int_or_die (SNDFILE *file, int pass, int *test, sf_count_t frames, in
 		} ;
 
 	return ;
-} /* test_readf_int */
+} /* test_readf_int_or_die */
 
 void
 test_readf_float_or_die (SNDFILE *file, int pass, float *test, sf_count_t frames, int line_num)
@@ -738,7 +747,7 @@ test_readf_float_or_die (SNDFILE *file, int pass, float *test, sf_count_t frames
 		} ;
 
 	return ;
-} /* test_readf_float */
+} /* test_readf_float_or_die */
 
 void
 test_readf_double_or_die (SNDFILE *file, int pass, double *test, sf_count_t frames, int line_num)
@@ -756,9 +765,27 @@ test_readf_double_or_die (SNDFILE *file, int pass, double *test, sf_count_t fram
 		} ;
 
 	return ;
-} /* test_readf_double */
+} /* test_readf_double_or_die */
 
 
+void
+test_read_raw_or_die (SNDFILE *file, int pass, void *test, sf_count_t items, int line_num)
+{	sf_count_t count ;
+
+	if ((count = sf_read_raw (file, test, items)) != items)
+	{	printf ("\n\nLine %d", line_num) ;
+		if (pass > 0)
+			printf (" (pass %d)", pass) ;
+		printf (" : sf_read_raw failed with short read (%ld => %ld).\n",
+						SF_COUNT_TO_LONG (items), SF_COUNT_TO_LONG (count)) ;
+		fflush (stdout) ;
+		puts (sf_strerror (file)) ;
+		exit (1) ;
+		} ;
+
+	return ;
+} /* test_read_raw_or_die */
+
 
 
 void
@@ -777,7 +804,7 @@ test_write_short_or_die (SNDFILE *file, int pass, const short *test, sf_count_t
 		} ;
 
 	return ;
-} /* test_write_short */
+} /* test_write_short_or_die */
 
 void
 test_write_int_or_die (SNDFILE *file, int pass, const int *test, sf_count_t items, int line_num)
@@ -795,7 +822,7 @@ test_write_int_or_die (SNDFILE *file, int pass, const int *test, sf_count_t item
 		} ;
 
 	return ;
-} /* test_write_int */
+} /* test_write_int_or_die */
 
 void
 test_write_float_or_die (SNDFILE *file, int pass, const float *test, sf_count_t items, int line_num)
@@ -813,7 +840,7 @@ test_write_float_or_die (SNDFILE *file, int pass, const float *test, sf_count_t
 		} ;
 
 	return ;
-} /* test_write_float */
+} /* test_write_float_or_die */
 
 void
 test_write_double_or_die (SNDFILE *file, int pass, const double *test, sf_count_t items, int line_num)
@@ -831,7 +858,7 @@ test_write_double_or_die (SNDFILE *file, int pass, const double *test, sf_count_
 		} ;
 
 	return ;
-} /* test_write_double */
+} /* test_write_double_or_die */
 
 
 void
@@ -850,7 +877,7 @@ test_writef_short_or_die (SNDFILE *file, int pass, const short *test, sf_count_t
 		} ;
 
 	return ;
-} /* test_writef_short */
+} /* test_writef_short_or_die */
 
 void
 test_writef_int_or_die (SNDFILE *file, int pass, const int *test, sf_count_t frames, int line_num)
@@ -868,7 +895,7 @@ test_writef_int_or_die (SNDFILE *file, int pass, const int *test, sf_count_t fra
 		} ;
 
 	return ;
-} /* test_writef_int */
+} /* test_writef_int_or_die */
 
 void
 test_writef_float_or_die (SNDFILE *file, int pass, const float *test, sf_count_t frames, int line_num)
@@ -886,7 +913,7 @@ test_writef_float_or_die (SNDFILE *file, int pass, const float *test, sf_count_t
 		} ;
 
 	return ;
-} /* test_writef_float */
+} /* test_writef_float_or_die */
 
 void
 test_writef_double_or_die (SNDFILE *file, int pass, const double *test, sf_count_t frames, int line_num)
@@ -904,7 +931,26 @@ test_writef_double_or_die (SNDFILE *file, int pass, const double *test, sf_count
 		} ;
 
 	return ;
-} /* test_writef_double */
+} /* test_writef_double_or_die */
+
+
+void
+test_write_raw_or_die (SNDFILE *file, int pass, const void *test, sf_count_t items, int line_num)
+{	sf_count_t count ;
+
+	if ((count = sf_write_raw (file, test, items)) != items)
+	{	printf ("\n\nLine %d", line_num) ;
+		if (pass > 0)
+			printf (" (pass %d)", pass) ;
+		printf (" : sf_write_raw failed with short write (%ld => %ld).\n",
+						SF_COUNT_TO_LONG (items), SF_COUNT_TO_LONG (count)) ;
+		fflush (stdout) ;
+		puts (sf_strerror (file)) ;
+		exit (1) ;
+		} ;
+
+	return ;
+} /* test_write_raw_or_die */
 
 
 void
@@ -996,7 +1042,7 @@ static int allowed_open_files = -1 ;
 void
 count_open_files (void)
 {
-#if (defined (WIN32) || defined (_WIN32))
+#if OS_IS_WIN32
 	return ;
 #else
 	int k, count = 0 ;
@@ -1021,7 +1067,7 @@ increment_open_file_count (void)
 void
 check_open_file_count_or_die (int lineno)
 {
-#if (defined (WIN32) || defined (_WIN32))
+#if OS_IS_WIN32
 	lineno = 0 ;
 	return ;
 #else
diff --git a/libs/libsndfile/tests/utils.h b/libs/libsndfile/tests/utils.h
index 9f9f684813..79da2861dc 100644
--- a/libs/libsndfile/tests/utils.h
+++ b/libs/libsndfile/tests/utils.h
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2002-2009 Erik de Castro Lopo 
+** Copyright (C) 2002-2011 Erik de Castro Lopo 
 **
 ** 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
@@ -31,19 +31,15 @@ extern "C" {
 
 #include 
 #include 
-#include 
-#include 
 
 #define SF_COUNT_TO_LONG(x)	((long) (x))
 #define	ARRAY_LEN(x)		((int) (sizeof (x)) / (sizeof ((x) [0])))
 #define SIGNED_SIZEOF(x)	((int64_t) (sizeof (x)))
+#define	NOT(x)				(! (x))
 
 #define	PIPE_INDEX(x)	((x) + 500)
 #define	PIPE_TEST_LEN	12345
 
-#if (defined (WIN32) || defined (_WIN32) || defined (__OS2__))
-#define	snprintf	_snprintf
-#endif
 
 void gen_windowed_sine_float (float *data, int len, double maximum) ;
 void gen_windowed_sine_double (double *data, int len, double maximum) ;
@@ -89,6 +85,21 @@ void	check_open_file_count_or_die (int lineno) ;
 
 #ifdef SNDFILE_H
 
+static inline void
+sf_info_clear (SF_INFO * info)
+{	memset (info, 0, sizeof (SF_INFO)) ;
+} /* sf_info_clear */
+
+static inline void
+sf_info_setup (SF_INFO * info, int format, int samplerate, int channels)
+{	sf_info_clear (info) ;
+
+	info->format = format ;
+	info->samplerate = samplerate ;
+	info->channels = channels ;
+} /* sf_info_setup */
+
+
 void 	dump_log_buffer (SNDFILE *file) ;
 void 	check_log_buffer_or_die (SNDFILE *file, int line_num) ;
 int 	string_in_log_buffer (SNDFILE *file, const char *s) ;
@@ -124,6 +135,9 @@ void 	test_readf_double_or_die
 			(SNDFILE *file, int pass, double *test, sf_count_t frames, int line_num) ;
 
 
+void
+test_read_raw_or_die (SNDFILE *file, int pass, void *test, sf_count_t items, int line_num) ;
+
 
 void 	test_write_short_or_die
 			(SNDFILE *file, int pass, const short *test, sf_count_t items, int line_num) ;
@@ -144,6 +158,9 @@ void 	test_writef_double_or_die
 			(SNDFILE *file, int pass, const double *test, sf_count_t frames, int line_num) ;
 
 
+void
+test_write_raw_or_die (SNDFILE *file, int pass, const void *test, sf_count_t items, int line_num) ;
+
 void compare_short_or_die (const short *left, const short *right, unsigned count, int line_num) ;
 void compare_int_or_die (const int *left, const int *right, unsigned count, int line_num) ;
 void compare_float_or_die (const float *left, const float *right, unsigned count, int line_num) ;
diff --git a/libs/libsndfile/tests/utils.tpl b/libs/libsndfile/tests/utils.tpl
index 04aa7f7117..d88e263ff0 100644
--- a/libs/libsndfile/tests/utils.tpl
+++ b/libs/libsndfile/tests/utils.tpl
@@ -1,6 +1,6 @@
 [+ AutoGen5 template h c +]
 /*
-** Copyright (C) 2002-2009 Erik de Castro Lopo 
+** Copyright (C) 2002-2012 Erik de Castro Lopo 
 **
 ** 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
@@ -34,16 +34,13 @@ extern "C" {
 #include 
 #include 
 
-#define SF_COUNT_TO_LONG(x)	((long) (x))
 #define	ARRAY_LEN(x)		((int) (sizeof (x)) / (sizeof ((x) [0])))
 #define SIGNED_SIZEOF(x)	((int64_t) (sizeof (x)))
+#define	NOT(x)				(! (x))
 
 #define	PIPE_INDEX(x)	((x) + 500)
 #define	PIPE_TEST_LEN	12345
 
-#if (defined (WIN32) || defined (_WIN32) || defined (__OS2__))
-#define	snprintf	_snprintf
-#endif
 
 [+ FOR float_type
 +]void gen_windowed_sine_[+ (get "name") +] ([+ (get "name") +] *data, int len, double maximum) ;
@@ -60,6 +57,16 @@ void	dump_data_to_file (const char *filename, const void *data, unsigned int dat
 
 void	write_mono_file (const char * filename, int format, int srate, float * output, int len) ;
 
+#ifdef __GNUC__
+static inline void
+exit_if_true (int test, const char *format, ...)
+#ifdef __USE_MINGW_ANSI_STDIO
+	__attribute__ ((format (gnu_printf, 2, 3))) ;
+#else
+	__attribute__ ((format (printf, 2, 3))) ;
+#endif
+#endif
+
 static inline void
 exit_if_true (int test, const char *format, ...)
 {	if (test)
@@ -89,6 +96,21 @@ void	check_open_file_count_or_die (int lineno) ;
 
 #ifdef SNDFILE_H
 
+static inline void
+sf_info_clear (SF_INFO * info)
+{	memset (info, 0, sizeof (SF_INFO)) ;
+} /* sf_info_clear */
+
+static inline void
+sf_info_setup (SF_INFO * info, int format, int samplerate, int channels)
+{	sf_info_clear (info) ;
+
+	info->format = format ;
+	info->samplerate = samplerate ;
+	info->channels = channels ;
+} /* sf_info_setup */
+
+
 void 	dump_log_buffer (SNDFILE *file) ;
 void 	check_log_buffer_or_die (SNDFILE *file, int line_num) ;
 int 	string_in_log_buffer (SNDFILE *file, const char *s) ;
@@ -110,18 +132,24 @@ void	test_seek_or_die
 			(SNDFILE *file, int pass, [+ (get "io_element") +] *test, sf_count_t [+ (get "count_name") +], int line_num) ;
 [+ ENDFOR io_type +][+ ENDFOR read_op +]
 
+void
+test_read_raw_or_die (SNDFILE *file, int pass, void *test, sf_count_t items, int line_num) ;
+
 [+ FOR write_op +]
 [+ FOR io_type
 +]void 	test_[+ (get "op_element") +]_[+ (get "io_element") +]_or_die
 			(SNDFILE *file, int pass, const [+ (get "io_element") +] *test, sf_count_t [+ (get "count_name") +], int line_num) ;
 [+ ENDFOR io_type +][+ ENDFOR write_op +]
 
+void
+test_write_raw_or_die (SNDFILE *file, int pass, const void *test, sf_count_t items, int line_num) ;
+
 [+ FOR io_type
-+]void compare_[+ (get "io_element") +]_or_die (const [+ (get "io_element") +] *left, const [+ (get "io_element") +] *right, unsigned count, int line_num) ;
++]void compare_[+ (get "io_element") +]_or_die (const [+ (get "io_element") +] *expected, const [+ (get "io_element") +] *actual, unsigned count, int line_num) ;
 [+ ENDFOR io_type +]
 
 
-void	gen_lowpass_noise_float (float *data, int len) ;
+void	gen_lowpass_signal_float (float *data, int len) ;
 
 sf_count_t		file_length (const char * fname) ;
 sf_count_t		file_length_fd (int fd) ;
@@ -341,7 +369,7 @@ check_log_buffer_or_die (SNDFILE *file, int line_num)
 {	static char	buffer [LOG_BUFFER_SIZE] ;
 	int			count ;
 
-	memset (buffer, 0, LOG_BUFFER_SIZE) ;
+	memset (buffer, 0, sizeof (buffer)) ;
 
 	/* Get the log buffer data. */
 	count = sf_command	(file, SFC_GET_LOG_INFO, buffer, LOG_BUFFER_SIZE) ;
@@ -380,7 +408,7 @@ string_in_log_buffer (SNDFILE *file, const char *s)
 {	static char	buffer [LOG_BUFFER_SIZE] ;
 	int			count ;
 
-	memset (buffer, 0, LOG_BUFFER_SIZE) ;
+	memset (buffer, 0, sizeof (buffer)) ;
 
 	/* Get the log buffer data. */
 	count = sf_command	(file, SFC_GET_LOG_INFO, buffer, LOG_BUFFER_SIZE) ;
@@ -402,7 +430,7 @@ hexdump_file (const char * filename, sf_count_t offset, sf_count_t length)
 	int k, m, ch, readcount ;
 
 	if (length > 1000000)
-	{	printf ("\n\nError : length (%ld) too long.\n\n", SF_COUNT_TO_LONG (offset)) ;
+	{	printf ("\n\nError : length (%" PRId64 ") too long.\n\n", offset) ;
 		exit (1) ;
 		} ;
 
@@ -412,7 +440,7 @@ hexdump_file (const char * filename, sf_count_t offset, sf_count_t length)
 		} ;
 
 	if (fseek (file, offset, SEEK_SET) != 0)
-	{	printf ("\n\nError : fseek(file, %ld, SEEK_SET) failed : %s\n\n", SF_COUNT_TO_LONG (offset), strerror (errno)) ;
+	{	printf ("\n\nError : fseek(file, %" PRId64 ", SEEK_SET) failed : %s\n\n", offset, strerror (errno)) ;
 		exit (1) ;
 		} ;
 
@@ -421,7 +449,7 @@ hexdump_file (const char * filename, sf_count_t offset, sf_count_t length)
 	for (k = 0 ; k < length ; k+= sizeof (buffer))
 	{	readcount = fread (buffer, 1, sizeof (buffer), file) ;
 
-		printf ("%08lx : ", SF_COUNT_TO_LONG (offset + k)) ;
+		printf ("%08" PRIx64 " : ", offset + k) ;
 
 		for (m = 0 ; m < readcount ; m++)
 			printf ("%02x ", buffer [m] & 0xFF) ;
@@ -449,12 +477,11 @@ hexdump_file (const char * filename, sf_count_t offset, sf_count_t length)
 void
 dump_log_buffer (SNDFILE *file)
 {	static char	buffer [LOG_BUFFER_SIZE] ;
-	int			count ;
 
-	memset (buffer, 0, LOG_BUFFER_SIZE) ;
+	memset (buffer, 0, sizeof (buffer)) ;
 
 	/* Get the log buffer data. */
-	count = sf_command	(file, SFC_GET_LOG_INFO, buffer, LOG_BUFFER_SIZE) ;
+	sf_command	(file, SFC_GET_LOG_INFO, buffer, LOG_BUFFER_SIZE) ;
 
 	if (strlen (buffer) < 1)
 		puts ("Log buffer empty.\n") ;
@@ -470,7 +497,7 @@ test_open_file_or_die (const char *filename, int mode, SF_INFO *sfinfo, int allo
 
 	SNDFILE *file ;
 	const char *modestr, *func_name ;
-	int oflags = 0, omode = 0 ;
+	int oflags = 0, omode = 0, err ;
 
 	/*
 	** Need to test both sf_open() and sf_open_fd().
@@ -501,17 +528,20 @@ test_open_file_or_die (const char *filename, int mode, SF_INFO *sfinfo, int allo
 		} ;
 
 	if (OS_IS_WIN32)
-	{	/* Windows doesn't support Unix file permissions so set it to zero. */
-		omode = 0 ;
+	{	/* Windows does not understand and ignores the S_IRGRP flag, but Wine
+		** gives a run time warning message, so just clear it.
+		*/
+		omode &= ~S_IRGRP ;
 		} ;
 
 	if (allow_fd && ((++count) & 1) == 1)
 	{	int fd ;
 
-		fd = open (filename, oflags, omode) ;
+		/* Only use the three argument open() function if omode != 0. */
+		fd = (omode == 0) ? open (filename, oflags) : open (filename, oflags, omode) ;
 
 		if (fd < 0)
-		{	perror ("open") ;
+		{	printf ("\n\n%s : open failed : %s\n", __func__, strerror (errno)) ;
 			exit (1) ;
 			} ;
 
@@ -529,6 +559,13 @@ test_open_file_or_die (const char *filename, int mode, SF_INFO *sfinfo, int allo
 		exit (1) ;
 		} ;
 
+	err = sf_error (file) ;
+	if (err != SF_ERR_NO_ERROR)
+	{	printf ("\n\nLine %d : sf_error : %s\n\n", line_num, sf_error_number (err)) ;
+		dump_log_buffer (file) ;
+		exit (1) ;
+		} ;
+
 	return file ;
 } /* test_open_file_or_die */
 
@@ -541,7 +578,7 @@ test_read_write_position_or_die (SNDFILE *file, int line_num, int pass, sf_count
 	{	printf ("\n\nLine %d ", line_num) ;
 		if (pass > 0)
 			printf ("(pass %d): ", pass) ;
-		printf ("Read position (%ld) should be %ld.\n", SF_COUNT_TO_LONG (pos), SF_COUNT_TO_LONG (read_pos)) ;
+		printf ("Read position (%" PRId64 ") should be %" PRId64 ".\n", pos, read_pos) ;
 		exit (1) ;
 		} ;
 
@@ -550,8 +587,7 @@ test_read_write_position_or_die (SNDFILE *file, int line_num, int pass, sf_count
 	{	printf ("\n\nLine %d", line_num) ;
 		if (pass > 0)
 			printf (" (pass %d)", pass) ;
-		printf (" : Write position (%ld) should be %ld.\n",
-						SF_COUNT_TO_LONG (pos), SF_COUNT_TO_LONG (write_pos)) ;
+		printf (" : Write position (%" PRId64 ") should be %" PRId64 ".\n", pos, write_pos) ;
 		exit (1) ;
 		} ;
 
@@ -604,9 +640,8 @@ test_seek_or_die (SNDFILE *file, sf_count_t offset, int whence, sf_count_t new_p
 	channel_name = (channels == 1) ? "Mono" : "Stereo" ;
 
 	if ((position = sf_seek (file, offset, whence)) != new_pos)
-	{	printf ("\n\nLine %d : %s : sf_seek (file, %ld, %s) returned %ld (should be %ld).\n\n",
-					line_num, channel_name, SF_COUNT_TO_LONG (offset), whence_name,
-					SF_COUNT_TO_LONG (position), SF_COUNT_TO_LONG (new_pos)) ;
+	{	printf ("\n\nLine %d : %s : sf_seek (file, %" PRId64 ", %s) returned %" PRId64 " (should be %" PRId64 ").\n\n",
+					line_num, channel_name, offset, whence_name, position, new_pos) ;
 		exit (1) ;
 		} ;
 
@@ -622,17 +657,34 @@ test_[+ (get "op_element") +]_[+ (get "io_element") +]_or_die (SNDFILE *file, in
 	{	printf ("\n\nLine %d", line_num) ;
 		if (pass > 0)
 			printf (" (pass %d)", pass) ;
-		printf (" : sf_[+ (get "op_element") +]_[+ (get "io_element") +] failed with short [+ (get "op_element") +] (%ld => %ld).\n",
-						SF_COUNT_TO_LONG ([+ (get "count_name") +]), SF_COUNT_TO_LONG (count)) ;
+		printf (" : sf_[+ (get "op_element") +]_[+ (get "io_element") +] failed with short [+ (get "op_element") +] (%" PRId64 " => %" PRId64 ").\n",
+						[+ (get "count_name") +], count) ;
 		fflush (stdout) ;
 		puts (sf_strerror (file)) ;
 		exit (1) ;
 		} ;
 
 	return ;
-} /* test_[+ (get "op_element") +]_[+ (get "io_element") +] */
+} /* test_[+ (get "op_element") +]_[+ (get "io_element") +]_or_die */
 [+ ENDFOR io_type +][+ ENDFOR read_op +]
 
+void
+test_read_raw_or_die (SNDFILE *file, int pass, void *test, sf_count_t items, int line_num)
+{	sf_count_t count ;
+
+	if ((count = sf_read_raw (file, test, items)) != items)
+	{	printf ("\n\nLine %d", line_num) ;
+		if (pass > 0)
+			printf (" (pass %d)", pass) ;
+		printf (" : sf_read_raw failed with short read (%" PRId64 " => %" PRId64 ").\n", items, count) ;
+		fflush (stdout) ;
+		puts (sf_strerror (file)) ;
+		exit (1) ;
+		} ;
+
+	return ;
+} /* test_read_raw_or_die */
+
 [+ FOR write_op +]
 [+ FOR io_type +]
 void
@@ -643,26 +695,44 @@ test_[+ (get "op_element") +]_[+ (get "io_element") +]_or_die (SNDFILE *file, in
 	{	printf ("\n\nLine %d", line_num) ;
 		if (pass > 0)
 			printf (" (pass %d)", pass) ;
-		printf (" : sf_[+ (get "op_element") +]_[+ (get "io_element") +] failed with short [+ (get "op_element") +] (%ld => %ld).\n",
-						SF_COUNT_TO_LONG ([+ (get "count_name") +]), SF_COUNT_TO_LONG (count)) ;
+		printf (" : sf_[+ (get "op_element") +]_[+ (get "io_element") +] failed with short [+ (get "op_element") +] (%" PRId64 " => %" PRId64 ").\n",
+						[+ (get "count_name") +], count) ;
 		fflush (stdout) ;
 		puts (sf_strerror (file)) ;
 		exit (1) ;
 		} ;
 
 	return ;
-} /* test_[+ (get "op_element") +]_[+ (get "io_element") +] */
+} /* test_[+ (get "op_element") +]_[+ (get "io_element") +]_or_die */
 [+ ENDFOR io_type +][+ ENDFOR write_op +]
 
+void
+test_write_raw_or_die (SNDFILE *file, int pass, const void *test, sf_count_t items, int line_num)
+{	sf_count_t count ;
+
+	if ((count = sf_write_raw (file, test, items)) != items)
+	{	printf ("\n\nLine %d", line_num) ;
+		if (pass > 0)
+			printf (" (pass %d)", pass) ;
+		printf (" : sf_write_raw failed with short write (%" PRId64 " => %" PRId64 ").\n", items, count) ;
+		fflush (stdout) ;
+		puts (sf_strerror (file)) ;
+		exit (1) ;
+		} ;
+
+	return ;
+} /* test_write_raw_or_die */
+
+
 [+ FOR io_type
 +]void
-compare_[+ (get "io_element") +]_or_die (const [+ (get "io_element") +] *left, const [+ (get "io_element") +] *right, unsigned count, int line_num)
+compare_[+ (get "io_element") +]_or_die (const [+ (get "io_element") +] *expected, const [+ (get "io_element") +] *actual, unsigned count, int line_num)
 {
 	unsigned k ;
 
-	for (k = 0 ; k < count ;k++)
-		if (left [k] != right [k])
-		{	printf ("\n\nLine %d : Error at index %d, " [+ (get "format_str") +] " should be " [+ (get "format_str") +] ".\n\n", line_num, k, left [k], right [k]) ;
+	for (k = 0 ; k < count ; k++)
+		if (expected [k] != actual [k])
+		{	printf ("\n\nLine %d : Error at index %d, got " [+ (get "format_str") +] ", should be " [+ (get "format_str") +] ".\n\n", line_num, k, actual [k], expected [k]) ;
 			exit (1) ;
 			} ;
 
@@ -705,7 +775,7 @@ static int allowed_open_files = -1 ;
 void
 count_open_files (void)
 {
-#if (defined (WIN32) || defined (_WIN32))
+#if OS_IS_WIN32
 	return ;
 #else
 	int k, count = 0 ;
@@ -730,8 +800,8 @@ increment_open_file_count (void)
 void
 check_open_file_count_or_die (int lineno)
 {
-#if (defined (WIN32) || defined (_WIN32))
-	lineno = 0 ;
+#if OS_IS_WIN32
+	(void) lineno ;
 	return ;
 #else
 	int k, count = 0 ;
@@ -773,7 +843,7 @@ write_mono_file (const char * filename, int format, int srate, float * output, i
 } /* write_mono_file */
 
 void
-gen_lowpass_noise_float (float *data, int len)
+gen_lowpass_signal_float (float *data, int len)
 {	int32_t value = 0x1243456 ;
 	double sample, last_val = 0.0 ;
 	int k ;
@@ -787,10 +857,12 @@ gen_lowpass_noise_float (float *data, int len)
 		sample = value / (0x7fffffff * 1.000001) ;
 		sample = 0.2 * sample - 0.9 * last_val ;
 
-		data [k] = last_val = sample ;
+		last_val = sample ;
+
+		data [k] = 0.5 * (sample + sin (2.0 * k * M_PI * 1.0 / 32.0)) ;
 		} ;
 
-} /* gen_lowpass_noise_float */
+} /* gen_lowpass_signal_float */
 
 
 /*
diff --git a/libs/libsndfile/tests/virtual_io_test.c b/libs/libsndfile/tests/virtual_io_test.c
index b84bf6b3b0..1aae063df8 100644
--- a/libs/libsndfile/tests/virtual_io_test.c
+++ b/libs/libsndfile/tests/virtual_io_test.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2011 Erik de Castro Lopo 
 **
 ** 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
@@ -39,6 +39,7 @@ main (void)
 	vio_test ("vio_pcm16.wav", SF_FORMAT_WAV | SF_FORMAT_PCM_16) ;
 	vio_test ("vio_pcm24.aiff", SF_FORMAT_AIFF | SF_FORMAT_PCM_24) ;
 	vio_test ("vio_float.au", SF_FORMAT_AU | SF_FORMAT_FLOAT) ;
+	vio_test ("vio_pcm24.paf", SF_FORMAT_PAF | SF_FORMAT_PCM_24) ;
 
 	return 0 ;
 } /* main */
@@ -189,6 +190,11 @@ vio_test (const char *fname, int format)
 		exit (1) ;
 		} ;
 
+	if (vfget_filelen (&vio_data) < 0)
+	{	printf ("\n\nLine %d : vfget_filelen returned negative length.\n\n", __LINE__) ;
+		exit (1) ;
+		} ;
+
 	gen_short_data (data, ARRAY_LEN (data), 0) ;
 	sf_write_short (file, data, ARRAY_LEN (data)) ;
 
diff --git a/libs/libsndfile/tests/vorbis_test.c b/libs/libsndfile/tests/vorbis_test.c
index c86a22cfac..9f5797fde9 100644
--- a/libs/libsndfile/tests/vorbis_test.c
+++ b/libs/libsndfile/tests/vorbis_test.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2007-2009 Erik de Castro Lopo 
+** Copyright (C) 2007-2011 Erik de Castro Lopo 
 **
 ** 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
@@ -96,8 +96,8 @@ vorbis_test (void)
 	for (k = 0 ; k < ARRAY_LEN (float_data) ; k ++)
 		max_abs = max_float (max_abs, fabs (float_data [k])) ;
 
-	if (max_abs > 1.02)
-	{	printf ("\n\n    Error : max_abs %f should be < 1.02.\n\n", max_abs) ;
+	if (max_abs > 1.021)
+	{	printf ("\n\n    Error : max_abs %f should be < 1.021.\n\n", max_abs) ;
 		exit (1) ;
 		} ;
 
diff --git a/libs/libsndfile/tests/win32_ordinal_test.c b/libs/libsndfile/tests/win32_ordinal_test.c
index acdcc75343..5324a2ed57 100644
--- a/libs/libsndfile/tests/win32_ordinal_test.c
+++ b/libs/libsndfile/tests/win32_ordinal_test.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2006-2009 Erik de Castro Lopo 
+** Copyright (C) 2006-2011 Erik de Castro Lopo 
 **
 ** 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
@@ -17,7 +17,6 @@
 */
 
 #include "sfconfig.h"
-#include "sndfile.h"
 
 #include 
 #include 
@@ -47,7 +46,7 @@
 
 
 static const char * locations [] =
-{	"../src/", "src/", "../src/.libs/", "src/.libs/",
+{	".", "../src/", "src/", "../src/.libs/", "src/.libs/",
 	NULL
 } ; /* locations. */
 
diff --git a/libs/libsndfile/tests/win32_test.c b/libs/libsndfile/tests/win32_test.c
index 3f776b8378..d0dc6d8ea4 100644
--- a/libs/libsndfile/tests/win32_test.c
+++ b/libs/libsndfile/tests/win32_test.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2001-2009 Erik de Castro Lopo 
+** Copyright (C) 2001-2011 Erik de Castro Lopo 
 **
 ** 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
@@ -21,6 +21,7 @@
 
 #include 
 #include 
+#include 
 
 #if HAVE_UNISTD_H
 #include 
@@ -38,7 +39,8 @@
 
 #define SIGNED_SIZEOF(x)	((int) sizeof (x))
 
-#if defined (__CYGWIN__)
+/* EMX is OS/2. */
+#if defined (__CYGWIN__) || defined (__EMX__)
 
 	#define		LSEEK	lseek
 	#define		FSTAT	fstat
@@ -74,6 +76,7 @@
 static void show_fstat_error (void) ;
 static void show_lseek_error (void) ;
 static void show_stat_fstat_error (void) ;
+static void write_to_closed_file (void) ;
 
 int
 main (void)
@@ -88,6 +91,7 @@ main (void)
 	show_fstat_error () ;
 	show_lseek_error () ;
 	show_stat_fstat_error () ;
+	write_to_closed_file () ;
 
 	puts ("\n\n") ;
 
@@ -100,7 +104,7 @@ show_fstat_error (void)
 	static char data [256] ;
 
 	STATBUF 	statbuf ;
-	int fd, mode, flags, ignored ;
+	int fd, mode, flags ;
 
 	if (sizeof (statbuf.st_size) != sizeof (INT64))
 	{	printf ("\n\nLine %d: Error, sizeof (statbuf.st_size) != 8.\n\n", __LINE__) ;
@@ -116,7 +120,7 @@ show_fstat_error (void)
 	{	printf ("\n\nLine %d: open() failed : %s\n\n", __LINE__, strerror (errno)) ;
 		return ;
 		} ;
-	ignored = write (fd, data, sizeof (data)) ;
+	assert (write (fd, data, sizeof (data)) > 0) ;
 	close (fd) ;
 
 	printf ("1) Re-open file in read/write mode and write another %d bytes at the end.\n", SIGNED_SIZEOF (data)) ;
@@ -127,7 +131,7 @@ show_fstat_error (void)
 		return ;
 		} ;
 	LSEEK (fd, 0, SEEK_END) ;
-	ignored = write (fd, data, sizeof (data)) ;
+	assert (write (fd, data, sizeof (data)) > 0) ;
 
 	printf ("2) Now use system (\"%s %s\") to show the file length.\n\n", dir_cmd, filename) ;
 
@@ -137,7 +141,7 @@ show_fstat_error (void)
 	strncat (data, " ", sizeof (data) - 1 - strlen (data)) ;
 	strncat (data, filename, sizeof (data) - 1 - strlen (data)) ;
 
-	ignored = system (data) ;
+	assert (system (data) >= 0) ;
 	puts ("") ;
 
 	printf ("3) Now use fstat() to get the file length.\n") ;
@@ -165,7 +169,7 @@ show_lseek_error (void)
 	static char data [256] ;
 
 	INT64	retval ;
-	int fd, mode, flags, ignored ;
+	int fd, mode, flags ;
 
 	puts ("\n64 bit lseek() test.\n--------------------") ;
 
@@ -176,7 +180,7 @@ show_lseek_error (void)
 	{	printf ("\n\nLine %d: open() failed : %s\n\n", __LINE__, strerror (errno)) ;
 		return ;
 		} ;
-	ignored = write (fd, data, sizeof (data)) ;
+	assert (write (fd, data, sizeof (data)) > 0) ;
 	close (fd) ;
 
 	printf ("1) Re-open file in read/write mode and write another %d bytes at the end.\n", SIGNED_SIZEOF (data)) ;
@@ -188,7 +192,7 @@ show_lseek_error (void)
 		} ;
 
 	LSEEK (fd, 0, SEEK_END) ;
-	ignored = write (fd, data, sizeof (data)) ;
+	assert (write (fd, data, sizeof (data)) > 0) ;
 
 	printf ("2) Now use system (\"%s %s\") to show the file length.\n\n", dir_cmd, filename) ;
 
@@ -198,7 +202,7 @@ show_lseek_error (void)
 	strncat (data, " ", sizeof (data) - 1 - strlen (data)) ;
 	strncat (data, filename, sizeof (data) - 1 - strlen (data)) ;
 
-	ignored = system (data) ;
+	assert (system (data) >= 0) ;
 	puts ("") ;
 
 	printf ("3) Now use lseek() to go to the end of the file.\n") ;
@@ -223,7 +227,7 @@ show_stat_fstat_error (void)
 	static char data [256] ;
 
 	int fd, mode, flags ;
-	int stat_size, fstat_size, ignored ;
+	int stat_size, fstat_size ;
 	struct stat buf ;
 
 	/* Known to fail on WinXP. */
@@ -238,7 +242,7 @@ show_stat_fstat_error (void)
 		return ;
 		} ;
 
-	ignored = write (fd, data, sizeof (data)) ;
+	assert (write (fd, data, sizeof (data)) > 0) ;
 
 	printf ("1) Now call stat and fstat on the file and retreive the file lengths.\n") ;
 
@@ -254,7 +258,7 @@ show_stat_fstat_error (void)
 		} ;
 	fstat_size = buf.st_size ;
 
-	printf ("3) Size returned by stat and fstat is %d and %d, ", stat_size, fstat_size) ;
+	printf ("2) Size returned by stat and fstat is %d and %d, ", stat_size, fstat_size) ;
 
 
 	if (stat_size == 0 || stat_size != fstat_size)
@@ -271,3 +275,44 @@ error_exit :
 } /* show_stat_fstat_error */
 
 
+static void
+write_to_closed_file (void)
+{	const char * filename = "closed_write_test.txt" ;
+	struct stat buf ;
+	FILE * file ;
+	int		fd ;
+
+	puts ("\nWrite to closed file test.\n--------------------------") ;
+
+	printf ("0) First we open file for write using fopen().\n") ;
+	if ((file = fopen (filename, "w")) == NULL)
+	{	printf ("\n\nLine %d: fopen() failed : %s\n\n", __LINE__, strerror (errno)) ;
+		return ;
+		} ;
+
+	printf ("1) Now we grab the file descriptor fileno().\n") ;
+	fd = fileno (file) ;
+
+	printf ("2) Write some text via the file descriptor.\n") ;
+	assert (write (fd, "a\n", 2) > 0) ;
+
+	printf ("3) Now we close the file using fclose().\n") ;
+	fclose (file) ;
+
+	stat (filename, &buf) ;
+	printf ("   File size is %d bytes.\n", (int) buf.st_size) ;
+
+	printf ("4) Now write more data to the file descriptor which should fail.\n") ;
+	if (write (fd, "b\n", 2) < 0)
+		printf ("5) Good, write returned an error code as it should have.\n") ;
+	else
+	{	printf ("5) Attempting to write to a closed file should have failed but didn't! *** WRONG ***\n") ;
+
+		stat (filename, &buf) ;
+		printf ("   File size is %d bytes.\n", (int) buf.st_size) ;
+		} ;
+
+	unlink (filename) ;
+
+	return ;
+} /* write_to_closed_file */
diff --git a/libs/libsndfile/tests/write_read_test.c b/libs/libsndfile/tests/write_read_test.c
index a758454cf1..9f8a8f538b 100644
--- a/libs/libsndfile/tests/write_read_test.c
+++ b/libs/libsndfile/tests/write_read_test.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2011 Erik de Castro Lopo 
 **
 ** 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
@@ -347,9 +347,9 @@ main (int argc, char **argv)
 		} ;
 
 	if (do_all || ! strcmp (argv [1], "sds"))
-	{	pcm_test_char	("char.sds"		, SF_FORMAT_SDS | SF_FORMAT_PCM_S8, SF_TRUE) ;
-		pcm_test_short	("short.sds"	, SF_FORMAT_SDS | SF_FORMAT_PCM_16, SF_TRUE) ;
-		pcm_test_24bit	("24bit.sds"	, SF_FORMAT_SDS | SF_FORMAT_PCM_24, SF_TRUE) ;
+	{	pcm_test_char	("char.sds"		, SF_FORMAT_SDS | SF_FORMAT_PCM_S8, SF_FALSE) ;
+		pcm_test_short	("short.sds"	, SF_FORMAT_SDS | SF_FORMAT_PCM_16, SF_FALSE) ;
+		pcm_test_24bit	("24bit.sds"	, SF_FORMAT_SDS | SF_FORMAT_PCM_24, SF_FALSE) ;
 
 		empty_file_test ("empty_char.sds", SF_FORMAT_SDS | SF_FORMAT_PCM_S8) ;
 		empty_file_test ("empty_short.sds", SF_FORMAT_SDS | SF_FORMAT_PCM_16) ;
@@ -435,8 +435,8 @@ static void write_seek_extend_test (const char * filename, int format) ;
 static void
 pcm_test_char (const char *filename, int format, int long_file_ok)
 {	SF_INFO		sfinfo ;
-	short		*orig, *test ;
-	int			k, items, allow_fd ;
+	short		*orig ;
+	int			k, allow_fd ;
 
 	/* Sd2 files cannot be opened from an existing file descriptor. */
 	allow_fd = ((format & SF_FORMAT_TYPEMASK) == SF_FORMAT_SD2) ? SF_FALSE : SF_TRUE ;
@@ -451,13 +451,10 @@ pcm_test_char (const char *filename, int format, int long_file_ok)
 	gen_windowed_sine_double (orig_data.d, DATA_LENGTH, 32000.0) ;
 
 	orig = orig_data.s ;
-	test = test_data.s ;
 
 	/* Make this a macro so gdb steps over it in one go. */
 	CONVERT_DATA (k, DATA_LENGTH, orig, orig_data.d) ;
 
-	items = DATA_LENGTH ;
-
 	/* Some test broken out here. */
 
 	mono_char_test (filename, format, long_file_ok, allow_fd) ;
@@ -954,8 +951,8 @@ static void write_seek_extend_test (const char * filename, int format) ;
 static void
 pcm_test_short (const char *filename, int format, int long_file_ok)
 {	SF_INFO		sfinfo ;
-	short		*orig, *test ;
-	int			k, items, allow_fd ;
+	short		*orig ;
+	int			k, allow_fd ;
 
 	/* Sd2 files cannot be opened from an existing file descriptor. */
 	allow_fd = ((format & SF_FORMAT_TYPEMASK) == SF_FORMAT_SD2) ? SF_FALSE : SF_TRUE ;
@@ -970,13 +967,10 @@ pcm_test_short (const char *filename, int format, int long_file_ok)
 	gen_windowed_sine_double (orig_data.d, DATA_LENGTH, 32000.0) ;
 
 	orig = orig_data.s ;
-	test = test_data.s ;
 
 	/* Make this a macro so gdb steps over it in one go. */
 	CONVERT_DATA (k, DATA_LENGTH, orig, orig_data.d) ;
 
-	items = DATA_LENGTH ;
-
 	/* Some test broken out here. */
 
 	mono_short_test (filename, format, long_file_ok, allow_fd) ;
@@ -1473,8 +1467,8 @@ static void write_seek_extend_test (const char * filename, int format) ;
 static void
 pcm_test_24bit (const char *filename, int format, int long_file_ok)
 {	SF_INFO		sfinfo ;
-	int		*orig, *test ;
-	int			k, items, allow_fd ;
+	int		*orig ;
+	int			k, allow_fd ;
 
 	/* Sd2 files cannot be opened from an existing file descriptor. */
 	allow_fd = ((format & SF_FORMAT_TYPEMASK) == SF_FORMAT_SD2) ? SF_FALSE : SF_TRUE ;
@@ -1489,13 +1483,10 @@ pcm_test_24bit (const char *filename, int format, int long_file_ok)
 	gen_windowed_sine_double (orig_data.d, DATA_LENGTH, (1.0 * 0x7F000000)) ;
 
 	orig = orig_data.i ;
-	test = test_data.i ;
 
 	/* Make this a macro so gdb steps over it in one go. */
 	CONVERT_DATA (k, DATA_LENGTH, orig, orig_data.d) ;
 
-	items = DATA_LENGTH ;
-
 	/* Some test broken out here. */
 
 	mono_24bit_test (filename, format, long_file_ok, allow_fd) ;
@@ -1992,8 +1983,8 @@ static void write_seek_extend_test (const char * filename, int format) ;
 static void
 pcm_test_int (const char *filename, int format, int long_file_ok)
 {	SF_INFO		sfinfo ;
-	int		*orig, *test ;
-	int			k, items, allow_fd ;
+	int		*orig ;
+	int			k, allow_fd ;
 
 	/* Sd2 files cannot be opened from an existing file descriptor. */
 	allow_fd = ((format & SF_FORMAT_TYPEMASK) == SF_FORMAT_SD2) ? SF_FALSE : SF_TRUE ;
@@ -2008,13 +1999,10 @@ pcm_test_int (const char *filename, int format, int long_file_ok)
 	gen_windowed_sine_double (orig_data.d, DATA_LENGTH, (1.0 * 0x7F000000)) ;
 
 	orig = orig_data.i ;
-	test = test_data.i ;
 
 	/* Make this a macro so gdb steps over it in one go. */
 	CONVERT_DATA (k, DATA_LENGTH, orig, orig_data.d) ;
 
-	items = DATA_LENGTH ;
-
 	/* Some test broken out here. */
 
 	mono_int_test (filename, format, long_file_ok, allow_fd) ;
@@ -2511,8 +2499,8 @@ static void write_seek_extend_test (const char * filename, int format) ;
 static void
 pcm_test_float (const char *filename, int format, int long_file_ok)
 {	SF_INFO		sfinfo ;
-	float		*orig, *test ;
-	int			k, items, allow_fd ;
+	float		*orig ;
+	int			k, allow_fd ;
 
 	/* Sd2 files cannot be opened from an existing file descriptor. */
 	allow_fd = ((format & SF_FORMAT_TYPEMASK) == SF_FORMAT_SD2) ? SF_FALSE : SF_TRUE ;
@@ -2527,13 +2515,10 @@ pcm_test_float (const char *filename, int format, int long_file_ok)
 	gen_windowed_sine_double (orig_data.d, DATA_LENGTH, 1.0) ;
 
 	orig = orig_data.f ;
-	test = test_data.f ;
 
 	/* Make this a macro so gdb steps over it in one go. */
 	CONVERT_DATA (k, DATA_LENGTH, orig, orig_data.d) ;
 
-	items = DATA_LENGTH ;
-
 	/* Some test broken out here. */
 
 	mono_float_test (filename, format, long_file_ok, allow_fd) ;
@@ -3030,8 +3015,8 @@ static void write_seek_extend_test (const char * filename, int format) ;
 static void
 pcm_test_double (const char *filename, int format, int long_file_ok)
 {	SF_INFO		sfinfo ;
-	double		*orig, *test ;
-	int			k, items, allow_fd ;
+	double		*orig ;
+	int			k, allow_fd ;
 
 	/* Sd2 files cannot be opened from an existing file descriptor. */
 	allow_fd = ((format & SF_FORMAT_TYPEMASK) == SF_FORMAT_SD2) ? SF_FALSE : SF_TRUE ;
@@ -3046,13 +3031,10 @@ pcm_test_double (const char *filename, int format, int long_file_ok)
 	gen_windowed_sine_double (orig_data.d, DATA_LENGTH, 1.0) ;
 
 	orig = orig_data.d ;
-	test = test_data.d ;
 
 	/* Make this a macro so gdb steps over it in one go. */
 	CONVERT_DATA (k, DATA_LENGTH, orig, orig_data.d) ;
 
-	items = DATA_LENGTH ;
-
 	/* Some test broken out here. */
 
 	mono_double_test (filename, format, long_file_ok, allow_fd) ;
diff --git a/libs/libsndfile/tests/write_read_test.def b/libs/libsndfile/tests/write_read_test.def
index cfc7ce58dc..3316aec577 100644
--- a/libs/libsndfile/tests/write_read_test.def
+++ b/libs/libsndfile/tests/write_read_test.def
@@ -1,6 +1,6 @@
 autogen definitions write_read_test.tpl;
 
-data_type = { 
+data_type = {
 	type_name		= char ;
 	data_type		= short ;
 	data_field		= s ;
@@ -10,7 +10,7 @@ data_type = {
 	max_error		= "255" ;
 	} ;
 
-data_type = { 
+data_type = {
 	type_name		= short ;
 	data_type		= short ;
 	data_field		= s ;
@@ -20,7 +20,17 @@ data_type = {
 	max_error		= "0" ;
 	} ;
 
-data_type = { 
+data_type = {
+	type_name		= "20bit" ;
+	data_type		= int ;
+	data_field		= i ;
+	error_func		= BIT_20_ERROR ;
+	format_char		= "0x%X" ;
+	max_val			= "(1.0 * 0x7F00000)" ;
+	max_error		= "4096" ;
+	} ;
+
+data_type = {
 	type_name		= "24bit" ;
 	data_type		= int ;
 	data_field		= i ;
@@ -30,7 +40,7 @@ data_type = {
 	max_error		= "256" ;
 	} ;
 
-data_type = { 
+data_type = {
 	type_name		= int ;
 	data_type		= int ;
 	data_field		= i ;
@@ -42,7 +52,7 @@ data_type = {
 
 /* Lite remove start */
 
-data_type = { 
+data_type = {
 	type_name		= float ;
 	data_type		= float ;
 	data_field		= f ;
@@ -52,7 +62,7 @@ data_type = {
 	max_error		= "0" ;
 	} ;
 
-data_type = { 
+data_type = {
 	type_name		= double ;
 	data_type		= double ;
 	data_field		= d ;
diff --git a/libs/libsndfile/tests/write_read_test.tpl b/libs/libsndfile/tests/write_read_test.tpl
index 550e22494a..55bf1db173 100644
--- a/libs/libsndfile/tests/write_read_test.tpl
+++ b/libs/libsndfile/tests/write_read_test.tpl
@@ -1,6 +1,6 @@
 [+ AutoGen5 template c +]
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2012 Erik de Castro Lopo 
 **
 ** 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
@@ -22,25 +22,21 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+
 
 #if HAVE_UNISTD_H
 #include 
 #endif
 
-#include	
+#include 
 
-#if (defined (WIN32) || defined (_WIN32))
-#include	
-static int truncate (const char *filename, int ignored) ;
-#endif
-
-#include	
-
-#include	"utils.h"
-#include	"generate.h"
+#include "utils.h"
+#include "generate.h"
 
 #define	SAMPLE_RATE			11025
-#define	DATA_LENGTH			(1<<12)
+#define	DATA_LENGTH			(1 << 12)
 
 #define	SILLY_WRITE_COUNT	(234)
 
@@ -191,6 +187,12 @@ main (int argc, char **argv)
 		/* Lite remove start */
 		pcm_test_float	("float_le.caf"	, SF_ENDIAN_LITTLE | SF_FORMAT_CAF | SF_FORMAT_FLOAT , SF_FALSE) ;
 		pcm_test_double	("double_le.caf", SF_ENDIAN_LITTLE | SF_FORMAT_CAF | SF_FORMAT_DOUBLE, SF_FALSE) ;
+
+		pcm_test_short	("alac16.caf"	, SF_FORMAT_CAF | SF_FORMAT_ALAC_16, SF_FALSE) ;
+		pcm_test_20bit	("alac20.caf"	, SF_FORMAT_CAF | SF_FORMAT_ALAC_20, SF_FALSE) ;
+		pcm_test_24bit	("alac24.caf"	, SF_FORMAT_CAF | SF_FORMAT_ALAC_24, SF_FALSE) ;
+		pcm_test_int	("alac32.caf"	, SF_FORMAT_CAF | SF_FORMAT_ALAC_32, SF_FALSE) ;
+
 		/* Lite remove end */
 		test_count++ ;
 		} ;
@@ -345,9 +347,9 @@ main (int argc, char **argv)
 		} ;
 
 	if (do_all || ! strcmp (argv [1], "sds"))
-	{	pcm_test_char	("char.sds"		, SF_FORMAT_SDS | SF_FORMAT_PCM_S8, SF_TRUE) ;
-		pcm_test_short	("short.sds"	, SF_FORMAT_SDS | SF_FORMAT_PCM_16, SF_TRUE) ;
-		pcm_test_24bit	("24bit.sds"	, SF_FORMAT_SDS | SF_FORMAT_PCM_24, SF_TRUE) ;
+	{	pcm_test_char	("char.sds"		, SF_FORMAT_SDS | SF_FORMAT_PCM_S8, SF_FALSE) ;
+		pcm_test_short	("short.sds"	, SF_FORMAT_SDS | SF_FORMAT_PCM_16, SF_FALSE) ;
+		pcm_test_24bit	("24bit.sds"	, SF_FORMAT_SDS | SF_FORMAT_PCM_24, SF_FALSE) ;
 
 		empty_file_test ("empty_char.sds", SF_FORMAT_SDS | SF_FORMAT_PCM_S8) ;
 		empty_file_test ("empty_short.sds", SF_FORMAT_SDS | SF_FORMAT_PCM_16) ;
@@ -359,6 +361,7 @@ main (int argc, char **argv)
 	{	pcm_test_char	("char.sd2"		, SF_FORMAT_SD2 | SF_FORMAT_PCM_S8, SF_TRUE) ;
 		pcm_test_short	("short.sd2"	, SF_FORMAT_SD2 | SF_FORMAT_PCM_16, SF_TRUE) ;
 		pcm_test_24bit	("24bit.sd2"	, SF_FORMAT_SD2 | SF_FORMAT_PCM_24, SF_TRUE) ;
+		pcm_test_int	("32bit.sd2"	, SF_FORMAT_SD2 | SF_FORMAT_PCM_32, SF_TRUE) ;
 		test_count++ ;
 		} ;
 
@@ -409,12 +412,13 @@ main (int argc, char **argv)
 
 static void	create_short_file (const char *filename) ;
 
-#define	CHAR_ERROR(x,y)		(abs ((x) - (y)) > 255)
-#define	INT_ERROR(x,y)		(((x) - (y)) != 0)
-#define	TRIBYTE_ERROR(x,y)	(abs ((x) - (y)) > 255)
-#define	FLOAT_ERROR(x,y)	(fabs ((x) - (y)) > 1e-5)
+#define	CHAR_ERROR(x, y)		(abs ((x) - (y)) > 255)
+#define	INT_ERROR(x, y)			(((x) - (y)) != 0)
+#define	BIT_20_ERROR(x, y)		(abs ((x) - (y)) > 4095)
+#define	TRIBYTE_ERROR(x, y)		(abs ((x) - (y)) > 255)
+#define	FLOAT_ERROR(x, y)		(fabs ((x) - (y)) > 1e-5)
 
-#define CONVERT_DATA(k,len,new,orig)					\
+#define CONVERT_DATA(k, len, new, orig)					\
 			{	for ((k) = 0 ; (k) < (len) ; (k) ++)	\
 					(new) [k] = (orig) [k] ;			\
 				}
@@ -434,8 +438,8 @@ static void write_seek_extend_test (const char * filename, int format) ;
 static void
 pcm_test_[+ (get "type_name") +] (const char *filename, int format, int long_file_ok)
 {	SF_INFO		sfinfo ;
-	[+ (get "data_type") +]		*orig, *test ;
-	int			k, items, allow_fd ;
+	[+ (get "data_type") +]		*orig ;
+	int			k, allow_fd ;
 
 	/* Sd2 files cannot be opened from an existing file descriptor. */
 	allow_fd = ((format & SF_FORMAT_TYPEMASK) == SF_FORMAT_SD2) ? SF_FALSE : SF_TRUE ;
@@ -450,13 +454,10 @@ pcm_test_[+ (get "type_name") +] (const char *filename, int format, int long_fil
 	gen_windowed_sine_double (orig_data.d, DATA_LENGTH, [+ (get "max_val") +]) ;
 
 	orig = orig_data.[+ (get "data_field") +] ;
-	test = test_data.[+ (get "data_field") +] ;
 
 	/* Make this a macro so gdb steps over it in one go. */
 	CONVERT_DATA (k, DATA_LENGTH, orig, orig_data.d) ;
 
-	items = DATA_LENGTH ;
-
 	/* Some test broken out here. */
 
 	mono_[+ (get "type_name") +]_test (filename, format, long_file_ok, allow_fd) ;
@@ -469,7 +470,12 @@ pcm_test_[+ (get "type_name") +] (const char *filename, int format, int long_fil
 		return ;
 		} ;
 
-	if ((format & SF_FORMAT_TYPEMASK) != SF_FORMAT_FLAC)
+	if ((format & SF_FORMAT_TYPEMASK) != SF_FORMAT_FLAC
+		&& (format & SF_FORMAT_SUBMASK) != SF_FORMAT_ALAC_16
+		&& (format & SF_FORMAT_SUBMASK) != SF_FORMAT_ALAC_20
+		&& (format & SF_FORMAT_SUBMASK) != SF_FORMAT_ALAC_24
+		&& (format & SF_FORMAT_SUBMASK) != SF_FORMAT_ALAC_32
+		)
 		mono_rdwr_[+ (get "type_name") +]_test (filename, format, long_file_ok, allow_fd) ;
 
 	/* If the format doesn't support stereo we're done. */
@@ -484,9 +490,14 @@ pcm_test_[+ (get "type_name") +] (const char *filename, int format, int long_fil
 
 	/* New read/write test. Not sure if this is needed yet. */
 
-	if ((format & SF_FORMAT_TYPEMASK) != SF_FORMAT_PAF &&
-			(format & SF_FORMAT_TYPEMASK) != SF_FORMAT_VOC &&
-			(format & SF_FORMAT_TYPEMASK) != SF_FORMAT_FLAC)
+	if ((format & SF_FORMAT_TYPEMASK) != SF_FORMAT_PAF
+			&& (format & SF_FORMAT_TYPEMASK) != SF_FORMAT_VOC
+			&& (format & SF_FORMAT_TYPEMASK) != SF_FORMAT_FLAC
+			&& (format & SF_FORMAT_SUBMASK) != SF_FORMAT_ALAC_16
+			&& (format & SF_FORMAT_SUBMASK) != SF_FORMAT_ALAC_20
+			&& (format & SF_FORMAT_SUBMASK) != SF_FORMAT_ALAC_24
+			&& (format & SF_FORMAT_SUBMASK) != SF_FORMAT_ALAC_32
+			)
 		new_rdwr_[+ (get "type_name") +]_test (filename, format, allow_fd) ;
 
 	delete_file (format, filename) ;
@@ -501,7 +512,7 @@ mono_[+ (get "type_name") +]_test (const char *filename, int format, int long_fi
 	SF_INFO		sfinfo ;
 	[+ (get "data_type") +]		*orig, *test ;
 	sf_count_t	count ;
-	int			k, items ;
+	int			k, items, total ;
 
 	sfinfo.samplerate	= 44100 ;
 	sfinfo.frames		= SILLY_WRITE_COUNT ; /* Wrong length. Library should correct this on sf_close. */
@@ -540,12 +551,12 @@ mono_[+ (get "type_name") +]_test (const char *filename, int format, int long_fi
 		} ;
 
 	if (sfinfo.frames < 2 * items)
-	{	printf ("\n\nLine %d : Mono : Incorrect number of frames in file (too short). (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), items) ;
+	{	printf ("\n\nLine %d : Mono : Incorrect number of frames in file (too short). (%" PRId64 " should be %d)\n", __LINE__, sfinfo.frames, items) ;
 		exit (1) ;
 		} ;
 
 	if (! long_file_ok && sfinfo.frames > 2 * items)
-	{	printf ("\n\nLine %d : Mono : Incorrect number of frames in file (too long). (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), items) ;
+	{	printf ("\n\nLine %d : Mono : Incorrect number of frames in file (too long). (%" PRId64 " should be %d)\n", __LINE__, sfinfo.frames, items) ;
 		exit (1) ;
 		} ;
 
@@ -564,6 +575,23 @@ mono_[+ (get "type_name") +]_test (const char *filename, int format, int long_fi
 			exit (1) ;
 			} ;
 
+	/* Test multiple short reads. */
+	test_seek_or_die (file, 0, SEEK_SET, 0, sfinfo.channels, __LINE__) ;
+
+	total = 0 ;
+	for (k = 1 ; k <= 32 ; k++)
+	{	int ik ;
+
+		test_read_[+ (get "data_type") +]_or_die (file, 0, test + total, k, __LINE__) ;
+		total += k ;
+
+		for (ik = 0 ; ik < total ; ik++)
+			if ([+ (get "error_func") +] (orig [ik], test [ik]))
+			{	printf ("\n\nLine %d : Mono : Incorrect sample A (#%d : [+ (get "format_char") +] => [+ (get "format_char") +]).\n", __LINE__, ik, orig [ik], test [ik]) ;
+				exit (1) ;
+				} ;
+		} ;
+
 	/* Seek to start of file. */
 	test_seek_or_die (file, 0, SEEK_SET, 0, sfinfo.channels, __LINE__) ;
 
@@ -574,6 +602,7 @@ mono_[+ (get "type_name") +]_test (const char *filename, int format, int long_fi
 			exit (1) ;
 			} ;
 
+	/* For some codecs we can't go past here. */
 	if ((format & SF_FORMAT_SUBMASK) == SF_FORMAT_DWVW_16 ||
 			(format & SF_FORMAT_SUBMASK) == SF_FORMAT_DWVW_24)
 	{	sf_close (file) ;
@@ -628,7 +657,7 @@ mono_[+ (get "type_name") +]_test (const char *filename, int format, int long_fi
 
 	/* Check that we haven't read beyond EOF. */
 	if (count > sfinfo.frames)
-	{	printf ("\n\nLines %d : read past end of file (%ld should be %ld)\n", __LINE__, (long) count, (long) sfinfo.frames) ;
+	{	printf ("\n\nLines %d : read past end of file (%" PRId64 " should be %" PRId64 ")\n", __LINE__, count, sfinfo.frames) ;
 		exit (1) ;
 		} ;
 
@@ -688,14 +717,14 @@ stereo_[+ (get "type_name") +]_test (const char *filename, int format, int long_
 		} ;
 
 	if (sfinfo.frames < frames)
-	{	printf ("\n\nLine %d : Stereo : Incorrect number of frames in file (too short). (%ld should be %d)\n",
-				__LINE__, SF_COUNT_TO_LONG (sfinfo.frames), frames) ;
+	{	printf ("\n\nLine %d : Stereo : Incorrect number of frames in file (too short). (%" PRId64 " should be %d)\n",
+				__LINE__, sfinfo.frames, frames) ;
 		exit (1) ;
 		} ;
 
 	if (! long_file_ok && sfinfo.frames > frames)
-	{	printf ("\n\nLine %d : Stereo : Incorrect number of frames in file (too long). (%ld should be %d)\n",
-				__LINE__, SF_COUNT_TO_LONG (sfinfo.frames), frames) ;
+	{	printf ("\n\nLine %d : Stereo : Incorrect number of frames in file (too long). (%" PRId64 " should be %d)\n",
+				__LINE__, sfinfo.frames, frames) ;
 		exit (1) ;
 		} ;
 
@@ -781,6 +810,18 @@ mono_rdwr_[+ (get "type_name") +]_test (const char *filename, int format, int lo
 	[+ (get "data_type") +]		*orig, *test ;
 	int			k, pass ;
 
+	switch (format & SF_FORMAT_SUBMASK)
+	{	case SF_FORMAT_ALAC_16 :
+		case SF_FORMAT_ALAC_20 :
+		case SF_FORMAT_ALAC_24 :
+		case SF_FORMAT_ALAC_32 :
+			allow_fd = 0 ;
+			break ;
+
+		default :
+			break ;
+		} ;
+
 	orig = orig_data.[+ (get "data_field") +] ;
 	test = test_data.[+ (get "data_field") +] ;
 
@@ -859,12 +900,12 @@ mono_rdwr_[+ (get "type_name") +]_test (const char *filename, int format, int lo
 		} ;
 
 	if (sfinfo.frames < 3 * DATA_LENGTH)
-	{	printf ("\n\nLine %d : Not enough frames in file. (%ld < %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), 3 * DATA_LENGTH ) ;
+	{	printf ("\n\nLine %d : Not enough frames in file. (%" PRId64 " < %d)\n", __LINE__, sfinfo.frames, 3 * DATA_LENGTH) ;
 		exit (1) ;
 		}
 
 	if (! long_file_ok && sfinfo.frames != 3 * DATA_LENGTH)
-	{	printf ("\n\nLine %d : Incorrect number of frames in file. (%ld should be %d)\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), 3 * DATA_LENGTH ) ;
+	{	printf ("\n\nLine %d : Incorrect number of frames in file. (%" PRId64 " should be %d)\n", __LINE__, sfinfo.frames, 3 * DATA_LENGTH) ;
 		exit (1) ;
 		} ;
 
@@ -926,7 +967,7 @@ new_rdwr_[+ (get "type_name") +]_test (const char *filename, int format, int all
 
 	rwfile = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, allow_fd, __LINE__) ;
 	if (sfinfo.frames != 2 * frames)
-	{	printf ("\n\nLine %d : incorrect number of frames in file (%ld should be %d)\n\n", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), 2 * frames) ;
+	{	printf ("\n\nLine %d : incorrect number of frames in file (%" PRId64 " should be %d)\n\n", __LINE__, sfinfo.frames, 2 * frames) ;
 		exit (1) ;
 		} ;
 
@@ -976,8 +1017,8 @@ empty_file_test (const char *filename, int format)
 	/* Open for read and check the length. */
 	file = test_open_file_or_die (filename, SFM_READ, &info, allow_fd, __LINE__) ;
 
-	if (SF_COUNT_TO_LONG (info.frames) != 0)
-	{	printf ("\n\nError : frame count (%ld) should be zero.\n", SF_COUNT_TO_LONG (info.frames)) ;
+	if (info.frames != 0)
+	{	printf ("\n\nError : frame count (%" PRId64 ") should be zero.\n", info.frames) ;
 			exit (1) ;
 			} ;
 
@@ -986,8 +1027,8 @@ empty_file_test (const char *filename, int format)
 	/* Open for read/write and check the length. */
 	file = test_open_file_or_die (filename, SFM_RDWR, &info, allow_fd, __LINE__) ;
 
-	if (SF_COUNT_TO_LONG (info.frames) != 0)
-	{	printf ("\n\nError : frame count (%ld) should be zero.\n", SF_COUNT_TO_LONG (info.frames)) ;
+	if (info.frames != 0)
+	{	printf ("\n\nError : frame count (%" PRId64 ") should be zero.\n", info.frames) ;
 		exit (1) ;
 		} ;
 
@@ -996,8 +1037,8 @@ empty_file_test (const char *filename, int format)
 	/* Open for read and check the length. */
 	file = test_open_file_or_die (filename, SFM_READ, &info, allow_fd, __LINE__) ;
 
-	if (SF_COUNT_TO_LONG (info.frames) != 0)
-	{	printf ("\n\nError : frame count (%ld) should be zero.\n", SF_COUNT_TO_LONG (info.frames)) ;
+	if (info.frames != 0)
+	{	printf ("\n\nError : frame count (%" PRId64 ") should be zero.\n", info.frames) ;
 		exit (1) ;
 		} ;
 
@@ -1031,28 +1072,6 @@ create_short_file (const char *filename)
 	fclose (file) ;
 } /* create_short_file */
 
-#if (defined (WIN32) || defined (__WIN32))
-
-/* Win32 does not have truncate (nor does it have the POSIX function ftruncate).
-** Hack somethng up here to over come this. This function can only truncate to a
-** length of zero.
-*/
-
-static int
-truncate (const char *filename, int ignored)
-{	int fd ;
-
-	ignored = 0 ;
-
-	if ((fd = open (filename, O_RDWR | O_TRUNC | O_BINARY)) < 0)
-		return 0 ;
-
-	close (fd) ;
-
-	return 0 ;
-} /* truncate */
-
-#endif
 
 static void
 multi_seek_test (const char * filename, int format)
@@ -1091,7 +1110,7 @@ write_seek_extend_test (const char * filename, int format)
 	short	*orig, *test ;
 	unsigned items, k ;
 
-	/* This test doesn't work on the following. */
+	/* This test doesn't work on the following container formats. */
 	switch (format & SF_FORMAT_TYPEMASK)
 	{	case SF_FORMAT_FLAC :
 		case SF_FORMAT_HTK :
@@ -1104,6 +1123,18 @@ write_seek_extend_test (const char * filename, int format)
 			break ;
 		} ;
 
+	/* This test doesn't work on the following codec formats. */
+	switch (format & SF_FORMAT_SUBMASK)
+	{	case SF_FORMAT_ALAC_16 :
+		case SF_FORMAT_ALAC_20 :
+		case SF_FORMAT_ALAC_24 :
+		case SF_FORMAT_ALAC_32 :
+			return ;
+
+		default :
+			break ;
+		} ;
+
 	memset (&info, 0, sizeof (info)) ;
 
 	info.samplerate = 48000 ;
diff --git a/libs/win32/libsndfile/config.h b/libs/win32/libsndfile/config.h
index f36852d9f6..bdea0c7bb5 100644
--- a/libs/win32/libsndfile/config.h
+++ b/libs/win32/libsndfile/config.h
@@ -209,7 +209,7 @@
 #define PACKAGE_VERSION "1.0.12"
 
 /* Set to maximum allowed value of sf_count_t type. */
-#define SF_COUNT_MAX 0x7FFFFFFFFFFFFFFFi64
+//#define SF_COUNT_MAX 0x7FFFFFFFFFFFFFFFi64
 
 /* The size of a `double', as computed by sizeof. */
 #define SIZEOF_DOUBLE 8
@@ -265,6 +265,8 @@
 /* Version number of package */
 #define VERSION "1.0.18"
 
+#define HAVE_STDINT_H 1
+
 /* Number of bits in a file offset, on hosts where this is settable. */
 /* #undef _FILE_OFFSET_BITS */
 
@@ -280,6 +282,7 @@ typedef __int32 int32_t;
 typedef intptr_t ssize_t;
 typedef unsigned __int16 uint16_t;
 typedef unsigned __int32 uint32_t;
+#define PRId64 "I64d"
 
 #define __func__ __FUNCTION__
 #define snprintf _snprintf
diff --git a/libs/win32/libsndfile/libsndfile.2010.vcxproj b/libs/win32/libsndfile/libsndfile.2010.vcxproj
index ea9e3be89a..2b06e70d6c 100644
--- a/libs/win32/libsndfile/libsndfile.2010.vcxproj
+++ b/libs/win32/libsndfile/libsndfile.2010.vcxproj
@@ -116,12 +116,24 @@
   
   
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
     
     
     
+    
+    
     
     
     
@@ -144,6 +156,7 @@
     
     
     
+    
     
     
     
@@ -194,6 +207,9 @@
     
   
   
+    
+    
+    
     
   
   
diff --git a/libs/win32/libsndfile/libsndfile.2010.vcxproj.filters b/libs/win32/libsndfile/libsndfile.2010.vcxproj.filters
index f16a39b0c7..a4335a1522 100644
--- a/libs/win32/libsndfile/libsndfile.2010.vcxproj.filters
+++ b/libs/win32/libsndfile/libsndfile.2010.vcxproj.filters
@@ -19,6 +19,9 @@
       {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
       rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav
     
+    
+      {f00f84d5-78ae-4996-bee3-00106a731232}
+    
   
   
     
@@ -225,10 +228,58 @@
     
       Source Files\G72X Sources
     
+    
+      Source Files
+    
+    
+      Source Files
+    
+    
+      Source Files
+    
+    
+      Source Files
+    
+    
+      Source Files\ALLAC Sources
+    
+    
+      Source Files\ALLAC Sources
+    
+    
+      Source Files\ALLAC Sources
+    
+    
+      Source Files\ALLAC Sources
+    
+    
+      Source Files\ALLAC Sources
+    
+    
+      Source Files\ALLAC Sources
+    
+    
+      Source Files\ALLAC Sources
+    
+    
+      Source Files\ALLAC Sources
+    
+    
+      Source Files\ALLAC Sources
+    
   
   
     
       Source Files
     
+    
+      Header Files
+    
+    
+      Source Files\ALLAC Sources
+    
+    
+      Source Files\ALLAC Sources
+    
   
 
\ No newline at end of file
diff --git a/libs/win32/libsndfile/libsndfile.2012.vcxproj b/libs/win32/libsndfile/libsndfile.2012.vcxproj
index 6e76110e21..39dd95373a 100644
--- a/libs/win32/libsndfile/libsndfile.2012.vcxproj
+++ b/libs/win32/libsndfile/libsndfile.2012.vcxproj
@@ -1,4 +1,4 @@
-
+
 
   
     
@@ -120,12 +120,24 @@
   
   
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
     
     
     
+    
+    
     
     
     
@@ -148,6 +160,7 @@
     
     
     
+    
     
     
     
@@ -198,9 +211,12 @@
     
   
   
+    
+    
+    
     
   
   
   
   
-
+
\ No newline at end of file
diff --git a/libs/win32/libsndfile/libsndfile.2012.vcxproj.filters b/libs/win32/libsndfile/libsndfile.2012.vcxproj.filters
index f16a39b0c7..a4335a1522 100644
--- a/libs/win32/libsndfile/libsndfile.2012.vcxproj.filters
+++ b/libs/win32/libsndfile/libsndfile.2012.vcxproj.filters
@@ -19,6 +19,9 @@
       {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
       rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav
     
+    
+      {f00f84d5-78ae-4996-bee3-00106a731232}
+    
   
   
     
@@ -225,10 +228,58 @@
     
       Source Files\G72X Sources
     
+    
+      Source Files
+    
+    
+      Source Files
+    
+    
+      Source Files
+    
+    
+      Source Files
+    
+    
+      Source Files\ALLAC Sources
+    
+    
+      Source Files\ALLAC Sources
+    
+    
+      Source Files\ALLAC Sources
+    
+    
+      Source Files\ALLAC Sources
+    
+    
+      Source Files\ALLAC Sources
+    
+    
+      Source Files\ALLAC Sources
+    
+    
+      Source Files\ALLAC Sources
+    
+    
+      Source Files\ALLAC Sources
+    
+    
+      Source Files\ALLAC Sources
+    
   
   
     
       Source Files
     
+    
+      Header Files
+    
+    
+      Source Files\ALLAC Sources
+    
+    
+      Source Files\ALLAC Sources
+    
   
 
\ No newline at end of file
diff --git a/libs/win32/libsndfile/sndfile.h b/libs/win32/libsndfile/sndfile.h
index 7fc07e0aa3..fa11e700e2 100644
--- a/libs/win32/libsndfile/sndfile.h
+++ b/libs/win32/libsndfile/sndfile.h
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2009 Erik de Castro Lopo 
+** Copyright (C) 1999-2013 Erik de Castro Lopo 
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -105,6 +105,11 @@ enum
 
 	SF_FORMAT_VORBIS		= 0x0060,		/* Xiph Vorbis encoding. */
 
+	SF_FORMAT_ALAC_16		= 0x0070,		/* Apple Lossless Audio Codec (16 bit). */
+	SF_FORMAT_ALAC_20		= 0x0071,		/* Apple Lossless Audio Codec (20 bit). */
+	SF_FORMAT_ALAC_24		= 0x0072,		/* Apple Lossless Audio Codec (24 bit). */
+	SF_FORMAT_ALAC_32		= 0x0073,		/* Apple Lossless Audio Codec (32 bit). */
+
 	/* Endian-ness options. */
 
 	SF_ENDIAN_FILE			= 0x00000000,	/* Default file endian-ness. */
@@ -192,6 +197,11 @@ enum
 	SFC_WAVEX_GET_AMBISONIC			= 0x1201,
 
 	SFC_SET_VBR_ENCODING_QUALITY	= 0x1300,
+	SFC_SET_COMPRESSION_LEVEL		= 0x1301,
+
+	/* Cart Chunk support */
+	SFC_SET_CART_INFO				= 0x1400,
+	SFC_GET_CART_INFO				= 0x1401,
 
 	/* Following commands for testing only. */
 	SFC_TEST_IEEE_FLOAT_REPLACE		= 0x6001,
@@ -199,7 +209,7 @@ enum
 	/*
 	** SFC_SET_ADD_* values are deprecated and will disappear at some
 	** time in the future. They are guaranteed to be here up to and
-	** including version 1.0.8 to avoid breakage of existng software.
+	** including version 1.0.8 to avoid breakage of existing software.
 	** They currently do nothing and will continue to do nothing.
 	*/
 	SFC_SET_ADD_DITHER_ON_WRITE		= 0x1070,
@@ -221,7 +231,9 @@ enum
 	SF_STR_COMMENT					= 0x05,
 	SF_STR_DATE						= 0x06,
 	SF_STR_ALBUM					= 0x07,
-	SF_STR_LICENSE					= 0x08
+	SF_STR_LICENSE					= 0x08,
+	SF_STR_TRACKNUMBER				= 0x09,
+	SF_STR_GENRE					= 0x10
 } ;
 
 /*
@@ -230,7 +242,7 @@ enum
 */
 
 #define	SF_STR_FIRST	SF_STR_TITLE
-#define	SF_STR_LAST		SF_STR_LICENSE
+#define	SF_STR_LAST		SF_STR_GENRE
 
 enum
 {	/* True and false */
@@ -267,27 +279,34 @@ enum
 enum
 {	SF_CHANNEL_MAP_INVALID = 0,
 	SF_CHANNEL_MAP_MONO = 1,
-	SF_CHANNEL_MAP_LEFT,
-	SF_CHANNEL_MAP_RIGHT,
-	SF_CHANNEL_MAP_CENTER,
+	SF_CHANNEL_MAP_LEFT,					/* Apple calls this 'Left' */
+	SF_CHANNEL_MAP_RIGHT,					/* Apple calls this 'Right' */
+	SF_CHANNEL_MAP_CENTER,					/* Apple calls this 'Center' */
 	SF_CHANNEL_MAP_FRONT_LEFT,
 	SF_CHANNEL_MAP_FRONT_RIGHT,
 	SF_CHANNEL_MAP_FRONT_CENTER,
-	SF_CHANNEL_MAP_REAR_CENTER,
-	SF_CHANNEL_MAP_REAR_LEFT,
-	SF_CHANNEL_MAP_REAR_RIGHT,
-	SF_CHANNEL_MAP_LFE,
-	SF_CHANNEL_MAP_FRONT_LEFT_OF_CENTER,
-	SF_CHANNEL_MAP_FRONT_RIGHT_OF_CENTER,
-	SF_CHANNEL_MAP_SIDE_LEFT,
-	SF_CHANNEL_MAP_SIDE_RIGHT,
-	SF_CHANNEL_MAP_TOP_CENTER,
-	SF_CHANNEL_MAP_TOP_FRONT_LEFT,
-	SF_CHANNEL_MAP_TOP_FRONT_RIGHT,
-	SF_CHANNEL_MAP_TOP_FRONT_CENTER,
-	SF_CHANNEL_MAP_TOP_REAR_LEFT,
-	SF_CHANNEL_MAP_TOP_REAR_RIGHT,
-	SF_CHANNEL_MAP_TOP_REAR_CENTER
+	SF_CHANNEL_MAP_REAR_CENTER,				/* Apple calls this 'Center Surround', Msft calls this 'Back Center' */
+	SF_CHANNEL_MAP_REAR_LEFT,				/* Apple calls this 'Left Surround', Msft calls this 'Back Left' */
+	SF_CHANNEL_MAP_REAR_RIGHT,				/* Apple calls this 'Right Surround', Msft calls this 'Back Right' */
+	SF_CHANNEL_MAP_LFE,						/* Apple calls this 'LFEScreen', Msft calls this 'Low Frequency'  */
+	SF_CHANNEL_MAP_FRONT_LEFT_OF_CENTER,	/* Apple calls this 'Left Center' */
+	SF_CHANNEL_MAP_FRONT_RIGHT_OF_CENTER,	/* Apple calls this 'Right Center */
+	SF_CHANNEL_MAP_SIDE_LEFT,				/* Apple calls this 'Left Surround Direct' */
+	SF_CHANNEL_MAP_SIDE_RIGHT,				/* Apple calls this 'Right Surround Direct' */
+	SF_CHANNEL_MAP_TOP_CENTER,				/* Apple calls this 'Top Center Surround' */
+	SF_CHANNEL_MAP_TOP_FRONT_LEFT,			/* Apple calls this 'Vertical Height Left' */
+	SF_CHANNEL_MAP_TOP_FRONT_RIGHT,			/* Apple calls this 'Vertical Height Right' */
+	SF_CHANNEL_MAP_TOP_FRONT_CENTER,		/* Apple calls this 'Vertical Height Center' */
+	SF_CHANNEL_MAP_TOP_REAR_LEFT,			/* Apple and MS call this 'Top Back Left' */
+	SF_CHANNEL_MAP_TOP_REAR_RIGHT,			/* Apple and MS call this 'Top Back Right' */
+	SF_CHANNEL_MAP_TOP_REAR_CENTER,			/* Apple and MS call this 'Top Back Center' */
+
+	SF_CHANNEL_MAP_AMBISONIC_B_W,
+	SF_CHANNEL_MAP_AMBISONIC_B_X,
+	SF_CHANNEL_MAP_AMBISONIC_B_Y,
+	SF_CHANNEL_MAP_AMBISONIC_B_Z,
+
+	SF_CHANNEL_MAP_MAX
 } ;
 
 
@@ -296,18 +315,24 @@ enum
 typedef	struct SNDFILE_tag	SNDFILE ;
 
 /* The following typedef is system specific and is defined when libsndfile is
-** compiled. sf_count_t can be one of loff_t (Linux), off_t (*BSD), off64_t 
-** (Solaris), __int64_t (Win32) etc. On windows, we need to allow the same
-** header file to be compiler by both GCC and the microsoft compiler.
+** compiled. sf_count_t will be a 64 bit value when the underlying OS allows
+** 64 bit file offsets.
+** On windows, we need to allow the same header file to be compiler by both GCC
+** and the Microsoft compiler.
 */
 
-typedef __int64	sf_count_t ;
+#if (defined (_MSCVER) || defined (_MSC_VER))
+typedef __int64		sf_count_t ;
+#define SF_COUNT_MAX		0x7fffffffffffffffi64
+#else
+typedef @TYPEOF_SF_COUNT_T@	sf_count_t ;
+#define SF_COUNT_MAX		@SF_COUNT_MAX@
+#endif
 
-#define SF_COUNT_MAX		0x7FFFFFFFFFFFFFFFi64
 
-/* A pointer to a SF_INFO structure is passed to sf_open_read () and filled in.
+/* A pointer to a SF_INFO structure is passed to sf_open () and filled in.
 ** On write, the SF_INFO structure is filled in by the user and passed into
-** sf_open_write ().
+** sf_open ().
 */
 
 struct SF_INFO
@@ -391,9 +416,9 @@ typedef struct
 
 	struct
 	{	int mode ;
-		unsigned int start ;
-		unsigned int end ;
-		unsigned int count ;
+		uint32_t start ;
+		uint32_t end ;
+		uint32_t count ;
 	} loops [16] ; /* make variable in a sensible way */
 } SF_INSTRUMENT ;
 
@@ -411,7 +436,7 @@ typedef struct
 							/* a full bar of 7/8 is 7 beats */
 
 	float	bpm ;			/* suggestion, as it can be calculated using other fields:*/
-							/* file's lenght, file's sampleRate and our time_sig_den*/
+							/* file's length, file's sampleRate and our time_sig_den*/
 							/* -> bpms are always the amount of _quarter notes_ per minute */
 
 	int	root_key ;			/* MIDI note, or -1 for None */
@@ -424,23 +449,56 @@ typedef struct
 */
 #define	SF_BROADCAST_INFO_VAR(coding_hist_size) \
 			struct \
-			{	char			description [256] ; \
-				char			originator [32] ; \
-				char			originator_reference [32] ; \
-				char			origination_date [10] ; \
-				char			origination_time [8] ; \
-				unsigned int	time_reference_low ; \
-				unsigned int	time_reference_high ; \
-				short			version ; \
-				char			umid [64] ; \
-				char			reserved [190] ; \
-				unsigned int	coding_history_size ; \
-				char			coding_history [coding_hist_size] ; \
+			{	char		description [256] ; \
+				char		originator [32] ; \
+				char		originator_reference [32] ; \
+				char		origination_date [10] ; \
+				char		origination_time [8] ; \
+				uint32_t	time_reference_low ; \
+				uint32_t	time_reference_high ; \
+				short		version ; \
+				char		umid [64] ; \
+				char		reserved [190] ; \
+				uint32_t	coding_history_size ; \
+				char		coding_history [coding_hist_size] ; \
 			}
 
 /* SF_BROADCAST_INFO is the above struct with coding_history field of 256 bytes. */
 typedef SF_BROADCAST_INFO_VAR (256) SF_BROADCAST_INFO ;
 
+struct SF_CART_TIMER
+{	char	usage[4] ;
+	int32_t	value ;
+} ;
+
+typedef struct SF_CART_TIMER SF_CART_TIMER ;
+
+#define	SF_CART_INFO_VAR(p_tag_text_size) \
+			struct \
+			{	char		version [4] ; \
+				char		title [64] ; \
+				char		artist [64] ; \
+				char		cut_id [64] ; \
+				char		client_id [64] ; \
+				char		category [64] ; \
+				char		classification [64] ; \
+				char		out_cue [64] ; \
+				char		start_date [10] ; \
+				char		start_time [8] ; \
+				char		end_date [10] ; \
+				char		end_time [8] ; \
+				char		producer_app_id [64] ; \
+				char		producer_app_version [64] ; \
+				char		user_def [64] ; \
+				int32_t		level_reference ; \
+				SF_CART_TIMER	post_timers [8] ; \
+				char		reserved [276] ; \
+				char		url [1024] ; \
+				uint32_t	tag_text_size ; \
+				char		tag_text[p_tag_text_size] ; \
+			}
+
+typedef SF_CART_INFO_VAR (256) SF_CART_INFO ;
 
 /*	Virtual I/O functionality. */
 
@@ -460,6 +518,7 @@ struct SF_VIRTUAL_IO
 
 typedef	struct SF_VIRTUAL_IO SF_VIRTUAL_IO ;
 
+
 /* Open the specified file for read, write or both. On error, this will
 ** return a NULL pointer. To find the error number, pass a NULL SNDFILE
 ** to sf_strerror ().
@@ -468,6 +527,7 @@ typedef	struct SF_VIRTUAL_IO SF_VIRTUAL_IO ;
 
 SNDFILE* 	sf_open		(const char *path, int mode, SF_INFO *sfinfo) ;
 
+
 /* Use the existing file descriptor to create a SNDFILE object. If close_desc
 ** is TRUE, the file descriptor will be closed when sf_close() is called. If
 ** it is FALSE, the descritor will not be closed.
@@ -484,18 +544,21 @@ SNDFILE* 	sf_open_fd	(int fd, int mode, SF_INFO *sfinfo, int close_desc) ;
 
 SNDFILE* 	sf_open_virtual	(SF_VIRTUAL_IO *sfvirtual, int mode, SF_INFO *sfinfo, void *user_data) ;
 
+
 /* sf_error () returns a error number which can be translated to a text
 ** string using sf_error_number().
 */
 
 int		sf_error		(SNDFILE *sndfile) ;
 
+
 /* sf_strerror () returns to the caller a pointer to the current error message for
 ** the given SNDFILE.
 */
 
 const char* sf_strerror (SNDFILE *sndfile) ;
 
+
 /* sf_error_number () allows the retrieval of the error string for each internal
 ** error number.
 **
@@ -503,6 +566,7 @@ const char* sf_strerror (SNDFILE *sndfile) ;
 
 const char*	sf_error_number	(int errnum) ;
 
+
 /* The following two error functions are deprecated but they will remain in the
 ** library for the forseeable future. The function sf_strerror() should be used
 ** in their place.
@@ -516,10 +580,12 @@ int		sf_error_str	(SNDFILE *sndfile, char* str, size_t len) ;
 
 int		sf_command	(SNDFILE *sndfile, int command, void *data, int datasize) ;
 
+
 /* Return TRUE if fields of the SF_INFO struct are a valid combination of values. */
 
 int		sf_format_check	(const SF_INFO *info) ;
 
+
 /* Seek within the waveform data chunk of the SNDFILE. sf_seek () uses
 ** the same values for whence (SEEK_SET, SEEK_CUR and SEEK_END) as
 ** stdio.h function fseek ().
@@ -534,6 +600,7 @@ int		sf_format_check	(const SF_INFO *info) ;
 
 sf_count_t	sf_seek 		(SNDFILE *sndfile, sf_count_t frames, int whence) ;
 
+
 /* Functions for retrieving and setting string data within sound files.
 ** Not all file types support this features; AIFF and WAV do. For both
 ** functions, the str_type parameter must be one of the SF_STR_* values
@@ -546,12 +613,31 @@ int sf_set_string (SNDFILE *sndfile, int str_type, const char* str) ;
 
 const char* sf_get_string (SNDFILE *sndfile, int str_type) ;
 
+
+/* Return the library version string. */
+
+const char * sf_version_string (void) ;
+
+/* Return the current byterate at this point in the file. The byte rate in this
+** case is the number of bytes per second of audio data. For instance, for a
+** stereo, 18 bit PCM encoded file with an 16kHz sample rate, the byte rate
+** would be 2 (stereo) * 2 (two bytes per sample) * 16000 => 64000 bytes/sec.
+** For some file formats the returned value will be accurate and exact, for some
+** it will be a close approximation, for some it will be the average bitrate for
+** the whole file and for some it will be a time varying value that was accurate
+** when the file was most recently read or written.
+** To get the bitrate, multiple this value by 8.
+** Returns -1 for unknown.
+*/
+int sf_current_byterate (SNDFILE *sndfile) ;
+
 /* Functions for reading/writing the waveform data of a sound file.
 */
 
 sf_count_t	sf_read_raw		(SNDFILE *sndfile, void *ptr, sf_count_t bytes) ;
 sf_count_t	sf_write_raw 	(SNDFILE *sndfile, const void *ptr, sf_count_t bytes) ;
 
+
 /* Functions for reading and writing the data chunk in terms of frames.
 ** The number of items actually read/written = frames * number of channels.
 **     sf_xxxx_raw		read/writes the raw data bytes from/to the file
@@ -574,6 +660,7 @@ sf_count_t	sf_writef_float	(SNDFILE *sndfile, const float *ptr, sf_count_t frame
 sf_count_t	sf_readf_double		(SNDFILE *sndfile, double *ptr, sf_count_t frames) ;
 sf_count_t	sf_writef_double	(SNDFILE *sndfile, const double *ptr, sf_count_t frames) ;
 
+
 /* Functions for reading and writing the data chunk in terms of items.
 ** Otherwise similar to above.
 ** All of these read/write function return number of items read/written.
@@ -591,6 +678,7 @@ sf_count_t	sf_write_float	(SNDFILE *sndfile, const float *ptr, sf_count_t items)
 sf_count_t	sf_read_double	(SNDFILE *sndfile, double *ptr, sf_count_t items) ;
 sf_count_t	sf_write_double	(SNDFILE *sndfile, const double *ptr, sf_count_t items) ;
 
+
 /* Close the SNDFILE and clean up all memory allocations associated with this
 ** file.
 ** Returns 0 on success, or an error number.
@@ -598,6 +686,7 @@ sf_count_t	sf_write_double	(SNDFILE *sndfile, const double *ptr, sf_count_t item
 
 int		sf_close		(SNDFILE *sndfile) ;
 
+
 /* If the file is opened SFM_WRITE or SFM_RDWR, call fsync() on the file
 ** to force the writing of data to disk. If the file is opened SFM_READ
 ** no action is taken.
@@ -605,8 +694,124 @@ int		sf_close		(SNDFILE *sndfile) ;
 
 void	sf_write_sync	(SNDFILE *sndfile) ;
 
+
+
+/* The function sf_wchar_open() is Windows Only!
+** Open a file passing in a Windows Unicode filename. Otherwise, this is
+** the same as sf_open().
+**
+** In order for this to work, you need to do the following:
+**
+**		#include 
+**		#define ENABLE_SNDFILE_WINDOWS_PROTOTYPES 1
+**		#including 
+*/
+
+#if (defined (ENABLE_SNDFILE_WINDOWS_PROTOTYPES) && ENABLE_SNDFILE_WINDOWS_PROTOTYPES)
+SNDFILE* sf_wchar_open (LPCWSTR wpath, int mode, SF_INFO *sfinfo) ;
+#endif
+
+
+
+
+/* Getting and setting of chunks from within a sound file.
+**
+** These functions allow the getting and setting of chunks within a sound file
+** (for those formats which allow it).
+**
+** These functions fail safely. Specifically, they will not allow you to overwrite
+** existing chunks or add extra versions of format specific reserved chunks but
+** should allow you to retrieve any and all chunks (may not be implemented for
+** all chunks or all file formats).
+*/
+
+struct SF_CHUNK_INFO
+{	char		id [64] ;	/* The chunk identifier. */
+	unsigned	id_size ;	/* The size of the chunk identifier. */
+	unsigned	datalen ;	/* The size of that data. */
+	void		*data ;		/* Pointer to the data. */
+} ;
+
+typedef struct SF_CHUNK_INFO SF_CHUNK_INFO ;
+
+/* Set the specified chunk info (must be done before any audio data is written
+** to the file). This will fail for format specific reserved chunks.
+** The chunk_info->data pointer must be valid until the file is closed.
+** Returns SF_ERR_NO_ERROR on success or non-zero on failure.
+*/
+int sf_set_chunk (SNDFILE * sndfile, const SF_CHUNK_INFO * chunk_info) ;
+
+/*
+** An opaque structure to an iterator over the all chunks of a given id
+*/
+typedef	struct SF_CHUNK_ITERATOR SF_CHUNK_ITERATOR ;
+
+/* Get an iterator for all chunks matching chunk_info.
+** The iterator will point to the first chunk matching chunk_info.
+** Chunks are matching, if (chunk_info->id) matches the first
+**     (chunk_info->id_size) bytes of a chunk found in the SNDFILE* handle.
+** If chunk_info is NULL, an iterator to all chunks in the SNDFILE* handle
+**     is returned.
+** The values of chunk_info->datalen and chunk_info->data are ignored.
+** If no matching chunks are found in the sndfile, NULL is returned.
+** The returned iterator will stay valid until one of the following occurs:
+**     a) The sndfile is closed.
+**     b) A new chunk is added using sf_set_chunk().
+**     c) Another chunk iterator function is called on the same SNDFILE* handle
+**        that causes the iterator to be modified.
+** The memory for the iterator belongs to the SNDFILE* handle and is freed when
+** sf_close() is called.
+*/
+SF_CHUNK_ITERATOR *
+sf_get_chunk_iterator (SNDFILE * sndfile, const SF_CHUNK_INFO * chunk_info) ;
+
+/* Iterate through chunks by incrementing the iterator.
+** Increments the iterator and returns a handle to the new one.
+** After this call, iterator will no longer be valid, and you must use the
+**      newly returned handle from now on.
+** The returned handle can be used to access the next chunk matching
+**      the criteria as defined in sf_get_chunk_iterator().
+** If iterator points to the last chunk, this will free all resources
+**      associated with iterator and return NULL.
+** The returned iterator will stay valid until sf_get_chunk_iterator_next
+**      is called again, the sndfile is closed or a new chunk us added.
+*/
+SF_CHUNK_ITERATOR *
+sf_next_chunk_iterator (SF_CHUNK_ITERATOR * iterator) ;
+
+
+/* Get the size of the specified chunk.
+** If the specified chunk exists, the size will be returned in the
+**      datalen field of the SF_CHUNK_INFO struct.
+**      Additionally, the id of the chunk will be copied to the id
+**      field of the SF_CHUNK_INFO struct and it's id_size field will
+**      be updated accordingly.
+** If the chunk doesn't exist chunk_info->datalen will be zero, and the
+**      id and id_size fields will be undefined.
+** The function will return SF_ERR_NO_ERROR on success or non-zero on
+** failure.
+*/
+int
+sf_get_chunk_size (const SF_CHUNK_ITERATOR * it, SF_CHUNK_INFO * chunk_info) ;
+
+/* Get the specified chunk data.
+** If the specified chunk exists, up to chunk_info->datalen bytes of
+**      the chunk data will be copied into the chunk_info->data buffer
+**      (allocated by the caller) and the chunk_info->datalen field
+**      updated to reflect the size of the data. The id and id_size
+**      field will be updated according to the retrieved chunk
+** If the chunk doesn't exist chunk_info->datalen will be zero, and the
+**      id and id_size fields will be undefined.
+** The function will return SF_ERR_NO_ERROR on success or non-zero on
+** failure.
+*/
+int
+sf_get_chunk_data (const SF_CHUNK_ITERATOR * it, SF_CHUNK_INFO * chunk_info) ;
+
+
 #ifdef __cplusplus
 }		/* extern "C" */
 #endif	/* __cplusplus */
 
 #endif	/* SNDFILE_H */
+