Tarball conversion

15 files changed, 4854 insertions, 0 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..e5f7591
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,25 @@
+## Process this file with automake to produce Makefile.in. -*-Makefile-*-
+
+# $Id: Makefile.am,v 1.11 2004/02/18 06:59:40 jm Exp $
+
+# Disable automatic dependency tracking if using other tools than gcc and gmake
+#AUTOMAKE_OPTIONS = no-dependencies
+
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@
+
+man_MANS = speexenc.1 speexdec.1
+
+EXTRA_DIST = $(man_MANS) getopt_win.h getopt.c getopt1.c wave_out.c wave_out.h skeleton.h
+
+include_HEADERS = 
+noinst_HEADERS = wav_io.h
+
+bin_PROGRAMS = speexenc speexdec
+
+speexenc_SOURCES = speexenc.c wav_io.c skeleton.c
+speexenc_LDADD = $(top_builddir)/libspeex/libspeex.la $(top_builddir)/libspeex/libspeexdsp.la \
+	$(OGG_LIBS)  @FFT_LIBS@	
+
+speexdec_SOURCES = speexdec.c wav_io.c
+speexdec_LDADD = $(top_builddir)/libspeex/libspeex.la \
+	$(OGG_LIBS)  @FFT_LIBS@
diff --git a/src/Makefile.in b/src/Makefile.in
new file mode 100644
index 0000000..006f44f
--- /dev/null
+++ b/src/Makefile.in
@@ -0,0 +1,583 @@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# $Id: Makefile.am,v 1.11 2004/02/18 06:59:40 jm Exp $
+
+# Disable automatic dependency tracking if using other tools than gcc and gmake
+#AUTOMAKE_OPTIONS = no-dependencies
+
+
+SOURCES = $(speexdec_SOURCES) $(speexenc_SOURCES)
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+bin_PROGRAMS = speexenc$(EXEEXT) speexdec$(EXEEXT)
+subdir = src
+DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(mkdir_p)
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(includedir)"
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS)
+am_speexdec_OBJECTS = speexdec.$(OBJEXT) wav_io.$(OBJEXT)
+speexdec_OBJECTS = $(am_speexdec_OBJECTS)
+am__DEPENDENCIES_1 =
+speexdec_DEPENDENCIES = $(top_builddir)/libspeex/libspeex.la \
+	$(am__DEPENDENCIES_1)
+am_speexenc_OBJECTS = speexenc.$(OBJEXT) wav_io.$(OBJEXT) \
+	skeleton.$(OBJEXT)
+speexenc_OBJECTS = $(am_speexenc_OBJECTS)
+speexenc_DEPENDENCIES = $(top_builddir)/libspeex/libspeex.la \
+	$(top_builddir)/libspeex/libspeexdsp.la $(am__DEPENDENCIES_1)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/skeleton.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/speexdec.Po ./$(DEPDIR)/speexenc.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/wav_io.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(speexdec_SOURCES) $(speexenc_SOURCES)
+DIST_SOURCES = $(speexdec_SOURCES) $(speexenc_SOURCES)
+man1dir = $(mandir)/man1
+NROFF = nroff
+MANS = $(man_MANS)
+includeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(include_HEADERS) $(noinst_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_KISS_FFT_FALSE = @BUILD_KISS_FFT_FALSE@
+BUILD_KISS_FFT_TRUE = @BUILD_KISS_FFT_TRUE@
+BUILD_SMALLFT_FALSE = @BUILD_SMALLFT_FALSE@
+BUILD_SMALLFT_TRUE = @BUILD_SMALLFT_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FFT_CFLAGS = @FFT_CFLAGS@
+FFT_LIBS = @FFT_LIBS@
+FFT_PKGCONFIG = @FFT_PKGCONFIG@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SIZE16 = @SIZE16@
+SIZE32 = @SIZE32@
+SPEEX_LT_AGE = @SPEEX_LT_AGE@
+SPEEX_LT_CURRENT = @SPEEX_LT_CURRENT@
+SPEEX_LT_REVISION = @SPEEX_LT_REVISION@
+SPEEX_VERSION = @SPEEX_VERSION@
+STRIP = @STRIP@
+VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+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@
+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@
+src = @src@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@
+man_MANS = speexenc.1 speexdec.1
+EXTRA_DIST = $(man_MANS) getopt_win.h getopt.c getopt1.c wave_out.c wave_out.h skeleton.h
+include_HEADERS = 
+noinst_HEADERS = wav_io.h
+speexenc_SOURCES = speexenc.c wav_io.c skeleton.c
+speexenc_LDADD = $(top_builddir)/libspeex/libspeex.la $(top_builddir)/libspeex/libspeexdsp.la \
+	$(OGG_LIBS)  @FFT_LIBS@	
+
+speexdec_SOURCES = speexdec.c wav_io.c
+speexdec_LDADD = $(top_builddir)/libspeex/libspeex.la \
+	$(OGG_LIBS)  @FFT_LIBS@
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	@list='$(bin_PROGRAMS)'; 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 $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
+	done
+
+clean-binPROGRAMS:
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+speexdec$(EXEEXT): $(speexdec_OBJECTS) $(speexdec_DEPENDENCIES) 
+	@rm -f speexdec$(EXEEXT)
+	$(LINK) $(speexdec_LDFLAGS) $(speexdec_OBJECTS) $(speexdec_LDADD) $(LIBS)
+speexenc$(EXEEXT): $(speexenc_OBJECTS) $(speexenc_DEPENDENCIES) 
+	@rm -f speexenc$(EXEEXT)
+	$(LINK) $(speexenc_LDFLAGS) $(speexenc_OBJECTS) $(speexenc_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/skeleton.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/speexdec.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/speexenc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wav_io.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+install-man1: $(man1_MANS) $(man_MANS)
+	@$(NORMAL_INSTALL)
+	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.1*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+	  else file=$$i; fi; \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    1*) ;; \
+	    *) ext='1' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
+	done
+uninstall-man1:
+	@$(NORMAL_UNINSTALL)
+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.1*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    1*) ;; \
+	    *) ext='1' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
+	done
+install-includeHEADERS: $(include_HEADERS)
+	@$(NORMAL_INSTALL)
+	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+	@list='$(include_HEADERS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
+	done
+
+uninstall-includeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(include_HEADERS)'; for p in $$list; do \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS) $(MANS) $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(includedir)"; 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:
+	-rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-includeHEADERS install-man
+
+install-exec-am: install-binPROGRAMS
+
+install-info: install-info-am
+
+install-man: install-man1
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \
+	uninstall-info-am uninstall-man
+
+uninstall-man: uninstall-man1
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-libtool ctags distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-binPROGRAMS install-data install-data-am install-exec \
+	install-exec-am install-includeHEADERS install-info \
+	install-info-am install-man install-man1 install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-binPROGRAMS \
+	uninstall-includeHEADERS uninstall-info-am uninstall-man \
+	uninstall-man1
+
+# 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/src/getopt.c b/src/getopt.c
new file mode 100644
index 0000000..33d299b
--- /dev/null
+++ b/src/getopt.c
@@ -0,0 +1,1047 @@
+/* Getopt for GNU.

+   NOTE: getopt is now part of the C library, so if you don't know what

+   "Keep this file name-space clean" means, talk to drepper@gnu.org

+   before changing it!

+

+   Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99

+   	Free Software Foundation, Inc.

+

+   The GNU C Library is free software; you can redistribute it and/or

+   modify it under the terms of the GNU Library General Public License as

+   published by the Free Software Foundation; either version 2 of the

+   License, or (at your option) any later version.

+

+   The GNU C Library 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

+   Library General Public License for more details.

+

+   You should have received a copy of the GNU Library General Public

+   License along with the GNU C Library; see the file COPYING.LIB.  If not,

+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,

+   Boston, MA 02111-1307, USA.  */

+

+/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.

+   Ditto for AIX 3.2 and <stdlib.h>.  */

+#ifndef _NO_PROTO

+# define _NO_PROTO

+#endif

+

+#ifdef HAVE_CONFIG_H

+# include "config.h"

+#endif

+

+#if !defined __STDC__ || !__STDC__

+/* This is a separate conditional since some stdc systems

+   reject `defined (const)'.  */

+# ifndef const

+#  define const

+# endif

+#endif

+

+#include <stdio.h>

+

+/* Comment out all this code if we are using the GNU C Library, and are not

+   actually compiling the library itself.  This code is part of the GNU C

+   Library, but also included in many other GNU distributions.  Compiling

+   and linking in this code is a waste when using the GNU C library

+   (especially if it is a shared library).  Rather than having every GNU

+   program understand `configure --with-gnu-libc' and omit the object files,

+   it is simpler to just do this in the source for each such file.  */

+

+#define GETOPT_INTERFACE_VERSION 2

+#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2

+# include <gnu-versions.h>

+# if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION

+#  define ELIDE_CODE

+# endif

+#endif

+

+#ifndef ELIDE_CODE

+

+

+/* This needs to come after some library #include

+   to get __GNU_LIBRARY__ defined.  */

+#ifdef	__GNU_LIBRARY__

+/* Don't include stdlib.h for non-GNU C libraries because some of them

+   contain conflicting prototypes for getopt.  */

+# include <stdlib.h>

+# include <unistd.h>

+#endif	/* GNU C library.  */

+

+#ifdef VMS

+# include <unixlib.h>

+# if HAVE_STRING_H - 0

+#  include <string.h>

+# endif

+#endif

+

+#ifndef _

+/* This is for other GNU distributions with internationalized messages.

+   When compiling libc, the _ macro is predefined.  */

+# ifdef HAVE_LIBINTL_H

+#  include <libintl.h>

+#  define _(msgid)	gettext (msgid)

+# else

+#  define _(msgid)	(msgid)

+# endif

+#endif

+

+/* This version of `getopt' appears to the caller like standard Unix `getopt'

+   but it behaves differently for the user, since it allows the user

+   to intersperse the options with the other arguments.

+

+   As `getopt' works, it permutes the elements of ARGV so that,

+   when it is done, all the options precede everything else.  Thus

+   all application programs are extended to handle flexible argument order.

+

+   Setting the environment variable POSIXLY_CORRECT disables permutation.

+   Then the behavior is completely standard.

+

+   GNU application programs can use a third alternative mode in which

+   they can distinguish the relative order of options and other arguments.  */

+

+#include "getopt_win.h"

+

+/* For communication from `getopt' to the caller.

+   When `getopt' finds an option that takes an argument,

+   the argument value is returned here.

+   Also, when `ordering' is RETURN_IN_ORDER,

+   each non-option ARGV-element is returned here.  */

+

+char *optarg;

+

+/* Index in ARGV of the next element to be scanned.

+   This is used for communication to and from the caller

+   and for communication between successive calls to `getopt'.

+

+   On entry to `getopt', zero means this is the first call; initialize.

+

+   When `getopt' returns -1, this is the index of the first of the

+   non-option elements that the caller should itself scan.

+

+   Otherwise, `optind' communicates from one call to the next

+   how much of ARGV has been scanned so far.  */

+

+/* 1003.2 says this must be 1 before any call.  */

+int optind = 1;

+

+/* Formerly, initialization of getopt depended on optind==0, which

+   causes problems with re-calling getopt as programs generally don't

+   know that. */

+

+int __getopt_initialized;

+

+/* The next char to be scanned in the option-element

+   in which the last option character we returned was found.

+   This allows us to pick up the scan where we left off.

+

+   If this is zero, or a null string, it means resume the scan

+   by advancing to the next ARGV-element.  */

+

+static char *nextchar;

+

+/* Callers store zero here to inhibit the error message

+   for unrecognized options.  */

+

+int opterr = 1;

+

+/* Set to an option character which was unrecognized.

+   This must be initialized on some systems to avoid linking in the

+   system's own getopt implementation.  */

+

+int optopt = '?';

+

+/* Describe how to deal with options that follow non-option ARGV-elements.

+

+   If the caller did not specify anything,

+   the default is REQUIRE_ORDER if the environment variable

+   POSIXLY_CORRECT is defined, PERMUTE otherwise.

+

+   REQUIRE_ORDER means don't recognize them as options;

+   stop option processing when the first non-option is seen.

+   This is what Unix does.

+   This mode of operation is selected by either setting the environment

+   variable POSIXLY_CORRECT, or using `+' as the first character

+   of the list of option characters.

+

+   PERMUTE is the default.  We permute the contents of ARGV as we scan,

+   so that eventually all the non-options are at the end.  This allows options

+   to be given in any order, even with programs that were not written to

+   expect this.

+

+   RETURN_IN_ORDER is an option available to programs that were written

+   to expect options and other ARGV-elements in any order and that care about

+   the ordering of the two.  We describe each non-option ARGV-element

+   as if it were the argument of an option with character code 1.

+   Using `-' as the first character of the list of option characters

+   selects this mode of operation.

+

+   The special argument `--' forces an end of option-scanning regardless

+   of the value of `ordering'.  In the case of RETURN_IN_ORDER, only

+   `--' can cause `getopt' to return -1 with `optind' != ARGC.  */

+

+static enum

+{

+  REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER

+} ordering;

+

+/* Value of POSIXLY_CORRECT environment variable.  */

+static char *posixly_correct;

+

+#ifdef	__GNU_LIBRARY__

+/* We want to avoid inclusion of string.h with non-GNU libraries

+   because there are many ways it can cause trouble.

+   On some systems, it contains special magic macros that don't work

+   in GCC.  */

+# include <string.h>

+# define my_index	strchr

+#else

+

+#include <string.h>

+

+/* Avoid depending on library functions or files

+   whose names are inconsistent.  */

+

+#ifndef getenv

+extern char *getenv ();

+#endif

+

+static char *

+my_index (str, chr)

+     const char *str;

+     int chr;

+{

+  while (*str)

+    {

+      if (*str == chr)

+	return (char *) str;

+      str++;

+    }

+  return 0;

+}

+

+/* If using GCC, we can safely declare strlen this way.

+   If not using GCC, it is ok not to declare it.  */

+#ifdef __GNUC__

+/* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h.

+   That was relevant to code that was here before.  */

+# if (!defined __STDC__ || !__STDC__) && !defined strlen

+/* gcc with -traditional declares the built-in strlen to return int,

+   and has done so at least since version 2.4.5. -- rms.  */

+extern int strlen (const char *);

+# endif /* not __STDC__ */

+#endif /* __GNUC__ */

+

+#endif /* not __GNU_LIBRARY__ */

+

+/* Handle permutation of arguments.  */

+

+/* Describe the part of ARGV that contains non-options that have

+   been skipped.  `first_nonopt' is the index in ARGV of the first of them;

+   `last_nonopt' is the index after the last of them.  */

+

+static int first_nonopt;

+static int last_nonopt;

+

+#ifdef _LIBC

+/* Bash 2.0 gives us an environment variable containing flags

+   indicating ARGV elements that should not be considered arguments.  */

+

+/* Defined in getopt_init.c  */

+extern char *__getopt_nonoption_flags;

+

+static int nonoption_flags_max_len;

+static int nonoption_flags_len;

+

+static int original_argc;

+static char *const *original_argv;

+

+/* Make sure the environment variable bash 2.0 puts in the environment

+   is valid for the getopt call we must make sure that the ARGV passed

+   to getopt is that one passed to the process.  */

+static void

+__attribute__ ((unused))

+store_args_and_env (int argc, char *const *argv)

+{

+  /* XXX This is no good solution.  We should rather copy the args so

+     that we can compare them later.  But we must not use malloc(3).  */

+  original_argc = argc;

+  original_argv = argv;

+}

+# ifdef text_set_element

+text_set_element (__libc_subinit, store_args_and_env);

+# endif /* text_set_element */

+

+# define SWAP_FLAGS(ch1, ch2) \

+  if (nonoption_flags_len > 0)						      \

+    {									      \

+      char __tmp = __getopt_nonoption_flags[ch1];			      \

+      __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2];	      \

+      __getopt_nonoption_flags[ch2] = __tmp;				      \

+    }

+#else	/* !_LIBC */

+# define SWAP_FLAGS(ch1, ch2)

+#endif	/* _LIBC */

+

+/* Exchange two adjacent subsequences of ARGV.

+   One subsequence is elements [first_nonopt,last_nonopt)

+   which contains all the non-options that have been skipped so far.

+   The other is elements [last_nonopt,optind), which contains all

+   the options processed since those non-options were skipped.

+

+   `first_nonopt' and `last_nonopt' are relocated so that they describe

+   the new indices of the non-options in ARGV after they are moved.  */

+

+#if defined __STDC__ && __STDC__

+static void exchange (char **);

+#endif

+

+static void

+exchange (argv)

+     char **argv;

+{

+  int bottom = first_nonopt;

+  int middle = last_nonopt;

+  int top = optind;

+  char *tem;

+

+  /* Exchange the shorter segment with the far end of the longer segment.

+     That puts the shorter segment into the right place.

+     It leaves the longer segment in the right place overall,

+     but it consists of two parts that need to be swapped next.  */

+

+#ifdef _LIBC

+  /* First make sure the handling of the `__getopt_nonoption_flags'

+     string can work normally.  Our top argument must be in the range

+     of the string.  */

+  if (nonoption_flags_len > 0 && top >= nonoption_flags_max_len)

+    {

+      /* We must extend the array.  The user plays games with us and

+	 presents new arguments.  */

+      char *new_str = malloc (top + 1);

+      if (new_str == NULL)

+	nonoption_flags_len = nonoption_flags_max_len = 0;

+      else

+	{

+	  memset (__mempcpy (new_str, __getopt_nonoption_flags,

+			     nonoption_flags_max_len),

+		  '\0', top + 1 - nonoption_flags_max_len);

+	  nonoption_flags_max_len = top + 1;

+	  __getopt_nonoption_flags = new_str;

+	}

+    }

+#endif

+

+  while (top > middle && middle > bottom)

+    {

+      if (top - middle > middle - bottom)

+	{

+	  /* Bottom segment is the short one.  */

+	  int len = middle - bottom;

+	  register int i;

+

+	  /* Swap it with the top part of the top segment.  */

+	  for (i = 0; i < len; i++)

+	    {

+	      tem = argv[bottom + i];

+	      argv[bottom + i] = argv[top - (middle - bottom) + i];

+	      argv[top - (middle - bottom) + i] = tem;

+	      SWAP_FLAGS (bottom + i, top - (middle - bottom) + i);

+	    }

+	  /* Exclude the moved bottom segment from further swapping.  */

+	  top -= len;

+	}

+      else

+	{

+	  /* Top segment is the short one.  */

+	  int len = top - middle;

+	  register int i;

+

+	  /* Swap it with the bottom part of the bottom segment.  */

+	  for (i = 0; i < len; i++)

+	    {

+	      tem = argv[bottom + i];

+	      argv[bottom + i] = argv[middle + i];

+	      argv[middle + i] = tem;

+	      SWAP_FLAGS (bottom + i, middle + i);

+	    }

+	  /* Exclude the moved top segment from further swapping.  */

+	  bottom += len;

+	}

+    }

+

+  /* Update records for the slots the non-options now occupy.  */

+

+  first_nonopt += (optind - last_nonopt);

+  last_nonopt = optind;

+}

