* #29632: Added libsndfile dep
jni: updated sflphone
diff --git a/jni/libsndfile-1.0.25/Octave/Makefile b/jni/libsndfile-1.0.25/Octave/Makefile
new file mode 100644
index 0000000..101d0f9
--- /dev/null
+++ b/jni/libsndfile-1.0.25/Octave/Makefile
@@ -0,0 +1,543 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Octave/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/libsndfile
+pkgincludedir = $(includedir)/libsndfile
+pkglibdir = $(libdir)/libsndfile
+pkglibexecdir = $(libexecdir)/libsndfile
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+target_triplet = x86_64-unknown-linux-gnu
+subdir = Octave
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/M4/add_cflags.m4 \
+	$(top_srcdir)/M4/add_cxxflags.m4 $(top_srcdir)/M4/clip_mode.m4 \
+	$(top_srcdir)/M4/endian.m4 $(top_srcdir)/M4/extra_largefile.m4 \
+	$(top_srcdir)/M4/extra_pkg.m4 \
+	$(top_srcdir)/M4/flexible_array.m4 \
+	$(top_srcdir)/M4/gcc_version.m4 $(top_srcdir)/M4/libtool.m4 \
+	$(top_srcdir)/M4/lrint.m4 $(top_srcdir)/M4/lrintf.m4 \
+	$(top_srcdir)/M4/ltoptions.m4 $(top_srcdir)/M4/ltsugar.m4 \
+	$(top_srcdir)/M4/ltversion.m4 $(top_srcdir)/M4/lt~obsolete.m4 \
+	$(top_srcdir)/M4/mkoctfile_version.m4 \
+	$(top_srcdir)/M4/octave.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(octconfigdir)"
+DATA = $(noinst_DATA) $(octconfig_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = ${SHELL} /home/lisional/git/sflphone-android/jni/libsndfile-1.0.25/Cfg/missing --run aclocal-1.11
+ACLOCAL_AMFLAGS = -I M4
+ALSA_LIBS = 
+AMTAR = ${SHELL} /home/lisional/git/sflphone-android/jni/libsndfile-1.0.25/Cfg/missing --run tar
+AM_DEFAULT_VERBOSITY = 0
+AR = ar
+AUTOCONF = ${SHELL} /home/lisional/git/sflphone-android/jni/libsndfile-1.0.25/Cfg/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/lisional/git/sflphone-android/jni/libsndfile-1.0.25/Cfg/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/lisional/git/sflphone-android/jni/libsndfile-1.0.25/Cfg/missing --run automake-1.11
+AWK = gawk
+CC = gcc
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -std=gnu99 -Wall -Wextra -Wdeclaration-after-statement -Wpointer-arith -funsigned-char -Wstrict-prototypes -Wmissing-prototypes -Waggregate-return -Wcast-align -Wcast-qual -Wnested-externs -Wshadow -Wbad-function-cast -Wwrite-strings -Wundef  -pipe 
+CLEAN_VERSION = 1.0.25
+CPP = gcc -E
+CPPFLAGS = 
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2 -Wall -Wextra -Wcast-align -Wcast-qual -Wshadow -Wwrite-strings -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual -Wreorder -Wsign-promo -Wundef 
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DLLTOOL = false
+DSYMUTIL = 
+DUMPBIN = 
+ECHO_C = 
+ECHO_N = -n
+ECHO_T = 
+EGREP = /usr/bin/grep -E
+
+# Prevent any extension.
+EXEEXT = 
+EXTERNAL_CFLAGS = 
+EXTERNAL_LIBS = 
+FGREP = /usr/bin/grep -F
+FLAC_CFLAGS = 
+FLAC_LIBS = 
+GCC_MAJOR_VERSION = 4
+GCC_MINOR_VERSION = 7
+GCC_VERSION = 4.7.2
+GETCONF = 
+GREP = /usr/bin/grep
+HAVE_AUTOGEN = no
+HAVE_MKOCTFILE = no
+HAVE_OCTAVE = no
+HAVE_OCTAVE_CONFIG = no
+HAVE_WINE = no
+HOST_TRIPLET = x86_64-unknown-linux-gnu
+HTML_BGCOLOUR = black
+HTML_FGCOLOUR = white
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+LD = /usr/bin/ld -m elf_x86_64
+LDFLAGS = 
+LIBOBJS = 
+LIBS = -lm 
+LIBTOOL = $(SHELL) $(top_builddir)/libtool
+LIBTOOL_DEPS = Cfg/ltmain.sh
+LIPO = 
+LN_S = ln -s
+LTLIBOBJS = 
+MAKEINFO = ${SHELL} /home/lisional/git/sflphone-android/jni/libsndfile-1.0.25/Cfg/missing --run makeinfo
+MANIFEST_TOOL = :
+MKDIR_P = /usr/bin/mkdir -p
+MKOCTFILE = 
+MKOCTFILE_VERSION = 
+NM = /usr/bin/nm -B
+NMEDIT = 
+OBJDUMP = objdump
+OBJEXT = o
+OCTAVE = 
+OCTAVE_CONFIG = 
+OCTAVE_CONFIG_VERSION = 
+OCTAVE_DEST_MDIR = 
+OCTAVE_DEST_ODIR = /sndfile
+OCTAVE_VERSION = 
+OGG_CFLAGS = 
+OGG_LIBS = 
+OS_SPECIFIC_CFLAGS = 
+OS_SPECIFIC_LINKS = 
+OTOOL = 
+OTOOL64 = 
+PACKAGE = libsndfile
+PACKAGE_BUGREPORT = sndfile@mega-nerd.com
+PACKAGE_NAME = libsndfile
+PACKAGE_STRING = libsndfile 1.0.25
+PACKAGE_TARNAME = libsndfile
+PACKAGE_URL = http://www.mega-nerd.com/libsndfile/
+PACKAGE_VERSION = 1.0.25
+PATH_SEPARATOR = :
+PKG_CONFIG = /usr/bin/pkg-config
+PKG_CONFIG_LIBDIR = 
+PKG_CONFIG_PATH = 
+RANLIB = ranlib
+RC = 
+SED = /usr/bin/sed
+SET_MAKE = 
+SF_COUNT_MAX = 0x7FFFFFFFFFFFFFFFLL
+SHARED_VERSION_INFO = 1:25:0
+SHELL = /bin/sh
+SHLIB_VERSION_ARG = -Wl,--version-script=$(srcdir)/Symbols.gnu-binutils
+SIZEOF_SF_COUNT_T = 8
+SNDIO_LIBS = 
+SPEEX_CFLAGS = 
+SPEEX_LIBS = 
+SQLITE3_CFLAGS =  
+SQLITE3_LIBS = -lsqlite3  
+STRIP = strip
+TYPEOF_SF_COUNT_T = int64_t
+VERSION = 1.0.25
+VORBISENC_CFLAGS = 
+VORBISENC_LIBS = 
+VORBIS_CFLAGS = 
+VORBIS_LIBS = 
+WIN_RC_VERSION = 1,0,25
+abs_builddir = /home/lisional/git/sflphone-android/jni/libsndfile-1.0.25/Octave
+abs_srcdir = /home/lisional/git/sflphone-android/jni/libsndfile-1.0.25/Octave
+abs_top_builddir = /home/lisional/git/sflphone-android/jni/libsndfile-1.0.25
+abs_top_srcdir = /home/lisional/git/sflphone-android/jni/libsndfile-1.0.25
+ac_ct_AR = ar
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_DUMPBIN = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+bindir = ${exec_prefix}/bin
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
+builddir = .
+datadir = ${datarootdir}
+datarootdir = ${prefix}/share
+docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
+dvidir = ${docdir}
+exec_prefix = ${prefix}
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
+htmldir = ${docdir}
+htmldocdir = /usr/local/share/doc/libsndfile1-dev/html
+includedir = ${prefix}/include
+infodir = ${datarootdir}/info
+install_sh = ${SHELL} /home/lisional/git/sflphone-android/jni/libsndfile-1.0.25/Cfg/install-sh
+libdir = ${exec_prefix}/lib
+libexecdir = ${exec_prefix}/libexec
+localedir = ${datarootdir}/locale
+localstatedir = ${prefix}/var
+mandir = ${datarootdir}/man
+mkdir_p = /usr/bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+prefix = /usr/local
+program_transform_name = s,x,x,
+psdir = ${docdir}
+sbindir = ${exec_prefix}/sbin
+sharedstatedir = ${prefix}/com
+srcdir = .
+sysconfdir = ${prefix}/etc
+target = x86_64-unknown-linux-gnu
+target_alias = 
+target_cpu = x86_64
+target_os = linux-gnu
+target_vendor = unknown
+top_build_prefix = ../
+top_builddir = ..
+top_srcdir = ..
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+
+EXTRA_DIST = sndfile_load.m sndfile_save.m sndfile_play.m \
+	octave_test.m octave_test.sh $(oct_module_srcs) PKG_ADD
+
+octconfigdir = $(exec_prefix)/share/octave/site/m
+octconfig_DATA = sndfile_load.m sndfile_save.m sndfile_play.m
+OCT_CXXFLAGS = @OCT_CXXFLAGS@
+OCT_LIB_DIR = @OCT_LIB_DIR@
+OCT_LIBS = @OCT_LIBS@
+SNDFILEDIR = $(top_builddir)/src
+INCLUDES = -I$(SNDFILEDIR)
+oct_module_srcs = sndfile.cc
+oct_module_files = sndfile.oct PKG_ADD
+
+# Make these noinst so they can be installed manually.
+noinst_DATA = $(oct_module_files)
+
+# Used by shave which cleans up automake generated Makefile output.
+V = @
+Q = $(V:1=)
+QUIET_GEN = $(Q:@=@echo '  GEN   '$@;)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Octave/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu Octave/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-octconfigDATA: $(octconfig_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(octconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(octconfigdir)"
+	@list='$(octconfig_DATA)'; test -n "$(octconfigdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(octconfigdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(octconfigdir)" || exit $$?; \
+	done
+
+uninstall-octconfigDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(octconfig_DATA)'; test -n "$(octconfigdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(octconfigdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(octconfigdir)" && rm -f $$files
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(octconfigdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-octconfigDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-exec-local
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-local uninstall-octconfigDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	clean-local distclean distclean-generic distclean-libtool \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-exec-local \
+	install-html install-html-am install-info install-info-am \
+	install-man install-octconfigDATA install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-local uninstall-octconfigDATA
+
+
+# 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
+	$(QUIET_GEN) $(MKOCTFILE) -v $(INCLUDES) $(top_builddir)/Octave/$+ -L$(SNDFILEDIR)/.libs -L$(SNDFILEDIR) -lsndfile -o $(top_builddir)/Octave/$@ > /dev/null
+
+sndfile.o : sndfile.cc
+	$(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.
+check :
+	octave_src_dir=$(srcdir) $(srcdir)/octave_test.sh
+
+# Since the octave modules are installed in a special location, a custom install
+# and uninstall routine must be specified.
+install-exec-local : $(oct_module_files)
+	@$(NORMAL_INSTALL)
+	test -z "$(OCTAVE_DEST_ODIR)" || $(mkdir_p) "$(DESTDIR)$(OCTAVE_DEST_ODIR)"
+	@list='$(oct_module_files)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL) '$$p' '$(DESTDIR)$(OCTAVE_DEST_ODIR)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL) "$$p" "$(DESTDIR)$(OCTAVE_DEST_ODIR)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-local :
+	@$(NORMAL_UNINSTALL)
+	@list='$(oct_module_files)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(OCTAVE_DEST_ODIR)/$$f'"; \
+	  rm -f "$(DESTDIR)$(OCTAVE_DEST_ODIR)/$$f"; \
+	done
+
+clean-local :
+	rm -f sndfile.o sndfile.oct
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/jni/libsndfile-1.0.25/Octave/Makefile.am b/jni/libsndfile-1.0.25/Octave/Makefile.am
new file mode 100644
index 0000000..40968dd
--- /dev/null
+++ b/jni/libsndfile-1.0.25/Octave/Makefile.am
@@ -0,0 +1,78 @@
+## Process this file with automake to produce Makefile.in
+
+# Prevent any extension.
+EXEEXT =
+
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+
+EXTRA_DIST = sndfile_load.m sndfile_save.m sndfile_play.m \
+	octave_test.m octave_test.sh $(oct_module_srcs) PKG_ADD
+
+octconfigdir = $(exec_prefix)/share/octave/site/m
+octconfig_DATA = sndfile_load.m sndfile_save.m sndfile_play.m
+
+OCTAVE_DEST_MDIR = @OCTAVE_DEST_MDIR@
+OCTAVE_DEST_ODIR = @OCTAVE_DEST_ODIR@/sndfile
+
+OCT_CXXFLAGS = @OCT_CXXFLAGS@
+OCT_LIB_DIR = @OCT_LIB_DIR@
+OCT_LIBS = @OCT_LIBS@
+
+SNDFILEDIR = $(top_builddir)/src
+INCLUDES = -I$(SNDFILEDIR)
+
+oct_module_srcs = sndfile.cc
+oct_module_files = sndfile.oct PKG_ADD
+
+# Make these noinst so they can be installed manually.
+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
+	$(QUIET_GEN) $(MKOCTFILE) -v $(INCLUDES) $(top_builddir)/Octave/$+ -L$(SNDFILEDIR)/.libs -L$(SNDFILEDIR) -lsndfile -o $(top_builddir)/Octave/$@ > /dev/null
+
+sndfile.o : sndfile.cc
+	$(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.
+check :
+	octave_src_dir=$(srcdir) $(srcdir)/octave_test.sh
+
+
+# Since the octave modules are installed in a special location, a custom install
+# and uninstall routine must be specified.
+install-exec-local : $(oct_module_files)
+	@$(NORMAL_INSTALL)
+	test -z "$(OCTAVE_DEST_ODIR)" || $(mkdir_p) "$(DESTDIR)$(OCTAVE_DEST_ODIR)"
+	@list='$(oct_module_files)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL) '$$p' '$(DESTDIR)$(OCTAVE_DEST_ODIR)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL) "$$p" "$(DESTDIR)$(OCTAVE_DEST_ODIR)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-local :
+	@$(NORMAL_UNINSTALL)
+	@list='$(oct_module_files)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(OCTAVE_DEST_ODIR)/$$f'"; \
+	  rm -f "$(DESTDIR)$(OCTAVE_DEST_ODIR)/$$f"; \
+	done
+
+clean-local :
+	rm -f sndfile.o sndfile.oct
diff --git a/jni/libsndfile-1.0.25/Octave/Makefile.in b/jni/libsndfile-1.0.25/Octave/Makefile.in
new file mode 100644
index 0000000..5ee3126
--- /dev/null
+++ b/jni/libsndfile-1.0.25/Octave/Makefile.in
@@ -0,0 +1,543 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = Octave
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/M4/add_cflags.m4 \
+	$(top_srcdir)/M4/add_cxxflags.m4 $(top_srcdir)/M4/clip_mode.m4 \
+	$(top_srcdir)/M4/endian.m4 $(top_srcdir)/M4/extra_largefile.m4 \
+	$(top_srcdir)/M4/extra_pkg.m4 \
+	$(top_srcdir)/M4/flexible_array.m4 \
+	$(top_srcdir)/M4/gcc_version.m4 $(top_srcdir)/M4/libtool.m4 \
+	$(top_srcdir)/M4/lrint.m4 $(top_srcdir)/M4/lrintf.m4 \
+	$(top_srcdir)/M4/ltoptions.m4 $(top_srcdir)/M4/ltsugar.m4 \
+	$(top_srcdir)/M4/ltversion.m4 $(top_srcdir)/M4/lt~obsolete.m4 \
+	$(top_srcdir)/M4/mkoctfile_version.m4 \
+	$(top_srcdir)/M4/octave.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(octconfigdir)"
+DATA = $(noinst_DATA) $(octconfig_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CLEAN_VERSION = @CLEAN_VERSION@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+
+# Prevent any extension.
+EXEEXT = 
+EXTERNAL_CFLAGS = @EXTERNAL_CFLAGS@
+EXTERNAL_LIBS = @EXTERNAL_LIBS@
+FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
+FLAC_LIBS = @FLAC_LIBS@
+GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@
+GCC_MINOR_VERSION = @GCC_MINOR_VERSION@
+GCC_VERSION = @GCC_VERSION@
+GETCONF = @GETCONF@
+GREP = @GREP@
+HAVE_AUTOGEN = @HAVE_AUTOGEN@
+HAVE_MKOCTFILE = @HAVE_MKOCTFILE@
+HAVE_OCTAVE = @HAVE_OCTAVE@
+HAVE_OCTAVE_CONFIG = @HAVE_OCTAVE_CONFIG@
+HAVE_WINE = @HAVE_WINE@
+HOST_TRIPLET = @HOST_TRIPLET@
+HTML_BGCOLOUR = @HTML_BGCOLOUR@
+HTML_FGCOLOUR = @HTML_FGCOLOUR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MKOCTFILE = @MKOCTFILE@
+MKOCTFILE_VERSION = @MKOCTFILE_VERSION@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OCTAVE = @OCTAVE@
+OCTAVE_CONFIG = @OCTAVE_CONFIG@
+OCTAVE_CONFIG_VERSION = @OCTAVE_CONFIG_VERSION@
+OCTAVE_DEST_MDIR = @OCTAVE_DEST_MDIR@
+OCTAVE_DEST_ODIR = @OCTAVE_DEST_ODIR@/sndfile
+OCTAVE_VERSION = @OCTAVE_VERSION@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
+OS_SPECIFIC_CFLAGS = @OS_SPECIFIC_CFLAGS@
+OS_SPECIFIC_LINKS = @OS_SPECIFIC_LINKS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+RANLIB = @RANLIB@
+RC = @RC@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SF_COUNT_MAX = @SF_COUNT_MAX@
+SHARED_VERSION_INFO = @SHARED_VERSION_INFO@
+SHELL = @SHELL@
+SHLIB_VERSION_ARG = @SHLIB_VERSION_ARG@
+SIZEOF_SF_COUNT_T = @SIZEOF_SF_COUNT_T@
+SNDIO_LIBS = @SNDIO_LIBS@
+SPEEX_CFLAGS = @SPEEX_CFLAGS@
+SPEEX_LIBS = @SPEEX_LIBS@
+SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
+SQLITE3_LIBS = @SQLITE3_LIBS@
+STRIP = @STRIP@
+TYPEOF_SF_COUNT_T = @TYPEOF_SF_COUNT_T@
+VERSION = @VERSION@
+VORBISENC_CFLAGS = @VORBISENC_CFLAGS@
+VORBISENC_LIBS = @VORBISENC_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
+VORBIS_LIBS = @VORBIS_LIBS@
+WIN_RC_VERSION = @WIN_RC_VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+htmldocdir = @htmldocdir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+
+EXTRA_DIST = sndfile_load.m sndfile_save.m sndfile_play.m \
+	octave_test.m octave_test.sh $(oct_module_srcs) PKG_ADD
+
+octconfigdir = $(exec_prefix)/share/octave/site/m
+octconfig_DATA = sndfile_load.m sndfile_save.m sndfile_play.m
+OCT_CXXFLAGS = @OCT_CXXFLAGS@
+OCT_LIB_DIR = @OCT_LIB_DIR@
+OCT_LIBS = @OCT_LIBS@
+SNDFILEDIR = $(top_builddir)/src
+INCLUDES = -I$(SNDFILEDIR)
+oct_module_srcs = sndfile.cc
+oct_module_files = sndfile.oct PKG_ADD
+
+# Make these noinst so they can be installed manually.
+noinst_DATA = $(oct_module_files)
+
+# Used by shave which cleans up automake generated Makefile output.
+V = @
+Q = $(V:1=)
+QUIET_GEN = $(Q:@=@echo '  GEN   '$@;)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Octave/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu Octave/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-octconfigDATA: $(octconfig_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(octconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(octconfigdir)"
+	@list='$(octconfig_DATA)'; test -n "$(octconfigdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(octconfigdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(octconfigdir)" || exit $$?; \
+	done
+
+uninstall-octconfigDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(octconfig_DATA)'; test -n "$(octconfigdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(octconfigdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(octconfigdir)" && rm -f $$files
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(octconfigdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-octconfigDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-exec-local
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-local uninstall-octconfigDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	clean-local distclean distclean-generic distclean-libtool \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-exec-local \
+	install-html install-html-am install-info install-info-am \
+	install-man install-octconfigDATA install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-local uninstall-octconfigDATA
+
+
+# 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
+	$(QUIET_GEN) $(MKOCTFILE) -v $(INCLUDES) $(top_builddir)/Octave/$+ -L$(SNDFILEDIR)/.libs -L$(SNDFILEDIR) -lsndfile -o $(top_builddir)/Octave/$@ > /dev/null
+
+sndfile.o : sndfile.cc
+	$(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.
+check :
+	octave_src_dir=$(srcdir) $(srcdir)/octave_test.sh
+
+# Since the octave modules are installed in a special location, a custom install
+# and uninstall routine must be specified.
+install-exec-local : $(oct_module_files)
+	@$(NORMAL_INSTALL)
+	test -z "$(OCTAVE_DEST_ODIR)" || $(mkdir_p) "$(DESTDIR)$(OCTAVE_DEST_ODIR)"
+	@list='$(oct_module_files)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL) '$$p' '$(DESTDIR)$(OCTAVE_DEST_ODIR)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL) "$$p" "$(DESTDIR)$(OCTAVE_DEST_ODIR)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-local :
+	@$(NORMAL_UNINSTALL)
+	@list='$(oct_module_files)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(OCTAVE_DEST_ODIR)/$$f'"; \
+	  rm -f "$(DESTDIR)$(OCTAVE_DEST_ODIR)/$$f"; \
+	done
+
+clean-local :
+	rm -f sndfile.o sndfile.oct
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/jni/libsndfile-1.0.25/Octave/PKG_ADD b/jni/libsndfile-1.0.25/Octave/PKG_ADD
new file mode 100644
index 0000000..3efd688
--- /dev/null
+++ b/jni/libsndfile-1.0.25/Octave/PKG_ADD
@@ -0,0 +1,3 @@
+autoload ("sfread", "sndfile.oct");
+autoload ("sfversion", "sndfile.oct");
+autoload ("sfwrite", "sndfile.oct");
diff --git a/jni/libsndfile-1.0.25/Octave/octave_test.m b/jni/libsndfile-1.0.25/Octave/octave_test.m
new file mode 100644
index 0000000..25a922e
--- /dev/null
+++ b/jni/libsndfile-1.0.25/Octave/octave_test.m
@@ -0,0 +1,52 @@
+# Copyright (C) 2007-2011 Erik de Castro Lopo <erikd@mega-nerd.com>
+#
+# 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.
+
+# These tests are nowhere near comprehensive.
+
+printf ("    Running Octave tests                     : ") ;
+fflush (stdout) ;
+
+filename = "whatever" ;
+srate_out = 32000 ;
+fmt_out = "wav-float" ;
+
+t = (2 * pi / srate_out * (0:srate_out-1))' ;
+data_out = sin (440.0 * t) ;
+
+# Write out a file.
+sfwrite (filename, data_out, srate_out, fmt_out) ;
+
+# Read it back in again.
+[ data_in, srate_in, fmt_in ] = sfread (filename) ;
+
+if (srate_in != srate_out)
+	error ("\n\nSample rate mismatch : %d -> %d.\n\n", srate_out, srate_in) ;
+	endif
+
+# Octave strcmp return 1 for the same.
+if (strcmp (fmt_in, fmt_out) != 1)
+	error ("\n\nFormat error : '%s' -> '%s'.\n\n", fmt_out, fmt_in) ;
+	endif
+
+err = max (abs (data_out - data_in)) ;
+
+if (err > 1e-7)
+	error ("err : %g\n", err) ;
+	endif
+
+printf ("ok") ;
+
+unlink (filename) ;
diff --git a/jni/libsndfile-1.0.25/Octave/octave_test.sh b/jni/libsndfile-1.0.25/Octave/octave_test.sh
new file mode 100755
index 0000000..319d86b
--- /dev/null
+++ b/jni/libsndfile-1.0.25/Octave/octave_test.sh
@@ -0,0 +1,70 @@
+#!/bin/bash
+
+
+# Check where we're being run from.
+if [ -d Octave ]; then
+	cd Octave
+	fi
+
+# Find libsndfile shared object.
+libsndfile_lib_location=""
+
+if [ -f "../src/.libs/libsndfile.so" ]; then
+	libsndfile_lib_location="../src/.libs/"
+elif [ -f "../src/libsndfile.so" ]; then
+	libsndfile_lib_location="../src/"
+elif [ -f "../src/.libs/libsndfile.dylib" ]; then
+	libsndfile_lib_location="../src/.libs/"
+elif [ -f "../src/libsndfile.dylib" ]; then
+	libsndfile_lib_location="../src/"
+else
+	echo
+	echo "Not able to find the libsndfile shared lib we've just built."
+	echo "This may cause the following test to fail."
+	echo
+	fi
+
+libsndfile_lib_location=`(cd $libsndfile_lib_location && pwd)`
+
+
+# Find sndfile.oct
+sndfile_oct_location=""
+
+if [ -f .libs/sndfile.oct ]; then
+	sndfile_oct_location=".libs"
+elif [ -f sndfile.oct ]; then
+	sndfile_oct_location="."
+else
+	echo "Not able to find the sndfile.oct binaries we've just built."
+	exit 1
+	fi
+
+case `file -b $sndfile_oct_location/sndfile.oct` in
+	ELF*)
+		;;
+	Mach*)
+		echo "Tests don't work on this platform."
+		exit 0
+		;;
+	*)
+		echo "Not able to find the sndfile.oct binaries we've just built."
+		exit 1
+		;;
+	esac
+
+
+# Make sure the TERM environment variable doesn't contain anything wrong.
+unset TERM
+
+# echo "libsndfile_lib_location : $libsndfile_lib_location"
+# echo "sndfile_oct_location : $sndfile_oct_location"
+
+export LD_LIBRARY_PATH="$libsndfile_lib_location:$LD_LIBRARY_PATH"
+
+octave_src_dir=`(cd $octave_src_dir && pwd)`
+
+octave_script="$octave_src_dir/octave_test.m"
+
+(cd $sndfile_oct_location && octave -qH $octave_script)
+
+
diff --git a/jni/libsndfile-1.0.25/Octave/sndfile.cc b/jni/libsndfile-1.0.25/Octave/sndfile.cc
new file mode 100644
index 0000000..6e9cd44
--- /dev/null
+++ b/jni/libsndfile-1.0.25/Octave/sndfile.cc
@@ -0,0 +1,405 @@
+/*
+** Copyright (C) 2007-2011 Erik de Castro Lopo <erikd@mega-nerd.com>
+**
+** 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 <octave/oct.h>
+
+#include "sndfile.h"
+
+#define FOUR_GIG 		(0x100000000LL)
+#define	BUFFER_FRAMES	8192
+
+
+static int format_of_str (const std::string & fmt) ;
+static void string_of_format (std::string & fmt, int format) ;
+
+
+DEFUN_DLD (sfversion, args, nargout ,
+"-*- texinfo -*-\n\
+@deftypefn {Loadable Function} {@var{version} =} sfversion ()\n\
+@cindex Reading sound files\n\
+Return a string containing the libsndfile version.\n\
+@seealso{sfread, sfwrite}\n\
+@end deftypefn")
+{	char buffer [256] ;
+	octave_value_list retval ;
+
+	/* Bail out if the input parameters are bad. */
+	if (args.length () != 0 || nargout > 1)
+	{	print_usage () ;
+		return retval ;
+		} ;
+
+	sf_command (NULL, SFC_GET_LIB_VERSION, buffer, sizeof (buffer)) ;
+
+	std::string version (buffer) ;
+
+	retval.append (version) ;
+	return retval ;
+} /* sfversion */
+
+
+DEFUN_DLD (sfread, args, nargout ,
+"-*- texinfo -*-\n\
+@deftypefn {Loadable Function} {@var{data},@var{srate},@var{format} =} sfread (@var{filename})\n\
+@cindex Reading sound files\n\
+Read a sound file from disk using libsndfile.\n\
+@seealso{sfversion, sfwrite}\n\
+@end deftypefn")
+{	SNDFILE * file ;
+	SF_INFO sfinfo ;
+
+	octave_value_list retval ;
+
+	int nargin  = args.length () ;
+
+	/* Bail out if the input parameters are bad. */
+	if ((nargin != 1) || !args (0) .is_string () || nargout < 1 || nargout > 3)
+	{	print_usage () ;
+		return retval ;
+		} ;
+
+	memset (&sfinfo, 0, sizeof (sfinfo)) ;
+
+	std::string filename = args (0).string_value () ;
+
+	if ((file = sf_open (filename.c_str (), SFM_READ, &sfinfo)) == NULL)
+	{	error ("sfread: couldn't open file %s : %s", filename.c_str (), sf_strerror (NULL)) ;
+		return retval ;
+		} ;
+
+	if (sfinfo.frames > FOUR_GIG)
+		printf ("This is a really huge file (%lld frames).\nYou may run out of memory trying to load it.\n", (long long) sfinfo.frames) ;
+
+	dim_vector dim = dim_vector () ;
+	dim.resize (2) ;
+	dim (0) = sfinfo.frames ;
+	dim (1) = sfinfo.channels ;
+
+	/* Should I be using Matrix instead? */
+	NDArray out (dim, 0.0) ;
+
+	float buffer [BUFFER_FRAMES * sfinfo.channels] ;
+	int readcount ;
+	sf_count_t total = 0 ;
+
+	do
+	{	readcount = sf_readf_float (file, buffer, BUFFER_FRAMES) ;
+
+		/* Make sure we don't read more frames than we allocated. */
+		if (total + readcount > sfinfo.frames)
+			readcount = sfinfo.frames - total ;
+
+		for (int ch = 0 ; ch < sfinfo.channels ; ch++)
+		{	for (int k = 0 ; k < readcount ; k++)
+				out (total + k, ch) = buffer [k * sfinfo.channels + ch] ;
+			} ;
+
+		total += readcount ;
+	} while (readcount > 0 && total < sfinfo.frames) ;
+
+	retval.append (out.squeeze ()) ;
+
+	if (nargout >= 2)
+		retval.append ((octave_uint32) sfinfo.samplerate) ;
+
+	if (nargout >= 3)
+	{	std::string fmt ("") ;
+		string_of_format (fmt, sfinfo.format) ;
+		retval.append (fmt) ;
+		} ;
+
+	/* Clean up. */
+	sf_close (file) ;
+
+	return retval ;
+} /* sfread */
+
+DEFUN_DLD (sfwrite, args, nargout ,
+"-*- texinfo -*-\n\
+@deftypefn {Function File} sfwrite (@var{filename},@var{data},@var{srate},@var{format})\n\
+Write a sound file to disk using libsndfile.\n\
+@seealso{sfread, sfversion}\n\
+@end deftypefn\n\
+")
+{	SNDFILE * file ;
+	SF_INFO sfinfo ;
+
+    octave_value_list retval ;
+
+    int nargin  = args.length () ;
+
+    /* Bail out if the input parameters are bad. */
+    if (nargin != 4 || !args (0).is_string () || !args (1).is_real_matrix ()
+			|| !args (2).is_real_scalar () || !args (3).is_string ()
+			|| nargout != 0)
+	{	print_usage () ;
+		return retval ;
+    	} ;
+
+    std::string filename = args (0).string_value () ;
+    std::string format = args (3).string_value () ;
+
+	memset (&sfinfo, 0, sizeof (sfinfo)) ;
+
+	sfinfo.format = format_of_str (format) ;
+	if (sfinfo.format == 0)
+	{	error ("Bad format '%s'", format.c_str ()) ;
+		return retval ;
+		} ;
+
+	sfinfo.samplerate = lrint (args (2).scalar_value ()) ;
+	if (sfinfo.samplerate < 1)
+	{	error ("Bad sample rate : %d.\n", sfinfo.samplerate) ;
+		return retval ;
+		} ;
+
+	Matrix data = args (1).matrix_value () ;
+	long rows = args (1).rows () ;
+	long cols = args (1).columns () ;
+
+	if (cols > rows)
+	{	error ("Audio data should have one column per channel, but supplied data "
+				"has %ld rows and %ld columns.\n", rows, cols) ;
+		return retval ;
+		} ;
+
+	sfinfo.channels = cols ;
+
+    if ((file = sf_open (filename.c_str (), SFM_WRITE, &sfinfo)) == NULL)
+	{	error ("Couldn't open file %s : %s", filename.c_str (), sf_strerror (NULL)) ;
+		return retval ;
+    	} ;
+
+	float buffer [BUFFER_FRAMES * sfinfo.channels] ;
+	int writecount ;
+	long total = 0 ;
+
+	do
+	{
+		writecount = BUFFER_FRAMES ;
+
+		/* Make sure we don't read more frames than we allocated. */
+		if (total + writecount > rows)
+			writecount = rows - total ;
+
+		for (int ch = 0 ; ch < sfinfo.channels ; ch++)
+		{	for (int k = 0 ; k < writecount ; k++)
+				buffer [k * sfinfo.channels + ch] = data (total + k, ch) ;
+			} ;
+
+		if (writecount > 0)
+			sf_writef_float (file, buffer, writecount) ;
+
+		total += writecount ;
+	} while (writecount > 0 && total < rows) ;
+
+    /* Clean up. */
+    sf_close (file) ;
+
+    return retval ;
+} /* sfwrite */
+
+
+static void
+str_split (const std::string & str, const std::string & delim, std::vector <std::string> & output)
+{
+    unsigned int offset = 0 ;
+    size_t delim_index = 0 ;
+
+    delim_index = str.find (delim, offset) ;
+
+    while (delim_index != std::string::npos)
+    {
+        output.push_back (str.substr(offset, delim_index - offset)) ;
+        offset += delim_index - offset + delim.length () ;
+        delim_index = str.find (delim, offset) ;
+    }
+
+    output.push_back (str.substr (offset)) ;
+} /* str_split */
+
+static int
+hash_of_str (const std::string & str)
+{
+	int hash = 0 ;
+
+	for (unsigned k = 0 ; k < str.length () ; k++)
+		hash = (hash * 3) + tolower (str [k]) ;
+
+	return hash ;
+} /* hash_of_str */
+
+static int
+major_format_of_hash (const std::string & str)
+{	int hash ;
+
+	hash = hash_of_str (str) ;
+
+	switch (hash)
+	{
+		case 0x5c8 : /* 'wav' */ return SF_FORMAT_WAV ;
+		case 0xf84 : /* 'aiff' */ return SF_FORMAT_AIFF ;
+		case 0x198 : /* 'au' */ return SF_FORMAT_AU ;
+		case 0x579 : /* 'paf' */ return SF_FORMAT_PAF ;
+		case 0x5e5 : /* 'svx' */ return SF_FORMAT_SVX ;
+		case 0x1118 : /* 'nist' */ return SF_FORMAT_NIST ;
+		case 0x5d6 : /* 'voc' */ return SF_FORMAT_VOC ;
+		case 0x324a : /* 'ircam' */ return SF_FORMAT_IRCAM ;
+		case 0x505 : /* 'w64' */ return SF_FORMAT_W64 ;
+		case 0x1078 : /* 'mat4' */ return SF_FORMAT_MAT4 ;
+		case 0x1079 : /* 'mat5' */ return SF_FORMAT_MAT5 ;
+		case 0x5b8 : /* 'pvf' */ return SF_FORMAT_PVF ;
+		case 0x1d1 : /* 'xi' */ return SF_FORMAT_XI ;
+		case 0x56f : /* 'htk' */ return SF_FORMAT_HTK ;
+		case 0x5aa : /* 'sds' */ return SF_FORMAT_SDS ;
+		case 0x53d : /* 'avr' */ return SF_FORMAT_AVR ;
+		case 0x11d0 : /* 'wavx' */ return SF_FORMAT_WAVEX ;
+		case 0x569 : /* 'sd2' */ return SF_FORMAT_SD2 ;
+		case 0x1014 : /* 'flac' */ return SF_FORMAT_FLAC ;
+		case 0x504 : /* 'caf' */ return SF_FORMAT_CAF ;
+		case 0x5f6 : /* 'wve' */ return SF_FORMAT_WVE ;
+		default : break ;
+		} ;
+
+	printf ("%s : hash '%s' -> 0x%x\n", __func__, str.c_str (), hash) ;
+
+	return 0 ;
+} /* major_format_of_hash */
+
+static int
+minor_format_of_hash (const std::string & str)
+{	int hash ;
+
+	hash = hash_of_str (str) ;
+
+	switch (hash)
+	{
+		case 0x1085 : /* 'int8' */ return SF_FORMAT_PCM_S8 ;
+		case 0x358a : /* 'uint8' */ return SF_FORMAT_PCM_U8 ;
+		case 0x31b0 : /* 'int16' */ return SF_FORMAT_PCM_16 ;
+		case 0x31b1 : /* 'int24' */ return SF_FORMAT_PCM_24 ;
+		case 0x31b2 : /* 'int32' */ return SF_FORMAT_PCM_32 ;
+		case 0x3128 : /* 'float' */ return SF_FORMAT_FLOAT ;
+		case 0x937d : /* 'double' */ return SF_FORMAT_DOUBLE ;
+		case 0x11bd : /* 'ulaw' */ return SF_FORMAT_ULAW ;
+		case 0xfa1 : /* 'alaw' */ return SF_FORMAT_ALAW ;
+		case 0xfc361 : /* 'ima_adpcm' */ return SF_FORMAT_IMA_ADPCM ;
+		case 0x5739a : /* 'ms_adpcm' */ return SF_FORMAT_MS_ADPCM ;
+		case 0x9450 : /* 'gsm610' */ return SF_FORMAT_GSM610 ;
+		case 0x172a3 : /* 'g721_32' */ return SF_FORMAT_G721_32 ;
+		case 0x172d8 : /* 'g723_24' */ return SF_FORMAT_G723_24 ;
+		case 0x172da : /* 'g723_40' */ return SF_FORMAT_G723_40 ;
+		default : break ;
+		} ;
+
+	printf ("%s : hash '%s' -> 0x%x\n", __func__, str.c_str (), hash) ;
+
+	return 0 ;
+} /* minor_format_of_hash */
+
+
+static const char *
+string_of_major_format (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_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 "wavx" ;
+		case SF_FORMAT_SD2 : return "sd2" ;
+		case SF_FORMAT_FLAC : return "flac" ;
+		case SF_FORMAT_CAF : return "caf" ;
+		case SF_FORMAT_WVE : return "wfe" ;
+		default : break ;
+		} ;
+
+	return "unknown" ;
+} /* string_of_major_format */
+
+static const char *
+string_of_minor_format (int format)
+{
+	switch (format & SF_FORMAT_SUBMASK)
+	{
+		case SF_FORMAT_PCM_S8 : return "int8" ;
+		case SF_FORMAT_PCM_U8 : return "uint8" ;
+		case SF_FORMAT_PCM_16 : return "int16" ;
+		case SF_FORMAT_PCM_24 : return "int24" ;
+		case SF_FORMAT_PCM_32 : return "int32" ;
+		case SF_FORMAT_FLOAT : return "float" ;
+		case SF_FORMAT_DOUBLE : return "double" ;
+		case SF_FORMAT_ULAW : return "ulaw" ;
+		case SF_FORMAT_ALAW : return "alaw" ;
+		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_G721_32 : return "g721_32" ;
+		case SF_FORMAT_G723_24 : return "g723_24" ;
+		case SF_FORMAT_G723_40 : return "g723_40" ;
+		default : break ;
+		} ;
+
+	return "unknown" ;
+} /* string_of_minor_format */
+
+static int
+format_of_str (const std::string & fmt)
+{
+	std::vector <std::string> split ;
+
+	str_split (fmt, "-", split) ;
+
+	if (split.size () != 2)
+		return 0 ;
+
+	int major_fmt = major_format_of_hash (split.at (0)) ;
+	if (major_fmt == 0)
+		return 0 ;
+
+	int minor_fmt = minor_format_of_hash (split.at (1)) ;
+	if (minor_fmt == 0)
+		return 0 ;
+
+	return major_fmt | minor_fmt ;
+} /* format_of_str */
+
+static void
+string_of_format (std::string & fmt, int format)
+{
+	char buffer [64] ;
+
+	snprintf (buffer, sizeof (buffer), "%s-%s", string_of_major_format (format), string_of_minor_format (format)) ;
+
+	fmt = buffer ;
+
+	return ;
+} /* string_of_format */
diff --git a/jni/libsndfile-1.0.25/Octave/sndfile_load.m b/jni/libsndfile-1.0.25/Octave/sndfile_load.m
new file mode 100644
index 0000000..c66198f
--- /dev/null
+++ b/jni/libsndfile-1.0.25/Octave/sndfile_load.m
@@ -0,0 +1,52 @@
+## 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
+## the Free Software Foundation; either version 2, 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 file.  If not, write to the Free Software Foundation,
+## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+## -*- texinfo -*-
+## @deftypefn {Function File} {} sndfile_load (@var{filename})
+## Load data from the file given by @var{filename}.
+## @end deftypefn
+
+## Author: Erik de Castro Lopo <erikd@mega-nerd.com>
+## Description: Load the sound data from the given file name
+
+function [data fs] = sndfile_load (filename)
+
+if (nargin != 1),
+	error ("Need an input filename") ;
+	endif
+
+samplerate = -1 ;
+samplingrate = -1 ;
+wavedata = -1 ;
+
+
+eval (sprintf ('load -f %s', filename)) ;
+
+if (samplerate > 0),
+	fs = samplerate ;
+elseif (samplingrate > 0),
+	fs = samplingrate ;
+else
+	error ("Not able to find sample rate.") ;
+	endif
+
+if (max (size (wavedata)) > 1),
+	data = wavedata ;
+else
+	error ("Not able to find waveform data.") ;
+	endif
+
+endfunction
diff --git a/jni/libsndfile-1.0.25/Octave/sndfile_play.m b/jni/libsndfile-1.0.25/Octave/sndfile_play.m
new file mode 100644
index 0000000..e8a34a7
--- /dev/null
+++ b/jni/libsndfile-1.0.25/Octave/sndfile_play.m
@@ -0,0 +1,59 @@
+## 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
+## the Free Software Foundation; either version 2, 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 file.  If not, write to the Free Software Foundation,
+## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+## -*- texinfo -*-
+## @deftypefn {Function File} {} sndfile_play (@var{data, fs})
+## Play @var{data} at sample rate @var{fs} using the sndfile-play
+## program.
+## @end deftypefn
+
+## Author: Erik de Castro Lopo <erikd@mega-nerd.com>
+## Description: Play the given data as a sound file
+
+function sndfile_play (data, fs)
+
+if nargin != 2,
+	error ("Need two input arguments: data and fs.") ;
+	endif
+
+if (max (size (fs)) > 1),
+	error ("Second parameter fs must be a single value.") ;
+	endif
+
+[nr nc] = size (data) ;
+
+if (nr > nc),
+	data = data' ;
+	endif
+
+samplerate = fs ;
+wavedata = data ;
+
+filename = tmpnam () ;
+
+cmd = sprintf ("save -mat-binary %s fs data", filename) ;
+
+eval (cmd) ;
+
+cmd = sprintf ("sndfile-play %s", filename) ;
+
+[output, status] = system (cmd) ;
+
+if (status),
+	disp (outout) ;
+	endif
+
+endfunction
diff --git a/jni/libsndfile-1.0.25/Octave/sndfile_save.m b/jni/libsndfile-1.0.25/Octave/sndfile_save.m
new file mode 100644
index 0000000..5b7e7c7
--- /dev/null
+++ b/jni/libsndfile-1.0.25/Octave/sndfile_save.m
@@ -0,0 +1,53 @@
+## 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
+## the Free Software Foundation; either version 2, 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 file.  If not, write to the Free Software Foundation,
+## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+## -*- texinfo -*-
+## @deftypefn {Function File} {} sndfile_save (@var{filename, data, fs})
+## Save the given @var{data} as audio data to the given at @var{fs}. Set
+## the sample rate to @var{fs}.
+## @end deftypefn
+
+## Author: Erik de Castro Lopo <erikd@mega-nerd.com>
+## Description: Save data as a sound file
+
+function sndfile_save (filename, data, fs)
+
+if nargin != 3,
+	error ("Need three input arguments: filename, data and fs.") ;
+	endif
+
+if (! isstr (filename)),
+	error ("First parameter 'filename' is must be a string.") ;
+	endif
+
+if (max (size (fs)) > 1),
+	error ("Second parameter 'fs' must be a single value, not an array or matrix.") ;
+	endif
+
+[nr nc] = size (data) ;
+
+if (nr > nc),
+	data = data' ;
+	endif
+
+samplerate = fs ;
+wavedata = data ;
+
+str = sprintf ("save -mat-binary %s samplerate wavedata", filename) ;
+
+eval (str) ;
+
+endfunction