+

+/* Initialize the internal data when the first call is made.  */

+

+#if defined __STDC__ && __STDC__

+static const char *_getopt_initialize (int, char *const *, const char *);

+#endif

+static const char *

+_getopt_initialize (argc, argv, optstring)

+     int argc;

+     char *const *argv;

+     const char *optstring;

+{

+  /* Start processing options with ARGV-element 1 (since ARGV-element 0

+     is the program name); the sequence of previously skipped

+     non-option ARGV-elements is empty.  */

+

+  first_nonopt = last_nonopt = optind;

+

+  nextchar = NULL;

+

+  posixly_correct = getenv ("POSIXLY_CORRECT");

+

+  /* Determine how to handle the ordering of options and nonoptions.  */

+

+  if (optstring[0] == '-')

+    {

+      ordering = RETURN_IN_ORDER;

+      ++optstring;

+    }

+  else if (optstring[0] == '+')

+    {

+      ordering = REQUIRE_ORDER;

+      ++optstring;

+    }

+  else if (posixly_correct != NULL)

+    ordering = REQUIRE_ORDER;

+  else

+    ordering = PERMUTE;

+

+#ifdef _LIBC

+  if (posixly_correct == NULL

+      && argc == original_argc && argv == original_argv)

+    {

+      if (nonoption_flags_max_len == 0)

+	{

+	  if (__getopt_nonoption_flags == NULL

+	      || __getopt_nonoption_flags[0] == '\0')

+	    nonoption_flags_max_len = -1;

+	  else

+	    {

+	      const char *orig_str = __getopt_nonoption_flags;

+	      int len = nonoption_flags_max_len = strlen (orig_str);

+	      if (nonoption_flags_max_len < argc)

+		nonoption_flags_max_len = argc;

+	      __getopt_nonoption_flags =

+		(char *) malloc (nonoption_flags_max_len);

+	      if (__getopt_nonoption_flags == NULL)

+		nonoption_flags_max_len = -1;

+	      else

+		memset (__mempcpy (__getopt_nonoption_flags, orig_str, len),

+			'\0', nonoption_flags_max_len - len);

+	    }

+	}

+      nonoption_flags_len = nonoption_flags_max_len;

+    }

+  else

+    nonoption_flags_len = 0;

+#endif

+

+  return optstring;

+}

+

+/* Scan elements of ARGV (whose length is ARGC) for option characters

+   given in OPTSTRING.

+

+   If an element of ARGV starts with '-', and is not exactly "-" or "--",

+   then it is an option element.  The characters of this element

+   (aside from the initial '-') are option characters.  If `getopt'

+   is called repeatedly, it returns successively each of the option characters

+   from each of the option elements.

+

+   If `getopt' finds another option character, it returns that character,

+   updating `optind' and `nextchar' so that the next call to `getopt' can

+   resume the scan with the following option character or ARGV-element.

+

+   If there are no more option characters, `getopt' returns -1.

+   Then `optind' is the index in ARGV of the first ARGV-element

+   that is not an option.  (The ARGV-elements have been permuted

+   so that those that are not options now come last.)

+

+   OPTSTRING is a string containing the legitimate option characters.

+   If an option character is seen that is not listed in OPTSTRING,

+   return '?' after printing an error message.  If you set `opterr' to

+   zero, the error message is suppressed but we still return '?'.

+

+   If a char in OPTSTRING is followed by a colon, that means it wants an arg,

+   so the following text in the same ARGV-element, or the text of the following

+   ARGV-element, is returned in `optarg'.  Two colons mean an option that

+   wants an optional arg; if there is text in the current ARGV-element,

+   it is returned in `optarg', otherwise `optarg' is set to zero.

+

+   If OPTSTRING starts with `-' or `+', it requests different methods of

+   handling the non-option ARGV-elements.

+   See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above.

+

+   Long-named options begin with `--' instead of `-'.

+   Their names may be abbreviated as long as the abbreviation is unique

+   or is an exact match for some defined option.  If they have an

+   argument, it follows the option name in the same ARGV-element, separated

+   from the option name by a `=', or else the in next ARGV-element.

+   When `getopt' finds a long-named option, it returns 0 if that option's

+   `flag' field is nonzero, the value of the option's `val' field

+   if the `flag' field is zero.

+

+   The elements of ARGV aren't really const, because we permute them.

+   But we pretend they're const in the prototype to be compatible

+   with other systems.

+

+   LONGOPTS is a vector of `struct option' terminated by an

+   element containing a name which is zero.

+

+   LONGIND returns the index in LONGOPT of the long-named option found.

+   It is only valid when a long-named option has been found by the most

+   recent call.

+

+   If LONG_ONLY is nonzero, '-' as well as '--' can introduce

+   long-named options.  */

+

+int

+_getopt_internal (argc, argv, optstring, longopts, longind, long_only)

+     int argc;

+     char *const *argv;

+     const char *optstring;

+     const struct option *longopts;

+     int *longind;

+     int long_only;

+{

+  optarg = NULL;

+

+  if (optind == 0 || !__getopt_initialized)

+    {

+      if (optind == 0)

+	optind = 1;	/* Don't scan ARGV[0], the program name.  */

+      optstring = _getopt_initialize (argc, argv, optstring);

+      __getopt_initialized = 1;

+    }

+

+  /* Test whether ARGV[optind] points to a non-option argument.

+     Either it does not have option syntax, or there is an environment flag

+     from the shell indicating it is not an option.  The later information

+     is only used when the used in the GNU libc.  */

+#ifdef _LIBC

+# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0'	      \

+		      || (optind < nonoption_flags_len			      \

+			  && __getopt_nonoption_flags[optind] == '1'))

+#else

+# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0')

+#endif

+

+  if (nextchar == NULL || *nextchar == '\0')

+    {

+      /* Advance to the next ARGV-element.  */

+

+      /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been

+	 moved back by the user (who may also have changed the arguments).  */

+      if (last_nonopt > optind)

+	last_nonopt = optind;

+      if (first_nonopt > optind)

+	first_nonopt = optind;

+

+      if (ordering == PERMUTE)

+	{

+	  /* If we have just processed some options following some non-options,

+	     exchange them so that the options come first.  */

+

+	  if (first_nonopt != last_nonopt && last_nonopt != optind)

+	    exchange ((char **) argv);

+	  else if (last_nonopt != optind)

+	    first_nonopt = optind;

+

+	  /* Skip any additional non-options

+	     and extend the range of non-options previously skipped.  */

+

+	  while (optind < argc && NONOPTION_P)

+	    optind++;

+	  last_nonopt = optind;

+	}

+

+      /* The special ARGV-element `--' means premature end of options.

+	 Skip it like a null option,

+	 then exchange with previous non-options as if it were an option,

+	 then skip everything else like a non-option.  */

+

+      if (optind != argc && !strcmp (argv[optind], "--"))

+	{

+	  optind++;

+

+	  if (first_nonopt != last_nonopt && last_nonopt != optind)

+	    exchange ((char **) argv);

+	  else if (first_nonopt == last_nonopt)

+	    first_nonopt = optind;

+	  last_nonopt = argc;

+

+	  optind = argc;

+	}

+

+      /* If we have done all the ARGV-elements, stop the scan

+	 and back over any non-options that we skipped and permuted.  */

+

+      if (optind == argc)

+	{

+	  /* Set the next-arg-index to point at the non-options

+	     that we previously skipped, so the caller will digest them.  */

+	  if (first_nonopt != last_nonopt)

+	    optind = first_nonopt;

+	  return -1;

+	}

+

+      /* If we have come to a non-option and did not permute it,

+	 either stop the scan or describe it to the caller and pass it by.  */

+

+      if (NONOPTION_P)

+	{

+	  if (ordering == REQUIRE_ORDER)

+	    return -1;

+	  optarg = argv[optind++];

+	  return 1;

+	}

+

+      /* We have found another option-ARGV-element.

+	 Skip the initial punctuation.  */

+

+      nextchar = (argv[optind] + 1

+		  + (longopts != NULL && argv[optind][1] == '-'));

+    }

+

+  /* Decode the current option-ARGV-element.  */

+

+  /* Check whether the ARGV-element is a long option.

+

+     If long_only and the ARGV-element has the form "-f", where f is

+     a valid short option, don't consider it an abbreviated form of

+     a long option that starts with f.  Otherwise there would be no

+     way to give the -f short option.

+

+     On the other hand, if there's a long option "fubar" and

+     the ARGV-element is "-fu", do consider that an abbreviation of

+     the long option, just like "--fu", and not "-f" with arg "u".

+

+     This distinction seems to be the most useful approach.  */

+

+  if (longopts != NULL

+      && (argv[optind][1] == '-'

+	  || (long_only && (argv[optind][2] || !my_index (optstring, argv[optind][1])))))

+    {

+      char *nameend;

+      const struct option *p;

+      const struct option *pfound = NULL;

+      int exact = 0;

+      int ambig = 0;

+      int indfound = -1;

+      int option_index;

+

+      for (nameend = nextchar; *nameend && *nameend != '='; nameend++)

+	/* Do nothing.  */ ;

+

+      /* Test all long options for either exact match

+	 or abbreviated matches.  */

+      for (p = longopts, option_index = 0; p->name; p++, option_index++)

+	if (!strncmp (p->name, nextchar, nameend - nextchar))

+	  {

+	    if ((unsigned int) (nameend - nextchar)

+		== (unsigned int) strlen (p->name))

+	      {

+		/* Exact match found.  */

+		pfound = p;

+		indfound = option_index;

+		exact = 1;

+		break;

+	      }

+	    else if (pfound == NULL)

+	      {

+		/* First nonexact match found.  */

+		pfound = p;

+		indfound = option_index;

+	      }

+	    else

+	      /* Second or later nonexact match found.  */

+	      ambig = 1;

+	  }

+

+      if (ambig && !exact)

+	{

+	  if (opterr)

+	    fprintf (stderr, _("%s: option `%s' is ambiguous\n"),

+		     argv[0], argv[optind]);

+	  nextchar += strlen (nextchar);

+	  optind++;

+	  optopt = 0;

+	  return '?';

+	}

+

+      if (pfound != NULL)

+	{

+	  option_index = indfound;

+	  optind++;

+	  if (*nameend)

+	    {

+	      /* Don't test has_arg with >, because some C compilers don't

+		 allow it to be used on enums.  */

+	      if (pfound->has_arg)

+		optarg = nameend + 1;

+	      else

+		{

+		  if (opterr)

+		    {

+		      if (argv[optind - 1][1] == '-')

+			/* --option */

+			fprintf (stderr,

+				 _("%s: option `--%s' doesn't allow an argument\n"),

+				 argv[0], pfound->name);

+		      else

+			/* +option or -option */

+			fprintf (stderr,

+				 _("%s: option `%c%s' doesn't allow an argument\n"),

+				 argv[0], argv[optind - 1][0], pfound->name);

+		    }

+

+		  nextchar += strlen (nextchar);

+

+		  optopt = pfound->val;

+		  return '?';

+		}

+	    }

+	  else if (pfound->has_arg == 1)

+	    {

+	      if (optind < argc)

+		optarg = argv[optind++];

+	      else

+		{

+		  if (opterr)

+		    fprintf (stderr,

+			   _("%s: option `%s' requires an argument\n"),

+			   argv[0], argv[optind - 1]);

+		  nextchar += strlen (nextchar);

+		  optopt = pfound->val;

+		  return optstring[0] == ':' ? ':' : '?';

+		}

+	    }

+	  nextchar += strlen (nextchar);

+	  if (longind != NULL)

+	    *longind = option_index;

+	  if (pfound->flag)

+	    {

+	      *(pfound->flag) = pfound->val;

+	      return 0;

+	    }

+	  return pfound->val;

+	}

+

+      /* Can't find it as a long option.  If this is not getopt_long_only,

+	 or the option starts with '--' or is not a valid short

+	 option, then it's an error.

+	 Otherwise interpret it as a short option.  */

+      if (!long_only || argv[optind][1] == '-'

+	  || my_index (optstring, *nextchar) == NULL)

+	{

+	  if (opterr)

+	    {

+	      if (argv[optind][1] == '-')

+		/* --option */

+		fprintf (stderr, _("%s: unrecognized option `--%s'\n"),

+			 argv[0], nextchar);

+	      else

+		/* +option or -option */

+		fprintf (stderr, _("%s: unrecognized option `%c%s'\n"),

+			 argv[0], argv[optind][0], nextchar);

+	    }

+	  nextchar = (char *) "";

+	  optind++;

+	  optopt = 0;

+	  return '?';

+	}

+    }

+

+  /* Look at and handle the next short option-character.  */

+

+  {

+    char c = *nextchar++;

+    char *temp = my_index (optstring, c);

+

+    /* Increment `optind' when we start to process its last character.  */

+    if (*nextchar == '\0')

+      ++optind;

+

+    if (temp == NULL || c == ':')

+      {

+	if (opterr)

+	  {

+	    if (posixly_correct)

+	      /* 1003.2 specifies the format of this message.  */

+	      fprintf (stderr, _("%s: illegal option -- %c\n"),

+		       argv[0], c);

+	    else

+	      fprintf (stderr, _("%s: invalid option -- %c\n"),

+		       argv[0], c);

+	  }

+	optopt = c;

+	return '?';

+      }

+    /* Convenience. Treat POSIX -W foo same as long option --foo */

+    if (temp[0] == 'W' && temp[1] == ';')

+      {

+	char *nameend;

+	const struct option *p;

+	const struct option *pfound = NULL;

+	int exact = 0;

+	int ambig = 0;

+	int indfound = 0;

+	int option_index;

+

+	/* This is an option that requires an argument.  */

+	if (*nextchar != '\0')

+	  {

+	    optarg = nextchar;

+	    /* If we end this ARGV-element by taking the rest as an arg,

+	       we must advance to the next element now.  */

+	    optind++;

+	  }

+	else if (optind == argc)

+	  {

+	    if (opterr)

+	      {

+		/* 1003.2 specifies the format of this message.  */

+		fprintf (stderr, _("%s: option requires an argument -- %c\n"),

+			 argv[0], c);

+	      }

+	    optopt = c;

+	    if (optstring[0] == ':')

+	      c = ':';

+	    else

+	      c = '?';

+	    return c;

+	  }

+	else

+	  /* We already incremented `optind' once;

+	     increment it again when taking next ARGV-elt as argument.  */

+	  optarg = argv[optind++];

+

+	/* optarg is now the argument, see if it's in the

+	   table of longopts.  */

+

+	for (nextchar = nameend = optarg; *nameend && *nameend != '='; nameend++)

+	  /* Do nothing.  */ ;

+

+	/* Test all long options for either exact match

+	   or abbreviated matches.  */

+	for (p = longopts, option_index = 0; p->name; p++, option_index++)

+	  if (!strncmp (p->name, nextchar, nameend - nextchar))

+	    {

+	      if ((unsigned int) (nameend - nextchar) == strlen (p->name))

+		{

+		  /* Exact match found.  */

+		  pfound = p;

+		  indfound = option_index;

+		  exact = 1;

+		  break;

+		}

+	      else if (pfound == NULL)

+		{

+		  /* First nonexact match found.  */

+		  pfound = p;

+		  indfound = option_index;

+		}

+	      else

+		/* Second or later nonexact match found.  */

+		ambig = 1;

+	    }

+	if (ambig && !exact)

+	  {

+	    if (opterr)

+	      fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"),

+		       argv[0], argv[optind]);

+	    nextchar += strlen (nextchar);

+	    optind++;

+	    return '?';

+	  }

+	if (pfound != NULL)

+	  {

+	    option_index = indfound;

+	    if (*nameend)

+	      {

+		/* Don't test has_arg with >, because some C compilers don't

+		   allow it to be used on enums.  */

+		if (pfound->has_arg)

+		  optarg = nameend + 1;

+		else

+		  {

+		    if (opterr)

+		      fprintf (stderr, _("\

+%s: option `-W %s' doesn't allow an argument\n"),

+			       argv[0], pfound->name);

+

+		    nextchar += strlen (nextchar);

+		    return '?';

+		  }

+	      }

+	    else if (pfound->has_arg == 1)

+	      {

+		if (optind < argc)

+		  optarg = argv[optind++];

+		else

+		  {

+		    if (opterr)

+		      fprintf (stderr,

+			       _("%s: option `%s' requires an argument\n"),

+			       argv[0], argv[optind - 1]);

+		    nextchar += strlen (nextchar);

+		    return optstring[0] == ':' ? ':' : '?';

+		  }

+	      }

+	    nextchar += strlen (nextchar);

+	    if (longind != NULL)

+	      *longind = option_index;

+	    if (pfound->flag)

+	      {

+		*(pfound->flag) = pfound->val;

+		return 0;

+	      }

+	    return pfound->val;

+	  }

+	  nextchar = NULL;

+	  return 'W';	/* Let the application handle it.   */

+      }

+    if (temp[1] == ':')

+      {

+	if (temp[2] == ':')

+	  {

+	    /* This is an option that accepts an argument optionally.  */

+	    if (*nextchar != '\0')

+	      {

+		optarg = nextchar;

+		optind++;

+	      }

+	    else

+	      optarg = NULL;

+	    nextchar = NULL;

+	  }

+	else

+	  {

+	    /* This is an option that requires an argument.  */

+	    if (*nextchar != '\0')

+	      {

+		optarg = nextchar;

+		/* If we end this ARGV-element by taking the rest as an arg,

+		   we must advance to the next element now.  */

+		optind++;

+	      }

+	    else if (optind == argc)

+	      {

+		if (opterr)

+		  {

+		    /* 1003.2 specifies the format of this message.  */

+		    fprintf (stderr,

+			   _("%s: option requires an argument -- %c\n"),

+			   argv[0], c);

+		  }

+		optopt = c;

+		if (optstring[0] == ':')

+		  c = ':';

+		else

+		  c = '?';

+	      }

+	    else

+	      /* We already incremented `optind' once;

+		 increment it again when taking next ARGV-elt as argument.  */

+	      optarg = argv[optind++];

+	    nextchar = NULL;

+	  }

+      }

+    return c;

+  }

+}

+

+int

+getopt (argc, argv, optstring)

+     int argc;

+     char *const *argv;

+     const char *optstring;

+{

+  return _getopt_internal (argc, argv, optstring,

+			   (const struct option *) 0,

+			   (int *) 0,

+			   0);

+}

+

+#endif	/* Not ELIDE_CODE.  */

+

+#ifdef TEST

+

+/* Compile with -DTEST to make an executable for use in testing

+   the above definition of `getopt'.  */

+

+int

+main (argc, argv)

+     int argc;

+     char **argv;

+{

+  int c;

+  int digit_optind = 0;

+

+  while (1)

+    {

+      int this_option_optind = optind ? optind : 1;

+

+      c = getopt (argc, argv, "abc:d:0123456789");

+      if (c == -1)

+	break;

+

+      switch (c)

+	{

+	case '0':

+	case '1':

+	case '2':

+	case '3':

+	case '4':

+	case '5':

+	case '6':

+	case '7':

+	case '8':

+	case '9':

+	  if (digit_optind != 0 && digit_optind != this_option_optind)

+	    printf ("digits occur in two different argv-elements.\n");

+	  digit_optind = this_option_optind;

+	  printf ("option %c\n", c);

+	  break;

+

+	case 'a':

+	  printf ("option a\n");

+	  break;

+

+	case 'b':

+	  printf ("option b\n");

+	  break;

+

+	case 'c':

+	  printf ("option c with value `%s'\n", optarg);

+	  break;

+

+	case '?':

+	  break;

+

+	default:

+	  printf ("?? getopt returned character code 0%o ??\n", c);

+	}

+    }

+

+  if (optind < argc)

+    {

+      printf ("non-option ARGV-elements: ");

+      while (optind < argc)

+	printf ("%s ", argv[optind++]);

+      printf ("\n");

+    }

+

+  exit (0);

+}

+

+#endif /* TEST */

diff --git a/src/getopt1.c b/src/getopt1.c
new file mode 100644
index 0000000..39f8383
--- /dev/null
+++ b/src/getopt1.c
@@ -0,0 +1,188 @@
+/* getopt_long and getopt_long_only entry points for GNU getopt.

+   Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98

+     Free Software Foundation, Inc.

+   This file is part of the GNU C Library.

+

+   The GNU C Library is free software; you can redistribute it and/or

+   modify it under the terms of the GNU Library General Public License as

+   published by the Free Software Foundation; either version 2 of the

+   License, or (at your option) any later version.

+

+   The GNU C Library 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

+   Library General Public License for more details.

+

+   You should have received a copy of the GNU Library General Public

+   License along with the GNU C Library; see the file COPYING.LIB.  If not,

+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,

+   Boston, MA 02111-1307, USA.  */

+

+#ifdef HAVE_CONFIG_H

+#include "config.h"

+#endif

+

+#include "getopt_win.h"

+

+#if !defined __STDC__ || !__STDC__

+/* This is a separate conditional since some stdc systems

+   reject `defined (const)'.  */

+#ifndef const

+#define const

+#endif

+#endif

+

+#include <stdio.h>

+

+/* Comment out all this code if we are using the GNU C Library, and are not

+   actually compiling the library itself.  This code is part of the GNU C

+   Library, but also included in many other GNU distributions.  Compiling

+   and linking in this code is a waste when using the GNU C library

+   (especially if it is a shared library).  Rather than having every GNU

+   program understand `configure --with-gnu-libc' and omit the object files,

+   it is simpler to just do this in the source for each such file.  */

+

+#define GETOPT_INTERFACE_VERSION 2

+#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2

+#include <gnu-versions.h>

+#if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION

+#define ELIDE_CODE

+#endif

+#endif

+

+#ifndef ELIDE_CODE

+

+

+/* This needs to come after some library #include

+   to get __GNU_LIBRARY__ defined.  */

+#ifdef __GNU_LIBRARY__

+#include <stdlib.h>

+#endif

+

+#ifndef	NULL

+#define NULL 0

+#endif

+

+int

+getopt_long (argc, argv, options, long_options, opt_index)

+     int argc;

+     char *const *argv;

+     const char *options;

+     const struct option *long_options;

+     int *opt_index;

+{

+  return _getopt_internal (argc, argv, options, long_options, opt_index, 0);

+}

+

+/* Like getopt_long, but '-' as well as '--' can indicate a long option.

+   If an option that starts with '-' (not '--') doesn't match a long option,

+   but does match a short option, it is parsed as a short option

+   instead.  */

+

+int

+getopt_long_only (argc, argv, options, long_options, opt_index)

+     int argc;

+     char *const *argv;

+     const char *options;

+     const struct option *long_options;

+     int *opt_index;

+{

+  return _getopt_internal (argc, argv, options, long_options, opt_index, 1);

+}

+

+

+#endif	/* Not ELIDE_CODE.  */

+

+#ifdef TEST

+

+#include <stdio.h>

+

+int

+main (argc, argv)

+     int argc;

+     char **argv;

+{

+  int c;

+  int digit_optind = 0;

+

+  while (1)

+    {

+      int this_option_optind = optind ? optind : 1;

+      int option_index = 0;

+      static struct option long_options[] =

+      {

+	{"add", 1, 0, 0},

+	{"append", 0, 0, 0},

+	{"delete", 1, 0, 0},

+	{"verbose", 0, 0, 0},

+	{"create", 0, 0, 0},

+	{"file", 1, 0, 0},

+	{0, 0, 0, 0}

+      };

+

+      c = getopt_long (argc, argv, "abc:d:0123456789",

+		       long_options, &option_index);

+      if (c == -1)

+	break;

+

+      switch (c)

+	{

+	case 0:

+	  printf ("option %s", long_options[option_index].name);

+	  if (optarg)

+	    printf (" with arg %s", optarg);

+	  printf ("\n");

+	  break;

+

+	case '0':

+	case '1':

+	case '2':

+	case '3':

+	case '4':

+	case '5':

+	case '6':

+	case '7':

+	case '8':

+	case '9':

+	  if (digit_optind != 0 && digit_optind != this_option_optind)

+	    printf ("digits occur in two different argv-elements.\n");

+	  digit_optind = this_option_optind;

+	  printf ("option %c\n", c);

+	  break;

+

+	case 'a':

+	  printf ("option a\n");

+	  break;

+

+	case 'b':

+	  printf ("option b\n");

+	  break;

+

+	case 'c':

+	  printf ("option c with value `%s'\n", optarg);

+	  break;

+

+	case 'd':

+	  printf ("option d with value `%s'\n", optarg);

+	  break;

+

+	case '?':

+	  break;

+

+	default:

+	  printf ("?? getopt returned character code 0%o ??\n", c);

+	}

+    }

+

+  if (optind < argc)

+    {

+      printf ("non-option ARGV-elements: ");

+      while (optind < argc)

+	printf ("%s ", argv[optind++]);

+      printf ("\n");

+    }

+

+  exit (0);

+}

+

+#endif /* TEST */

diff --git a/src/getopt_win.h b/src/getopt_win.h
new file mode 100644
index 0000000..91eb54e
--- /dev/null
+++ b/src/getopt_win.h
@@ -0,0 +1,169 @@
+/* Declarations for getopt.

+   Copyright (C) 1989,90,91,92,93,94,96,97,98 Free Software Foundation, Inc.

+   This file is part of the GNU C Library.

+

+   The GNU C Library is free software; you can redistribute it and/or

+   modify it under the terms of the GNU Library General Public License as

+   published by the Free Software Foundation; either version 2 of the

+   License, or (at your option) any later version.

+

+   The GNU C Library 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

+   Library General Public License for more details.

+

+   You should have received a copy of the GNU Library General Public

+   License along with the GNU C Library; see the file COPYING.LIB.  If not,

+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,

+   Boston, MA 02111-1307, USA.  */

+

+#ifndef _GETOPT_H

+

+#ifndef __need_getopt

+# define _GETOPT_H 1

+#endif

+

+#ifdef	__cplusplus

+extern "C" {

+#endif

+

+/* For communication from `getopt' to the caller.

+   When `getopt' finds an option that takes an argument,

+   the argument value is returned here.

+   Also, when `ordering' is RETURN_IN_ORDER,

+   each non-option ARGV-element is returned here.  */

+

+extern char *optarg;

+

+/* Index in ARGV of the next element to be scanned.

+   This is used for communication to and from the caller

+   and for communication between successive calls to `getopt'.

+

+   On entry to `getopt', zero means this is the first call; initialize.

+

+   When `getopt' returns -1, this is the index of the first of the

+   non-option elements that the caller should itself scan.

+

+   Otherwise, `optind' communicates from one call to the next

+   how much of ARGV has been scanned so far.  */

+

+extern int optind;

+

+/* Callers store zero here to inhibit the error message `getopt' prints

+   for unrecognized options.  */

+

+extern int opterr;

+

+/* Set to an option character which was unrecognized.  */

+

+extern int optopt;

+

+#ifndef __need_getopt

+/* Describe the long-named options requested by the application.

+   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector

+   of `struct option' terminated by an element containing a name which is

+   zero.

+

+   The field `has_arg' is:

+   no_argument		(or 0) if the option does not take an argument,

+   required_argument	(or 1) if the option requires an argument,

+   optional_argument 	(or 2) if the option takes an optional argument.

+

+   If the field `flag' is not NULL, it points to a variable that is set

+   to the value given in the field `val' when the option is found, but

+   left unchanged if the option is not found.

+

+   To have a long-named option do something other than set an `int' to

+   a compiled-in constant, such as set a value from `optarg', set the

+   option's `flag' field to zero and its `val' field to a nonzero

+   value (the equivalent single-letter option character, if there is

+   one).  For long options that have a zero `flag' field, `getopt'

+   returns the contents of the `val' field.  */

+

+struct option

+{

+# if defined __STDC__ && __STDC__

+  const char *name;

+# else

+  char *name;

+# endif

+  /* has_arg can't be an enum because some compilers complain about

+     type mismatches in all the code that assumes it is an int.  */

+  int has_arg;

+  int *flag;

+  int val;

+};

+

+/* Names for the values of the `has_arg' field of `struct option'.  */

+

+# define no_argument		0

+# define required_argument	1

+# define optional_argument	2

+#endif	/* need getopt */

+

+

+/* Get definitions and prototypes for functions to process the

+   arguments in ARGV (ARGC of them, minus the program name) for

+   options given in OPTS.

+

+   Return the option character from OPTS just read.  Return -1 when

+   there are no more options.  For unrecognized options, or options

+   missing arguments, `optopt' is set to the option letter, and '?' is

+   returned.

+

+   The OPTS string is a list of characters which are recognized option

+   letters, optionally followed by colons, specifying that that letter

+   takes an argument, to be placed in `optarg'.

+

+   If a letter in OPTS is followed by two colons, its argument is

+   optional.  This behavior is specific to the GNU `getopt'.

+

+   The argument `--' causes premature termination of argument

+   scanning, explicitly telling `getopt' that there are no more

+   options.

+

+   If OPTS begins with `--', then non-option arguments are treated as

+   arguments to the option '\0'.  This behavior is specific to the GNU

+   `getopt'.  */

+

+#if defined __STDC__ && __STDC__

+# ifdef __GNU_LIBRARY__

+/* Many other libraries have conflicting prototypes for getopt, with

+   differences in the consts, in stdlib.h.  To avoid compilation

+   errors, only prototype getopt for the GNU C library.  */

+extern int getopt (int __argc, char *const *__argv, const char *__shortopts);

+# else /* not __GNU_LIBRARY__ */

+extern int getopt ();

+# endif /* __GNU_LIBRARY__ */

+

+# ifndef __need_getopt

+extern int getopt_long (int __argc, char *const *__argv, const char *__shortopts,

+		        const struct option *__longopts, int *__longind);

+extern int getopt_long_only (int __argc, char *const *__argv,

+			     const char *__shortopts,

+		             const struct option *__longopts, int *__longind);

+

+/* Internal only.  Users should not call this directly.  */

+extern int _getopt_internal (int __argc, char *const *__argv,

+			     const char *__shortopts,

+		             const struct option *__longopts, int *__longind,

+			     int __long_only);

+# endif

+#else /* not __STDC__ */

+extern int getopt ();

+# ifndef __need_getopt

+extern int getopt_long ();

+extern int getopt_long_only ();

+

+extern int _getopt_internal ();

+# endif

+#endif /* __STDC__ */

+

+#ifdef	__cplusplus

+}

+#endif

+

+/* Make sure we later can get all the definitions and declarations.  */

+#undef __need_getopt

+

+#endif /* getopt.h */

diff --git a/src/skeleton.c b/src/skeleton.c
new file mode 100644
index 0000000..22159d5
--- /dev/null
+++ b/src/skeleton.c
@@ -0,0 +1,188 @@
+/*
+ * skeleton.c
+ * author: Tahseen Mohammad
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+#include <ogg/ogg.h>
+
+#include "skeleton.h"
+
+/* write an ogg_page to a file pointer */
+int write_ogg_page_to_file(ogg_page *og, FILE *out) {
+   int written;
+   
+   written = fwrite(og->header,1, og->header_len, out);
+   written += fwrite(og->body,1, og->body_len, out);
+
+   return written;
+}
+
+int add_message_header_field(fisbone_packet *fp, 
+                                        char *header_key, 
+                                        char *header_value) {
+
+    /* size of both key and value + ': ' + CRLF */
+    int this_message_size = strlen(header_key) + strlen(header_value) + 4;
+    if (fp->message_header_fields == NULL) {
+        fp->message_header_fields = _ogg_calloc(this_message_size, sizeof(char));
+    } else {
+        int new_size = (fp->current_header_size + this_message_size) * sizeof(char);
+        fp->message_header_fields = _ogg_realloc(fp->message_header_fields, new_size);
+    }
+    snprintf(fp->message_header_fields + fp->current_header_size, 
+                this_message_size+1, 
+                "%s: %s\r\n", 
+                header_key, 
+                header_value);
+    fp->current_header_size += this_message_size;
+
+    return 0;
+}
+
+/* create a ogg_packet from a fishead_packet structure */
+ogg_packet ogg_from_fishead(fishead_packet *fp) {
+
+    ogg_packet op;
+
+    memset(&op, 0, sizeof(op));
+    op.packet = _ogg_calloc(FISHEAD_SIZE, sizeof(unsigned char));
+    memset(op.packet, 0, FISHEAD_SIZE);
+
+    memcpy (op.packet, FISHEAD_IDENTIFIER, 8); /* identifier */
+    *((ogg_uint16_t*)(op.packet+8)) = SKELETON_VERSION_MAJOR; /* version major */
+    *((ogg_uint16_t*)(op.packet+10)) = SKELETON_VERSION_MINOR; /* version minor */
+    *((ogg_int64_t*)(op.packet+12)) = (ogg_int64_t)fp->ptime_n; /* presentationtime numerator */
+    *((ogg_int64_t*)(op.packet+20)) = (ogg_int64_t)fp->ptime_d; /* presentationtime denominator */
+    *((ogg_int64_t*)(op.packet+28)) = (ogg_int64_t)fp->btime_n; /* basetime numerator */
+    *((ogg_int64_t*)(op.packet+36)) = (ogg_int64_t)fp->btime_d; /* basetime denominator */
+    /* TODO: UTC time, set to zero for now */
+
+    op.b_o_s = 1;   /* its the first packet of the stream */
+    op.e_o_s = 0;   /* its not the last packet of the stream */
+    op.bytes = FISHEAD_SIZE;  /* length of the packet in bytes */
+
+    return op;
+}
+
+/* create a ogg_packet from a fisbone_packet structure. 
+ * call this method after the fisbone_packet is filled and all message header fields are added
+ * by calling add_message_header_field method.
+ */
+ogg_packet ogg_from_fisbone(fisbone_packet *fp) {
+    
+    ogg_packet op;
+    int packet_size = FISBONE_SIZE + fp->current_header_size;
+
+    memset (&op, 0, sizeof (op));       
+    op.packet = _ogg_calloc (packet_size, sizeof(unsigned char));
+    memset (op.packet, 0, packet_size);
+    memcpy (op.packet, FISBONE_IDENTIFIER, 8); /* identifier */
+    *((ogg_uint32_t*)(op.packet+8)) = FISBONE_MESSAGE_HEADER_OFFSET; /* offset of the message header fields */
+    *((ogg_uint32_t*)(op.packet+12)) = fp->serial_no; /* serialno of the respective stream */
+    *((ogg_uint32_t*)(op.packet+16)) = fp->nr_header_packet; /* number of header packets */
+    *((ogg_int64_t*)(op.packet+20)) = fp->granule_rate_n; /* granulrate numerator */
+    *((ogg_int64_t*)(op.packet+28)) = fp->granule_rate_d; /* granulrate denominator */
+    *((ogg_int64_t*)(op.packet+36)) = fp->start_granule; /* start granule */
+    *((ogg_uint32_t*)(op.packet+44)) = fp->preroll; /* preroll, for theora its 0 */
+    *(op.packet+48) = fp->granule_shift; /* granule shift */
+    memcpy((op.packet+FISBONE_SIZE), fp->message_header_fields, fp->current_header_size);
+
+    op.b_o_s = 0;
+    op.e_o_s = 0;
+    op.bytes = packet_size; /* size of the packet in bytes */
+
+    return op;
+}
+
+/* fills up a fishead_packet from a fishead ogg_packet of a skeleton bistream */
+fishead_packet fishead_from_ogg(ogg_packet *op) {
+	
+    fishead_packet fp;
+
+    if (memcmp(op->packet, FISHEAD_IDENTIFIER, 8))
+	; /* invalid packet what do we do? */
+
+    fp.version_major = *((ogg_uint16_t*)(op->packet+8)); /* version major */
+    fp.version_minor = *((ogg_uint16_t*)(op->packet+10)); /* version minor */
+    fp.ptime_n = *((ogg_int64_t*)(op->packet+12)); /* presentationtime numerator */
+    fp.ptime_d = *((ogg_int64_t*)(op->packet+20)); /* presentationtime denominator */
+    fp.btime_n = *((ogg_int64_t*)(op->packet+28)); /* basetime numerator */
+    fp.btime_d = *((ogg_int64_t*)(op->packet+36)); /* basetime denominator */
+    memcpy(fp.UTC, op->packet+44, 20);
+
+    return fp;
+}
+
+/* fills up a fisbone_packet from a fisbone ogg_packet of a skeleton bitstream */
+fisbone_packet fisbone_from_ogg(ogg_packet *op) {
+
+    fisbone_packet fp;
+    
+    if (memcmp(op->packet, FISBONE_IDENTIFIER, 8))
+	; /* invalid value, what do we do? */
+    fp.serial_no = *((ogg_uint32_t*)(op->packet+12)); /* serialno of the stream represented by this fisbone packet */
+    fp.nr_header_packet = *((ogg_uint32_t*)(op->packet+16)); /* number of header packets */
+    fp.granule_rate_n = *((ogg_int64_t*)(op->packet+20)); /* granulrate numerator */
+    fp.granule_rate_d = *((ogg_int64_t*)(op->packet+28)); /* granulrate denominator */
+    fp.start_granule = *((ogg_int64_t*)(op->packet+36)); /* start granule */
+    fp.preroll = *((ogg_uint32_t*)(op->packet+44)); /* preroll, for theora its 0 */
+    fp.granule_shift = *(op->packet+48); /* granule shift */
+    fp.current_header_size = op->bytes - FISBONE_SIZE;
+    fp.message_header_fields = _ogg_calloc(fp.current_header_size+1, sizeof(char));
+    memcpy(fp.message_header_fields, op->packet+FISBONE_SIZE, fp.current_header_size);
+
+    return fp;
+}
+
+int add_fishead_to_stream(ogg_stream_state *os, fishead_packet *fp) {
+
+    ogg_packet op;
+
+    op = ogg_from_fishead(fp);
+    ogg_stream_packetin(os, &op);
+    _ogg_free(op.packet);
+
+    return 0;
+}
+
+int add_fisbone_to_stream(ogg_stream_state *os, fisbone_packet *fp) {
+
+    ogg_packet op;
+
+    op = ogg_from_fisbone(fp);
+    ogg_stream_packetin(os, &op);
+    _ogg_free(op.packet);
+
+    return 0;
+}
+
+int add_eos_packet_to_stream(ogg_stream_state *os) {
+
+    ogg_packet op;
+
+    memset (&op, 0, sizeof(op));
+    op.e_o_s = 1;
+    ogg_stream_packetin(os, &op);
+
+    return 0;
+}
+
+int flush_ogg_stream_to_file(ogg_stream_state *os, FILE *out) {
+
+    ogg_page og;
+    int result;
+
+    while((result = ogg_stream_flush(os, &og)))
+    {
+        if(!result) break;
+        result = write_ogg_page_to_file(&og, out);
+        if(result != og.header_len + og.body_len)
+            return 1;
+    }
+
+    return 0;
+}
diff --git a/src/skeleton.h b/src/skeleton.h
new file mode 100644
index 0000000..f07d7a3
--- /dev/null
+++ b/src/skeleton.h
@@ -0,0 +1,78 @@
+/*
+ * skeleton.h
+ * author: Tahseen Mohammad
+ */
+
+#ifndef _SKELETON_H
+#define _SKELETON_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef WIN32
+#define snprintf _snprintf
+#endif
+
+#include <ogg/ogg.h>
+
+#define SKELETON_VERSION_MAJOR 3
+#define SKELETON_VERSION_MINOR 0
+#define FISHEAD_IDENTIFIER "fishead\0"
+#define FISBONE_IDENTIFIER "fisbone\0"
+#define FISHEAD_SIZE 64
+#define FISBONE_SIZE 52
+#define FISBONE_MESSAGE_HEADER_OFFSET 44
+
+/* fishead_packet holds a fishead header packet. */
+typedef struct {
+    ogg_uint16_t version_major;				    /* skeleton version major */
+    ogg_uint16_t version_minor;				    /* skeleton version minor */
+    /* Start time of the presentation
+     * For a new stream presentationtime & basetime is same. */
+    ogg_int64_t ptime_n;                                    /* presentation time numerator */
+    ogg_int64_t ptime_d;                                    /* presentation time denominator */
+    ogg_int64_t btime_n;                                    /* basetime numerator */
+    ogg_int64_t btime_d;                                    /* basetime denominator */
+    /* will holds the time of origin of the stream, a 20 bit field. */
+    unsigned char UTC[20];
+} fishead_packet;
+
+/* fisbone_packet holds a fisbone header packet. */
+typedef struct {
+    ogg_uint32_t serial_no;                                 /* serial no of the corresponding stream */
+    ogg_uint32_t nr_header_packet;                      /* number of header packets */
+    /* granule rate is the temporal resolution of the logical bitstream */
+    ogg_int64_t granule_rate_n;                            /* granule rate numerator */
+    ogg_int64_t granule_rate_d;                            /* granule rate denominator */
+    ogg_int64_t start_granule;                             /* start granule value */
+    ogg_uint32_t preroll;                                   /* preroll */
+    unsigned char granule_shift;		            /* 1 byte value holding the granule shift */
+    char *message_header_fields;                            /* holds all the message header fields */
+    /* current total size of the message header fields, for realloc purpose, initially zero */
+    ogg_uint32_t current_header_size;
+} fisbone_packet;
+
+extern int write_ogg_page_to_file(ogg_page *og, FILE *out);
+extern int add_message_header_field(fisbone_packet *fp, char *header_key, char *header_value);
+/* remember to deallocate the returned ogg_packet properly */
+extern ogg_packet ogg_from_fishead(fishead_packet *fp);
+extern ogg_packet ogg_from_fisbone(fisbone_packet *fp);
+extern fishead_packet fishead_from_ogg(ogg_packet *op);
+extern fisbone_packet fisbone_from_ogg(ogg_packet *op);
+extern int add_fishead_to_stream(ogg_stream_state *os, fishead_packet *fp);
+extern int add_fisbone_to_stream(ogg_stream_state *os, fisbone_packet *fp);
+extern int add_eos_packet_to_stream(ogg_stream_state *os);
+extern int flush_ogg_stream_to_file(ogg_stream_state *os, FILE *out);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* _SKELETON_H */
+
+
+
+
+
+
diff --git a/src/speexdec.1 b/src/speexdec.1
new file mode 100644
index 0000000..3545f09
--- /dev/null
+++ b/src/speexdec.1
@@ -0,0 +1,78 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.29.
+.TH SPEEXDEC "1" "September 2003" "speexdec version 1.1" "User Commands"
+.SH NAME
+speexdec \- The reference implementation speex decoder.
+.SH SYNOPSIS
+.B speexdec
+[\fIoptions\fR] \fIinput_file.spx \fR[\fIoutput_file\fR]
+.SH DESCRIPTION
+Decodes a Speex file and produce a WAV file or raw file
+.SS "input_file can be:"
+.TP
+filename.spx
+regular Speex file
+.TP
+-
+stdin
+.SS "output_file can be:"
+.TP
+filename.wav
+Wav file
+.TP
+filename.*
+Raw PCM file (any extension other that .wav)
+.TP
+-
+stdout
+.TP
+(nothing)
+Will be played to soundcard
+.SH OPTIONS
+.TP
+\fB\-\-enh\fR
+Enable perceptual enhancement (default)
+.TP
+\fB\-\-no\-enh\fR
+Disable perceptual enhancement
+.TP
+\fB\-\-force\-nb\fR
+Force decoding in narrowband
+.TP
+\fB\-\-force\-wb\fR
+Force decoding in wideband
+.TP
+\fB\-\-force\-uwb\fR
+Force decoding in ultra-wideband
+.TP
+\fB\-\-mono\fR
+Force decoding in mono
+.TP
+\fB\-\-stereo\fR
+Force decoding in stereo
+.TP
+\fB\-\-rate\fR n
+Force decoding at sampling rate n Hz
+.TP
+\fB\-\-packet\-loss\fR n
+Simulate n % random packet loss
+.TP
+\fB\-V\fR
+Verbose mode (show bit-rate)
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+This help
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Version information
+.TP
+\fB\-\-pf\fR
+Deprecated, use \fB\-\-enh\fR instead
+.TP
+\fB\-\-no\-pf\fR
+Deprecated, use \fB\-\-no\-enh\fR instead
+.PP
+More information is available from the Speex site: http://www.speex.org
+.PP
+Please report bugs to the mailing list `speex-dev@xiph.org'.
+.SH COPYRIGHT
+Copyright \(co 2002 Jean-Marc Valin
diff --git a/src/speexdec.c b/src/speexdec.c
new file mode 100644
index 0000000..24a62d4
--- /dev/null
+++ b/src/speexdec.c
@@ -0,0 +1,808 @@
+/* Copyright (C) 2002-2006 Jean-Marc Valin 
+   File: speexdec.c
+
+   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.
+*/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdio.h>
+#if !defined WIN32 && !defined _WIN32
+#include <unistd.h>
+#endif
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#endif
+#ifndef HAVE_GETOPT_LONG
+#include "getopt_win.h"
+#endif
+#include <stdlib.h>
+#include <string.h>
+
+#include <speex/speex.h>
+#include <ogg/ogg.h>
+
+#if defined WIN32 || defined _WIN32
+#include "wave_out.h"
+/* We need the following two to set stdout to binary */
+#include <io.h>
+#include <fcntl.h>
+#endif
+#include <math.h>
+
+#ifdef __MINGW32__
+#include "wave_out.c"
+#endif
+
+#ifdef HAVE_SYS_SOUNDCARD_H
+#include <sys/soundcard.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+
+#elif defined HAVE_SYS_AUDIOIO_H
+#include <sys/types.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <sys/audioio.h>
+#ifndef AUDIO_ENCODING_SLINEAR
+#define AUDIO_ENCODING_SLINEAR AUDIO_ENCODING_LINEAR /* Solaris */
+#endif
+
+#endif
+
+#include <string.h>
+#include "wav_io.h"
+#include <speex/speex_header.h>
+#include <speex/speex_stereo.h>
+#include <speex/speex_callbacks.h>
+
+#define MAX_FRAME_SIZE 2000
+
+#define readint(buf, base) (((buf[base+3]<<24)&0xff000000)| \
+                           ((buf[base+2]<<16)&0xff0000)| \
+                           ((buf[base+1]<<8)&0xff00)| \
+  	           	    (buf[base]&0xff))
+
+static void print_comments(char *comments, int length)
+{
+   char *c=comments;
+   int len, i, nb_fields;
+   char *end;
+   
+   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;
+   }
+   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;
+      }
+      fwrite(c, 1, len, stderr);
+      c+=len;
+      fprintf (stderr, "\n");
+   }
+}
+
+FILE *out_file_open(char *outFile, int rate, int *channels)
+{
+   FILE *fout=NULL;
+   /*Open output file*/
+   if (strlen(outFile)==0)
+   {
+#if defined HAVE_SYS_SOUNDCARD_H
+      int audio_fd, format, stereo;
+      audio_fd=open("/dev/dsp", O_WRONLY);
+      if (audio_fd<0)
+      {
+         perror("Cannot open /dev/dsp");
+         exit(1);         
+      }
+
+      format=AFMT_S16_NE;
+      if (ioctl(audio_fd, SNDCTL_DSP_SETFMT, &format)==-1)
+      {
+         perror("SNDCTL_DSP_SETFMT");
+         close(audio_fd);
+         exit(1);
+      }
+
+      stereo=0;
+      if (*channels==2)
+         stereo=1;
+      if (ioctl(audio_fd, SNDCTL_DSP_STEREO, &stereo)==-1)
+      {
+         perror("SNDCTL_DSP_STEREO");
+         close(audio_fd);
+         exit(1);
+      }
+      if (stereo!=0)
+      {
+         if (*channels==1)
+            fprintf (stderr, "Cannot set mono mode, will decode in stereo\n");
+         *channels=2;
+      }
+
+      if (ioctl(audio_fd, SNDCTL_DSP_SPEED, &rate)==-1)
+      {
+         perror("SNDCTL_DSP_SPEED");
+         close(audio_fd);
+         exit(1);
+      }
+      fout = fdopen(audio_fd, "w");
+#elif defined HAVE_SYS_AUDIOIO_H
+      audio_info_t info;
+      int audio_fd;
+      
+      audio_fd = open("/dev/audio", O_WRONLY);
+      if (audio_fd<0)
+      {
+         perror("Cannot open /dev/audio");
+         exit(1);
+      }
+
+      AUDIO_INITINFO(&info);
+#ifdef AUMODE_PLAY    /* NetBSD/OpenBSD */
+      info.mode = AUMODE_PLAY;
+#endif
+      info.play.encoding = AUDIO_ENCODING_SLINEAR;
+      info.play.precision = 16;
+      info.play.sample_rate = rate;
+      info.play.channels = *channels;
+      
+      if (ioctl(audio_fd, AUDIO_SETINFO, &info) < 0)
+      {
+         perror ("AUDIO_SETINFO");
+         exit(1);
+      }
+      fout = fdopen(audio_fd, "w");
+#elif defined WIN32 || defined _WIN32
+      {
+         unsigned int speex_channels = *channels;
+         if (Set_WIN_Params (INVALID_FILEDESC, rate, SAMPLE_SIZE, speex_channels))
+         {
+            fprintf (stderr, "Can't access %s\n", "WAVE OUT");
+            exit(1);
+         }
+      }
+#else
+      fprintf (stderr, "No soundcard support\n");
+      exit(1);
+#endif
+   } else {
+      if (strcmp(outFile,"-")==0)
+      {
+#if defined WIN32 || defined _WIN32
+         _setmode(_fileno(stdout), _O_BINARY);
+#elif defined OS2
+         _fsetmode(stdout,"b");
+#endif
+         fout=stdout;
+      }
+      else 
+      {
+         fout = fopen(outFile, "wb");
+         if (!fout)
+         {
+            perror(outFile);
+            exit(1);
+         }
+         if (strcmp(outFile+strlen(outFile)-4,".wav")==0 || strcmp(outFile+strlen(outFile)-4,".WAV")==0)
+            write_wav_header(fout, rate, *channels, 0, 0);
+      }
+   }
+   return fout;
+}
+
+void usage()
+{
+   printf ("Usage: speexdec [options] input_file.spx [output_file]\n");
+   printf ("\n");
+   printf ("Decodes a Speex file and produce a WAV file or raw file\n");
+   printf ("\n");
+   printf ("input_file can be:\n");
+   printf ("  filename.spx         regular Speex file\n");
+   printf ("  -                    stdin\n");
+   printf ("\n");  
+   printf ("output_file can be:\n");
+   printf ("  filename.wav         Wav file\n");
+   printf ("  filename.*           Raw PCM file (any extension other that .wav)\n");
+   printf ("  -                    stdout\n");
+   printf ("  (nothing)            Will be played to soundcard\n");
+   printf ("\n");  
+   printf ("Options:\n");
+   printf (" --enh                 Enable perceptual enhancement (default)\n");
+   printf (" --no-enh              Disable perceptual enhancement\n");
+   printf (" --force-nb            Force decoding in narrowband\n");
+   printf (" --force-wb            Force decoding in wideband\n");
+   printf (" --force-uwb           Force decoding in ultra-wideband\n");
+   printf (" --mono                Force decoding in mono\n");
+   printf (" --stereo              Force decoding in stereo\n");
+   printf (" --rate n              Force decoding at sampling rate n Hz\n");
+   printf (" --packet-loss n       Simulate n %% random packet loss\n");
+   printf (" -V                    Verbose mode (show bit-rate)\n"); 
+   printf (" -h, --help            This help\n");
+   printf (" -v, --version         Version information\n");
+   printf (" --pf                  Deprecated, use --enh instead\n");
+   printf (" --no-pf               Deprecated, use --no-enh instead\n");
+   printf ("\n");
+   printf ("More information is available from the Speex site: http://www.speex.org\n");
+   printf ("\n");
+   printf ("Please report bugs to the mailing list `speex-dev@xiph.org'.\n");
+}
+
+void version()
+{
+   const char* speex_version;
+   speex_lib_ctl(SPEEX_LIB_GET_VERSION_STRING, (void*)&speex_version);
+   printf ("speexdec (Speex decoder) version %s (compiled " __DATE__ ")\n", speex_version);
+   printf ("Copyright (C) 2002-2006 Jean-Marc Valin\n");
+}
+
+void version_short()
+{
+   const char* speex_version;
+   speex_lib_ctl(SPEEX_LIB_GET_VERSION_STRING, (void*)&speex_version);
+   printf ("speexdec version %s\n", speex_version);
+   printf ("Copyright (C) 2002-2006 Jean-Marc Valin\n");
+}
+
+static void *process_header(ogg_packet *op, spx_int32_t enh_enabled, spx_int32_t *frame_size, int *granule_frame_size, spx_int32_t *rate, int *nframes, int forceMode, int *channels, SpeexStereoState *stereo, int *extra_headers, int quiet)
+{
+   void *st;
+   const SpeexMode *mode;
+   SpeexHeader *header;
+   int modeID;
+   SpeexCallback callback;
+      
+   header = speex_packet_to_header((char*)op->packet, op->bytes);
+   if (!header)
+   {
+      fprintf (stderr, "Cannot read header\n");
+      return NULL;
+   }
+   if (header->mode >= SPEEX_NB_MODES || header->mode<0)
+   {
+      fprintf (stderr, "Mode number %d does not (yet/any longer) exist in this version\n", 
+               header->mode);
+      free(header);
+      return NULL;
+   }
+      
+   modeID = header->mode;
+   if (forceMode!=-1)
+      modeID = forceMode;
+
+   mode = speex_lib_get_mode (modeID);
+   
+   if (header->speex_version_id > 1)
+   {
+      fprintf (stderr, "This file was encoded with Speex bit-stream version %d, which I don't know how to decode\n", header->speex_version_id);
+      free(header);
+      return NULL;
+   }
+
+   if (mode->bitstream_version < header->mode_bitstream_version)
+   {
+      fprintf (stderr, "The file was encoded with a newer version of Speex. You need to upgrade in order to play it.\n");
+      free(header);
+      return NULL;
+   }
+   if (mode->bitstream_version > header->mode_bitstream_version) 
+   {
+      fprintf (stderr, "The file was encoded with an older version of Speex. You would need to downgrade the version in order to play it.\n");
+      free(header);
+      return NULL;
+   }
+   
+   st = speex_decoder_init(mode);
+   if (!st)
+   {
+      fprintf (stderr, "Decoder initialization failed.\n");
+      free(header);
+      return NULL;
+   }
+   speex_decoder_ctl(st, SPEEX_SET_ENH, &enh_enabled);
+   speex_decoder_ctl(st, SPEEX_GET_FRAME_SIZE, frame_size);
+   *granule_frame_size = *frame_size;
+
+   if (!*rate)
+      *rate = header->rate;
+   /* Adjust rate if --force-* options are used */
+   if (forceMode!=-1)
+   {
+      if (header->mode < forceMode)
+      {
+         *rate <<= (forceMode - header->mode);
+         *granule_frame_size >>= (forceMode - header->mode);
+      }
+      if (header->mode > forceMode)
+      {
+         *rate >>= (header->mode - forceMode);
+         *granule_frame_size <<= (header->mode - forceMode);
+      }
+   }
+
+
+   speex_decoder_ctl(st, SPEEX_SET_SAMPLING_RATE, rate);
+
+   *nframes = header->frames_per_packet;
+
+   if (*channels==-1)
+      *channels = header->nb_channels;
+
+   if (!(*channels==1))
+   {
+      *channels = 2;
+      callback.callback_id = SPEEX_INBAND_STEREO;
+      callback.func = speex_std_stereo_request_handler;
+      callback.data = stereo;
+      speex_decoder_ctl(st, SPEEX_SET_HANDLER, &callback);
+   }
+   
+   if (!quiet)
+   {
+      fprintf (stderr, "Decoding %d Hz audio using %s mode", 
+               *rate, mode->modeName);
+
+      if (*channels==1)
+         fprintf (stderr, " (mono");
+      else
+         fprintf (stderr, " (stereo");
+      
+      if (header->vbr)
+         fprintf (stderr, ", VBR)\n");
+      else
+         fprintf(stderr, ")\n");
+      /*fprintf (stderr, "Decoding %d Hz audio at %d bps using %s mode\n", 
+       *rate, mode->bitrate, mode->modeName);*/
+   }
+
+   *extra_headers = header->extra_headers;
+
+   free(header);
+   return st;
+}
+
+int main(int argc, char **argv)
+{
+   int c;
+   int option_index = 0;
+   char *inFile, *outFile;
+   FILE *fin, *fout=NULL;
+   short out[MAX_FRAME_SIZE];
+   short output[MAX_FRAME_SIZE];
+   int frame_size=0, granule_frame_size=0;
+   void *st=NULL;
+   SpeexBits bits;
+   int packet_count=0;
+   int stream_init = 0;
+   int quiet = 0;
+   ogg_int64_t page_granule=0, last_granule=0;
+   int skip_samples=0, page_nb_packets;
+   struct option long_options[] =
+   {
+      {"help", no_argument, NULL, 0},
+      {"quiet", no_argument, NULL, 0},
+      {"version", no_argument, NULL, 0},
+      {"version-short", no_argument, NULL, 0},
+      {"enh", no_argument, NULL, 0},
+      {"no-enh", no_argument, NULL, 0},
+      {"pf", no_argument, NULL, 0},
+      {"no-pf", no_argument, NULL, 0},
+      {"force-nb", no_argument, NULL, 0},
+      {"force-wb", no_argument, NULL, 0},
+      {"force-uwb", no_argument, NULL, 0},
+      {"rate", required_argument, NULL, 0},
+      {"mono", no_argument, NULL, 0},
+      {"stereo", no_argument, NULL, 0},
+      {"packet-loss", required_argument, NULL, 0},
+      {0, 0, 0, 0}
+   };
+   ogg_sync_state oy;
+   ogg_page       og;
+   ogg_packet     op;
+   ogg_stream_state os;
+   int enh_enabled;
+   int nframes=2;
+   int print_bitrate=0;
+   int close_in=0;
+   int eos=0;
+   int forceMode=-1;
+   int audio_size=0;
+   float loss_percent=-1;
+   SpeexStereoState stereo = SPEEX_STEREO_STATE_INIT;
+   int channels=-1;
+   int rate=0;
+   int extra_headers=0;
+   int wav_format=0;
+   int lookahead;
+   int speex_serialno = -1;
+
+   enh_enabled = 1;
+
+   /*Process options*/
+   while(1)
+   {
+      c = getopt_long (argc, argv, "hvV",
+                       long_options, &option_index);
+      if (c==-1)
+         break;
+      
+      switch(c)
+      {
+      case 0:
+         if (strcmp(long_options[option_index].name,"help")==0)
+         {
+            usage();
+            exit(0);
+         } else if (strcmp(long_options[option_index].name,"quiet")==0)
+         {
+            quiet = 1;
+         } else if (strcmp(long_options[option_index].name,"version")==0)
+         {
+            version();
+            exit(0);
+         } else if (strcmp(long_options[option_index].name,"version-short")==0)
+         {
+            version_short();
+            exit(0);
+         } else if (strcmp(long_options[option_index].name,"enh")==0)
+         {
+            enh_enabled=1;
+         } else if (strcmp(long_options[option_index].name,"no-enh")==0)
+         {
+            enh_enabled=0;
+         } else if (strcmp(long_options[option_index].name,"pf")==0)
+         {
+            fprintf (stderr, "--pf is deprecated, use --enh instead\n");
+            enh_enabled=1;
+         } else if (strcmp(long_options[option_index].name,"no-pf")==0)
+         {
+            fprintf (stderr, "--no-pf is deprecated, use --no-enh instead\n");
+            enh_enabled=0;
+         } else if (strcmp(long_options[option_index].name,"force-nb")==0)
+         {
+            forceMode=0;
+         } else if (strcmp(long_options[option_index].name,"force-wb")==0)
+         {
+            forceMode=1;
+         } else if (strcmp(long_options[option_index].name,"force-uwb")==0)
+         {
+            forceMode=2;
+         } else if (strcmp(long_options[option_index].name,"mono")==0)
+         {
+            channels=1;
+         } else if (strcmp(long_options[option_index].name,"stereo")==0)
+         {
+            channels=2;
+         } else if (strcmp(long_options[option_index].name,"rate")==0)
+         {
+            rate=atoi (optarg);
+         } else if (strcmp(long_options[option_index].name,"packet-loss")==0)
+         {
+            loss_percent = atof(optarg);
+         }
+         break;
+      case 'h':
+         usage();
+         exit(0);
+         break;
+      case 'v':
+         version();
+         exit(0);
+         break;
+      case 'V':
+         print_bitrate=1;
+         break;
+      case '?':
+         usage();
+         exit(1);
+         break;
+      }
+   }
+   if (argc-optind!=2 && argc-optind!=1)
+   {
+      usage();
+      exit(1);
+   }
+   inFile=argv[optind];
+
+   if (argc-optind==2)
+      outFile=argv[optind+1];
+   else
+      outFile = "";
+   wav_format = strlen(outFile)>=4 && (
+                                       strcmp(outFile+strlen(outFile)-4,".wav")==0
+                                       || strcmp(outFile+strlen(outFile)-4,".WAV")==0);
+   /*Open input file*/
+   if (strcmp(inFile, "-")==0)
+   {
+#if defined WIN32 || defined _WIN32
+      _setmode(_fileno(stdin), _O_BINARY);
+#endif
+      fin=stdin;
+   }
+   else 
+   {
+      fin = fopen(inFile, "rb");
+      if (!fin)
+      {
+         perror(inFile);
+         exit(1);
+      }
+      close_in=1;
+   }
+
+
+   /*Init Ogg data struct*/
+   ogg_sync_init(&oy);
+   
+   speex_bits_init(&bits);
+   /*Main decoding loop*/
+   
+   while (1)
+   {
+      char *data;
+      int i, j, nb_read;
+      /*Get the ogg buffer for writing*/
+      data = ogg_sync_buffer(&oy, 200);
+      /*Read bitstream from input file*/
+      nb_read = fread(data, sizeof(char), 200, fin);      
+      ogg_sync_wrote(&oy, nb_read);
+
+      /*Loop for all complete pages we got (most likely only one)*/
+      while (ogg_sync_pageout(&oy, &og)==1)
+      {
+         int packet_no;
+         if (stream_init == 0) {
+            ogg_stream_init(&os, ogg_page_serialno(&og));
+            stream_init = 1;
+         }
+	 if (ogg_page_serialno(&og) != os.serialno) {
+	    /* so all streams are read. */
+	    ogg_stream_reset_serialno(&os, ogg_page_serialno(&og));
+	 }
+         /*Add page to the bitstream*/
+         ogg_stream_pagein(&os, &og);
+         page_granule = ogg_page_granulepos(&og);
+         page_nb_packets = ogg_page_packets(&og);
+         if (page_granule>0 && frame_size)
+         {
+            /* FIXME: shift the granule values if --force-* is specified */
+            skip_samples = frame_size*(page_nb_packets*granule_frame_size*nframes - (page_granule-last_granule))/granule_frame_size;
+            if (ogg_page_eos(&og))
+               skip_samples = -skip_samples;
+            /*else if (!ogg_page_bos(&og))
+               skip_samples = 0;*/
+         } else
+         {
+            skip_samples = 0;
+         }
+         /*printf ("page granulepos: %d %d %d\n", skip_samples, page_nb_packets, (int)page_granule);*/
+         last_granule = page_granule;
+         /*Extract all available packets*/
+         packet_no=0;
+         while (!eos && ogg_stream_packetout(&os, &op) == 1)
+         {
+	    if (op.bytes>=5 && !memcmp(op.packet, "Speex", 5)) {
+	       speex_serialno = os.serialno;
+	    }
+	    if (speex_serialno == -1 || os.serialno != speex_serialno)
+	       break;
+            /*If first packet, process as Speex header*/
+            if (packet_count==0)
+            {
+               st = process_header(&op, enh_enabled, &frame_size, &granule_frame_size, &rate, &nframes, forceMode, &channels, &stereo, &extra_headers, quiet);
+               if (!st)
+                  exit(1);
+               speex_decoder_ctl(st, SPEEX_GET_LOOKAHEAD, &lookahead);
+               if (!nframes)
+                  nframes=1;
+               fout = out_file_open(outFile, rate, &channels);
+
+            } else if (packet_count==1)
+            {
+               if (!quiet)
+                  print_comments((char*)op.packet, op.bytes);
+            } else if (packet_count<=1+extra_headers)
+            {
+               /* Ignore extra headers */
+            } else {
+               int lost=0;
+               packet_no++;
+               if (loss_percent>0 && 100*((float)rand())/RAND_MAX<loss_percent)
+                  lost=1;
+
+               /*End of stream condition*/
+               if (op.e_o_s && os.serialno == speex_serialno) /* don't care for anything except speex eos */
+                  eos=1;
+	       
+               /*Copy Ogg packet to Speex bitstream*/
+               speex_bits_read_from(&bits, (char*)op.packet, op.bytes);
+               for (j=0;j!=nframes;j++)
+               {
+                  int ret;
+                  /*Decode frame*/
+                  if (!lost)
+                     ret = speex_decode_int(st, &bits, output);
+                  else
+                     ret = speex_decode_int(st, NULL, output);
+
+                  /*for (i=0;i<frame_size*channels;i++)
+                    printf ("%d\n", (int)output[i]);*/
+
+                  if (ret==-1)
+                     break;
+                  if (ret==-2)
+                  {
+                     fprintf (stderr, "Decoding error: corrupted stream?\n");
+                     break;
+                  }
+                  if (speex_bits_remaining(&bits)<0)
+                  {
+                     fprintf (stderr, "Decoding overflow: corrupted stream?\n");
+                     break;
+                  }
+                  if (channels==2)
+                     speex_decode_stereo_int(output, frame_size, &stereo);
+
+                  if (print_bitrate) {
+                     spx_int32_t tmp;
+                     char ch=13;
+                     speex_decoder_ctl(st, SPEEX_GET_BITRATE, &tmp);
+                     fputc (ch, stderr);
+                     fprintf (stderr, "Bitrate is use: %d bps     ", tmp);
+                  }
+                  /*Convert to short and save to output file*/
+		  if (strlen(outFile)!=0)
+                  {
+                     for (i=0;i<frame_size*channels;i++)
+                        out[i]=le_short(output[i]);
+		  } else {
+                     for (i=0;i<frame_size*channels;i++)
+                        out[i]=output[i];
+		  }
+                  {
+                     int frame_offset = 0;
+                     int new_frame_size = frame_size;
+                     /*printf ("packet %d %d\n", packet_no, skip_samples);*/
+                     /*fprintf (stderr, "packet %d %d %d\n", packet_no, skip_samples, lookahead);*/
+                     if (packet_no == 1 && j==0 && skip_samples > 0)
+                     {
+                        /*printf ("chopping first packet\n");*/
+                        new_frame_size -= skip_samples+lookahead;
+                        frame_offset = skip_samples+lookahead;
+                     }
+                     if (packet_no == page_nb_packets && skip_samples < 0)
+                     {
+                        int packet_length = nframes*frame_size+skip_samples+lookahead;
+                        new_frame_size = packet_length - j*frame_size;
+                        if (new_frame_size<0)
+                           new_frame_size = 0;
+                        if (new_frame_size>frame_size)
+                           new_frame_size = frame_size;
+                        /*printf ("chopping end: %d %d %d\n", new_frame_size, packet_length, packet_no);*/
+                     }
+                     if (new_frame_size>0)
+                     {  
+#if defined WIN32 || defined _WIN32
+                        if (strlen(outFile)==0)
+                           WIN_Play_Samples (out+frame_offset*channels, sizeof(short) * new_frame_size*channels);
+                        else
+#endif
+                           fwrite(out+frame_offset*channels, sizeof(short), new_frame_size*channels, fout);
+                  
+                        audio_size+=sizeof(short)*new_frame_size*channels;
+                     }
+                  }
+               }
+            }
+            packet_count++;
+         }
+      }
+      if (feof(fin))
+         break;
+
+   }
+
+   if (fout && wav_format)
+   {
+      if (fseek(fout,4,SEEK_SET)==0)
+      {
+         int tmp;
+         tmp = le_int(audio_size+36);
+         fwrite(&tmp,4,1,fout);
+         if (fseek(fout,32,SEEK_CUR)==0)
+         {
+            tmp = le_int(audio_size);
+            fwrite(&tmp,4,1,fout);
+         } else
+         {
+            fprintf (stderr, "First seek worked, second didn't\n");
+         }
+      } else {
+         fprintf (stderr, "Cannot seek on wave file, size will be incorrect\n");
+      }
+   }
+
+   if (st)
+      speex_decoder_destroy(st);
+   else 
+   {
+      fprintf (stderr, "This doesn't look like a Speex file\n");
+   }
+   speex_bits_destroy(&bits);
+   if (stream_init)
+      ogg_stream_clear(&os);
+   ogg_sync_clear(&oy);
+
+#if defined WIN32 || defined _WIN32
+   if (strlen(outFile)==0)
+      WIN_Audio_close ();
+#endif
+
+   if (close_in)
+      fclose(fin);
+   if (fout != NULL)
+      fclose(fout);   
+
+   return 0;
+}
diff --git a/src/speexenc.1 b/src/speexenc.1
new file mode 100644
index 0000000..9b0d6a7
--- /dev/null
+++ b/src/speexenc.1
@@ -0,0 +1,105 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.29.
+.TH SPEEXENC "1" "September 2003" "speexenc version 1.1" "User Commands"
+.SH NAME
+speexenc \- The reference implementation speex encoder.
+.SH SYNOPSIS
+.B speexenc
+[\fIoptions\fR] \fIinput_file output_file\fR
+.SH DESCRIPTION
+Encodes input_file using Speex. It can read the WAV or raw files.
+.SS "input_file can be:"
+.TP
+filename.wav
+wav file
+.TP
+filename.*
+Raw PCM file (any extension other than .wav)
+.TP
+-
+stdin
+.SS "output_file can be:"
+.TP
+filename.spx
+Speex file
+.TP
+-
+stdout
+.SH OPTIONS
+.TP
+\fB\-n\fR, \fB\-\-narrowband\fR
+Narrowband (8 kHz) input file
+.TP
+\fB\-w\fR, \fB\-\-wideband\fR
+Wideband (16 kHz) input file
+.HP
+\fB\-u\fR, \fB\-\-ultra\-wideband\fR "Ultra-wideband" (32 kHz) input file
+.TP
+\fB\-\-quality\fR n
+Encoding quality (0-10), default 8
+.TP
+\fB\-\-bitrate\fR n
+Encoding bit-rate (use bit-rate n or lower)
+.TP
+\fB\-\-vbr\fR
+Enable variable bit-rate (VBR)
+.TP
+\fB\-\-abr\fR rate
+Enable average bit-rate (ABR) at rate bps
+.TP
+\fB\-\-vad\fR
+Enable voice activity detection (VAD)
+.TP
+\fB\-\-dtx\fR
+Enable file-based discontinuous transmission (DTX)
+.TP
+\fB\-\-comp\fR n
+Set encoding complexity (0-10), default 3
+.TP
+\fB\-\-nframes\fR n
+Number of frames per Ogg packet (1-10), default 1
+.TP
+\fB\-\-comment\fR
+Add the given string as an extra comment. This may be
+used multiple times
+.TP
+\fB\-\-author\fR
+Author of this track
+.TP
+\fB\-\-title\fR
+Title for this track
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+This help
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Version information
+.TP
+\fB\-V\fR
+Verbose mode (show bit-rate)
+.SS "Raw input options:"
+.TP
+\fB\-\-rate\fR n
+Sampling rate for raw input
+.TP
+\fB\-\-stereo\fR
+Consider raw input as stereo
+.TP
+\fB\-\-le\fR
+Raw input is little-endian
+.TP
+\fB\-\-be\fR
+Raw input is big-endian
+.TP
+\fB\-\-8bit\fR
+Raw input is 8-bit unsigned
+.TP
+\fB\-\-16bit\fR
+Raw input is 16-bit signed
+.PP
+Default raw PCM input is 16-bit, little-endian, mono
+.PP
+More information is available from the Speex site: http://www.speex.org
+.PP
+Please report bugs to the mailing list `speex-dev@xiph.org'.
+.SH COPYRIGHT
+Copyright \(co 2002 Jean-Marc Valin
diff --git a/src/speexenc.c b/src/speexenc.c
new file mode 100644
index 0000000..a2554e1
--- /dev/null
+++ b/src/speexenc.c
@@ -0,0 +1,996 @@
+/* Copyright (C) 2002-2006 Jean-Marc Valin 
+   File: speexenc.c
+
+   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.
+*/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdio.h>
+#if !defined WIN32 && !defined _WIN32
+#include <unistd.h>
+#endif
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#endif
+#ifndef HAVE_GETOPT_LONG
+#include "getopt_win.h"
+#endif
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#include <speex/speex.h>
+#include <ogg/ogg.h>
+#include "wav_io.h"
+#include <speex/speex_header.h>
+#include <speex/speex_stereo.h>
+#include <speex/speex_preprocess.h>
+
+#if defined WIN32 || defined _WIN32
+/* We need the following two to set stdout to binary */
+#include <io.h>
+#include <fcntl.h>
+#endif
+
+#include "skeleton.h"
+
+
+void comment_init(char **comments, int* length, char *vendor_string);
+void comment_add(char **comments, int* length, char *tag, char *val);
+
+
+/*Write an Ogg page to a file pointer*/
+int oe_write_page(ogg_page *page, FILE *fp)
+{
+   int written;
+   written = fwrite(page->header,1,page->header_len, fp);
+   written += fwrite(page->body,1,page->body_len, fp);
+   
+   return written;
+}
+
+#define MAX_FRAME_SIZE 2000
+#define MAX_FRAME_BYTES 2000
+
+/* Convert input audio bits, endians and channels */
+static int read_samples(FILE *fin,int frame_size, int bits, int channels, int lsb, short * input, char *buff, spx_int32_t *size)
+{   
+   unsigned char in[MAX_FRAME_BYTES*2];
+   int i;
+   short *s;
+   int nb_read;
+
+   if (size && *size<=0)
+   {
+      return 0;
+   }
+   /*Read input audio*/
+   if (size)
+      *size -= bits/8*channels*frame_size;
+   if (buff)
+   {
+      for (i=0;i<12;i++)
+         in[i]=buff[i];
+      nb_read = fread(in+12,1,bits/8*channels*frame_size-12, fin) + 12;
+      if (size)
+         *size += 12;
+   } else {
+      nb_read = fread(in,1,bits/8*channels* frame_size, fin);
+   }
+   nb_read /= bits/8*channels;
+
+   /*fprintf (stderr, "%d\n", nb_read);*/
+   if (nb_read==0)
+      return 0;
+
+   s=(short*)in;
+   if(bits==8)
+   {
+      /* Convert 8->16 bits */
+      for(i=frame_size*channels-1;i>=0;i--)
+      {
+         s[i]=(in[i]<<8)^0x8000;
+      }
+   } else
+   {
+      /* convert to our endian format */
+      for(i=0;i<frame_size*channels;i++)
+      {
+         if(lsb) 
+            s[i]=le_short(s[i]); 
+         else
+            s[i]=be_short(s[i]);
+      }
+   }
+
+   /* FIXME: This is probably redundent now */
+   /* copy to float input buffer */
+   for (i=0;i<frame_size*channels;i++)
+   {
+      input[i]=(short)s[i];
+   }
+
+   for (i=nb_read*channels;i<frame_size*channels;i++)
+   {
+      input[i]=0;
+   }
+
+
+   return nb_read;
+}
+
+void add_fishead_packet (ogg_stream_state *os) {
+
+   fishead_packet fp;
+
+   memset(&fp, 0, sizeof(fp));
+   fp.ptime_n = 0;
+   fp.ptime_d = 1000;
+   fp.btime_n = 0;
+   fp.btime_d = 1000;
+
+   add_fishead_to_stream(os, &fp);
+}
+
+/*
+ * Adds the fishead packets in the skeleton output stream along with the e_o_s packet
+ */
+void add_fisbone_packet (ogg_stream_state *os, spx_int32_t serialno, SpeexHeader *header) {
+
+   fisbone_packet fp;
+
+   memset(&fp, 0, sizeof(fp));
+   fp.serial_no = serialno;
+   fp.nr_header_packet = 2 + header->extra_headers;
+   fp.granule_rate_n = header->rate;
+   fp.granule_rate_d = 1;
+   fp.start_granule = 0;
+   fp.preroll = 3;
+   fp.granule_shift = 0;
+
+   add_message_header_field(&fp, "Content-Type", "audio/x-speex");
+
+   add_fisbone_to_stream(os, &fp);
+}
+
+void version()
+{
+   const char* speex_version;
+   speex_lib_ctl(SPEEX_LIB_GET_VERSION_STRING, (void*)&speex_version);
+   printf ("speexenc (Speex encoder) version %s (compiled " __DATE__ ")\n", speex_version);
+   printf ("Copyright (C) 2002-2006 Jean-Marc Valin\n");
+}
+
+void version_short()
+{
+   const char* speex_version;
+   speex_lib_ctl(SPEEX_LIB_GET_VERSION_STRING, (void*)&speex_version);
+   printf ("speexenc version %s\n", speex_version);
+   printf ("Copyright (C) 2002-2006 Jean-Marc Valin\n");
+}
+
+void usage()
+{
+   printf ("Usage: speexenc [options] input_file output_file\n");
+   printf ("\n");
+   printf ("Encodes input_file using Speex. It can read the WAV or raw files.\n");
+   printf ("\n");
+   printf ("input_file can be:\n");
+   printf ("  filename.wav      wav file\n");
+   printf ("  filename.*        Raw PCM file (any extension other than .wav)\n");
+   printf ("  -                 stdin\n");
+   printf ("\n");  
+   printf ("output_file can be:\n");
+   printf ("  filename.spx      Speex file\n");
+   printf ("  -                 stdout\n");
+   printf ("\n");  
+   printf ("Options:\n");
+   printf (" -n, --narrowband   Narrowband (8 kHz) input file\n"); 
+   printf (" -w, --wideband     Wideband (16 kHz) input file\n"); 
+   printf (" -u, --ultra-wideband \"Ultra-wideband\" (32 kHz) input file\n"); 
+   printf (" --quality n        Encoding quality (0-10), default 8\n"); 
+   printf (" --bitrate n        Encoding bit-rate (use bit-rate n or lower)\n"); 
+   printf (" --vbr              Enable variable bit-rate (VBR)\n"); 
+   printf (" --vbr-max-bitrate  Set max VBR bit-rate allowed\n"); 
+   printf (" --abr rate         Enable average bit-rate (ABR) at rate bps\n"); 
+   printf (" --vad              Enable voice activity detection (VAD)\n"); 
+   printf (" --dtx              Enable file-based discontinuous transmission (DTX)\n"); 
+   printf (" --comp n           Set encoding complexity (0-10), default 3\n"); 
+   printf (" --nframes n        Number of frames per Ogg packet (1-10), default 1\n"); 
+   printf (" --denoise          Denoise the input before encoding\n"); 
+   printf (" --agc              Apply adaptive gain control (AGC) before encoding\n"); 
+   printf (" --skeleton         Outputs ogg skeleton metadata (may cause incompatibilities)\n");
+   printf (" --comment          Add the given string as an extra comment. This may be\n");
+   printf ("                     used multiple times\n");
+   printf (" --author           Author of this track\n");
+   printf (" --title            Title for this track\n");
+   printf (" -h, --help         This help\n"); 
+   printf (" -v, --version      Version information\n"); 
+   printf (" -V                 Verbose mode (show bit-rate)\n"); 
+   printf ("Raw input options:\n");
+   printf (" --rate n           Sampling rate for raw input\n"); 
+   printf (" --stereo           Consider raw input as stereo\n"); 
+   printf (" --le               Raw input is little-endian\n"); 
+   printf (" --be               Raw input is big-endian\n"); 
+   printf (" --8bit             Raw input is 8-bit unsigned\n"); 
+   printf (" --16bit            Raw input is 16-bit signed\n"); 
+   printf ("Default raw PCM input is 16-bit, little-endian, mono\n"); 
+   printf ("\n");
+   printf ("More information is available from the Speex site: http://www.speex.org\n");
+   printf ("\n");
+   printf ("Please report bugs to the mailing list `speex-dev@xiph.org'.\n");
+}
+
+
+int main(int argc, char **argv)
+{
+   int nb_samples, total_samples=0, nb_encoded;
+   int c;
+   int option_index = 0;
+   char *inFile, *outFile;
+   FILE *fin, *fout;
+   short input[MAX_FRAME_SIZE];
+   spx_int32_t frame_size;
+   int quiet=0;
+   spx_int32_t vbr_enabled=0;
+   spx_int32_t vbr_max=0;
+   int abr_enabled=0;
+   spx_int32_t vad_enabled=0;
+   spx_int32_t dtx_enabled=0;
+   int nbBytes;
+   const SpeexMode *mode=NULL;
+   int modeID = -1;
+   void *st;
+   SpeexBits bits;
+   char cbits[MAX_FRAME_BYTES];
+   int with_skeleton = 0;
+   struct option long_options[] =
+   {
+      {"wideband", no_argument, NULL, 0},
+      {"ultra-wideband", no_argument, NULL, 0},
+      {"narrowband", no_argument, NULL, 0},
+      {"vbr", no_argument, NULL, 0},
+      {"vbr-max-bitrate", required_argument, NULL, 0},
+      {"abr", required_argument, NULL, 0},
+      {"vad", no_argument, NULL, 0},
+      {"dtx", no_argument, NULL, 0},
+      {"quality", required_argument, NULL, 0},
+      {"bitrate", required_argument, NULL, 0},
+      {"nframes", required_argument, NULL, 0},
+      {"comp", required_argument, NULL, 0},
+      {"denoise", no_argument, NULL, 0},
+      {"agc", no_argument, NULL, 0},
+      {"skeleton",no_argument,NULL, 0},
+      {"help", no_argument, NULL, 0},
+      {"quiet", no_argument, NULL, 0},
+      {"le", no_argument, NULL, 0},
+      {"be", no_argument, NULL, 0},
+      {"8bit", no_argument, NULL, 0},
+      {"16bit", no_argument, NULL, 0},
+      {"stereo", no_argument, NULL, 0},
+      {"rate", required_argument, NULL, 0},
+      {"version", no_argument, NULL, 0},
+      {"version-short", no_argument, NULL, 0},
+      {"comment", required_argument, NULL, 0},
+      {"author", required_argument, NULL, 0},
+      {"title", required_argument, NULL, 0},
+      {0, 0, 0, 0}
+   };
+   int print_bitrate=0;
+   spx_int32_t rate=0;
+   spx_int32_t size;
+   int chan=1;
+   int fmt=16;
+   spx_int32_t quality=-1;
+   float vbr_quality=-1;
+   int lsb=1;
+   ogg_stream_state os;
+   ogg_stream_state so; /* ogg stream for skeleton bitstream */
+   ogg_page 		 og;
+   ogg_packet 		 op;
+   int bytes_written=0, ret, result;
+   int id=-1;
+   SpeexHeader header;
+   int nframes=1;
+   spx_int32_t complexity=3;
+   const char* speex_version;
+   char vendor_string[64];
+   char *comments;
+   int comments_length;
+   int close_in=0, close_out=0;
+   int eos=0;
+   spx_int32_t bitrate=0;
+   double cumul_bits=0, enc_frames=0;
+   char first_bytes[12];
+   int wave_input=0;
+   spx_int32_t tmp;
+   SpeexPreprocessState *preprocess = NULL;
+   int denoise_enabled=0, agc_enabled=0;
+   spx_int32_t lookahead = 0;
+
+   speex_lib_ctl(SPEEX_LIB_GET_VERSION_STRING, (void*)&speex_version);
+   snprintf(vendor_string, sizeof(vendor_string), "Encoded with Speex %s", speex_version);
+   
+   comment_init(&comments, &comments_length, vendor_string);
+
+   /*Process command-line options*/
+   while(1)
+   {
+      c = getopt_long (argc, argv, "nwuhvV",
+                       long_options, &option_index);
+      if (c==-1)
+         break;
+      
+      switch(c)
+      {
+      case 0:
+         if (strcmp(long_options[option_index].name,"narrowband")==0)
+         {
+            modeID = SPEEX_MODEID_NB;
+         } else if (strcmp(long_options[option_index].name,"wideband")==0)
+         {
+            modeID = SPEEX_MODEID_WB;
+         } else if (strcmp(long_options[option_index].name,"ultra-wideband")==0)
+         {
+            modeID = SPEEX_MODEID_UWB;
+         } else if (strcmp(long_options[option_index].name,"vbr")==0)
+         {
+            vbr_enabled=1;
+         } else if (strcmp(long_options[option_index].name,"vbr-max-bitrate")==0)
+         {
+            vbr_max=atoi(optarg);
+            if (vbr_max<1)
+            {
+               fprintf (stderr, "Invalid VBR max bit-rate value: %d\n", vbr_max);
+               exit(1);
+            }
+         } else if (strcmp(long_options[option_index].name,"abr")==0)
+         {
+            abr_enabled=atoi(optarg);
+            if (!abr_enabled)
+            {
+               fprintf (stderr, "Invalid ABR value: %d\n", abr_enabled);
+               exit(1);
+            }
+         } else if (strcmp(long_options[option_index].name,"vad")==0)
+         {
+            vad_enabled=1;
+         } else if (strcmp(long_options[option_index].name,"dtx")==0)
+         {
+            dtx_enabled=1;
+         } else if (strcmp(long_options[option_index].name,"quality")==0)
+         {
+            quality = atoi (optarg);
+            vbr_quality=atof(optarg);
+         } else if (strcmp(long_options[option_index].name,"bitrate")==0)
+         {
+            bitrate = atoi (optarg);
+         } else if (strcmp(long_options[option_index].name,"nframes")==0)
+         {
+            nframes = atoi (optarg);
+            if (nframes<1)
+               nframes=1;
+            if (nframes>10)
+               nframes=10;
+         } else if (strcmp(long_options[option_index].name,"comp")==0)
+         {
+            complexity = atoi (optarg);
+         } else if (strcmp(long_options[option_index].name,"denoise")==0)
+         {
+            denoise_enabled=1;
+         } else if (strcmp(long_options[option_index].name,"agc")==0)
+         {
+            agc_enabled=1;
+         } else if (strcmp(long_options[option_index].name,"skeleton")==0)
+         {
+            with_skeleton=1;
+         } else if (strcmp(long_options[option_index].name,"help")==0)
+         {
+            usage();
+            exit(0);
+         } else if (strcmp(long_options[option_index].name,"quiet")==0)
+         {
+            quiet = 1;
+         } else if (strcmp(long_options[option_index].name,"version")==0)
+         {
+            version();
+            exit(0);
+         } else if (strcmp(long_options[option_index].name,"version-short")==0)
+         {
+            version_short();
+            exit(0);
+         } else if (strcmp(long_options[option_index].name,"le")==0)
+         {
+            lsb=1;
+         } else if (strcmp(long_options[option_index].name,"be")==0)
+         {
+            lsb=0;
+         } else if (strcmp(long_options[option_index].name,"8bit")==0)
+         {
+            fmt=8;
+         } else if (strcmp(long_options[option_index].name,"16bit")==0)
+         {
+            fmt=16;
+         } else if (strcmp(long_options[option_index].name,"stereo")==0)
+         {
+            chan=2;
+         } else if (strcmp(long_options[option_index].name,"rate")==0)
+         {
+            rate=atoi (optarg);
+         } else if (strcmp(long_options[option_index].name,"comment")==0)
+         {
+	   if (!strchr(optarg, '='))
+	   {
+	     fprintf (stderr, "Invalid comment: %s\n", optarg);
+	     fprintf (stderr, "Comments must be of the form name=value\n");
+	     exit(1);
+	   }
+           comment_add(&comments, &comments_length, NULL, optarg); 
+         } else if (strcmp(long_options[option_index].name,"author")==0)
+         {
+           comment_add(&comments, &comments_length, "author=", optarg); 
+         } else if (strcmp(long_options[option_index].name,"title")==0)
+         {
+           comment_add(&comments, &comments_length, "title=", optarg); 
+         }
+
+         break;
+      case 'n':
+         modeID = SPEEX_MODEID_NB;
+         break;
+      case 'h':
+         usage();
+         exit(0);
+         break;
+      case 'v':
+         version();
+         exit(0);
+         break;
+      case 'V':
+         print_bitrate=1;
+         break;
+      case 'w':
+         modeID = SPEEX_MODEID_WB;
+         break;
+      case 'u':
+         modeID = SPEEX_MODEID_UWB;
+         break;
+      case '?':
+         usage();
+         exit(1);
+         break;
+      }
+   }
+   if (argc-optind!=2)
+   {
+      usage();
+      exit(1);
+   }
+   inFile=argv[optind];
+   outFile=argv[optind+1];
+
+   /*Initialize Ogg stream struct*/
+   srand(time(NULL));
+   if (ogg_stream_init(&os, rand())==-1)
+   {
+      fprintf(stderr,"Error: stream init failed\n");
+      exit(1);
+   }
+   if (with_skeleton && ogg_stream_init(&so, rand())==-1)
+   {
+      fprintf(stderr,"Error: stream init failed\n");
+      exit(1);
+   }
+
+   if (strcmp(inFile, "-")==0)
+   {
+#if defined WIN32 || defined _WIN32
+         _setmode(_fileno(stdin), _O_BINARY);
+#elif defined OS2
+         _fsetmode(stdin,"b");
+#endif
+      fin=stdin;
+   }
+   else 
+   {
+      fin = fopen(inFile, "rb");
+      if (!fin)
+      {
+         perror(inFile);
+         exit(1);
+      }
+      close_in=1;
+   }
+
+   {
+      fread(first_bytes, 1, 12, fin);
+      if (strncmp(first_bytes,"RIFF",4)==0 && strncmp(first_bytes,"RIFF",4)==0)
+      {
+         if (read_wav_header(fin, &rate, &chan, &fmt, &size)==-1)
+            exit(1);
+         wave_input=1;
+         lsb=1; /* CHECK: exists big-endian .wav ?? */
+      }
+   }
+
+   if (modeID==-1 && !rate)
+   {
+      /* By default, use narrowband/8 kHz */
+      modeID = SPEEX_MODEID_NB;
+      rate=8000;
+   } else if (modeID!=-1 && rate)
+   {
+      mode = speex_lib_get_mode (modeID);
+      if (rate>48000)
+      {
+         fprintf (stderr, "Error: sampling rate too high: %d Hz, try down-sampling\n", rate);
+         exit(1);
+      } else if (rate>25000)
+      {
+         if (modeID != SPEEX_MODEID_UWB)
+         {
+            fprintf (stderr, "Warning: Trying to encode in %s at %d Hz. I'll do it but I suggest you try ultra-wideband instead\n", mode->modeName , rate);
+         }
+      } else if (rate>12500)
+      {
+         if (modeID != SPEEX_MODEID_WB)
+         {
+            fprintf (stderr, "Warning: Trying to encode in %s at %d Hz. I'll do it but I suggest you try wideband instead\n", mode->modeName , rate);
+         }
+      } else if (rate>=6000)
+      {
+         if (modeID != SPEEX_MODEID_NB)
+         {
+            fprintf (stderr, "Warning: Trying to encode in %s at %d Hz. I'll do it but I suggest you try narrowband instead\n", mode->modeName , rate);
+         }
+      } else {
+         fprintf (stderr, "Error: sampling rate too low: %d Hz\n", rate);
+         exit(1);
+      }
+   } else if (modeID==-1)
+   {
+      if (rate>48000)
+      {
+         fprintf (stderr, "Error: sampling rate too high: %d Hz, try down-sampling\n", rate);
+         exit(1);
+      } else if (rate>25000)
+      {
+         modeID = SPEEX_MODEID_UWB;
+      } else if (rate>12500)
+      {
+         modeID = SPEEX_MODEID_WB;
+      } else if (rate>=6000)
+      {
+         modeID = SPEEX_MODEID_NB;
+      } else {
+         fprintf (stderr, "Error: Sampling rate too low: %d Hz\n", rate);
+         exit(1);
+      }
+   } else if (!rate)
+   {
+      if (modeID == SPEEX_MODEID_NB)
+         rate=8000;
+      else if (modeID == SPEEX_MODEID_WB)
+         rate=16000;
+      else if (modeID == SPEEX_MODEID_UWB)
+         rate=32000;
+   }
+
+   if (!quiet)
+      if (rate!=8000 && rate!=16000 && rate!=32000)
+         fprintf (stderr, "Warning: Speex is only optimized for 8, 16 and 32 kHz. It will still work at %d Hz but your mileage may vary\n", rate); 
+
+   if (!mode)
+      mode = speex_lib_get_mode (modeID);
+
+   speex_init_header(&header, rate, 1, mode);
+   header.frames_per_packet=nframes;
+   header.vbr=vbr_enabled;
+   header.nb_channels = chan;
+
+   {
+      char *st_string="mono";
+      if (chan==2)
+         st_string="stereo";
+      if (!quiet)
+         fprintf (stderr, "Encoding %d Hz audio using %s mode (%s)\n", 
+               header.rate, mode->modeName, st_string);
+   }
+   /*fprintf (stderr, "Encoding %d Hz audio at %d bps using %s mode\n", 
+     header.rate, mode->bitrate, mode->modeName);*/
+
+   /*Initialize Speex encoder*/
+   st = speex_encoder_init(mode);
+
+   if (strcmp(outFile,"-")==0)
+   {
+#if defined WIN32 || defined _WIN32
+      _setmode(_fileno(stdout), _O_BINARY);
+#endif
+      fout=stdout;
+   }
+   else 
+   {
+      fout = fopen(outFile, "wb");
+      if (!fout)
+      {
+         perror(outFile);
+         exit(1);
+      }
+      close_out=1;
+   }
+
+   speex_encoder_ctl(st, SPEEX_GET_FRAME_SIZE, &frame_size);
+   speex_encoder_ctl(st, SPEEX_SET_COMPLEXITY, &complexity);
+   speex_encoder_ctl(st, SPEEX_SET_SAMPLING_RATE, &rate);
+
+   if (quality >= 0)
+   {
+      if (vbr_enabled)
+      {
+         if (vbr_max>0)
+            speex_encoder_ctl(st, SPEEX_SET_VBR_MAX_BITRATE, &vbr_max);
+         speex_encoder_ctl(st, SPEEX_SET_VBR_QUALITY, &vbr_quality);
+      }
+      else
+         speex_encoder_ctl(st, SPEEX_SET_QUALITY, &quality);
+   }
+   if (bitrate)
+   {
+      if (quality >= 0 && vbr_enabled)
+         fprintf (stderr, "Warning: --bitrate option is overriding --quality\n");
+      speex_encoder_ctl(st, SPEEX_SET_BITRATE, &bitrate);
+   }
+   if (vbr_enabled)
+   {
+      tmp=1;
+      speex_encoder_ctl(st, SPEEX_SET_VBR, &tmp);
+   } else if (vad_enabled)
+   {
+      tmp=1;
+      speex_encoder_ctl(st, SPEEX_SET_VAD, &tmp);
+   }
+   if (dtx_enabled)
+      speex_encoder_ctl(st, SPEEX_SET_DTX, &tmp);
+   if (dtx_enabled && !(vbr_enabled || abr_enabled || vad_enabled))
+   {
+      fprintf (stderr, "Warning: --dtx is useless without --vad, --vbr or --abr\n");
+   } else if ((vbr_enabled || abr_enabled) && (vad_enabled))
+   {
+      fprintf (stderr, "Warning: --vad is already implied by --vbr or --abr\n");
+   }
+   if (with_skeleton) {
+      fprintf (stderr, "Warning: Enabling skeleton output may cause some decoders to fail.\n");
+   }
+
+   if (abr_enabled)
+   {
+      speex_encoder_ctl(st, SPEEX_SET_ABR, &abr_enabled);
+   }
+
+   speex_encoder_ctl(st, SPEEX_GET_LOOKAHEAD, &lookahead);
+   
+   if (denoise_enabled || agc_enabled)
+   {
+      preprocess = speex_preprocess_state_init(frame_size, rate);
+      speex_preprocess_ctl(preprocess, SPEEX_PREPROCESS_SET_DENOISE, &denoise_enabled);
+      speex_preprocess_ctl(preprocess, SPEEX_PREPROCESS_SET_AGC, &agc_enabled);
+      lookahead += frame_size;
+   }
+
+   /* first packet should be the skeleton header. */
+
+   if (with_skeleton) {
+      add_fishead_packet(&so);
+      if ((ret = flush_ogg_stream_to_file(&so, fout))) {
+	 fprintf (stderr,"Error: failed skeleton (fishead) header to output stream\n");
+         exit(1);
+      } else
+	 bytes_written += ret;
+   }
+
+   /*Write header*/
+   {
+      int packet_size;
+      op.packet = (unsigned char *)speex_header_to_packet(&header, &packet_size);
+      op.bytes = packet_size;
+      op.b_o_s = 1;
+      op.e_o_s = 0;
+      op.granulepos = 0;
+      op.packetno = 0;
+      ogg_stream_packetin(&os, &op);
+      free(op.packet);
+
+      while((result = ogg_stream_flush(&os, &og)))
+      {
+         if(!result) break;
+         ret = oe_write_page(&og, fout);
+         if(ret != og.header_len + og.body_len)
+         {
+            fprintf (stderr,"Error: failed writing header to output stream\n");
+            exit(1);
+         }
+         else
+            bytes_written += ret;
+      }
+
+      op.packet = (unsigned char *)comments;
+      op.bytes = comments_length;
+      op.b_o_s = 0;
+      op.e_o_s = 0;
+      op.granulepos = 0;
+      op.packetno = 1;
+      ogg_stream_packetin(&os, &op);
+   }
+
+   /* fisbone packet should be write after all bos pages */
+   if (with_skeleton) {
+      add_fisbone_packet(&so, os.serialno, &header);
+      if ((ret = flush_ogg_stream_to_file(&so, fout))) {
+	 fprintf (stderr,"Error: failed writing skeleton (fisbone )header to output stream\n");
+         exit(1);
+      } else
+	 bytes_written += ret;
+   }
+
+   /* writing the rest of the speex header packets */
+   while((result = ogg_stream_flush(&os, &og)))
+   {
+      if(!result) break;
+      ret = oe_write_page(&og, fout);
+      if(ret != og.header_len + og.body_len)
+      {
+         fprintf (stderr,"Error: failed writing header to output stream\n");
+         exit(1);
+      }
+      else
+         bytes_written += ret;
+   }
+
+   free(comments);
+
+   /* write the skeleton eos packet */
+   if (with_skeleton) {
+      add_eos_packet_to_stream(&so);
+      if ((ret = flush_ogg_stream_to_file(&so, fout))) {
+         fprintf (stderr,"Error: failed writing skeleton header to output stream\n");
+         exit(1);
+      } else
+	 bytes_written += ret;
+   }
+
+
+   speex_bits_init(&bits);
+
+   if (!wave_input)
+   {
+      nb_samples = read_samples(fin,frame_size,fmt,chan,lsb,input, first_bytes, NULL);
+   } else {
+      nb_samples = read_samples(fin,frame_size,fmt,chan,lsb,input, NULL, &size);
+   }
+   if (nb_samples==0)
+      eos=1;
+   total_samples += nb_samples;
+   nb_encoded = -lookahead;
+   /*Main encoding loop (one frame per iteration)*/
+   while (!eos || total_samples>nb_encoded)
+   {
+      id++;
+      /*Encode current frame*/
+      if (chan==2)
+         speex_encode_stereo_int(input, frame_size, &bits);
+
+      if (preprocess)
+         speex_preprocess(preprocess, input, NULL);
+
+      speex_encode_int(st, input, &bits);
+      
+      nb_encoded += frame_size;
+      if (print_bitrate) {
+         int tmp;
+         char ch=13;
+         speex_encoder_ctl(st, SPEEX_GET_BITRATE, &tmp);
+         fputc (ch, stderr);
+         cumul_bits += tmp;
+         enc_frames += 1;
+         if (!quiet)
+         {
+            if (vad_enabled || vbr_enabled || abr_enabled)
+               fprintf (stderr, "Bitrate is use: %d bps  (average %d bps)   ", tmp, (int)(cumul_bits/enc_frames));
+            else
+               fprintf (stderr, "Bitrate is use: %d bps     ", tmp);
+         }
+         
+      }
+
+      if (wave_input)
+      {
+         nb_samples = read_samples(fin,frame_size,fmt,chan,lsb,input, NULL, &size);
+      } else {
+         nb_samples = read_samples(fin,frame_size,fmt,chan,lsb,input, NULL, NULL);
+      }
+      if (nb_samples==0)
+      {
+         eos=1;
+      }
+      if (eos && total_samples<=nb_encoded)
+         op.e_o_s = 1;
+      else
+         op.e_o_s = 0;
+      total_samples += nb_samples;
+
+      if ((id+1)%nframes!=0)
+         continue;
+      speex_bits_insert_terminator(&bits);
+      nbBytes = speex_bits_write(&bits, cbits, MAX_FRAME_BYTES);
+      speex_bits_reset(&bits);
+      op.packet = (unsigned char *)cbits;
+      op.bytes = nbBytes;
+      op.b_o_s = 0;
+      /*Is this redundent?*/
+      if (eos && total_samples<=nb_encoded)
+         op.e_o_s = 1;
+      else
+         op.e_o_s = 0;
+      op.granulepos = (id+1)*frame_size-lookahead;
+      if (op.granulepos>total_samples)
+         op.granulepos = total_samples;
+      /*printf ("granulepos: %d %d %d %d %d %d\n", (int)op.granulepos, id, nframes, lookahead, 5, 6);*/
+      op.packetno = 2+id/nframes;
+      ogg_stream_packetin(&os, &op);
+
+      /*Write all new pages (most likely 0 or 1)*/
+      while (ogg_stream_pageout(&os,&og))
+      {
+         ret = oe_write_page(&og, fout);
+         if(ret != og.header_len + og.body_len)
+         {
+            fprintf (stderr,"Error: failed writing header to output stream\n");
+            exit(1);
+         }
+         else
+            bytes_written += ret;
+      }
+   }
+   if ((id+1)%nframes!=0)
+   {
+      while ((id+1)%nframes!=0)
+      {
+         id++;
+         speex_bits_pack(&bits, 15, 5);
+      }
+      nbBytes = speex_bits_write(&bits, cbits, MAX_FRAME_BYTES);
+      op.packet = (unsigned char *)cbits;
+      op.bytes = nbBytes;
+      op.b_o_s = 0;
+      op.e_o_s = 1;
+      op.granulepos = (id+1)*frame_size-lookahead;
+      if (op.granulepos>total_samples)
+         op.granulepos = total_samples;
+
+      op.packetno = 2+id/nframes;
+      ogg_stream_packetin(&os, &op);
+   }
+   /*Flush all pages left to be written*/
+   while (ogg_stream_flush(&os, &og))
+   {
+      ret = oe_write_page(&og, fout);
+      if(ret != og.header_len + og.body_len)
+      {
+         fprintf (stderr,"Error: failed writing header to output stream\n");
+         exit(1);
+      }
+      else
+         bytes_written += ret;
+   }
+
+   speex_encoder_destroy(st);
+   speex_bits_destroy(&bits);
+   ogg_stream_clear(&os);
+
+   if (close_in)
+      fclose(fin);
+   if (close_out)
+      fclose(fout);
+   return 0;
+}
+
+/*                 
+ Comments will be stored in the Vorbis style.            
+ It is describled in the "Structure" section of
+    http://www.xiph.org/ogg/vorbis/doc/v-comment.html
+
+The comment header is decoded as follows:
+  1) [vendor_length] = read an unsigned integer of 32 bits
+  2) [vendor_string] = read a UTF-8 vector as [vendor_length] octets
+  3) [user_comment_list_length] = read an unsigned integer of 32 bits
+  4) iterate [user_comment_list_length] times {
+     5) [length] = read an unsigned integer of 32 bits
+     6) this iteration's user comment = read a UTF-8 vector as [length] octets
+     }
+  7) [framing_bit] = read a single bit as boolean
+  8) if ( [framing_bit]  unset or end of packet ) then ERROR
+  9) done.
+
+  If you have troubles, please write to ymnk@jcraft.com.
+ */
+
+#define readint(buf, base) (((buf[base+3]<<24)&0xff000000)| \
+                           ((buf[base+2]<<16)&0xff0000)| \
+                           ((buf[base+1]<<8)&0xff00)| \
+  	           	    (buf[base]&0xff))
+#define writeint(buf, base, val) do{ buf[base+3]=((val)>>24)&0xff; \
+                                     buf[base+2]=((val)>>16)&0xff; \
+                                     buf[base+1]=((val)>>8)&0xff; \
+                                     buf[base]=(val)&0xff; \
+                                 }while(0)
+
+void comment_init(char **comments, int* length, char *vendor_string)
+{
+  int vendor_length=strlen(vendor_string);
+  int user_comment_list_length=0;
+  int len=4+vendor_length+4;
+  char *p=(char*)malloc(len);
+  if(p==NULL){
+     fprintf (stderr, "malloc failed in comment_init()\n");
+     exit(1);
+  }
+  writeint(p, 0, vendor_length);
+  memcpy(p+4, vendor_string, vendor_length);
+  writeint(p, 4+vendor_length, user_comment_list_length);
+  *length=len;
+  *comments=p;
+}
+void comment_add(char **comments, int* length, char *tag, char *val)
+{
+  char* p=*comments;
+  int vendor_length=readint(p, 0);
+  int user_comment_list_length=readint(p, 4+vendor_length);
+  int tag_len=(tag?strlen(tag):0);
+  int val_len=strlen(val);
+  int len=(*length)+4+tag_len+val_len;
+
+  p=(char*)realloc(p, len);
+  if(p==NULL){
+     fprintf (stderr, "realloc failed in comment_add()\n");
+     exit(1);
+  }
+
+  writeint(p, *length, tag_len+val_len);      /* length of comment */
+  if(tag) memcpy(p+*length+4, tag, tag_len);  /* comment */
+  memcpy(p+*length+4+tag_len, val, val_len);  /* comment */
+  writeint(p, 4+vendor_length, user_comment_list_length+1);
+
+  *comments=p;
+  *length=len;
+}
+#undef readint
+#undef writeint
diff --git a/src/wav_io.c b/src/wav_io.c
new file mode 100644
index 0000000..02931b1
--- /dev/null
+++ b/src/wav_io.c
@@ -0,0 +1,232 @@
+/* Copyright (C) 2002 Jean-Marc Valin 
+   File: wav_io.c
+   Routines to handle wav (RIFF) headers
+
+   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.
+*/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdio.h>
+#include <string.h>
+#include "speex/speex_types.h"
+#include "wav_io.h"
+
+
+int read_wav_header(FILE *file, int *rate, int *channels, int *format, spx_int32_t *size)
+{
+   char ch[5];
+   spx_int32_t itmp;
+   spx_int16_t stmp;
+   spx_int32_t bpersec;
+   spx_int16_t balign;
+   int skip_bytes;
+   int i;
+
+   ch[4]=0;
+#if 0
+   fread(ch, 1, 4, file);
+   if (strcmp(ch, "RIFF")!=0)
+   {
+      fseek(file, 0, SEEK_SET);
+      return 0;
+   }
+
+   fread(&itmp, 4, 1, file);
+   *size = le_int(itmp-36);
+
+   fread(ch, 1, 4, file);
+   if (strcmp(ch, "WAVE")!=0)
+   {
+      fprintf (stderr, "RIFF file is not a WAVE file\n");
+      return -1;
+   }
+#endif
+   fread(ch, 1, 4, file);
+   while (strcmp(ch, "fmt ")!=0)
+   {
+      fread(&itmp, 4, 1, file);
+      itmp = le_int(itmp);
+      /*fprintf (stderr, "skip=%d\n", itmp);*/
+      /*strange way of seeking, but it works even for pipes*/
+      for (i=0;i<itmp;i++)
+         fgetc(file);
+      /*fseek(file, itmp, SEEK_CUR);*/
+      fread(ch, 1, 4, file);
+      if (feof(file))
+      {
+         fprintf (stderr, "Corrupted WAVE file: no \"fmt \"\n");
+         return -1;
+      }
+   }
+   /*if (strcmp(ch, "fmt ")!=0)
+   {
+      fprintf (stderr, "Corrupted WAVE file: no \"fmt \"\n");
+      return -1;
+      }*/
+   
+   fread(&itmp, 4, 1, file);
+   itmp = le_int(itmp);
+   skip_bytes=itmp-16;
+   /*fprintf (stderr, "skip=%d\n", skip_bytes);*/
+   
+   fread(&stmp, 2, 1, file);
+   stmp = le_short(stmp);
+   if (stmp!=1)
+   {
+      fprintf (stderr, "Only PCM encoding is supported\n");
+      return -1;
+   }
+
+   fread(&stmp, 2, 1, file);
+   stmp = le_short(stmp);
+   *channels = stmp;
+   
+   if (stmp>2)
+   {
+      fprintf (stderr, "Only mono and (intensity) stereo supported\n");
+      return -1;
+   }
+
+   fread(&itmp, 4, 1, file);
+   itmp = le_int(itmp);
+   *rate = itmp;
+   if (*rate != 8000 && *rate != 16000 && *rate != 11025 && *rate != 22050 && *rate != 32000 && *rate != 44100 && *rate != 48000)
+   {
+      fprintf (stderr, "Only 8 kHz (narrowband) and 16 kHz (wideband) supported (plus 11.025 kHz and 22.05 kHz, but your mileage may vary)\n");
+      return -1;
+   }
+
+   fread(&itmp, 4, 1, file);
+   bpersec = le_int(itmp);
+
+   fread(&stmp, 2, 1, file);
+   balign = le_short(stmp);
+
+   fread(&stmp, 2, 1, file);
+   stmp = le_short(stmp);
+   if (stmp!=16 && stmp!=8)
+   {
+      fprintf (stderr, "Only 8/16-bit linear supported\n");
+      return -1;
+   }
+   *format=stmp;
+
+   if (bpersec!=*rate**channels*stmp/8)
+   {
+      fprintf (stderr, "Corrupted header: ByteRate mismatch\n");
+      return -1;
+   }
+
+   if (balign!=*channels*stmp/8)
+   {
+      fprintf (stderr, "Corrupted header: BlockAlign mismatch\n");
+      return -1;
+   }
+
+   
+   /*strange way of seeking, but it works even for pipes*/
+   if (skip_bytes>0)
+      for (i=0;i<skip_bytes;i++)
+         fgetc(file);
+
+   /*fseek(file, skip_bytes, SEEK_CUR);*/
+
+   fread(ch, 1, 4, file);
+   while (strcmp(ch, "data")!=0)
+   {
+      fread(&itmp, 4, 1, file);
+      itmp = le_int(itmp);
+      /*strange way of seeking, but it works even for pipes*/
+      for (i=0;i<itmp;i++)
+         fgetc(file);
+      /*fseek(file, itmp, SEEK_CUR);*/
+      fread(ch, 1, 4, file);
+      if (feof(file))
+      {
+         fprintf (stderr, "Corrupted WAVE file: no \"data\"\n");
+         return -1;
+      }
+   }
+
+   /*Ignore this for now*/
+   fread(&itmp, 4, 1, file);
+   itmp = le_int(itmp);
+
+   *size=itmp;
+
+   return 1;
+}
+
+
+
+void write_wav_header(FILE *file, int rate, int channels, int format, int size)
+{
+   char ch[5];
+   spx_int32_t itmp;
+   spx_int16_t stmp;
+
+   ch[4]=0;
+
+   fprintf (file, "RIFF");
+
+   itmp = 0x7fffffff;
+   fwrite(&itmp, 4, 1, file);
+
+   fprintf (file, "WAVEfmt ");
+
+   itmp = le_int(16);
+   fwrite(&itmp, 4, 1, file);
+
+   stmp = le_short(1);
+   fwrite(&stmp, 2, 1, file);
+
+   stmp = le_short(channels);
+   fwrite(&stmp, 2, 1, file);
+
+   itmp = le_int(rate);
+   fwrite(&itmp, 4, 1, file);
+
+   itmp = le_int(rate*channels*2);
+   fwrite(&itmp, 4, 1, file);
+
+   stmp = le_short(2*channels);
+   fwrite(&stmp, 2, 1, file);
+
+   stmp = le_short(16);
+   fwrite(&stmp, 2, 1, file);
+
+   fprintf (file, "data");
+
+   itmp = le_int(0x7fffffff);
+   fwrite(&itmp, 4, 1, file);
+
+
+}
diff --git a/src/wav_io.h b/src/wav_io.h
new file mode 100644
index 0000000..0755763
--- /dev/null
+++ b/src/wav_io.h
@@ -0,0 +1,66 @@
+/* Copyright (C) 2002 Jean-Marc Valin 
+   File: wav_io.h
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+   
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   
+   - Neither the name of the Xiph.org Foundation nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+   
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef WAV_IO_H
+#define WAV_IO_H
+
+#include <stdio.h>
+#include "speex/speex_types.h"
+
+#if !defined(__LITTLE_ENDIAN__) && ( defined(WORDS_BIGENDIAN) || defined(__BIG_ENDIAN__) )
+#define le_short(s) ((short) ((unsigned short) (s) << 8) | ((unsigned short) (s) >> 8))
+#define be_short(s) ((short) (s))
+#else
+#define le_short(s) ((short) (s))
+#define be_short(s) ((short) ((unsigned short) (s) << 8) | ((unsigned short) (s) >> 8))
+#endif 
+
+/** Convert little endian */
+static inline spx_int32_t le_int(spx_int32_t i)
+{
+#if !defined(__LITTLE_ENDIAN__) && ( defined(WORDS_BIGENDIAN) || defined(__BIG_ENDIAN__) )
+   spx_uint32_t ui, ret;
+   ui = i;
+   ret =  ui>>24;
+   ret |= (ui>>8)&0x0000ff00;
+   ret |= (ui<<8)&0x00ff0000;
+   ret |= (ui<<24);
+   return ret;
+#else
+   return i;
+#endif
+}
+
+int read_wav_header(FILE *file, int *rate, int *channels, int *format, spx_int32_t *size);
+
+void write_wav_header(FILE *file, int rate, int channels, int format, int size);
+
+#endif
diff --git a/src/wave_out.c b/src/wave_out.c
new file mode 100644
index 0000000..64eeb6e
--- /dev/null
+++ b/src/wave_out.c
@@ -0,0 +1,220 @@
+/* Copyright (c) 2002, John Edwards

+

+   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.

+*/

+

+#ifdef HAVE_CONFIG_H

+# include "config.h"

+#endif

+

+/* Set TABS = 4 */

+/********************************************************************

+

+ function: To provide playback of 16 bit PCM wave data in Win32

+           environments from decoded compressed files.

+

+ ********************************************************************/

+

+#if defined WIN32 || defined _WIN32

+

+#include <string.h>

+#include <errno.h>

+#include "wave_out.h"

+

+#define MAXWAVESIZE     4294967040LU

+#define MAX_WAVEBLOCKS    32

+

+// This is modified for USE_WIN_AUDIO - ONLY 2002-02-27

+

+

+static CRITICAL_SECTION  cs;

+static HWAVEOUT          dev                    = NULL;

+static int               ScheduledBlocks        = 0;

+static int               PlayedWaveHeadersCount = 0;          // free index

+static WAVEHDR*          PlayedWaveHeaders [MAX_WAVEBLOCKS];

+

+static int

+Box ( const char* msg )

+{

+	MessageBox ( NULL, msg, " "VERSION_STRING": Error Message . . .", MB_OK | MB_ICONEXCLAMATION );

+	return -1;

+}

+

+

+/*

+ *  This function registers already played WAVE chunks. Freeing is done by free_memory(),

+ */

+

+static void CALLBACK

+wave_callback ( HWAVE hWave, UINT uMsg, DWORD dwInstance, DWORD dwParam1, DWORD dwParam2 )

+{

+	if ( uMsg == WOM_DONE ) {

+		EnterCriticalSection ( &cs );

+		PlayedWaveHeaders [PlayedWaveHeadersCount++] = (WAVEHDR*) dwParam1;

+		LeaveCriticalSection ( &cs );

+	}

+}

+

+

+static void

+free_memory ( void )

+{

+	WAVEHDR*  wh;

+	HGLOBAL   hg;

+

+	EnterCriticalSection ( &cs );

+	wh = PlayedWaveHeaders [--PlayedWaveHeadersCount];

+	ScheduledBlocks--;                               // decrease the number of USED blocks

+	LeaveCriticalSection ( &cs );

+

+	waveOutUnprepareHeader ( dev, wh, sizeof (WAVEHDR) );

+

+	hg = GlobalHandle ( wh -> lpData );       // Deallocate the buffer memory

+	GlobalUnlock (hg);

+	GlobalFree   (hg);

+

+	hg = GlobalHandle ( wh );                 // Deallocate the header memory

+	GlobalUnlock (hg);

+	GlobalFree   (hg);

+}

+

+

+Int

+Set_WIN_Params ( FILE_T   dummyFile ,

+                 Ldouble  SampleFreq,

+                 Uint     BitsPerSample,

+                 Uint     Channels )

+{

+	WAVEFORMATEX  outFormat;

+	UINT          deviceID = WAVE_MAPPER;

+

+	(void) dummyFile;

+

+	if ( waveOutGetNumDevs () == 0 )

+		return Box ( "No audio device present." );

+

+	outFormat.wFormatTag      = WAVE_FORMAT_PCM;

+	outFormat.wBitsPerSample  = BitsPerSample;

+	outFormat.nChannels       = Channels;

+	outFormat.nSamplesPerSec  = (unsigned long)(SampleFreq + 0.5);

+	outFormat.nBlockAlign     = (outFormat.wBitsPerSample + 7) / 8 * outFormat.nChannels;

+	outFormat.nAvgBytesPerSec = outFormat.nSamplesPerSec * outFormat.nBlockAlign;

+

+	switch ( waveOutOpen ( &dev, deviceID, &outFormat, (DWORD)wave_callback, 0, CALLBACK_FUNCTION ) )

+	{

+		case MMSYSERR_ALLOCATED:   return Box ( "Device is already open." );

+		case MMSYSERR_BADDEVICEID: return Box ( "The specified device is out of range." );

+		case MMSYSERR_NODRIVER:    return Box ( "There is no audio driver in this system." );

+		case MMSYSERR_NOMEM:       return Box ( "Unable to allocate sound memory." );

+		case WAVERR_BADFORMAT:     return Box ( "This audio format is not supported." );

+		case WAVERR_SYNC:          return Box ( "The device is synchronous." );

+		default:                   return Box ( "Unknown media error." );

+		case MMSYSERR_NOERROR:     break;

+	}

+

+	waveOutReset ( dev );

+	InitializeCriticalSection ( &cs );

+	SetPriorityClass ( GetCurrentProcess (), HIGH_PRIORITY_CLASS );

+	return 0;

+}

+

+

+int

+WIN_Play_Samples ( const void* data, size_t len )

+{

+	HGLOBAL    hg;

+	HGLOBAL    hg2;

+	LPWAVEHDR  wh;

+	void*      allocptr;

+

+	do {

+		while ( PlayedWaveHeadersCount > 0 )                // free used blocks ...

+			free_memory ();

+

+		if ( ScheduledBlocks < sizeof(PlayedWaveHeaders)/sizeof(*PlayedWaveHeaders) ) // wait for a free block ...

+			break;

+		Sleep (26);

+	} while (1);

+

+	if ( (hg2 = GlobalAlloc ( GMEM_MOVEABLE, len )) == NULL )   // allocate some memory for a copy of the buffer

+		return Box ( "GlobalAlloc failed." );

+

+	allocptr = GlobalLock (hg2);

+	CopyMemory ( allocptr, data, len );                         // Here we can call any modification output functions we want....

+

+	if ( (hg = GlobalAlloc (GMEM_MOVEABLE | GMEM_ZEROINIT, sizeof (WAVEHDR))) == NULL ) // now make a header and WRITE IT!

+		return -1;

+

+	wh                   = GlobalLock (hg);

+	wh -> dwBufferLength = len;

+	wh -> lpData         = allocptr;

+

+	if ( waveOutPrepareHeader ( dev, wh, sizeof (WAVEHDR)) != MMSYSERR_NOERROR ) {

+		GlobalUnlock (hg);

+		GlobalFree   (hg);

+		return -1;

+	}

+

+	if ( waveOutWrite ( dev, wh, sizeof (WAVEHDR)) != MMSYSERR_NOERROR ) {

+		GlobalUnlock (hg);

+		GlobalFree   (hg);

+		return -1;

+	}

+

+	EnterCriticalSection ( &cs );

+	ScheduledBlocks++;

+	LeaveCriticalSection ( &cs );

+

+	return len;

+}

+

+

+int

+WIN_Audio_close ( void )

+{

+	if ( dev != NULL ) {

+

+		while ( ScheduledBlocks > 0 ) {

+			Sleep (ScheduledBlocks);

+			while ( PlayedWaveHeadersCount > 0 )         // free used blocks ...

+				free_memory ();

+		}

+

+		waveOutReset (dev);      // reset the device

+		waveOutClose (dev);      // close the device

+		dev = NULL;

+	}

+

+	DeleteCriticalSection ( &cs );

+	ScheduledBlocks = 0;

+	return 0;

+}

+

+#endif

+

+/* end of wave_out.c */

diff --git a/src/wave_out.h b/src/wave_out.h
new file mode 100644
index 0000000..0c467b1
--- /dev/null
+++ b/src/wave_out.h
@@ -0,0 +1,71 @@
+/* Copyright (c) 2002, John Edwards

+

+   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.

+*/

+

+//    WAVE_OUT.H - Necessary stuff for WIN_AUDIO

+

+#ifndef WAVE_OUT_H

+#define WAVE_OUT_H

+

+#include <stdio.h>

+#include <windows.h>

+#ifdef __MINGW32__

+#include <mmsystem.h>

+#endif

+

+#define VERSION_STRING "\n 0.7.0\n"

+

+#define Cdecl               __cdecl

+#define __attribute__(x)

+#define sleep(__sec)        Sleep ((__sec) * 1000)

+#define inline              __inline

+#define restrict

+

+//// constants /////////////////////////////////////////////////////

+

+#define CD_SAMPLE_FREQ         44.1e3

+#define SAMPLE_SIZE            16

+#define SAMPLE_SIZE_STRING     ""

+#define WINAUDIO_FD            ((FILE_T)-128)

+#define FILE_T                 FILE*

+#define INVALID_FILEDESC       NULL

+

+//// Simple types //////////////////////////////////////////////////

+

+typedef signed   int        Int;        // at least -32767...+32767, fast type

+typedef unsigned int        Uint;       // at least 0...65535, fast type

+typedef long double         Ldouble;    // most exact floating point format

+

+//// procedures/functions //////////////////////////////////////////

+// wave_out.c

+Int        Set_WIN_Params             ( FILE_T dummyFile , Ldouble SampleFreq, Uint BitsPerSample, Uint Channels);

+int        WIN_Play_Samples           ( const void* buff, size_t len );

+int        WIN_Audio_close            ( void );

+

+#endif /* WAVE_OUT_H */